From d5519068970d6a2c4aacf10bf361084bf72dbfe4 Mon Sep 17 00:00:00 2001
From: Renato Atilio <renato@discourse.org>
Date: Mon, 23 Feb 2026 10:31:18 -0300
Subject: [PATCH 001/168] DEV: restrict everyone on whisper groups via a new
 disallowed_groups attr (#37515)

Introduces support for a new `disallowed_groups` option for site
settings of type `group_list`.

This allows a site setting to specify groups that should be hidden from
the group selector in the UI and stripped from values set via the API.
---
 config/site_settings.yml                      |  4 ++
 .../components/site-settings/group-list.gjs   | 11 ++--
 .../components/group-list-setting-test.gjs    | 54 +++++++++++++++++++
 lib/site_setting_extension.rb                 | 11 ++++
 lib/site_settings/type_supervisor.rb          |  1 +
 spec/lib/site_setting_extension_spec.rb       | 18 +++++++
 6 files changed, 95 insertions(+), 4 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 401b66d49823d..b26acfbd97f6b 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -16,6 +16,9 @@
 #                         The key should be as the same as possible value of default_locale.
 # mandatory_values      - A list of mandatory values that must be included in the setting, these cannot be changed or removed
 #                         in the UI.
+# disallowed_groups     - A list of group IDs (pipe-separated) that should be hidden from the group selector.
+#                         These groups cannot be selected and will be stripped if set via API.
+#                         Only applies to group_list type settings.
 # requires_confirmation - A string that indicates if the setting requires confirmation before it can be changed.
 #                         Only valid value here is "simple" which will display a confirmation dialog when the setting
 #                         is changed.
@@ -449,6 +452,7 @@ basic:
     default: ""
     allow_any: false
     refresh: true
+    disallowed_groups: "0"
     area: "group_permissions"
   hidden_post_visible_groups:
     type: group_list
diff --git a/frontend/discourse/admin/components/site-settings/group-list.gjs b/frontend/discourse/admin/components/site-settings/group-list.gjs
index a10192021f508..b9127111a3ae1 100644
--- a/frontend/discourse/admin/components/site-settings/group-list.gjs
+++ b/frontend/discourse/admin/components/site-settings/group-list.gjs
@@ -10,11 +10,14 @@ export default class GroupList extends Component {
   nameProperty = "name";
   valueProperty = "id";
 
-  @computed("site.groups")
+  @computed("site.groups", "setting.disallowed_groups")
   get groupChoices() {
-    return (this.site.groups || []).map((g) => {
-      return { name: g.name, id: g.id.toString() };
-    });
+    const disallowed = (this.setting?.disallowed_groups || "")
+      .split("|")
+      .filter(Boolean);
+    return (this.site.groups || [])
+      .filter((g) => !disallowed.includes(g.id.toString()))
+      .map((g) => ({ name: g.name, id: g.id.toString() }));
   }
 
   @computed("value")
diff --git a/frontend/discourse/tests/integration/components/group-list-setting-test.gjs b/frontend/discourse/tests/integration/components/group-list-setting-test.gjs
index 465fc8b0f461b..912eef74b7199 100644
--- a/frontend/discourse/tests/integration/components/group-list-setting-test.gjs
+++ b/frontend/discourse/tests/integration/components/group-list-setting-test.gjs
@@ -102,4 +102,58 @@ module("Integration | Component | group-list site-setting", function (hooks) {
 
     assert.dom(".selected-content button").hasClass("disabled");
   });
+
+  test("disallowed groups", async function (assert) {
+    this.site.groups = [
+      {
+        id: 0,
+        name: "everyone",
+      },
+      {
+        id: 1,
+        name: "Donuts",
+      },
+      {
+        id: 2,
+        name: "Cheese cake",
+      },
+    ];
+
+    this.set(
+      "setting",
+      SiteSetting.create({
+        category: "foo",
+        default: "",
+        description: "Choose groups",
+        placeholder: null,
+        preview: null,
+        secret: false,
+        setting: "foo_bar",
+        type: "group_list",
+        disallowed_groups: "0",
+        value: "",
+      })
+    );
+
+    await render(
+      <template><SiteSettingComponent @setting={{this.setting}} /></template>
+    );
+
+    const subject = selectKit(".list-setting");
+
+    await subject.expand();
+
+    assert.false(
+      subject.rowByValue("0").exists(),
+      "disallowed group is not in the list"
+    );
+    assert.true(
+      subject.rowByValue("1").exists(),
+      "allowed group is in the list"
+    );
+    assert.true(
+      subject.rowByValue("2").exists(),
+      "allowed group is in the list"
+    );
+  });
 });
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index f7dd93b2ec140..41632988f5059 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -138,6 +138,10 @@ def mandatory_values
     @mandatory_values ||= {}
   end
 
+  def disallowed_groups
+    @disallowed_groups ||= {}
+  end
+
   def shadowed_settings
     @shadowed_settings ||= Set.new
   end
@@ -466,6 +470,7 @@ def all_settings(
             secret: secret_settings.include?(s),
             placeholder: placeholder(s),
             mandatory_values: mandatory_values[s],
+            disallowed_groups: disallowed_groups[s],
             requires_confirmation: requires_confirmation_settings[s],
             upcoming_change: only_upcoming_changes ? upcoming_change_metadata[s] : nil,
             themeable: themeable[s],
@@ -697,6 +702,11 @@ def add_override!(name, val)
         (mandatory_values[name.to_sym].split("|") | sanitized_val.to_s.split("|")).join("|")
     end
 
+    if disallowed_groups[name.to_sym]
+      disallowed = disallowed_groups[name.to_sym].split("|")
+      sanitized_val = sanitized_val.to_s.split("|").reject { |v| disallowed.include?(v) }.join("|")
+    end
+
     provider.save(name, sanitized_val, type)
     current[name] = type_supervisor.to_rb_value(name, sanitized_val)
     modified[name] = current[name]
@@ -1110,6 +1120,7 @@ def setting(name_arg, default = nil, opts = {})
       defaults.load_setting(name, default, opts.delete(:locale_default))
 
       mandatory_values[name] = opts[:mandatory_values] if opts[:mandatory_values]
+      disallowed_groups[name] = opts[:disallowed_groups] if opts[:disallowed_groups]
 
       requires_confirmation_settings[name] = (
         if SiteSettings::TypeSupervisor::REQUIRES_CONFIRMATION_TYPES.values.include?(
diff --git a/lib/site_settings/type_supervisor.rb b/lib/site_settings/type_supervisor.rb
index 7820b8ff517b0..36e623408b716 100644
--- a/lib/site_settings/type_supervisor.rb
+++ b/lib/site_settings/type_supervisor.rb
@@ -26,6 +26,7 @@ class SiteSettings::TypeSupervisor
     depends_behavior
     authorized_extensions
     max_file_size_kb
+    disallowed_groups
   ].freeze
   VALIDATOR_OPTS = %i[min max regex hidden regex_error json_schema schema].freeze
 
diff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rb
index bbe496bab33af..8f130e7247cef 100644
--- a/spec/lib/site_setting_extension_spec.rb
+++ b/spec/lib/site_setting_extension_spec.rb
@@ -1300,6 +1300,24 @@ def self.translate_names?
     end
   end
 
+  describe "disallowed_groups for group list settings" do
+    it "strips disallowed groups when setting a value" do
+      SiteSetting.whispers_allowed_groups = "0|1|2"
+      expect(SiteSetting.whispers_allowed_groups).to eq("1|2")
+
+      SiteSetting.whispers_allowed_groups = "0"
+      expect(SiteSetting.whispers_allowed_groups).to eq("")
+
+      SiteSetting.whispers_allowed_groups = "1|0|2|0"
+      expect(SiteSetting.whispers_allowed_groups).to eq("1|2")
+    end
+
+    it "is included in all_settings output" do
+      setting = SiteSetting.all_settings.find { |s| s[:setting] == :whispers_allowed_groups }
+      expect(setting[:disallowed_groups]).to eq("0")
+    end
+  end
+
   describe "requires_confirmation settings" do
     it "returns 'simple' for settings that require confirmation with 'simple' type" do
       expect(

From 0e138f0ac5f01fd6900add7094a311c11f459678 Mon Sep 17 00:00:00 2001
From: Renato Atilio <renato@discourse.org>
Date: Mon, 23 Feb 2026 10:31:34 -0300
Subject: [PATCH 002/168] FEATURE: add infinite loading to site texts (#37512)

Enhances the admin site text search page by adding support for infinite
"load more" results.
---
 .../controllers/admin-site-text/index.js      | 80 +++++++++++--------
 .../admin/routes/admin-site-text/index.js     | 15 +---
 .../admin/templates/admin-site-text/index.gjs | 29 ++++---
 spec/system/admin_site_texts_spec.rb          | 12 +++
 4 files changed, 79 insertions(+), 57 deletions(-)

diff --git a/frontend/discourse/admin/controllers/admin-site-text/index.js b/frontend/discourse/admin/controllers/admin-site-text/index.js
index ff470d843c91e..c225d80c00cc6 100644
--- a/frontend/discourse/admin/controllers/admin-site-text/index.js
+++ b/frontend/discourse/admin/controllers/admin-site-text/index.js
@@ -2,6 +2,7 @@ import { tracked } from "@glimmer/tracking";
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
+import { TrackedArray } from "@ember-compat/tracked-built-ins";
 import ReseedModal from "discourse/admin/components/modal/reseed";
 import discourseDebounce from "discourse/lib/debounce";
 import { disableImplicitInjections } from "discourse/lib/implicit-injections";
@@ -26,6 +27,7 @@ export default class AdminSiteTextIndexController extends Controller {
 
   @tracked searching = false;
   @tracked preferred = false;
+  @tracked canLoadMore = true;
 
   queryParams = [
     "q",
@@ -36,6 +38,17 @@ export default class AdminSiteTextIndexController extends Controller {
     "onlySelectedLocale",
   ];
 
+  #page = 0;
+  #results = new TrackedArray();
+
+  get siteTexts() {
+    return this.#results.flat();
+  }
+
+  get extras() {
+    return this.model?.extras ?? {};
+  }
+
   get resolvedOverridden() {
     return [true, "true"].includes(this.overridden) ?? false;
   }
@@ -72,12 +85,28 @@ export default class AdminSiteTextIndexController extends Controller {
         locale: this.resolvedLocale,
         untranslated: this.resolvedUntranslated,
         only_selected_locale: this.resolvedOnlySelectedLocale,
+        page: this.#page,
       });
+
+      if (this.#page === 0) {
+        this.#results.length = 0;
+      }
+
+      this.#results.push(this.model.content);
+      this.canLoadMore = this.model.extras?.has_more ?? false;
     } finally {
       this.searching = false;
     }
   }
 
+  resetSearch() {
+    this.#page = 0;
+    this.#results.length = 0;
+    this.canLoadMore = true;
+    this.searching = true;
+    this._performSearch();
+  }
+
   get availableLocales() {
     return this.siteSettings.available_locales;
   }
@@ -101,64 +130,51 @@ export default class AdminSiteTextIndexController extends Controller {
 
   @action
   toggleOverridden() {
-    if (this.resolvedOverridden) {
-      this.overridden = null;
-    } else {
-      this.overridden = true;
-    }
-    this.searching = true;
-    discourseDebounce(this, this._performSearch, 400);
+    this.overridden = this.resolvedOverridden ? null : true;
+    this.resetSearch();
   }
 
   @action
   toggleOutdated() {
-    if (this.resolvedOutdated) {
-      this.outdated = null;
-    } else {
-      this.outdated = true;
-    }
-    this.searching = true;
-    discourseDebounce(this, this._performSearch, 400);
+    this.outdated = this.resolvedOutdated ? null : true;
+    this.resetSearch();
   }
 
   @action
   toggleUntranslated() {
-    if (this.resolvedUntranslated) {
-      this.untranslated = null;
-    } else {
-      this.untranslated = true;
-    }
-    this.searching = true;
-    discourseDebounce(this, this._performSearch, 400);
+    this.untranslated = this.resolvedUntranslated ? null : true;
+    this.resetSearch();
   }
 
   @action
   toggleOnlySelectedLocale() {
-    if (this.resolvedOnlySelectedLocale) {
-      this.onlySelectedLocale = null;
-    } else {
-      this.onlySelectedLocale = true;
-    }
-    this.searching = true;
-    discourseDebounce(this, this._performSearch, 400);
+    this.onlySelectedLocale = this.resolvedOnlySelectedLocale ? null : true;
+    this.resetSearch();
   }
 
   @action
   search() {
     const q = this.q;
     if (q !== lastSearch) {
-      this.searching = true;
-      discourseDebounce(this, this._performSearch, 400);
       lastSearch = q;
+      discourseDebounce(this, this.resetSearch, 400);
     }
   }
 
   @action
   updateLocale(value) {
-    this.searching = true;
     this.locale = value;
+    this.resetSearch();
+  }
 
-    discourseDebounce(this, this._performSearch, 400);
+  @action
+  loadMore() {
+    if (this.searching || !this.canLoadMore) {
+      return;
+    }
+    this.#page += 1;
+    this.searching = true;
+    this._performSearch();
   }
 
   @action
diff --git a/frontend/discourse/admin/routes/admin-site-text/index.js b/frontend/discourse/admin/routes/admin-site-text/index.js
index 77c6b223399ba..7945c3d5d07ac 100644
--- a/frontend/discourse/admin/routes/admin-site-text/index.js
+++ b/frontend/discourse/admin/routes/admin-site-text/index.js
@@ -1,12 +1,8 @@
 import Route from "@ember/routing/route";
-import { service } from "@ember/service";
 import { disableImplicitInjections } from "discourse/lib/implicit-injections";
 
 @disableImplicitInjections
 export default class AdminSiteTextIndexRoute extends Route {
-  @service siteSettings;
-  @service store;
-
   queryParams = {
     q: { replace: true },
     overridden: { replace: true },
@@ -15,14 +11,7 @@ export default class AdminSiteTextIndexRoute extends Route {
     locale: { replace: true },
   };
 
-  model(params) {
-    return this.store.find("site-text", {
-      q: params.q,
-      overridden: params.overridden ?? false,
-      outdated: params.outdated ?? false,
-      untranslated: params.untranslated ?? false,
-      locale: params.locale ?? this.siteSettings.default_locale,
-      only_selected_locale: params.onlySelectedLocale ?? false,
-    });
+  setupController(controller) {
+    controller.resetSearch();
   }
 }
diff --git a/frontend/discourse/admin/templates/admin-site-text/index.gjs b/frontend/discourse/admin/templates/admin-site-text/index.gjs
index 4dcca172a6ded..82e1bf48a08e6 100644
--- a/frontend/discourse/admin/templates/admin-site-text/index.gjs
+++ b/frontend/discourse/admin/templates/admin-site-text/index.gjs
@@ -3,6 +3,7 @@ import { on } from "@ember/modifier";
 import SiteTextSummary from "discourse/admin/components/site-text-summary";
 import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
 import DButton from "discourse/components/d-button";
+import LoadMore from "discourse/components/load-more";
 import TextField from "discourse/components/text-field";
 import ComboBox from "discourse/select-kit/components/combo-box";
 import { i18n } from "discourse-i18n";
@@ -84,24 +85,28 @@ export default <template>
     </p>
   </div>
 
-  <ConditionalLoadingSpinner @condition={{@controller.searching}}>
-    {{#if @controller.model.extras.recommended}}
-      <p><b>{{i18n "admin.site_text.recommended"}}</b></p>
-    {{/if}}
+  {{#if @controller.extras.recommended}}
+    <p><b>{{i18n "admin.site_text.recommended"}}</b></p>
+  {{/if}}
 
-    {{#each @controller.model.content as |siteText|}}
+  <LoadMore
+    @action={{@controller.loadMore}}
+    @enabled={{@controller.canLoadMore}}
+    @isLoading={{@controller.searching}}
+    class="site-text-list"
+  >
+    {{#each @controller.siteTexts as |siteText|}}
       <SiteTextSummary
         @siteText={{siteText}}
         @editAction={{@controller.edit}}
         @term={{@controller.q}}
-        @searchRegex={{@controller.model.extras.regex}}
+        @searchRegex={{@controller.extras.regex}}
       />
     {{else}}
-      {{i18n "admin.site_text.no_results"}}
+      {{#unless @controller.searching}}
+        {{i18n "admin.site_text.no_results"}}
+      {{/unless}}
     {{/each}}
-
-    {{#if @controller.model.extras.has_more}}
-      <p class="warning">{{i18n "admin.site_text.more_than_50_results"}}</p>
-    {{/if}}
-  </ConditionalLoadingSpinner>
+    <ConditionalLoadingSpinner @condition={{@controller.searching}} />
+  </LoadMore>
 </template>
diff --git a/spec/system/admin_site_texts_spec.rb b/spec/system/admin_site_texts_spec.rb
index d8332718f4fd3..514a9595f730d 100644
--- a/spec/system/admin_site_texts_spec.rb
+++ b/spec/system/admin_site_texts_spec.rb
@@ -128,4 +128,16 @@
 
     expect(page.all(".modal label span").map(&:text)).to eq(["Uncategorized"])
   end
+
+  it "can load more results" do
+    site_texts_page.visit
+    site_texts_page.search("e")
+
+    expect(page).to have_css(".site-text", minimum: 50)
+    initial_count = page.all(".site-text").count
+
+    page.execute_script("window.scrollTo(0, document.body.scrollHeight)")
+
+    expect(page).to have_css(".site-text", minimum: initial_count + 1)
+  end
 end

From af3cca4462d5dd64463b057f3a7bff05317fbde4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 23 Feb 2026 16:05:49 +0100
Subject: [PATCH 003/168] FIX: Suppress post revision notifications during
 silent bulk category moves (#37832)

When performing a bulk category move with the "Notify users of this
change" option unchecked, topic authors were still receiving "edited"
notifications. This happened because the silent flag was not propagated
to the PostRevision `after_create` callback.

The original implementation (7a099ebb) correctly suppressed the
`notify_category_change` job (PostAlerter path) but missed the second
notification path: `PostActionNotifier.after_create_post_revision`,
which fires via the PostRevision `after_create` callback when
`create_revision_on_bulk_topic_moves` is enabled.

This fix adds a transient `silent` attr_accessor to PostRevision, set by
PostRevisor before saving, and checked as an early return guard in
`PostActionNotifier.after_create_post_revision`.

The specs are also updated to properly enable PostActionNotifier (which
is disabled by default in tests) so the revision notification path is
actually exercised.

Ref - t/174237
---
 app/models/post_revision.rb          |  2 +
 app/services/post_action_notifier.rb |  1 +
 lib/post_revisor.rb                  |  4 +-
 spec/lib/topics_bulk_action_spec.rb  | 85 ++++++++--------------------
 4 files changed, 29 insertions(+), 63 deletions(-)

diff --git a/app/models/post_revision.rb b/app/models/post_revision.rb
index 921267d3a0811..9c9c32363c3e9 100644
--- a/app/models/post_revision.rb
+++ b/app/models/post_revision.rb
@@ -4,6 +4,8 @@ class PostRevision < ActiveRecord::Base
   belongs_to :post
   belongs_to :user
 
+  attr_accessor :silent
+
   serialize :modifications, type: Hash, coder: YAML
 
   after_create :create_notification
diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index c90fa520349f0..698d2362935fb 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -105,6 +105,7 @@ def self.after_create_post_revision(post_revision)
     return if post_revision.user.blank?
     return if post.topic.blank?
     return if post.topic.private_message?
+    return if post_revision.silent
     return if notification_is_disabled?(post_revision)
 
     user_ids = []
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index ae85f470b0551..1f4ef6e5b5fba 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -625,13 +625,15 @@ def create_revision
     end
 
     @post_revision =
-      PostRevision.create!(
+      PostRevision.new(
         user_id: @post.last_editor_id,
         post_id: @post.id,
         number: @post.version,
         modifications:,
         hidden: @hidden_revision,
       )
+    @post_revision.silent = @silent
+    @post_revision.save!
   end
 
   def update_revision
diff --git a/spec/lib/topics_bulk_action_spec.rb b/spec/lib/topics_bulk_action_spec.rb
index 9787eef2dc8d9..43d91464372c3 100644
--- a/spec/lib/topics_bulk_action_spec.rb
+++ b/spec/lib/topics_bulk_action_spec.rb
@@ -160,84 +160,45 @@
     fab!(:first_post) { Fabricate(:post, topic: topic) }
 
     describe "silent option" do
-      fab!(:topic_watcher, :user)
-      fab!(:category_watcher, :user)
       fab!(:admin)
 
       before do
         Jobs.run_immediately!
+        PostActionNotifier.enable
+        SiteSetting.create_revision_on_bulk_topic_moves = true
         TopicUser.change(
-          topic_watcher,
+          Fabricate(:user),
           topic.id,
           notification_level: TopicUser.notification_levels[:watching],
         )
         CategoryUser.set_notification_level_for_category(
-          category_watcher,
+          Fabricate(:user),
           CategoryUser.notification_levels[:watching_first_post],
           category.id,
         )
       end
 
-      shared_examples "silent option suppresses notifications" do
-        it "notifies topic watchers when silent is false" do
-          expect do
-            TopicsBulkAction.new(
-              admin,
-              [topic.id],
-              type: "change_category",
-              category_id: category.id,
-            ).perform!
-          end.to change { Notification.where(user: topic_watcher).count }
-        end
-
-        it "does not notify topic watchers when silent is true" do
-          expect do
-            TopicsBulkAction.new(
-              admin,
-              [topic.id],
-              type: "change_category",
-              category_id: category.id,
-              silent: true,
-            ).perform!
-          end.to not_change { Notification.where(user: topic_watcher).count }
-        end
-
-        it "notifies category watchers when silent is false" do
-          expect do
-            TopicsBulkAction.new(
-              admin,
-              [topic.id],
-              type: "change_category",
-              category_id: category.id,
-            ).perform!
-          end.to change { Notification.where(user: category_watcher).count }.by(1)
-
-          expect(Notification.where(user: category_watcher).last.notification_type).to eq(
-            Notification.types[:watching_first_post],
-          )
-        end
-
-        it "does not notify category watchers when silent is true" do
-          expect do
-            TopicsBulkAction.new(
-              admin,
-              [topic.id],
-              type: "change_category",
-              category_id: category.id,
-              silent: true,
-            ).perform!
-          end.to not_change { Notification.where(user: category_watcher).count }
-        end
-      end
-
-      context "when create_revision_on_bulk_topic_moves is enabled" do
-        before { SiteSetting.create_revision_on_bulk_topic_moves = true }
-        include_examples "silent option suppresses notifications"
+      it "does not create any notifications when silent is true" do
+        expect do
+          TopicsBulkAction.new(
+            admin,
+            [topic.id],
+            type: "change_category",
+            category_id: category.id,
+            silent: true,
+          ).perform!
+        end.to not_change { Notification.count }
       end
 
-      context "when create_revision_on_bulk_topic_moves is disabled" do
-        before { SiteSetting.create_revision_on_bulk_topic_moves = false }
-        include_examples "silent option suppresses notifications"
+      it "creates notifications when silent is false" do
+        expect do
+          TopicsBulkAction.new(
+            admin,
+            [topic.id],
+            type: "change_category",
+            category_id: category.id,
+          ).perform!
+        end.to change { Notification.count }
       end
     end
 

From abb64e8b113f8dd9a9b6559a5a400a8e4e127703 Mon Sep 17 00:00:00 2001
From: Jake Goldsborough <ducks@discourse.org>
Date: Thu, 29 Jan 2026 14:28:19 -0800
Subject: [PATCH 004/168] FIX: Add nil guards to webhook signature validation

Prevents 500 errors when webhooks are called with missing or malformed
parameters. Now returns 406 Not Acceptable cleanly instead of crashing.

- Sendgrid: guard against nil error_code on non-blocked bounces
- Mailgun legacy: guard against nil params["error"]
- Sendgrid signature: early return if headers missing
- Mailjet/Postmark/Sparkpost: guard against missing token param
- Mandrill: guard against missing signature header
---
 app/controllers/webhooks_controller.rb    | 10 ++-
 spec/requests/webhooks_controller_spec.rb | 97 +++++++++++++++++++++++
 2 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index acd118650e885..763c31d07aa22 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -38,7 +38,7 @@ def sendgrid
         # so we set the error code to 5.1.2 which translates to permanent failure bad destination system address.
         error_code = "5.1.2" if !error_code && event["type"] == "blocked"
 
-        if error_code[Email::SMTP_STATUS_TRANSIENT_FAILURE]
+        if error_code&.[](Email::SMTP_STATUS_TRANSIENT_FAILURE)
           process_bounce(message_id, to_address, SiteSetting.soft_bounce_score, error_code)
         else
           process_bounce(message_id, to_address, SiteSetting.hard_bounce_score, error_code)
@@ -241,7 +241,7 @@ def handle_mailgun_legacy(params)
     # only handle soft bounces, because hard bounces are also handled
     # by the "dropped" event and we don't want to increase bounce score twice
     # for the same message
-    if event == "bounced" && params["error"][Email::SMTP_STATUS_TRANSIENT_FAILURE]
+    if event == "bounced" && params["error"]&.[](Email::SMTP_STATUS_TRANSIENT_FAILURE)
       process_bounce(message_id, to_address, SiteSetting.soft_bounce_score, error_code)
     elsif event == "dropped"
       process_bounce(message_id, to_address, SiteSetting.hard_bounce_score, error_code)
@@ -280,6 +280,8 @@ def handle_mailgun_new(params)
   def valid_sendgrid_signature?
     signature = request.headers["X-Twilio-Email-Event-Webhook-Signature"]
     timestamp = request.headers["X-Twilio-Email-Event-Webhook-Timestamp"]
+    return false if signature.blank? || timestamp.blank?
+
     request.body.rewind
     payload = request.body.read
 
@@ -297,11 +299,13 @@ def valid_sendgrid_signature?
   end
 
   def valid_mailjet_token?
+    return false if params[:t].blank?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.mailjet_webhook_token)
   end
 
   def valid_mandrill_signature?
     signature = request.headers["X-Mandrill-Signature"]
+    return false if signature.blank?
 
     payload = "#{Discourse.base_url}/webhooks/mandrill"
     params
@@ -322,10 +326,12 @@ def valid_mandrill_signature?
   end
 
   def valid_postmark_token?
+    return false if params[:t].blank?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.postmark_webhook_token)
   end
 
   def valid_sparkpost_token?
+    return false if params[:t].blank?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.sparkpost_webhook_token)
   end
 
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index a4076d367e410..bd4a52ec0eee0 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -197,6 +197,35 @@
 
       expect(response.status).to eq(406)
     end
+
+    it "returns error if signature header is missing" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
+      post "/webhooks/sendgrid.json",
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112492",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+
+      expect(response.status).to eq(406)
+    end
+
+    it "returns error if timestamp header is missing" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
+      post "/webhooks/sendgrid.json",
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIGHQVtGj+Y3LkG9fLcxf3qfI10QysgDWmMOVmxG0u6ZUAiEAyBiXDWzM+uOe5W0JuG+luQAbPIqHh89M15TluLtEZtM=",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+
+      expect(response.status).to eq(406)
+    end
   end
 
   describe "#mailjet" do
@@ -253,6 +282,23 @@
       expect(response.status).to eq(406)
       expect(email_log.reload.bounced).to eq(false)
     end
+
+    it "returns error if token param is missing" do
+      SiteSetting.mailjet_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailjet.json",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
   end
 
   describe "#mailpace" do
@@ -367,6 +413,14 @@
 
       expect(response.status).to eq(406)
     end
+
+    it "returns error if signature header is missing" do
+      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
+
+      post "/webhooks/mandrill.json", params: payload
+
+      expect(response.status).to eq(406)
+    end
   end
 
   describe "#mandrill_head" do
@@ -445,6 +499,22 @@
       expect(response.status).to eq(406)
       expect(email_log.reload.bounced).to eq(false)
     end
+
+    it "returns error if token param is missing" do
+      SiteSetting.postmark_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/postmark.json",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
   end
 
   describe "#sparkpost" do
@@ -530,6 +600,33 @@
       expect(response.status).to eq(406)
       expect(email_log.reload.bounced).to eq(false)
     end
+
+    it "returns error if token param is missing" do
+      SiteSetting.sparkpost_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/sparkpost.json",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
+                     },
+                   },
+                 },
+               },
+             ],
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
   end
 
   describe "#aws" do

From b92b803cbc83d86e4e7f04d12b359b4bef2a5cc3 Mon Sep 17 00:00:00 2001
From: elRicharde <52285099+elRicharde@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:28:23 +0100
Subject: [PATCH 005/168] FIX: Poll option mention overlap (#37972)

Created first in own fork here:
https://github.com/elRicharde/discourse/pull/1

Poll option list items had no layout container, allowing @mention pills
to overlap the option marker or checkbox.

This change makes poll options flex rows so marker and content are
always laid out side by side.

CSS only, no behavior or markup changes.

Repro:
Create a poll with options that include @mentions (mention pills).
In the cooked topic view, the option marker/checkbox can overlap the
mention pill.

Fix:
Make poll option list items a flex row so the marker/checkbox and the
option content
are laid out side by side with consistent spacing.

Screenshots show the overlap before the change.

Screenshot 2026-02-08 093307 Screenshot 2026-02-08 093403 image

---------

Co-authored-by: Derek Rushforth <derekrushforth@users.noreply.github.com>
---
 .../poll/assets/stylesheets/common/poll.scss    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 102bf487a7bf2..5e175bc811c9c 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -34,11 +34,22 @@ div.poll-outer {
       button {
         background-color: transparent;
         border: none;
-        text-align: left;
-        padding-left: 23px;
-        text-indent: -23px;
         width: 100%;
         cursor: pointer;
+        display: flex;
+        align-items: flex-start;
+        gap: 0.5em;
+        text-align: left;
+      }
+
+      button svg {
+        flex: 0 0 auto;
+        margin-top: 0.15em;
+      }
+
+      .option-text {
+        flex: 1 1 auto;
+        min-width: 0;
       }
     }
 

From d01d060a8b14684454329a2d64837eb32f893d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 23 Feb 2026 16:30:10 +0100
Subject: [PATCH 006/168] FIX: unify watched word boundary regex across Ruby
 and JS engines (#37965)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The CJK fix (d7a53ada16) introduced separate boundary patterns for Ruby
and JS engines in `match_word_regexp`. The Ruby engine used `[:word:]`
(which includes digits), while the JS engine used `\P{L}` (non-Letter).
Since digits are not letters, the JS pattern treated them as valid word
boundaries — causing "123Test" to match as "3Test" and standalone number
watched words like "123" to match inside "abc123".

Replace both engine-specific patterns with a single unified pattern
using Unicode property classes (`\p{L}`, `\p{M}`, `\p{N}`, `\p{Pc}`)
that work identically in Ruby and JavaScript. This treats letters,
marks, numbers, and connector punctuation as word characters in boundary
checks, which fixes the number-matching bug for JS consumers while
preserving the existing correct behavior on the Ruby side.

Since `match_word_regexp` no longer branches on engine, remove the
now-dead `engine:` parameter from all 5 method signatures that threaded
it through (`match_word_regexp`, `word_to_regexp`, `regexps_for_action`,
`compiled_regexps_for_action`, `serialized_regexps_for_action`) and all
call sites passing `engine: :js` (serializers, pretty_text).

https://meta.discourse.org/t/396110
https://meta.discourse.org/t/396109

Follow-up to d7a53ada16 (#37844)
---
 app/serializers/site_serializer.rb            |   6 +-
 .../watched_word_list_serializer.rb           |   2 +-
 app/serializers/watched_word_serializer.rb    |   2 +-
 app/services/word_watcher.rb                  |  43 +--
 lib/pretty_text.rb                            |   6 +-
 .../admin/watched_words_controller_spec.rb    |   6 +-
 spec/services/word_watcher_spec.rb            | 308 ++++++------------
 7 files changed, 122 insertions(+), 251 deletions(-)

diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index e628a72759f50..59edfa3149aaa 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -269,7 +269,7 @@ def topic_featured_link_allowed_category_ids
   end
 
   def censored_regexp
-    WordWatcher.serialized_regexps_for_action(:censor, engine: :js)
+    WordWatcher.serialized_regexps_for_action(:censor)
   end
 
   def custom_emoji_translation
@@ -285,11 +285,11 @@ def include_shared_drafts_category_id?
   end
 
   def watched_words_replace
-    WordWatcher.regexps_for_action(:replace, engine: :js)
+    WordWatcher.regexps_for_action(:replace)
   end
 
   def watched_words_link
-    WordWatcher.regexps_for_action(:link, engine: :js)
+    WordWatcher.regexps_for_action(:link)
   end
 
   def categories
diff --git a/app/serializers/watched_word_list_serializer.rb b/app/serializers/watched_word_list_serializer.rb
index 42f89f326a6fe..68f3243b4192a 100644
--- a/app/serializers/watched_word_list_serializer.rb
+++ b/app/serializers/watched_word_list_serializer.rb
@@ -18,7 +18,7 @@ def words
   def compiled_regular_expressions
     expressions = {}
     actions.each do |action|
-      expressions[action] = WordWatcher.serialized_regexps_for_action(action, engine: :js)
+      expressions[action] = WordWatcher.serialized_regexps_for_action(action)
     end
     expressions
   end
diff --git a/app/serializers/watched_word_serializer.rb b/app/serializers/watched_word_serializer.rb
index aff7cb7a7f719..a880a5cad2c47 100644
--- a/app/serializers/watched_word_serializer.rb
+++ b/app/serializers/watched_word_serializer.rb
@@ -11,7 +11,7 @@ class WatchedWordSerializer < ApplicationSerializer
              :html
 
   def regexp
-    WordWatcher.word_to_regexp(word, engine: :js)
+    WordWatcher.word_to_regexp(word)
   end
 
   def action
diff --git a/app/services/word_watcher.rb b/app/services/word_watcher.rb
index c92be31723659..46282e0e8b9b8 100644
--- a/app/services/word_watcher.rb
+++ b/app/services/word_watcher.rb
@@ -53,15 +53,13 @@ def self.cached_words_for_action(action)
     end
   end
 
-  def self.regexps_for_action(action, engine: :ruby)
-    cached_words_for_action(action)&.to_h do |_, attrs|
-      [word_to_regexp(attrs[:word], engine: engine), attrs]
-    end
+  def self.regexps_for_action(action)
+    cached_words_for_action(action)&.to_h { |_, attrs| [word_to_regexp(attrs[:word]), attrs] }
   end
 
   # This regexp is run in miniracer, and the client JS app
   # Make sure it is compatible with major browsers when changing
-  def self.compiled_regexps_for_action(action, engine: :ruby, raise_errors: false)
+  def self.compiled_regexps_for_action(action, raise_errors: false)
     words = cached_words_for_action(action)
     return [] if words.blank?
 
@@ -92,11 +90,7 @@ def self.compiled_regexps_for_action(action, engine: :ruby, raise_errors: false)
         next if regexp.blank?
 
         # Add word boundaries to the regexp for regular watched words
-        regexp =
-          match_word_regexp(
-            regexp,
-            engine: engine,
-          ) if !SiteSetting.watched_words_regular_expressions?
+        regexp = match_word_regexp(regexp) if !SiteSetting.watched_words_regular_expressions?
 
         # Add case insensitive flag if needed
         begin
@@ -112,13 +106,11 @@ def self.compiled_regexps_for_action(action, engine: :ruby, raise_errors: false)
       .compact
   end
 
-  def self.serialized_regexps_for_action(action, engine: :ruby)
-    compiled_regexps_for_action(action, engine: engine).map do |r|
-      { r.source => { case_sensitive: !r.casefold? } }
-    end
+  def self.serialized_regexps_for_action(action)
+    compiled_regexps_for_action(action).map { |r| { r.source => { case_sensitive: !r.casefold? } } }
   end
 
-  def self.word_to_regexp(word, engine: :ruby, match_word: true)
+  def self.word_to_regexp(word, match_word: true)
     if SiteSetting.watched_words_regular_expressions?
       regexp = word
       regexp = "(#{regexp})" if match_word
@@ -132,7 +124,7 @@ def self.word_to_regexp(word, engine: :ruby, match_word: true)
       # Convert wildcards to regexp
       regexp = regexp.gsub("\\*", '\S*')
 
-      regexp = match_word_regexp(regexp, engine: engine) if match_word
+      regexp = match_word_regexp(regexp) if match_word
       regexp
     end
   end
@@ -294,19 +286,14 @@ def self.censor_text_with_regexp(text, regexp)
     "Tibetan" => "\\u0F00-\\u0FFF",
   }.values.join
 
-  def self.match_word_regexp(regexp, engine: :ruby)
+  WORD_CHARS = "[\\p{L}\\p{M}\\p{N}\\p{Pc}]"
+
+  def self.match_word_regexp(regexp)
     s = SPACELESS_SCRIPTS
-    if engine == :js
-      leading = "(?:[\\P{L}#{s}]|^|(?=[#{s}]))"
-      trailing = "(?:(?=[\\P{L}#{s}]|$)|(?<=[#{s}]))"
-      "#{leading}(#{regexp})#{trailing}"
-    elsif engine == :ruby
-      leading = "(?:(?<![[:word:]&&[^#{s}]])|(?=[#{s}]))"
-      trailing = "(?:(?![[:word:]&&[^#{s}]])|(?<=[#{s}]))"
-      "#{leading}(#{regexp})#{trailing}"
-    else
-      raise "unknown regexp engine: #{engine}"
-    end
+    w = WORD_CHARS
+    leading = "(?:(?<!#{w})|(?<=[#{s}])|(?=[#{s}]))"
+    trailing = "(?:(?!#{w})|(?=[#{s}])|(?<=[#{s}]))"
+    "#{leading}(#{regexp})#{trailing}"
   end
 
   private_class_method :match_word_regexp
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 3fdc93b055195..dc691606f7b76 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -218,9 +218,9 @@ def self.markdown(text, opts = {})
         __optInput.emojiUnicodeReplacer = __emojiUnicodeReplacer;
         __optInput.emojiDenyList = #{Emoji.denied.to_json};
         __optInput.lookupUploadUrls = __lookupUploadUrls;
-        __optInput.censoredRegexp = #{WordWatcher.serialized_regexps_for_action(:censor, engine: :js).to_json};
-        __optInput.watchedWordsReplace = #{WordWatcher.regexps_for_action(:replace, engine: :js).to_json};
-        __optInput.watchedWordsLink = #{WordWatcher.regexps_for_action(:link, engine: :js).to_json};
+        __optInput.censoredRegexp = #{WordWatcher.serialized_regexps_for_action(:censor).to_json};
+        __optInput.watchedWordsReplace = #{WordWatcher.regexps_for_action(:replace).to_json};
+        __optInput.watchedWordsLink = #{WordWatcher.regexps_for_action(:link).to_json};
         __optInput.additionalOptions = #{Site.markdown_additional_options.to_json};
         __optInput.avatar_sizes = #{SiteSetting.avatar_sizes.to_json};
       JS
diff --git a/spec/requests/admin/watched_words_controller_spec.rb b/spec/requests/admin/watched_words_controller_spec.rb
index 84fc5a2216e59..56a768af9ce13 100644
--- a/spec/requests/admin/watched_words_controller_spec.rb
+++ b/spec/requests/admin/watched_words_controller_spec.rb
@@ -38,20 +38,20 @@
           hash_including(
             "id" => word1.id,
             "word" => word1.word,
-            "regexp" => WordWatcher.word_to_regexp(word1.word, engine: :js),
+            "regexp" => WordWatcher.word_to_regexp(word1.word),
             "case_sensitive" => false,
             "action" => "block",
           ),
           hash_including(
             "id" => word4.id,
             "word" => word4.word,
-            "regexp" => WordWatcher.word_to_regexp(word4.word, engine: :js),
+            "regexp" => WordWatcher.word_to_regexp(word4.word),
             "case_sensitive" => false,
             "action" => "censor",
           ),
         )
         expect(watched_words["compiled_regular_expressions"]["block"].first).to eq(
-          WordWatcher.serialized_regexps_for_action(:block, engine: :js).first.deep_stringify_keys,
+          WordWatcher.serialized_regexps_for_action(:block).first.deep_stringify_keys,
         )
       end
     end
diff --git a/spec/services/word_watcher_spec.rb b/spec/services/word_watcher_spec.rb
index 7ee982e8be24f..a2cf184366b6f 100644
--- a/spec/services/word_watcher_spec.rb
+++ b/spec/services/word_watcher_spec.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe WordWatcher do
-  let(:raw) { <<~RAW.strip }
-      Do you like liquorice?
-
+  def matches(text, action = :require_approval)
+    described_class.new(text).word_matches_for_action?(action)
+  end
 
-      I really like them. One could even say that I am *addicted* to liquorice. And if
-      you can mix it up with some anise, then I'm in heaven ;)
-    RAW
+  def matches_all(text, action = :block)
+    described_class.new(text).word_matches_for_action?(action, all_matches: true)
+  end
 
   after { Discourse.redis.flushdb }
 
@@ -63,39 +63,42 @@
     end
 
     context "when watched_words_regular_expressions = true" do
-      it "returns the proper regexp" do
-        SiteSetting.watched_words_regular_expressions = true
+      before { SiteSetting.watched_words_regular_expressions = true }
+
+      it "matches words and respects case sensitivity" do
         regexps = described_class.compiled_regexps_for_action(:block)
 
-        expect(regexps).to be_an(Array)
-        expect(regexps.map(&:inspect)).to contain_exactly(
-          "/(#{word1})|(#{word2})/i",
-          "/(#{word3})|(#{word4})/",
-        )
+        case_insensitive = regexps.find(&:casefold?)
+        case_sensitive = regexps.find { |r| !r.casefold? }
+
+        expect(case_insensitive).to match(word1)
+        expect(case_insensitive).to match(word2)
+        expect(case_insensitive).to match(word1.upcase)
+        expect(case_sensitive).to match(word3)
+        expect(case_sensitive).to match(word4)
+        expect(case_sensitive).not_to match(word3.swapcase)
       end
     end
 
     context "when watched_words_regular_expressions = false" do
-      it "returns the proper regexp" do
+      it "groups words by case sensitivity and wraps them with word boundaries" do
         SiteSetting.watched_words_regular_expressions = false
         regexps = described_class.compiled_regexps_for_action(:block)
 
-        s = WordWatcher::SPACELESS_SCRIPTS
-        leading = "(?:(?<![[:word:]&&[^#{s}]])|(?=[#{s}]))"
-        trailing = "(?:(?![[:word:]&&[^#{s}]])|(?<=[#{s}]))"
+        case_sensitive = regexps.find { |r| !r.casefold? }
+        case_insensitive = regexps.find(&:casefold?)
 
-        expect(regexps).to be_an(Array)
-        expect(regexps.map(&:inspect)).to contain_exactly(
-          "/#{leading}(#{word1}|#{word2})#{trailing}/i",
-          "/#{leading}(#{word3}|#{word4})#{trailing}/",
-        )
+        expect(case_insensitive).to match(word1)
+        expect(case_insensitive).to match(word2)
+        expect(case_sensitive).to match(word3)
+        expect(case_sensitive).to match(word4)
+
+        expect(case_insensitive).not_to match("x#{word1}x")
+        expect(case_sensitive).not_to match("x#{word3}x")
       end
 
       it "is empty for an action without watched words" do
-        regexps = described_class.compiled_regexps_for_action(:censor)
-
-        expect(regexps).to be_an(Array)
-        expect(regexps).to be_empty
+        expect(described_class.compiled_regexps_for_action(:censor)).to be_empty
       end
     end
 
@@ -129,8 +132,6 @@
 
       it "works correctly when regular expressions are disabled" do
         regexps = described_class.compiled_regexps_for_action(:block)
-        expect(regexps).to be_an(Array)
-        expect(regexps.size).to eq(1)
         expect(regexps.first).to match("xyzabc")
         expect(regexps.first).to match(" abc")
         expect(regexps.first).to match("testabc")
@@ -139,10 +140,7 @@
 
       it "skips invalid watched words when regular expression are enabled" do
         SiteSetting.watched_words_regular_expressions = true
-
-        regexps = described_class.compiled_regexps_for_action(:block)
-        expect(regexps).to be_an(Array)
-        expect(regexps).to be_empty
+        expect(described_class.compiled_regexps_for_action(:block)).to be_empty
       end
     end
 
@@ -155,29 +153,14 @@
         Fabricate(:watched_word, word: "word", action: WatchedWord.actions[:block])
       end
 
-      it "does not raise an exception and still compiles valid words" do
+      it "still matches valid words even with invalid regex present" do
         expect { described_class.compiled_regexps_for_action(:block) }.not_to raise_error
-        regexps = described_class.compiled_regexps_for_action(:block)
-        expect(regexps).to be_an(Array)
-        expect(regexps).not_to be_empty
-        expect(regexps.first.inspect).to match(/bad.*word/i)
-      end
-
-      it "still detects matches for valid words even with invalid regex present" do
-        watcher = described_class.new("This is a bad word")
-        expect(watcher.should_block?).to be_truthy
-        expect(watcher.word_matches_for_action?(:block, all_matches: true)).to include(
-          "bad",
-          "word",
-        )
+        expect(matches_all("This is a bad word")).to include("bad", "word")
       end
 
       it "does not break serialized_regexps_for_action" do
-        expect {
-          described_class.serialized_regexps_for_action(:block, engine: :js)
-        }.not_to raise_error
-        serialized = described_class.serialized_regexps_for_action(:block, engine: :js)
-        expect(serialized).to be_an(Array)
+        expect { described_class.serialized_regexps_for_action(:block) }.not_to raise_error
+        serialized = described_class.serialized_regexps_for_action(:block)
         expect(serialized).not_to be_empty
       end
     end
@@ -185,7 +168,7 @@
 
   describe "#word_matches_for_action?" do
     it "is falsey when there are no watched words" do
-      expect(described_class.new(raw).word_matches_for_action?(:require_approval)).to be_falsey
+      expect(matches("nothing to see here")).to be_falsey
     end
 
     context "with watched words" do
@@ -194,125 +177,78 @@
       end
 
       it "is falsey without a match" do
-        expect(
-          described_class.new("No liquorice for me, thanks...").word_matches_for_action?(
-            :require_approval,
-          ),
-        ).to be_falsey
+        expect(matches("No liquorice for me, thanks...")).to be_falsey
       end
 
-      it "is returns matched words if there's a match" do
-        matches = described_class.new(raw).word_matches_for_action?(:require_approval)
-        expect(matches).to be_truthy
-        expect(matches[1]).to eq(anise.word)
+      it "returns matched word on match" do
+        expect(matches("I like anise")[1]).to eq("anise")
       end
 
       it "finds at start of string" do
-        matches =
-          described_class.new("#{anise.word} is garbage").word_matches_for_action?(
-            :require_approval,
-          )
-        expect(matches[1]).to eq(anise.word)
+        expect(matches("#{anise.word} is garbage")[1]).to eq(anise.word)
       end
 
       it "finds at end of string" do
-        matches =
-          described_class.new("who likes #{anise.word}").word_matches_for_action?(:require_approval)
-        expect(matches[1]).to eq(anise.word)
+        expect(matches("who likes #{anise.word}")[1]).to eq(anise.word)
       end
 
       it "finds non-letters in place of letters" do
         Fabricate(:watched_word, word: "co(onut", action: WatchedWord.actions[:require_approval])
-
-        matches =
-          described_class.new("This co(onut is delicious.").word_matches_for_action?(
-            :require_approval,
-          )
-        expect(matches[1]).to eq("co(onut")
+        expect(matches("This co(onut is delicious.")[1]).to eq("co(onut")
       end
 
       it "handles * for wildcards" do
         Fabricate(:watched_word, word: "a**le*", action: WatchedWord.actions[:require_approval])
-
-        matches =
-          described_class.new("I acknowledge you.").word_matches_for_action?(:require_approval)
-        expect(matches[1]).to eq("acknowledge")
+        expect(matches("I acknowledge you.")[1]).to eq("acknowledge")
       end
 
-      it "handles word boundary" do
+      it "matches words at boundaries with punctuation" do
         Fabricate(:watched_word, word: "love", action: WatchedWord.actions[:require_approval])
-        expect(
-          described_class.new("I Love, bananas.").word_matches_for_action?(:require_approval)[1],
-        ).to eq("Love")
-        expect(
-          described_class.new("I LOVE; apples.").word_matches_for_action?(:require_approval)[1],
-        ).to eq("LOVE")
-        expect(
-          described_class.new("love: is a thing.").word_matches_for_action?(:require_approval)[1],
-        ).to eq("love")
-        expect(
-          described_class.new("I love. oranges").word_matches_for_action?(:require_approval)[1],
-        ).to eq("love")
-        expect(
-          described_class.new("I :love. pineapples").word_matches_for_action?(:require_approval)[1],
-        ).to eq("love")
-        expect(
-          described_class.new("peace ,love and understanding.").word_matches_for_action?(
-            :require_approval,
-          )[
-            1
-          ],
-        ).to eq("love")
+
+        %w[Love, LOVE; love: love. :love. ,love].each do |token|
+          text = "I #{token} things"
+          word = token.gsub(/[^a-zA-Z]/, "")
+          expect(matches(text)[1]).to eq(word), "expected '#{word}' to match in '#{text}'"
+        end
       end
 
-      it "handles CJK characters as word boundaries" do
+      it "matches CJK watched words within CJK text" do
         Fabricate(:watched_word, word: "测试", action: WatchedWord.actions[:require_approval])
 
-        expect(described_class.new("测试").word_matches_for_action?(:require_approval)[1]).to eq("测试")
-        expect(
-          described_class.new("这是一个测试文本").word_matches_for_action?(:require_approval)[1],
-        ).to eq("测试")
-        expect(
-          described_class.new("hello 测试 world").word_matches_for_action?(:require_approval)[1],
-        ).to eq("测试")
-        expect(described_class.new("API测试结果").word_matches_for_action?(:require_approval)[1]).to eq(
-          "测试",
-        )
+        expect(matches("测试")[1]).to eq("测试")
+        expect(matches("这是一个测试文本")[1]).to eq("测试")
+        expect(matches("hello 测试 world")[1]).to eq("测试")
+        expect(matches("API测试结果")[1]).to eq("测试")
       end
 
-      it "handles Latin watched words adjacent to CJK text" do
+      it "matches Latin watched words adjacent to CJK text" do
         Fabricate(:watched_word, word: "Test", action: WatchedWord.actions[:require_approval])
 
-        expect(
-          described_class.new("我的Test很好").word_matches_for_action?(:require_approval)[1],
-        ).to eq("Test")
-        expect(
-          described_class.new("Testing").word_matches_for_action?(:require_approval),
-        ).to be_falsey
+        expect(matches("我的Test很好")[1]).to eq("Test")
+        expect(matches("Testing")).to be_falsey
       end
 
-      it "handles CJK boundaries with the JS engine" do
-        Fabricate(:watched_word, word: "测试", action: WatchedWord.actions[:require_approval])
+      it "does not match across word boundaries" do
+        Fabricate(:watched_word, word: "Test", action: WatchedWord.actions[:require_approval])
 
-        regexps = described_class.compiled_regexps_for_action(:require_approval, engine: :js)
-        expect(regexps.size).to eq(1)
+        expect(matches("Test")[1]).to eq("Test")
+        expect(matches("Test 123")[1]).to eq("Test")
+        expect(matches("123Test")).to be_falsey
+        expect(matches("Test123")).to be_falsey
 
-        re = regexps.first
-        expect(re).to match("测试")
-        expect(re).to match("这是一个测试文本")
-        expect(re).to match("hello 测试 world")
-        expect(re).to match("API测试结果")
+        Fabricate(:watched_word, word: "test", action: WatchedWord.actions[:require_approval])
+        expect(matches("foo_test_bar")).to be_falsey
+        expect(matches("_test")).to be_falsey
+        expect(matches("test_")).to be_falsey
+        expect(matches("foo-test-bar")[1]).to eq("test")
       end
 
-      it "handles Latin words adjacent to CJK text with the JS engine" do
-        Fabricate(:watched_word, word: "Test", action: WatchedWord.actions[:require_approval])
-
-        regexps = described_class.compiled_regexps_for_action(:require_approval, engine: :js)
-        expect(regexps.size).to eq(1)
+      it "treats numbers as word characters at boundaries" do
+        Fabricate(:watched_word, word: "123", action: WatchedWord.actions[:require_approval])
 
-        re = regexps.first
-        expect(re).to match("我的Test很好")
-        expect(re).not_to match("Testing")
+        expect(matches("hello 123 world")[1]).to eq("123")
+        expect(matches("abc123")).to be_falsey
+        expect(matches("123abc")).to be_falsey
       end
 
       context "when there are multiple matches" do
@@ -322,19 +258,8 @@
               Fabricate(:watched_word, word: word, action: WatchedWord.actions[:block])
             end
 
-            matches =
-              described_class.new("I hate bananas").word_matches_for_action?(
-                :block,
-                all_matches: true,
-              )
-            expect(matches).to contain_exactly("hate", "bananas")
-
-            matches =
-              described_class.new("She hates bananas too").word_matches_for_action?(
-                :block,
-                all_matches: true,
-              )
-            expect(matches).to contain_exactly("hates", "bananas")
+            expect(matches_all("I hate bananas")).to contain_exactly("hate", "bananas")
+            expect(matches_all("She hates bananas too")).to contain_exactly("hates", "bananas")
           end
         end
 
@@ -349,18 +274,11 @@
               action: WatchedWord.actions[:block],
             )
 
-            matches =
-              described_class.new("pine pineapples apples").word_matches_for_action?(
-                :block,
-                all_matches: true,
-              )
-            expect(matches).to contain_exactly("pineapples", "apples")
-
-            matches =
-              described_class.new(
-                "go watched watch ed ing move d moveed moved moving",
-              ).word_matches_for_action?(:block, all_matches: true)
-            expect(matches).to contain_exactly(*%w[watched watch move moved])
+            expect(matches_all("pine pineapples apples")).to contain_exactly("pineapples", "apples")
+
+            expect(
+              matches_all("go watched watch ed ing move d moveed moved moving"),
+            ).to contain_exactly(*%w[watched watch move moved])
           end
         end
       end
@@ -368,20 +286,12 @@
       context "when word is an emoji" do
         it "handles emoji" do
           Fabricate(:watched_word, word: ":joy:", action: WatchedWord.actions[:require_approval])
-
-          matches =
-            described_class.new("Lots of emojis here :joy:").word_matches_for_action?(
-              :require_approval,
-            )
-          expect(matches[1]).to eq(":joy:")
+          expect(matches("Lots of emojis here :joy:")[1]).to eq(":joy:")
         end
 
         it "handles unicode emoji" do
           Fabricate(:watched_word, word: "🎃", action: WatchedWord.actions[:require_approval])
-
-          matches =
-            described_class.new("Halloween party! 🎃").word_matches_for_action?(:require_approval)
-          expect(matches[1]).to eq("🎃")
+          expect(matches("Halloween party! 🎃")[1]).to eq("🎃")
         end
 
         it "handles emoji skin tone" do
@@ -390,12 +300,7 @@
             word: ":woman:t5:",
             action: WatchedWord.actions[:require_approval],
           )
-
-          matches =
-            described_class.new("To Infinity and beyond! 🚀 :woman:t5:").word_matches_for_action?(
-              :require_approval,
-            )
-          expect(matches[1]).to eq(":woman:t5:")
+          expect(matches("To Infinity and beyond! 🚀 :woman:t5:")[1]).to eq(":woman:t5:")
         end
       end
 
@@ -404,9 +309,7 @@
 
         it "supports regular expressions on word boundaries" do
           Fabricate(:watched_word, word: /\btest\b/, action: WatchedWord.actions[:block])
-
-          matches = described_class.new("this is not a test.").word_matches_for_action?(:block)
-          expect(matches[0]).to eq("test")
+          expect(matches("this is not a test.", :block)[0]).to eq("test")
         end
 
         it "supports regular expressions as a site setting" do
@@ -416,31 +319,17 @@
             action: WatchedWord.actions[:require_approval],
           )
 
-          matches =
-            described_class.new("Evil Trout is cool").word_matches_for_action?(:require_approval)
-          expect(matches[0]).to eq("Trout")
-
-          matches =
-            described_class.new("Evil Troot is cool").word_matches_for_action?(:require_approval)
-          expect(matches[0]).to eq("Troot")
-
-          matches = described_class.new("trooooooooot").word_matches_for_action?(:require_approval)
-          expect(matches[0]).to eq("trooooooooot")
+          expect(matches("Evil Trout is cool")[0]).to eq("Trout")
+          expect(matches("Evil Troot is cool")[0]).to eq("Troot")
+          expect(matches("trooooooooot")[0]).to eq("trooooooooot")
         end
 
         it "support uppercase" do
           Fabricate(:watched_word, word: /a\S+ce/, action: WatchedWord.actions[:require_approval])
 
-          matches = described_class.new("Amazing place").word_matches_for_action?(:require_approval)
-          expect(matches).to be_nil
-
-          matches =
-            described_class.new("Amazing applesauce").word_matches_for_action?(:require_approval)
-          expect(matches[0]).to eq("applesauce")
-
-          matches =
-            described_class.new("Amazing AppleSauce").word_matches_for_action?(:require_approval)
-          expect(matches[0]).to eq("AppleSauce")
+          expect(matches("Amazing place")).to be_nil
+          expect(matches("Amazing applesauce")[0]).to eq("applesauce")
+          expect(matches("Amazing AppleSauce")[0]).to eq("AppleSauce")
         end
       end
 
@@ -459,11 +348,9 @@
             SiteSetting.watched_words_regular_expressions = true
             Fabricate(:watched_word, word: "p(rivate|ublic)", action: WatchedWord.actions[:block])
 
-            matches =
-              described_class.new(
-                "PUBLIC: Discourse is great for public discourse",
-              ).word_matches_for_action?(:block, all_matches: true)
-            expect(matches).to contain_exactly("PUBLIC", "Discourse", "public")
+            expect(
+              matches_all("PUBLIC: Discourse is great for public discourse"),
+            ).to contain_exactly("PUBLIC", "Discourse", "public")
           end
         end
 
@@ -472,12 +359,9 @@
             SiteSetting.watched_words_regular_expressions = false
             Fabricate(:watched_word, word: "private", action: WatchedWord.actions[:block])
 
-            matches =
-              described_class.new(
-                "PRIVATE: Discourse is also great private discourse",
-              ).word_matches_for_action?(:block, all_matches: true)
-
-            expect(matches).to contain_exactly("PRIVATE", "Discourse", "private")
+            expect(
+              matches_all("PRIVATE: Discourse is also great private discourse"),
+            ).to contain_exactly("PRIVATE", "Discourse", "private")
           end
         end
       end

From 22898b52d992deb2b362b87da9171a1119fa865a Mon Sep 17 00:00:00 2001
From: Jake Goldsborough <ducks@discourse.org>
Date: Thu, 12 Feb 2026 10:16:47 -0800
Subject: [PATCH 007/168] FIX: Add extension/original_filename to UploadData
 struct

The UploadData struct introduced in 2bfeb870137 for S3 backup deduplication
was missing extension and original_filename attributes. These are required
by FileStore::BaseStore#get_path_for_upload when the URL does not match
the standard UPLOAD_PATH_REGEX pattern (original/\d+X/).

For uploads with non-standard URLs (migrated uploads, custom storage paths,
or corrupted URLs), the fallback path in get_path_for_upload would cause
NoMethodError when accessing upload.extension or upload.original_filename.

Now plucks these additional fields from the database and includes them in
the struct to ensure backups work regardless of URL format.

Also changes from Struct to Data.define for immutability, as suggested by
@ZogStriP - these value objects should not be mutated after creation.
---
 lib/backup_restore/creator.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/backup_restore/creator.rb b/lib/backup_restore/creator.rb
index 9bcb02ba2c62e..ff3fcba943a54 100644
--- a/lib/backup_restore/creator.rb
+++ b/lib/backup_restore/creator.rb
@@ -300,8 +300,10 @@ def add_local_uploads_to_archive(tar_filename)
       end
     end
 
-    # Lightweight struct to avoid holding full ActiveRecord objects in memory
-    UploadData = Struct.new(:id, :url, :sha1, keyword_init: true)
+    # Lightweight immutable value object to avoid holding full ActiveRecord objects in memory
+    # Includes extension and original_filename for FileStore::BaseStore#get_path_for_upload
+    # fallback path when URL doesn't match UPLOAD_PATH_REGEX
+    UploadData = Data.define(:id, :url, :sha1, :extension, :original_filename)
 
     def add_remote_uploads_to_archive(tar_filename)
       if !SiteSetting.include_s3_uploads_in_backups
@@ -350,12 +352,20 @@ def group_remote_uploads_by_sha1
           :id,
           :url,
           :sha1,
+          :extension,
+          :original_filename,
         )
 
       uploads_by_sha1 = {}
-      upload_tuples.each do |sha1_key, id, url, sha1|
+      upload_tuples.each do |sha1_key, id, url, sha1, extension, original_filename|
         uploads_by_sha1[sha1_key] ||= []
-        uploads_by_sha1[sha1_key] << UploadData.new(id: id, url: url, sha1: sha1)
+        uploads_by_sha1[sha1_key] << UploadData.new(
+          id:,
+          url:,
+          sha1:,
+          extension:,
+          original_filename:,
+        )
       end
       uploads_by_sha1
     end

From bba215f0c7d3a2d7944fdc73247bf29b2d259c0b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 23 Feb 2026 16:10:26 +0000
Subject: [PATCH 008/168] FIX: Correctly handle deletion of anonymous
 master_user (#37983)

The silenced_till method would return an `undefined method '[]' for nil`
error, which would cause other parts of the application to fail (e.g.
CSV exports)
---
 app/models/user.rb       |  2 +-
 spec/models/user_spec.rb | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 54ff9f5154088..a49128ca482a8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2197,7 +2197,7 @@ def self.first_login_admin_id
   private
 
   def main_user_record
-    anonymous? ? master_user : self
+    (anonymous? && master_user) ? master_user : self
   end
 
   def set_default_sidebar_section_links(update: false)
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 53719a58c3aab..9101de6579b43 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2544,6 +2544,18 @@ def hash(password, salt, algorithm = UserPassword::TARGET_PASSWORD_ALGORITHM)
       it "delegates the value from the main user record" do
         expect(anon.silenced_till).to be_within(1.second).of(main.silenced_till)
       end
+
+      it "returns nil when the master user has been destroyed" do
+        main.destroy!
+        anon.reload
+        expect(anon.silenced_till).to be_nil
+      end
+
+      it "returns nil when the master user has been deleted without hooks" do
+        User.where(id: main.id).delete_all
+        anon.reload
+        expect(anon.silenced_till).to be_nil
+      end
     end
   end
 

From 637be82728781775a5236025ed78f5497e29b40f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Mon, 23 Feb 2026 17:14:44 +0100
Subject: [PATCH 009/168] DEV: Inline emojiUrlFor in user notes (#37988)

Extracted from #35477
---
 .../after-reviewable-post-user/show-user-notes-on-flags.gjs   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjs
index d3bf4f297e2d6..d537be2d4374a 100644
--- a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjs
+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjs
@@ -8,8 +8,6 @@ import { emojiUrlFor } from "discourse/lib/text";
 import { i18n } from "discourse-i18n";
 import { showUserNotes } from "../../lib/user-notes";
 
-const EMOJI_URL = emojiUrlFor("memo");
-
 export default class ShowUserNotesOnFlags extends Component {
   static shouldRender(args, { siteSettings }) {
     return siteSettings.user_notes_enabled && args.user;
@@ -40,7 +38,7 @@ export default class ShowUserNotesOnFlags extends Component {
         >
           {{#if this.siteSettings.enable_emoji}}
             <img
-              src={{EMOJI_URL}}
+              src={{emojiUrlFor "memo"}}
               title={{i18n "user_notes.show" count=this.userNotesCount}}
               alt
               class="emoji"

From fee2af52bb9856f9a4fc0df68e5a258856095045 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Mon, 23 Feb 2026 17:15:09 +0100
Subject: [PATCH 010/168] DEV: Update discourse-ai's requiredPlugins (#37987)

---
 plugins/discourse-ai/about.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-ai/about.json b/plugins/discourse-ai/about.json
index 0d1911d8eecdb..3b4df718223e6 100644
--- a/plugins/discourse-ai/about.json
+++ b/plugins/discourse-ai/about.json
@@ -2,7 +2,8 @@
   "tests": {
     "requiredPlugins": [
       "https://github.com/discourse/discourse-prometheus",
-      "https://github.com/discourse/discourse-solved.git"
+      "discourse-solved",
+      "chat"
     ]
   }
 }

From d9e71d308c42f7f86979dd004a96271dfe8cd1e1 Mon Sep 17 00:00:00 2001
From: Bannon Tanner <bannon@discourse.org>
Date: Mon, 23 Feb 2026 10:17:49 -0600
Subject: [PATCH 011/168] FEAT: combine upcoming events display for multi-day
 events (#37612)

Improves the upcoming events list to properly display multi-day events
as one entry.

## Changes
### Multi-Day Event Display
- Ongoing multi-day events now appear at today's date instead of being
hidden
- Multi-day events that haven't started yet appear at their start date
- Extended the `after` parameter to look back 30 days to catch ongoing
events

### Date Formatting
- Improved date range formatting for multi-day events:
  - Same month: `December 15-20, 2026`
  - Different months, same year: `November 28 - December 3, 2026`
  - Different years: `December 28, 2025 - January 3, 2026`

## Example

Before:
<img width="260" height="1157" alt="image"
src="https://github.com/user-attachments/assets/9e8c44aa-a13f-43d3-b205-91e528f26e9f"
/>

After:
<img width="276" height="536" alt="image"
src="https://github.com/user-attachments/assets/fec61e98-c723-4a85-900d-d8ec83e8e82d"
/>
---
 .../components/upcoming-events-list.gjs       |  68 +++--
 .../common/upcoming-events-list.scss          |   2 +
 .../components/upcoming-events-list-test.gjs  | 235 +++++++++++++++++-
 3 files changed, 279 insertions(+), 26 deletions(-)

diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs
index 96c1f2ed699c5..c14d9bc82531b 100644
--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs
+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs
@@ -104,7 +104,8 @@ export default class UpcomingEventsList extends Component {
     const data = {
       limit: this.count,
       before: moment().add(this.upcomingDays, "days").toISOString(),
-      after: moment().subtract(2, "hours").toISOString(),
+      // this enables showing ongoing multi-day events that started in the past but haven't ended yet
+      after: moment().subtract(30, "days").toISOString(),
     };
 
     if (this.includeSubcategories) {
@@ -129,9 +130,16 @@ export default class UpcomingEventsList extends Component {
   }
 
   @action
-  formatTime({ starts_at, ends_at }) {
-    return isNotFullDayEvent(moment(starts_at), moment(ends_at))
-      ? moment(starts_at).format(this.timeFormat)
+  formatTime(event) {
+    if (this.isMultiDayEvent(event)) {
+      return this.formatDateRange(event);
+    }
+
+    const startsAt = moment(event.starts_at);
+    const endsAt = event.ends_at ? moment(event.ends_at) : null;
+
+    return isNotFullDayEvent(startsAt, endsAt)
+      ? startsAt.format(this.timeFormat)
       : this.allDayLabel;
   }
 
@@ -145,23 +153,55 @@ export default class UpcomingEventsList extends Component {
     return moment(`${month}-${day}`).format("D");
   }
 
+  isMultiDayEvent(event) {
+    if (!event.ends_at) {
+      return false;
+    }
+    const startDate = moment(event.starts_at);
+    const endDate = moment(event.ends_at);
+    return !startDate.isSame(endDate, "day");
+  }
+
+  formatDateRange(event) {
+    const start = new Date(event.starts_at);
+    const end = new Date(event.ends_at);
+    return new Intl.DateTimeFormat(moment.locale(), {
+      month: "long",
+      day: "numeric",
+      year: "numeric",
+    }).formatRange(start, end);
+    // en-US: "June 5–10, 2025" or "June 5 – July 10, 2025"
+    // fr-FR: "5–10 juin 2025" or "5 juin – 10 juillet 2025"
+    // de-DE: "5.–10. Juni 2025"
+  }
+
   groupByMonthAndDay(data) {
+    const today = moment();
     let events = data.reduce((result, item) => {
       const startDate = moment(item.starts_at);
       const endDate = item.ends_at ? moment(item.ends_at) : null;
-      const today = moment();
 
-      if (!endDate) {
-        addToResult(startDate, item, result);
-        return result;
-      }
-
-      while (startDate.isSameOrBefore(endDate, "day")) {
-        if (startDate.isAfter(today)) {
-          addToResult(startDate, item, result);
+      let displayDate;
+      if (!this.isMultiDayEvent(item)) {
+        // Single-day event
+        displayDate = startDate.clone();
+      } else {
+        // Multi-day event
+        if (startDate.isAfter(today, "day")) {
+          // Future event - show at start date
+          displayDate = startDate.clone();
+        } else if (today.isSameOrBefore(endDate, "day")) {
+          // Ongoing event - show at today's date
+          displayDate = today.clone();
+        } else {
+          // Past event - skip it
+          return result;
         }
+      }
 
-        startDate.add(1, "day");
+      // Only add if display date is in the future or today
+      if (displayDate.isSameOrAfter(today, "day")) {
+        addToResult(displayDate, item, result);
       }
 
       return result;
diff --git a/plugins/discourse-calendar/assets/stylesheets/common/upcoming-events-list.scss b/plugins/discourse-calendar/assets/stylesheets/common/upcoming-events-list.scss
index ec8e62fa43b47..6d5226fcda0b9 100644
--- a/plugins/discourse-calendar/assets/stylesheets/common/upcoming-events-list.scss
+++ b/plugins/discourse-calendar/assets/stylesheets/common/upcoming-events-list.scss
@@ -60,6 +60,8 @@
     font-size: var(--font-down-2);
     font-weight: 400;
     color: var(--primary-700);
+    overflow-wrap: break-word;
+    line-height: var(--line-height-small);
   }
 
   &__footer {
diff --git a/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs b/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs
index ccb436dd9ef30..7d3867cd4509a 100644
--- a/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs
+++ b/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs
@@ -14,6 +14,22 @@ const tomorrowAllDay = "2100-02-02T00:00:00";
 const laterThisMonth = "2100-02-22T08:00:00";
 const nextWeek = "2100-02-09T08:00:00";
 
+// Cross-month: Nov 28 - Dec 3
+const crossMonthStart = "2100-11-28T00:00:00";
+const crossMonthEnd = "2100-12-03T00:00:00";
+
+// Cross-year: Dec 28 - Jan 3
+const crossYearStart = "2100-12-28T00:00:00";
+const crossYearEnd = "2101-01-03T00:00:00";
+
+// Ongoing event: started yesterday, ends next week
+const ongoingStart = "2100-01-25T00:00:00";
+const ongoingEnd = "2100-02-09T00:00:00";
+
+// Past event: already ended
+const pastStart = "2100-01-01T00:00:00";
+const pastEnd = "2100-01-15T00:00:00";
+
 module("Integration | Component | upcoming-events-list", function (hooks) {
   setupRenderingTest(hooks, { stubRouter: true });
 
@@ -114,7 +130,7 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
       .exists("displays the view-all link");
   });
 
-  test("with multi-day events, standard formats", async function (assert) {
+  test("with multi-day events in same month", async function (assert) {
     pretender.get("/discourse-post-event/events", multiDayEventResponseHandler);
 
     await render(<template><UpcomingEventsList /></template>);
@@ -123,23 +139,218 @@ module("Integration | Component | upcoming-events-list", function (hooks) {
 
     await waitFor(".loading-container .spinner", { count: 0 });
 
+    assert
+      .dom(".upcoming-events-list__event")
+      .exists({ count: 1 }, "multi-day event appears only once");
+
     assert.deepEqual(
       [...queryAll(".upcoming-events-list__event-name")].map(
         (el) => el.innerText
       ),
-      [
-        "Awesome Multiday Event",
-        "Awesome Multiday Event",
-        "Awesome Multiday Event",
-        "Awesome Multiday Event",
-        "Awesome Multiday Event",
-        "Awesome Multiday Event",
-        "Awesome Multiday Event",
-        "Awesome Multiday Event",
-      ],
+      ["Awesome Multiday Event"],
+      "displays the multiday event name once"
+    );
+
+    const eventTime = document.querySelector(
+      ".upcoming-events-list__event-time"
+    ).innerText;
+
+    // Feb 2 - Feb 9, 2100
+    assert.true(eventTime.includes("February"), "contains month name");
+    assert.true(eventTime.includes("2"), "contains start day");
+    assert.true(eventTime.includes("9"), "contains end day");
+    assert.true(eventTime.includes("2100"), "contains year");
+    assert.false(eventTime.includes(":"), "shows date range, not time");
+  });
+
+  test("with cross-month multi-day events", async function (assert) {
+    pretender.get("/discourse-post-event/events", () => {
+      return response({
+        events: [
+          {
+            id: 67504,
+            starts_at: crossMonthStart,
+            ends_at: crossMonthEnd,
+            timezone: "UTC",
+            post: {
+              id: 67504,
+              post_number: 1,
+              url: "/t/cross-month-event/18452/1",
+              topic: { id: 18452, title: "Cross month event" },
+            },
+            name: "Cross Month Event",
+            category_id: 1,
+          },
+        ],
+      });
+    });
+
+    await render(<template><UpcomingEventsList /></template>);
+
+    this.appEvents.trigger("page:changed", { url: "/" });
+
+    await waitFor(".loading-container .spinner", { count: 0 });
+
+    const eventTime = document.querySelector(
+      ".upcoming-events-list__event-time"
+    ).innerText;
+
+    // Nov 28 - Dec 3, 2100
+    assert.true(eventTime.includes("November"), "contains start month");
+    assert.true(eventTime.includes("28"), "contains start day");
+    assert.true(eventTime.includes("December"), "contains end month");
+    assert.true(eventTime.includes("3"), "contains end day");
+    assert.true(eventTime.includes("2100"), "contains year");
+  });
+
+  test("with cross-year multi-day events", async function (assert) {
+    pretender.get("/discourse-post-event/events", () => {
+      return response({
+        events: [
+          {
+            id: 67505,
+            starts_at: crossYearStart,
+            ends_at: crossYearEnd,
+            timezone: "UTC",
+            post: {
+              id: 67505,
+              post_number: 1,
+              url: "/t/cross-year-event/18453/1",
+              topic: { id: 18453, title: "Cross year event" },
+            },
+            name: "Cross Year Event",
+            category_id: 1,
+          },
+        ],
+      });
+    });
+
+    await render(<template><UpcomingEventsList /></template>);
+
+    this.appEvents.trigger("page:changed", { url: "/" });
+
+    await waitFor(".loading-container .spinner", { count: 0 });
+
+    const eventTime = document.querySelector(
+      ".upcoming-events-list__event-time"
+    ).innerText;
+
+    // Dec 28, 2100 - Jan 3, 2101
+    assert.true(eventTime.includes("December"), "contains start month");
+    assert.true(eventTime.includes("28"), "contains start day");
+    assert.true(eventTime.includes("2100"), "contains start year");
+    assert.true(eventTime.includes("January"), "contains end month");
+    assert.true(eventTime.includes("3"), "contains end day");
+    assert.true(eventTime.includes("2101"), "contains end year");
+  });
+
+  test("with ongoing multi-day events (started in past, ends in future)", async function (assert) {
+    pretender.get("/discourse-post-event/events", () => {
+      return response({
+        events: [
+          {
+            id: 67506,
+            starts_at: ongoingStart,
+            ends_at: ongoingEnd,
+            timezone: "UTC",
+            post: {
+              id: 67506,
+              post_number: 1,
+              url: "/t/ongoing-event/18454/1",
+              topic: { id: 18454, title: "Ongoing event" },
+            },
+            name: "Ongoing Event",
+            category_id: 1,
+          },
+        ],
+      });
+    });
+
+    await render(<template><UpcomingEventsList /></template>);
+
+    this.appEvents.trigger("page:changed", { url: "/" });
+
+    await waitFor(".loading-container .spinner", { count: 0 });
 
-      "displays the multiday event on all scheduled dates"
+    assert
+      .dom(".upcoming-events-list__event")
+      .exists({ count: 1 }, "ongoing event is displayed");
+
+    assert
+      .dom(".upcoming-events-list__event-name")
+      .hasText("Ongoing Event", "displays the ongoing event");
+
+    // Ongoing events should show at today's date
+    const displayedDay = document.querySelector(
+      ".upcoming-events-list__event-date .day"
+    ).innerText;
+    assert.strictEqual(
+      displayedDay,
+      moment(today).format("D"),
+      "ongoing event is shown at today's date"
     );
+
+    const eventTime = document.querySelector(
+      ".upcoming-events-list__event-time"
+    ).innerText;
+
+    // Jan 25 - Feb 9, 2100
+    assert.true(eventTime.includes("January"), "contains start month");
+    assert.true(eventTime.includes("25"), "contains start day");
+    assert.true(eventTime.includes("February"), "contains end month");
+    assert.true(eventTime.includes("9"), "contains end day");
+    assert.true(eventTime.includes("2100"), "contains year");
+  });
+
+  test("filters out events that have already ended", async function (assert) {
+    pretender.get("/discourse-post-event/events", () => {
+      return response({
+        events: [
+          {
+            id: 67507,
+            starts_at: pastStart,
+            ends_at: pastEnd,
+            timezone: "UTC",
+            post: {
+              id: 67507,
+              post_number: 1,
+              url: "/t/past-event/18455/1",
+              topic: { id: 18455, title: "Past event" },
+            },
+            name: "Past Event",
+            category_id: 1,
+          },
+          {
+            id: 67508,
+            starts_at: tomorrowAllDay,
+            ends_at: null,
+            timezone: "UTC",
+            post: {
+              id: 67508,
+              post_number: 1,
+              url: "/t/future-event/18456/1",
+              topic: { id: 18456, title: "Future event" },
+            },
+            name: "Future Event",
+            category_id: 1,
+          },
+        ],
+      });
+    });
+
+    await render(<template><UpcomingEventsList /></template>);
+
+    this.appEvents.trigger("page:changed", { url: "/" });
+
+    await waitFor(".loading-container .spinner", { count: 0 });
+
+    assert
+      .dom(".upcoming-events-list__event")
+      .exists({ count: 1 }, "only future event is displayed");
+
+    assert
+      .dom(".upcoming-events-list__event-name")
+      .hasText("Future Event", "past event is filtered out");
   });
 
   test("Uses custom category name from 'map_events_title'", async function (assert) {

From 5a1ab2b054fec48fb318068ad2bf9c03912d3040 Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Mon, 23 Feb 2026 10:59:56 -0600
Subject: [PATCH 012/168] FIX: Prevent unnecessary revision when editing first
 post with tagging enabled (#37989)

When editing the first post of a topic, we send `tags: []` via `PUT
/t/:id` even when the topic has no tags. Since `[].present?` is `false`,
the existing tag cleanup logic was skipped, leaving a no-op tags key in
the changes hash. This caused `PostRevisor#topic_changed?` to return
`true` (it checks key presence, not value), bypassing the grace period
and creating an empty hidden revision.

To fix this I updated the condition in `TopicsController#update` to use
`has_key?` instead of `present?`, and delete the tags key when both the
incoming tags and existing tags are empty. Also added matching
normalization in `PostRevisor#revise!`
---
 app/controllers/topics_controller.rb    | 32 ++++++++++++++-----------
 lib/post_revisor.rb                     |  1 +
 spec/lib/post_revisor_spec.rb           | 11 +++++++++
 spec/requests/topics_controller_spec.rb | 19 +++++++++++++++
 4 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 162bf4688a0ca..1829cd9bcb3a8 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -449,21 +449,25 @@ def update
     changes.delete(:title) if topic.title == changes[:title]
     changes.delete(:category_id) if topic.category_id.to_i == changes[:category_id].to_i
 
-    if Tag.include_tags? && changes[:tags].present?
-      incoming = changes[:tags]
-
-      if incoming.first.is_a?(String)
-        Discourse.deprecate(
-          "Passing tag names as strings to the tags param is deprecated, use tag objects ({id, name}) instead",
-          since: "2026.01",
-          drop_from: "2026.07",
-        )
-        changes.delete(:tags) if incoming.sort == topic.tags.map(&:name).sort
-      else
-        has_new = incoming.any? { |t| t[:id].blank? }
-        if !has_new && incoming.filter_map { |t| t[:id]&.to_i }.sort == topic.tags.pluck(:id).sort
-          changes.delete(:tags)
+    if Tag.include_tags? && changes.has_key?(:tags)
+      if changes[:tags].present?
+        incoming = changes[:tags]
+
+        if incoming.first.is_a?(String)
+          Discourse.deprecate(
+            "Passing tag names as strings to the tags param is deprecated, use tag objects ({id, name}) instead",
+            since: "2026.01",
+            drop_from: "2026.07",
+          )
+          changes.delete(:tags) if incoming.sort == topic.tags.map(&:name).sort
+        else
+          has_new = incoming.any? { |t| t[:id].blank? }
+          if !has_new && incoming.filter_map { |t| t[:id]&.to_i }.sort == topic.tags.pluck(:id).sort
+            changes.delete(:tags)
+          end
         end
+      elsif topic.tags.empty?
+        changes.delete(:tags)
       end
     end
 
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index 1f4ef6e5b5fba..b65bf9119624a 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -239,6 +239,7 @@ def revise!(editor, fields, opts = {})
     @fields[:raw] = cleanup_whitespaces(@fields[:raw]) if @fields.has_key?(:raw)
     @fields[:user_id] = @fields[:user_id].to_i if @fields.has_key?(:user_id)
     @fields[:category_id] = @fields[:category_id].to_i if @fields.has_key?(:category_id)
+    @fields.delete(:tags) if @fields.has_key?(:tags) && @fields[:tags].blank? && @topic.tags.empty?
 
     # always reset edit_reason unless provided, do not set to nil else
     # previous reasons are lost
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index 57c78eef9c932..a61e343e5b89a 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -575,6 +575,17 @@
         expect(post.public_version).to eq(1)
         expect(post.revisions.size).to eq(0)
       end
+
+      it "does not create a new version for tag-only topic change within grace period when tags unchanged" do
+        SiteSetting.tagging_enabled = true
+        SiteSetting.editing_grace_period = 1.minute
+
+        post_revisor.revise!(post.user, { tags: [] }, revised_at: post.updated_at + 10.seconds)
+        post.reload
+
+        expect(post.version).to eq(1)
+        expect(post.revisions.size).to eq(0)
+      end
     end
 
     describe "edit reasons" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 6d30a3fbeb8de..1da6ab3a158b0 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2259,6 +2259,25 @@ def topic_user_post_timings_count(user, topic)
             expect(response.status).to eq(200)
             expect(topic.reload.tags).to contain_exactly(tag)
           end
+
+          it "does not create a revision when tags param is empty and topic has no tags" do
+            expect do
+              put "/t/#{topic.slug}/#{topic.id}.json", params: { tags: [] }, as: :json
+            end.not_to change { topic.reload.first_post.revisions.count }
+
+            expect(response.status).to eq(200)
+          end
+
+          it "creates a revision when all tags are removed from a topic" do
+            topic.tags << tag
+
+            expect do
+              put "/t/#{topic.slug}/#{topic.id}.json", params: { tags: [] }, as: :json
+            end.to change { topic.reload.first_post.revisions.count }.by(1)
+
+            expect(response.status).to eq(200)
+            expect(topic.reload.tags).to be_empty
+          end
         end
 
         context "when topic is private" do

From 1a22ddb55e3a9af7091782b9fc2da6fb134bdca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 23 Feb 2026 18:32:51 +0100
Subject: [PATCH 013/168] FIX: Strip subfolder prefix before SERVER_SIDE_ONLY
 check in routeTo (#37996)

On subfolder setups, clicking server-side-only links (e.g. upload
download links on the admin user exports page) resulted in a "page
doesn't exist" error instead of downloading the file.

When Discourse runs in a subfolder (e.g. /forum), URLs like
`/forum/uploads/short-url/abc.csv.gz` were not matching the
SERVER_SIDE_ONLY regex patterns (e.g. `/^\/uploads\//`) because the
pathname still included the subfolder prefix at the point of the check.
This caused `routeTo` to hand the URL to Ember's router instead of
redirecting to the server, hitting the catch-all "unknown" route.

The fix strips the subfolder prefix using `withoutPrefix()` before
checking against SERVER_SIDE_ONLY patterns. The original path (with
prefix) is still passed to `redirectTo`, which correctly handles both
prefixed and unprefixed URLs via `getURL()`.

This only surfaced for the admin user exports page because most upload
links in post content go through `click-track.js` which calls
`redirectTo()` directly for `.attachment` links, bypassing `routeTo()`
and its SERVER_SIDE_ONLY check entirely.

https://meta.discourse.org/t/396783
---
 frontend/discourse/app/lib/url.js             |  5 +++-
 frontend/discourse/tests/unit/lib/url-test.js | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/frontend/discourse/app/lib/url.js b/frontend/discourse/app/lib/url.js
index d6d2090b3e517..eab4a85e4d54f 100644
--- a/frontend/discourse/app/lib/url.js
+++ b/frontend/discourse/app/lib/url.js
@@ -238,7 +238,10 @@ class DiscourseURL extends EmberObject {
       return this.redirectTo(path);
     }
 
-    const serverSide = SERVER_SIDE_ONLY.some((r) => pathname.match(r));
+    const pathnameWithoutPrefix = withoutPrefix(pathname);
+    const serverSide = SERVER_SIDE_ONLY.some((r) =>
+      pathnameWithoutPrefix.match(r)
+    );
     if (serverSide) {
       this.redirectTo(path);
       return;
diff --git a/frontend/discourse/tests/unit/lib/url-test.js b/frontend/discourse/tests/unit/lib/url-test.js
index 27956c0447369..805a90a766efc 100644
--- a/frontend/discourse/tests/unit/lib/url-test.js
+++ b/frontend/discourse/tests/unit/lib/url-test.js
@@ -264,6 +264,30 @@ module("Unit | Utility | url", function (hooks) {
     );
   });
 
+  test("routeTo redirects server-side-only URLs on subfolder setup", async function (assert) {
+    setPrefix("/forum");
+    sinon.stub(DiscourseURL, "redirectTo");
+    sinon.stub(DiscourseURL, "handleURL");
+
+    DiscourseURL.routeTo("/forum/uploads/short-url/test.csv.gz");
+    assert.true(
+      DiscourseURL.redirectTo.calledWith(
+        "/forum/uploads/short-url/test.csv.gz"
+      ),
+      "uploads short-url on subfolder is redirected to server"
+    );
+
+    DiscourseURL.redirectTo.resetHistory();
+
+    DiscourseURL.routeTo("/forum/secure-uploads/original/1X/test.pdf");
+    assert.true(
+      DiscourseURL.redirectTo.calledWith(
+        "/forum/secure-uploads/original/1X/test.pdf"
+      ),
+      "secure-uploads on subfolder is redirected to server"
+    );
+  });
+
   test("anchor handling", async function (assert) {
     sinon.stub(DiscourseURL, "jumpToElement");
     sinon.stub(DiscourseURL, "replaceState");

From c88a9c285a404aa23f9048e45eff86123a060f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Saquetim?=
 <1108771+megothss@users.noreply.github.com>
Date: Mon, 23 Feb 2026 15:44:16 -0300
Subject: [PATCH 014/168] DEV: replace static tracked property registry with
 dynamic introspection (#37908)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

- Adds `enumerateTrackedKeys` and `enumerateTrackedEntries` utilities to
`tracked-tools.js` that dynamically discover `@tracked` properties by
walking Ember's internal meta chain
- Removes the `@trackedPostProperty` decorator and
`trackedPropertiesForPostUpdate` static registry from the Post model
- Improves `@trackedArray` error messages to include the property name

## Problem

Ember's `@tracked` decorator defines properties on the class prototype,
making them invisible to `Object.keys()`, spread syntax (`...obj`), and
`Object.assign()`. This caused two issues:

**1. `RestModel.create()` silently dropped tracked property values**

When a model instance was passed to `create()` (e.g.
`AdminUser.create(user)` where `user` is a User instance), tracked
properties were lost during the spread in `RestModel.create()`:

```js
// Before: tracked properties on `args` were invisible to spread
const createArgs = this.munge(args, args.store);
// args.username (tracked) → silently missing from createArgs
```

**2. `Post.updateFromPost()` required a fragile manual registry**

To work around the non-enumerability of tracked properties, every
tracked property on Post had to use a custom `@trackedPostProperty`
decorator instead of standard `@tracked`. This decorator registered
property names in a static Set. Forgetting to use it (using `@tracked`
instead) meant the property wouldn't be copied when the identity map
updated a post, leading to stale UI data.

## Solution

`enumerateTrackedKeys(obj)` walks the prototype's Ember meta chain and
collects all `TrackedDescriptor` entries, returning the property names.
This works with `@tracked`, `@dedupeTracked`, and `@trackedArray`.

- `Post.updateFromPost()` now dynamically discovers tracked keys instead
of relying on a static registry — all Post properties use standard
`@tracked`
- `RestModel.create()` now surfaces tracked property values alongside
regular enumerable properties before passing to `munge()`
---
 frontend/discourse/app/lib/tracked-tools.js   |  84 +++-
 frontend/discourse/app/models/post.js         | 154 +++---
 frontend/discourse/app/models/rest.js         |   6 +-
 .../tests/unit/lib/tracked-tools-test.gjs     | 451 +++++++++++++++++-
 4 files changed, 601 insertions(+), 94 deletions(-)

diff --git a/frontend/discourse/app/lib/tracked-tools.js b/frontend/discourse/app/lib/tracked-tools.js
index cb5191b6c8540..fc5285ba4b5b0 100644
--- a/frontend/discourse/app/lib/tracked-tools.js
+++ b/frontend/discourse/app/lib/tracked-tools.js
@@ -1,5 +1,5 @@
 import { tracked } from "@glimmer/tracking";
-import { meta as metaFor } from "@ember/-internals/meta";
+import { meta as metaFor, peekMeta } from "@ember/-internals/meta";
 import { TrackedDescriptor } from "@ember/-internals/metal";
 import { next } from "@ember/runloop";
 import { TrackedArray, TrackedSet } from "@ember-compat/tracked-built-ins";
@@ -187,7 +187,7 @@ export class DeferredTrackedSet {
  *                                         or null/undefined if those values were passed
  * @throws {Error} If value is not an array, TrackedArray, null or undefined
  */
-function ensureTrackedArray(value) {
+function ensureTrackedArray(value, propertyName) {
   if (typeof value === "undefined" || value === null) {
     return value;
   }
@@ -201,7 +201,7 @@ function ensureTrackedArray(value) {
   }
 
   throw new Error(
-    `Expected an array, TrackedArray, null, or undefined, got ${typeof value}. Value received: ${value}`
+    `[${propertyName}]: Expected an array, TrackedArray, null, or undefined, got ${typeof value}. Value received: ${value}`
   );
 }
 
@@ -224,7 +224,7 @@ export function trackedArray(target, key, desc) {
     const originalInitializer = desc.initializer;
     desc.initializer = function () {
       const initialValue = originalInitializer.apply(this);
-      return ensureTrackedArray(initialValue);
+      return ensureTrackedArray(initialValue, key);
     };
   }
 
@@ -236,7 +236,7 @@ export function trackedArray(target, key, desc) {
   });
 
   function trackedArraySetter(value) {
-    set.call(this, ensureTrackedArray(value));
+    set.call(this, ensureTrackedArray(value, key));
   }
 
   // When using EmberObject.create(...), Ember accesses the tracked properties directly
@@ -258,3 +258,77 @@ export function trackedArray(target, key, desc) {
     isTracked: true,
   };
 }
+
+/**
+ * Enumerates all tracked property keys from an object instance.
+ *
+ * **Warning:** This function uses Ember internal APIs (`peekMeta`, `TrackedDescriptor`)
+ * which are not part of the public API and may change without notice in future Ember versions.
+ *
+ * @param {Object} obj - The object instance to enumerate tracked keys from
+ * @returns {Array<string>} An array of tracked property keys.
+ *                          Returns an empty array if the object has no prototype or no tracked properties.
+ *
+ * @example
+ * class MyClass {
+ *   @tracked name = "Alice";
+ *   @tracked age = 30;
+ *   regularProp = "not tracked";
+ * }
+ *
+ * const instance = new MyClass();
+ * const trackedKeys = enumerateTrackedKeys(instance);
+ * // Returns: ["name", "age"]
+ */
+export function enumerateTrackedKeys(obj) {
+  const prototype = obj?.constructor?.prototype;
+  if (!prototype) {
+    return [];
+  }
+
+  const result = new Set();
+
+  // Walk the prototype chain to collect tracked keys from parent classes too
+  let meta = peekMeta(prototype);
+  while (meta) {
+    const descriptors = meta._descriptors;
+
+    if (descriptors) {
+      for (const [key, desc] of descriptors) {
+        if (desc instanceof TrackedDescriptor) {
+          result.add(key);
+        }
+      }
+    }
+
+    meta = meta.parent;
+  }
+
+  return [...result];
+}
+
+/**
+ * Enumerates all tracked property entries from an object instance.
+ *
+ * **Warning:** This function uses Ember internal APIs (`peekMeta`, `TrackedDescriptor`)
+ * which are not part of the public API and may change without notice in future Ember versions.
+ *
+ * @param {Object} obj - The object instance to enumerate tracked entries from
+ * @returns {Array<[string, any]>} An array of [key, value] pairs for all tracked properties.
+ *                                  Returns an empty array if the object has no prototype or no tracked properties.
+ *
+ * @example
+ * class MyClass {
+ *   @tracked name = "Alice";
+ *   @tracked age = 30;
+ *   regularProp = "not tracked";
+ * }
+ *
+ * const instance = new MyClass();
+ * const trackedEntries = enumerateTrackedEntries(instance);
+ * // Returns: [["name", "Alice"], ["age", 30]]
+ */
+export function enumerateTrackedEntries(obj) {
+  const keys = enumerateTrackedKeys(obj);
+  return keys.map((key) => [key, obj[key]]);
+}
diff --git a/frontend/discourse/app/models/post.js b/frontend/discourse/app/models/post.js
index c53542ee127ee..ae3863b3af488 100644
--- a/frontend/discourse/app/models/post.js
+++ b/frontend/discourse/app/models/post.js
@@ -11,7 +11,10 @@ import { propertyEqual } from "discourse/lib/computed";
 import discourseComputed from "discourse/lib/decorators";
 import { cook } from "discourse/lib/text";
 import { fancyTitle } from "discourse/lib/topic-fancy-title";
-import { defineTrackedProperty } from "discourse/lib/tracked-tools";
+import {
+  defineTrackedProperty,
+  enumerateTrackedKeys,
+} from "discourse/lib/tracked-tools";
 import { userPath } from "discourse/lib/url";
 import { postUrl } from "discourse/lib/utilities";
 import ActionSummary from "discourse/models/action-summary";
@@ -23,7 +26,6 @@ import User from "discourse/models/user";
 import { i18n } from "discourse-i18n";
 
 const pluginTrackedProperties = new Set();
-const trackedPropertiesForPostUpdate = new Set();
 
 /**
  * @internal
@@ -46,22 +48,6 @@ export function clearAddedTrackedPostProperties() {
   pluginTrackedProperties.clear();
 }
 
-/**
- * Decorator to mark a property as post property as tracked.
- *
- * It extends the standard Ember @tracked behavior to also keep track of the fields
- * that need to be copied when using `post.updateFromPost`.
- *
- * @param {Object} target - The target object.
- * @param {string} propertyKey - The key of the property to track.
- * @param {PropertyDescriptor} descriptor - The property descriptor.
- * @returns {PropertyDescriptor} The updated property descriptor.
- */
-function trackedPostProperty(target, propertyKey, descriptor) {
-  trackedPropertiesForPostUpdate.add(propertyKey);
-  return tracked(target, propertyKey, descriptor);
-}
-
 export default class Post extends RestModel {
   static munge(json) {
     json.likeAction ??= null;
@@ -150,75 +136,69 @@ export default class Post extends RestModel {
   @service currentUser;
   @service site;
 
+  @tracked action_code;
+  @tracked action_code_path;
+  @tracked action_code_who;
+  @tracked actions_summary;
+  @tracked admin;
+  @tracked badges_granted;
+  @tracked bookmarked;
+  @tracked can_delete;
+  @tracked can_edit;
+  @tracked can_permanently_delete;
+  @tracked can_recover;
+  @tracked can_see_hidden_post;
+  @tracked can_view_edit_history;
+  @tracked cooked;
+  @tracked cooked_hidden;
+  @tracked created_at;
   @tracked customShare = null;
-
-  // Use @trackedPostProperty here instead of Glimmer's @tracked because we need to know which properties are tracked
-  // in order to correctly update the post in the updateFromPost method. Currently this is not possible using only
-  // the standard tracked method because these properties are added to the class prototype and are not enumarated by
-  // object.keys().
-  // See https://github.com/emberjs/ember.js/issues/18220
-  @trackedPostProperty action_code;
-  @trackedPostProperty action_code_path;
-  @trackedPostProperty action_code_who;
-  @trackedPostProperty actions_summary;
-  @trackedPostProperty admin;
-  @trackedPostProperty badges_granted;
-  @trackedPostProperty bookmarked;
-  @trackedPostProperty can_delete;
-  @trackedPostProperty can_edit;
-  @trackedPostProperty can_permanently_delete;
-  @trackedPostProperty can_recover;
-  @trackedPostProperty can_see_hidden_post;
-  @trackedPostProperty can_view_edit_history;
-  @trackedPostProperty cooked;
-  @trackedPostProperty cooked_hidden;
-  @trackedPostProperty created_at;
-  @trackedPostProperty deleted_at;
-  @trackedPostProperty deleted_by;
-  @trackedPostProperty excerpt;
-  @trackedPostProperty expandedExcerpt;
-  @trackedPostProperty group_moderator;
-  @trackedPostProperty hasGap;
-  @trackedPostProperty hidden;
-  @trackedPostProperty id;
-  @trackedPostProperty is_auto_generated;
-  @trackedPostProperty last_wiki_edit;
-  @trackedPostProperty likeAction;
-  @trackedPostProperty link_counts;
-  @trackedPostProperty locked;
-  @trackedPostProperty moderator;
-  @trackedPostProperty name;
-  @trackedPostProperty notice;
-  @trackedPostProperty notice_created_by_user;
-  @trackedPostProperty post_number;
-  @trackedPostProperty post_type;
-  @trackedPostProperty primary_group_name;
-  @trackedPostProperty quoted;
-  @trackedPostProperty read;
-  @trackedPostProperty readers_count;
-  @trackedPostProperty reply_count;
-  @trackedPostProperty reply_to_user;
-  @trackedPostProperty staff;
-  @trackedPostProperty staged;
-  @trackedPostProperty title_is_group;
-  @trackedPostProperty topic;
-  @trackedPostProperty topic_id;
-  @trackedPostProperty trust_level;
-  @trackedPostProperty updated_at;
-  @trackedPostProperty user_deleted;
-  @trackedPostProperty user_id;
-  @trackedPostProperty user_suspended;
-  @trackedPostProperty user_title;
-  @trackedPostProperty username;
-  @trackedPostProperty version;
-  @trackedPostProperty via_email;
-  @trackedPostProperty wiki;
-  @trackedPostProperty yours;
-  @trackedPostProperty user_custom_fields;
-  @trackedPostProperty post_localizations;
-  @trackedPostProperty is_localized;
-  @trackedPostProperty language;
-  @trackedPostProperty localization_outdated;
+  @tracked deleted_at;
+  @tracked deleted_by;
+  @tracked excerpt;
+  @tracked expandedExcerpt;
+  @tracked group_moderator;
+  @tracked hasGap;
+  @tracked hidden;
+  @tracked id;
+  @tracked is_auto_generated;
+  @tracked is_localized;
+  @tracked language;
+  @tracked last_wiki_edit;
+  @tracked likeAction;
+  @tracked link_counts;
+  @tracked localization_outdated;
+  @tracked locked;
+  @tracked moderator;
+  @tracked name;
+  @tracked notice;
+  @tracked notice_created_by_user;
+  @tracked post_localizations;
+  @tracked post_number;
+  @tracked post_type;
+  @tracked primary_group_name;
+  @tracked quoted;
+  @tracked read;
+  @tracked readers_count;
+  @tracked reply_count;
+  @tracked reply_to_user;
+  @tracked staff;
+  @tracked staged;
+  @tracked title_is_group;
+  @tracked topic;
+  @tracked topic_id;
+  @tracked trust_level;
+  @tracked updated_at;
+  @tracked user_custom_fields;
+  @tracked user_deleted;
+  @tracked user_id;
+  @tracked user_suspended;
+  @tracked user_title;
+  @tracked username;
+  @tracked version;
+  @tracked via_email;
+  @tracked wiki;
+  @tracked yours;
 
   @alias("can_edit") canEdit; // for compatibility with existing code
   @equal("trust_level", 0) new_user;
@@ -631,7 +611,7 @@ export default class Post extends RestModel {
   updateFromPost(otherPost) {
     [
       ...Object.keys(otherPost),
-      ...trackedPropertiesForPostUpdate,
+      ...enumerateTrackedKeys(otherPost),
       ...pluginTrackedProperties,
     ].forEach((key) => {
       let value = otherPost[key],
diff --git a/frontend/discourse/app/models/rest.js b/frontend/discourse/app/models/rest.js
index d3e99ccbdcce5..035e75f4fef31 100644
--- a/frontend/discourse/app/models/rest.js
+++ b/frontend/discourse/app/models/rest.js
@@ -5,6 +5,7 @@ import { equal } from "@ember/object/computed";
 import { getOwner, setOwner } from "@ember/owner";
 import { Promise } from "rsvp";
 import { getOwnerWithFallback } from "discourse/lib/get-owner";
+import { enumerateTrackedEntries } from "discourse/lib/tracked-tools";
 
 export default class RestModel extends EmberObject {
   // Overwrite and JSON will be passed through here before `create` and `update`
@@ -16,7 +17,10 @@ export default class RestModel extends EmberObject {
     args = args || {};
 
     args.__munge = this.munge;
-    const createArgs = this.munge(args, args.store);
+    const createArgs = this.munge(
+      { ...args, ...Object.fromEntries(enumerateTrackedEntries(args)) },
+      args.store
+    );
 
     // Some Discourse code calls `model.create()` directly without going through the
     // store. In that case the owner is not set, and injections will fail. This workaround ensures
diff --git a/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs b/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs
index 3db4a9881c0f3..9ffacf7492a33 100644
--- a/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs
+++ b/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs
@@ -1,4 +1,4 @@
-import { cached } from "@glimmer/tracking";
+import { cached, tracked } from "@glimmer/tracking";
 import { run } from "@ember/runloop";
 import { settled } from "@ember/test-helpers";
 import { TrackedArray } from "@ember-compat/tracked-built-ins";
@@ -6,6 +6,8 @@ import { module, test } from "qunit";
 import {
   dedupeTracked,
   DeferredTrackedSet,
+  enumerateTrackedEntries,
+  enumerateTrackedKeys,
   trackedArray,
 } from "discourse/lib/tracked-tools";
 
@@ -314,4 +316,451 @@ module("Unit | tracked-tools", function () {
       );
     });
   });
+
+  module("enumerateTrackedKeys", function () {
+    test("returns tracked property keys from an object", function (assert) {
+      class Person {
+        @tracked name = "Alice";
+        @tracked age = 30;
+        regularProp = "not tracked";
+      }
+
+      const instance = new Person();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.deepEqual(
+        result,
+        ["name", "age"],
+        "returns only tracked property keys"
+      );
+      assert.false(
+        result.includes("regularProp"),
+        "non-tracked property is not included"
+      );
+    });
+
+    test("returns empty array for null or undefined", function (assert) {
+      const resultNull = enumerateTrackedKeys(null);
+      const resultUndefined = enumerateTrackedKeys(undefined);
+
+      assert.deepEqual(resultNull, [], "returns empty array for null");
+      assert.deepEqual(
+        resultUndefined,
+        [],
+        "returns empty array for undefined"
+      );
+    });
+
+    test("returns empty array for objects without tracked properties", function (assert) {
+      class SimpleClass {
+        prop1 = "value1";
+        prop2 = "value2";
+      }
+
+      const instance = new SimpleClass();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.deepEqual(
+        result,
+        [],
+        "returns empty array for non-tracked properties"
+      );
+    });
+
+    test("handles objects with only tracked properties", function (assert) {
+      class AllTracked {
+        @tracked first = "one";
+        @tracked second = "two";
+        @tracked third = "three";
+      }
+
+      const instance = new AllTracked();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.deepEqual(
+        result.sort(),
+        ["first", "second", "third"].sort(),
+        "returns all tracked property keys"
+      );
+      assert.strictEqual(result.length, 3, "returns correct number of keys");
+    });
+
+    test("includes @dedupeTracked properties", function (assert) {
+      class TestClass {
+        @tracked normalTracked = "normal";
+        @dedupeTracked dedupedTracked = "deduped";
+        regularProp = "regular";
+      }
+
+      const instance = new TestClass();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.true(
+        result.includes("normalTracked"),
+        "includes @tracked property"
+      );
+      assert.true(
+        result.includes("dedupedTracked"),
+        "includes @dedupeTracked property"
+      );
+      assert.false(result.includes("regularProp"), "excludes regular property");
+    });
+
+    test("includes @trackedArray properties", function (assert) {
+      class TestClass {
+        @tracked name = "test";
+        @trackedArray items = ["a", "b", "c"];
+        regularProp = "regular";
+      }
+
+      const instance = new TestClass();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.true(result.includes("name"), "includes @tracked property");
+      assert.true(result.includes("items"), "includes @trackedArray property");
+      assert.false(result.includes("regularProp"), "excludes regular property");
+    });
+
+    test("handles inherited tracked properties", function (assert) {
+      class Parent {
+        @tracked parentProp = "parent";
+      }
+
+      class Child extends Parent {
+        @tracked childProp = "child";
+      }
+
+      const instance = new Child();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.true(
+        result.includes("parentProp"),
+        "includes parent tracked property"
+      );
+      assert.true(
+        result.includes("childProp"),
+        "includes child tracked property"
+      );
+      assert.strictEqual(
+        result.length,
+        2,
+        "includes both parent and child properties"
+      );
+    });
+
+    test("handles multi-level inheritance", function (assert) {
+      class GrandParent {
+        @tracked grandProp = "grand";
+      }
+
+      class Parent extends GrandParent {
+        @tracked parentProp = "parent";
+      }
+
+      class Child extends Parent {
+        @tracked childProp = "child";
+      }
+
+      const instance = new Child();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.true(
+        result.includes("grandProp"),
+        "includes grandparent property"
+      );
+      assert.true(result.includes("parentProp"), "includes parent property");
+      assert.true(result.includes("childProp"), "includes child property");
+      assert.strictEqual(result.length, 3, "includes all inherited properties");
+    });
+
+    test("returns keys regardless of current property values", function (assert) {
+      class TestClass {
+        @tracked nullProp = null;
+        @tracked undefinedProp = undefined;
+        @tracked stringProp = "value";
+      }
+
+      const instance = new TestClass();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.true(
+        result.includes("nullProp"),
+        "includes property with null value"
+      );
+      assert.true(
+        result.includes("undefinedProp"),
+        "includes property with undefined value"
+      );
+      assert.true(
+        result.includes("stringProp"),
+        "includes property with string value"
+      );
+      assert.strictEqual(
+        result.length,
+        3,
+        "returns all keys regardless of values"
+      );
+    });
+
+    test("handles objects with various tracked value types", function (assert) {
+      class MixedTypes {
+        @tracked string = "text";
+        @tracked number = 42;
+        @tracked boolean = true;
+        @tracked object = { nested: "value" };
+        @tracked array = [1, 2, 3];
+      }
+
+      const instance = new MixedTypes();
+      const result = enumerateTrackedKeys(instance);
+
+      assert.deepEqual(
+        result.sort(),
+        ["array", "boolean", "number", "object", "string"].sort(),
+        "returns keys for all value types"
+      );
+    });
+  });
+
+  module("enumerateTrackedEntries", function () {
+    test("returns tracked property entries from an object", function (assert) {
+      class Person {
+        @tracked name = "Alice";
+        @tracked age = 30;
+        regularProp = "not tracked";
+      }
+
+      const instance = new Person();
+      const result = enumerateTrackedEntries(instance);
+
+      assert.deepEqual(
+        result,
+        [
+          ["name", "Alice"],
+          ["age", 30],
+        ],
+        "returns entries for tracked properties"
+      );
+    });
+
+    test("returns empty array for null or undefined", function (assert) {
+      const resultNull = enumerateTrackedEntries(null);
+      const resultUndefined = enumerateTrackedEntries(undefined);
+
+      assert.deepEqual(resultNull, [], "returns empty array for null");
+      assert.deepEqual(
+        resultUndefined,
+        [],
+        "returns empty array for undefined"
+      );
+    });
+
+    test("returns empty array for objects without tracked properties", function (assert) {
+      class SimpleClass {
+        prop1 = "value1";
+        prop2 = "value2";
+      }
+
+      const instance = new SimpleClass();
+      const result = enumerateTrackedEntries(instance);
+
+      assert.deepEqual(
+        result,
+        [],
+        "returns empty array for non-tracked properties"
+      );
+    });
+
+    test("handles objects with only tracked properties", function (assert) {
+      class AllTracked {
+        @tracked first = "one";
+        @tracked second = "two";
+        @tracked third = "three";
+      }
+
+      const instance = new AllTracked();
+      const result = enumerateTrackedEntries(instance);
+
+      assert.strictEqual(result.length, 3, "returns three entries");
+      const obj = Object.fromEntries(result);
+      assert.strictEqual(obj.first, "one");
+      assert.strictEqual(obj.second, "two");
+      assert.strictEqual(obj.third, "three");
+    });
+
+    test("includes @dedupeTracked properties", function (assert) {
+      class TestClass {
+        @tracked normalTracked = "normal";
+        @dedupeTracked dedupedTracked = "deduped";
+        regularProp = "regular";
+      }
+
+      const instance = new TestClass();
+      const result = enumerateTrackedEntries(instance);
+
+      const obj = Object.fromEntries(result);
+      assert.strictEqual(obj.normalTracked, "normal");
+      assert.strictEqual(obj.dedupedTracked, "deduped");
+      assert.strictEqual(obj.regularProp, undefined);
+    });
+
+    test("includes @trackedArray properties", function (assert) {
+      class TestClass {
+        @tracked name = "test";
+        @trackedArray items = ["a", "b", "c"];
+        regularProp = "regular";
+      }
+
+      const instance = new TestClass();
+      const result = enumerateTrackedEntries(instance);
+
+      const obj = Object.fromEntries(result);
+      assert.strictEqual(obj.name, "test");
+      assert.true(obj.items instanceof TrackedArray);
+      assert.deepEqual(Array.from(obj.items), ["a", "b", "c"]);
+      assert.strictEqual(obj.regularProp, undefined);
+    });
+
+    test("handles inherited tracked properties", function (assert) {
+      class Parent {
+        @tracked parentProp = "parent";
+      }
+
+      class Child extends Parent {
+        @tracked childProp = "child";
+      }
+
+      const instance = new Child();
+      const result = enumerateTrackedEntries(instance);
+
+      assert.strictEqual(
+        result.length,
+        2,
+        "includes both parent and child properties"
+      );
+      const obj = Object.fromEntries(result);
+      assert.strictEqual(
+        obj.parentProp,
+        "parent",
+        "includes parent tracked property"
+      );
+      assert.strictEqual(
+        obj.childProp,
+        "child",
+        "includes child tracked property"
+      );
+    });
+
+    test("handles multi-level inheritance", function (assert) {
+      class GrandParent {
+        @tracked grandProp = "grand";
+      }
+
+      class Parent extends GrandParent {
+        @tracked parentProp = "parent";
+      }
+
+      class Child extends Parent {
+        @tracked childProp = "child";
+      }
+
+      const instance = new Child();
+      const result = enumerateTrackedEntries(instance);
+
+      assert.strictEqual(result.length, 3);
+      const obj = Object.fromEntries(result);
+      assert.strictEqual(obj.grandProp, "grand");
+      assert.strictEqual(obj.parentProp, "parent");
+      assert.strictEqual(obj.childProp, "child");
+    });
+
+    test("reflects current property values", function (assert) {
+      class Counter {
+        @tracked count = 0;
+      }
+
+      const instance = new Counter();
+      assert.strictEqual(
+        Object.fromEntries(enumerateTrackedEntries(instance)).count,
+        0,
+        "initial value is 0"
+      );
+
+      instance.count = 5;
+      assert.strictEqual(
+        Object.fromEntries(enumerateTrackedEntries(instance)).count,
+        5,
+        "updated value is reflected"
+      );
+
+      instance.count = 100;
+      assert.strictEqual(
+        Object.fromEntries(enumerateTrackedEntries(instance)).count,
+        100,
+        "further updates are reflected"
+      );
+    });
+
+    test("handles tracked properties with null/undefined values", function (assert) {
+      class TestClass {
+        @tracked nullProp = null;
+        @tracked undefinedProp = undefined;
+        @tracked stringProp = "value";
+      }
+
+      const instance = new TestClass();
+      const result = enumerateTrackedEntries(instance);
+
+      const obj = Object.fromEntries(result);
+      assert.strictEqual(obj.nullProp, null, "null value is preserved");
+      assert.strictEqual(
+        obj.undefinedProp,
+        undefined,
+        "undefined value is preserved"
+      );
+      assert.strictEqual(obj.stringProp, "value", "string value is correct");
+      assert.true("nullProp" in obj, "null property key exists in result");
+      assert.true(
+        "undefinedProp" in obj,
+        "undefined property key exists in result"
+      );
+    });
+
+    test("handles objects with various tracked value types", function (assert) {
+      class MixedTypes {
+        @tracked string = "text";
+        @tracked number = 42;
+        @tracked boolean = true;
+        @tracked object = { nested: "value" };
+        @tracked array = [1, 2, 3];
+      }
+
+      const instance = new MixedTypes();
+      const result = enumerateTrackedEntries(instance);
+
+      const obj = Object.fromEntries(result);
+      assert.strictEqual(obj.string, "text");
+      assert.strictEqual(obj.number, 42);
+      assert.true(obj.boolean);
+      assert.deepEqual(obj.object, { nested: "value" });
+      assert.deepEqual(obj.array, [1, 2, 3]);
+    });
+
+    test("can be converted to object with Object.fromEntries", function (assert) {
+      class TestClass {
+        @tracked firstName = "Alice";
+        @tracked lastName = "Smith";
+      }
+
+      const instance = new TestClass();
+      const entries = enumerateTrackedEntries(instance);
+      const obj = Object.fromEntries(entries);
+
+      assert.deepEqual(
+        obj,
+        { firstName: "Alice", lastName: "Smith" },
+        "entries can be converted back to object"
+      );
+    });
+  });
 });

From 61fac8a6a8a088dc27257a90d5c19ede7feb5d1e Mon Sep 17 00:00:00 2001
From: Canapin <canapin@gmail.com>
Date: Mon, 23 Feb 2026 19:48:23 +0100
Subject: [PATCH 015/168] FIX: user card cloak not disappearing on scroll (or
 long press) on mobile (#37973)

This commit fixes the issue by replacing the `mousedown` event with `pointerdown`.

`pointerdown` wasn't compatible with safari until 2019 but I guess it's safe to use now.

Related meta topic:
https://meta.discourse.org/t/usercard-cloak-not-disappears-on-touchstart/319061?u=canapin
---
 frontend/discourse/app/components/card-contents-base.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/discourse/app/components/card-contents-base.js b/frontend/discourse/app/components/card-contents-base.js
index eb9c801d2b804..44c55479a6479 100644
--- a/frontend/discourse/app/components/card-contents-base.js
+++ b/frontend/discourse/app/components/card-contents-base.js
@@ -106,7 +106,7 @@ export default class CardContentsBase extends Component {
   didInsertElement() {
     super.didInsertElement(...arguments);
 
-    document.addEventListener("mousedown", this._clickOutsideHandler);
+    document.addEventListener("pointerdown", this._clickOutsideHandler);
     document.addEventListener("keyup", this._escListener);
 
     _cardClickListenerSelectors.forEach((selector) => {
@@ -273,7 +273,7 @@ export default class CardContentsBase extends Component {
   willDestroyElement() {
     super.willDestroyElement(...arguments);
 
-    document.removeEventListener("mousedown", this._clickOutsideHandler);
+    document.removeEventListener("pointerdown", this._clickOutsideHandler);
     document.removeEventListener("keyup", this._escListener);
 
     _cardClickListenerSelectors.forEach((selector) => {

From efa0dbecff2778efd2ea5e88c2dab15af007f37d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 23 Feb 2026 13:59:27 -0500
Subject: [PATCH 016/168] UX: allow post controls to overflow when needed
 (#37997)

We were already allowing this overflow on smaller screens, but we should
always allow it to avoid overflow like this:

<img width="809" height="125" alt="image"
src="https://github.com/user-attachments/assets/3391a652-faa7-42b7-a8b3-52bbb01f203f"
/>

When there are many controls, scrolling is better

<img width="1394" height="416" alt="image"
src="https://github.com/user-attachments/assets/9870814d-f957-439c-af26-3a365ef515dd"
/>


Thanks to @small-lovely-cat for the suggestion in
https://github.com/discourse/discourse/pull/37400 (this is just a
slightly different approach)
---
 app/assets/stylesheets/common/base/topic-post.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 9e5f81a50d93e..11088d7e13640 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -410,6 +410,7 @@ nav.post-controls {
   justify-content: space-between;
   color: var(--d-post-control-text-color);
   user-select: none;
+  overflow-x: auto;
 
   .fade-out {
     .discourse-no-touch & {
@@ -428,7 +429,6 @@ nav.post-controls {
     --control-space: 0.58em;
     --control-space-small: calc(var(--control-space) / 2);
     --control-space-large: calc(var(--control-space) * 1.3);
-    overflow-x: auto;
   }
 
   .actions {

From 1bda9a7b449d35efaf4baf4970e8081556b84e6f Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Mon, 23 Feb 2026 19:59:43 +0100
Subject: [PATCH 017/168] DEV: Use optionalRequire to import chat in d-ai
 (#37990)

---
 .../components/reviewable-ai-chat-message.gjs    | 16 +++++++++++++---
 .../components/reviewable/ai-chat-message.gjs    | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs
index cdef8c29fb48c..f2e4a38fa7dd0 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs
@@ -4,9 +4,8 @@ import { LinkTo } from "@ember/routing";
 import { htmlSafe } from "@ember/template";
 import ReviewableCreatedBy from "discourse/components/reviewable-created-by";
 import ReviewablePostHeader from "discourse/components/reviewable-post-header";
+import { optionalRequire } from "discourse/lib/utilities";
 import { or } from "discourse/truth-helpers";
-import ChatChannelTitle from "discourse/plugins/chat/discourse/components/chat-channel-title";
-import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 import ModelAccuracies from "./model-accuracies";
 
 export default class ReviewableAiChatMessage extends Component {
@@ -14,9 +13,20 @@ export default class ReviewableAiChatMessage extends Component {
     if (!this.args.reviewable.chat_channel) {
       return;
     }
+
+    const ChatChannel = optionalRequire(
+      "discourse/plugins/chat/discourse/models/chat-channel"
+    );
+
     return ChatChannel.create(this.args.reviewable.chat_channel);
   }
 
+  get ChatChannelTitle() {
+    return optionalRequire(
+      "discourse/plugins/chat/discourse/components/chat-channel-title"
+    );
+  }
+
   <template>
     {{#if this.chatChannel}}
       <div class="flagged-post-header">
@@ -28,7 +38,7 @@ export default class ReviewableAiChatMessage extends Component {
             @reviewable.target_id
           }}
         >
-          <ChatChannelTitle @channel={{this.chatChannel}} />
+          <this.ChatChannelTitle @channel={{this.chatChannel}} />
         </LinkTo>
       </div>
     {{/if}}
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-chat-message.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-chat-message.gjs
index 8ce1a37a74402..35c9bb29d5d5b 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-chat-message.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-chat-message.gjs
@@ -5,9 +5,8 @@ import { LinkTo } from "@ember/routing";
 import ReviewableCreatedBy from "discourse/components/reviewable/created-by";
 import ReviewableTopicLink from "discourse/components/reviewable/topic-link";
 import highlightWatchedWords from "discourse/lib/highlight-watched-words";
+import { optionalRequire } from "discourse/lib/utilities";
 import { i18n } from "discourse-i18n";
-import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";
-import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
 import ModelAccuracies from "../model-accuracies";
 
 export default class ReviewableRefreshAiChatMessage extends Component {
@@ -16,6 +15,11 @@ export default class ReviewableRefreshAiChatMessage extends Component {
     if (!this.args.reviewable.chat_channel) {
       return;
     }
+
+    const ChatChannel = optionalRequire(
+      "discourse/plugins/chat/discourse/models/chat-channel"
+    );
+
     return ChatChannel.create(this.args.reviewable.chat_channel);
   }
 
@@ -26,6 +30,12 @@ export default class ReviewableRefreshAiChatMessage extends Component {
     );
   }
 
+  get ChannelTitle() {
+    return optionalRequire(
+      "discourse/plugins/chat/discourse/components/channel-title"
+    );
+  }
+
   <template>
     <div class="review-item__meta-content">
       <div class="review-item__meta-label">{{i18n
@@ -42,7 +52,7 @@ export default class ReviewableRefreshAiChatMessage extends Component {
               @reviewable.target_id
             }}
           >
-            <ChannelTitle @channel={{this.channel}} />
+            <this.ChannelTitle @channel={{this.channel}} />
           </LinkTo>
         {{else}}
           <ReviewableTopicLink @reviewable={{@reviewable}} />

From 80e73b4738a44bfd7fcee109da1a9885573f573d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 23 Feb 2026 20:57:11 +0100
Subject: [PATCH 018/168] FIX: Exclude deleted posts from group topic filter
 (#38000)

The group filter in TopicsFilter was including deleted posts when
determining whether a topic had contributions from a specific group's
members. This caused topics to appear in group-filtered results even
when the only post from a group member had been deleted.

Added a `deleted_at IS NULL` condition to both the single-group (OR) and
multi-group (AND) query paths, consistent with how whisper posts are
already filtered.

https://meta.discourse.org/t/396807
---
 lib/topics_filter.rb           | 10 +++++++---
 spec/lib/topics_filter_spec.rb | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/lib/topics_filter.rb b/lib/topics_filter.rb
index 24cef301fe843..9354fac100207 100644
--- a/lib/topics_filter.rb
+++ b/lib/topics_filter.rb
@@ -577,17 +577,21 @@ def filter_groups(values:)
               SELECT 1
               FROM posts pg#{idx}
               JOIN group_users gu#{idx} ON gu#{idx}.user_id = pg#{idx}.user_id
-              WHERE pg#{idx}.topic_id = topics.id AND gu#{idx}.group_id = #{gid} #{whisper_condition("pg#{idx}")}
+              WHERE pg#{idx}.topic_id = topics.id
+              AND pg#{idx}.deleted_at IS NULL
+              AND gu#{idx}.group_id = #{gid}
+              #{whisper_condition("pg#{idx}")}
             )
           SQL
       else
-        @scope = @scope.where(<<~SQL, group_ids: group_ids)
+        @scope = @scope.where(<<~SQL, group_ids:)
               topics.id IN (
                 SELECT DISTINCT p.topic_id
                 FROM posts p
                 JOIN group_users gu ON gu.user_id = p.user_id
                 WHERE gu.group_id IN (:group_ids)
-                  #{whisper_condition("p")}
+                AND p.deleted_at IS NULL
+                #{whisper_condition("p")}
               )
             SQL
       end
diff --git a/spec/lib/topics_filter_spec.rb b/spec/lib/topics_filter_spec.rb
index 35ecaf6fe4915..0ed42e581b89e 100644
--- a/spec/lib/topics_filter_spec.rb
+++ b/spec/lib/topics_filter_spec.rb
@@ -193,6 +193,32 @@
         expect(ids).to contain_exactly(topic_by_u1_and_u2.id)
       end
 
+      it "group:group1 should not return topics where the only post from a group member is deleted" do
+        topic = Fabricate(:topic)
+        post = Fabricate(:post, topic:, user: u1)
+        post.update_column(:deleted_at, Time.zone.now)
+
+        ids =
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("group:group1")
+            .pluck(:id)
+        expect(ids).not_to include(topic.id)
+      end
+
+      it "group:group1+group2 should not return topics where a group member's only post is deleted" do
+        topic = Fabricate(:topic)
+        Fabricate(:post, topic:, user: u1).update_column(:deleted_at, Time.zone.now)
+        Fabricate(:post, topic:, user: u2)
+
+        ids =
+          TopicsFilter
+            .new(guardian: Guardian.new)
+            .filter_from_query_string("group:group1+group2")
+            .pluck(:id)
+        expect(ids).not_to include(topic.id)
+      end
+
       context "with whispers" do
         fab!(:whisperer_group, :group)
         fab!(:whisperer_user) { Fabricate(:user).tap { |u| whisperer_group.add(u) } }

From dc74b64534bcccbbc379dce99fde85999e900fcb Mon Sep 17 00:00:00 2001
From: David McClure <mcwumbly@discourse.org>
Date: Mon, 23 Feb 2026 15:37:38 -0500
Subject: [PATCH 019/168] DEV: Fix typo (#37993)

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

diff --git a/plugins/discourse-ai/config/locales/client.en.yml b/plugins/discourse-ai/config/locales/client.en.yml
index dabfc72e173e7..1be7fe905d3f2 100644
--- a/plugins/discourse-ai/config/locales/client.en.yml
+++ b/plugins/discourse-ai/config/locales/client.en.yml
@@ -523,7 +523,7 @@ en:
         overwrite: "Overwrite"
         description: "Description"
         no_llm_selected: "No language model selected"
-        use_parent_llm: "Use personas language model"
+        use_parent_llm: "Use persona's language model"
         max_context_posts: "Max context posts"
         max_context_posts_help: "The maximum number of posts to use as context for the AI when responding to a user. (empty for default)"
         vision_enabled: Vision enabled

From 0eb7c83fab702f7815c57be7e95b2fa80dbe1c81 Mon Sep 17 00:00:00 2001
From: David McClure <mcwumbly@discourse.org>
Date: Mon, 23 Feb 2026 15:37:53 -0500
Subject: [PATCH 020/168] DEV: Remove unused string (#37994)

---
 config/locales/server.en.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 6a9ed2aac5b0c..cf47b90cebe67 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2876,7 +2876,6 @@ en:
       exclude_tag: "Exclude topics with a specific tag"
       exclude_tags_any: "Exclude topics with any of the specified tags (comma-separated)"
       exclude_tags_all: "Exclude topics with all of the specified tags (plus-separated)"
-      tags_alias: "Alias for 'tag:' filter"
       tag_group: "Show topics with tags from a specific tag group"
       exclude_tag_group: "Exclude topics with tags from a specific tag group"
       activity_before: "Show topics with last activity before a date (YYYY-MM-DD or days ago)"

From 415a53cd018f2dee984ba695cdf95609745d0b13 Mon Sep 17 00:00:00 2001
From: David McClure <mcwumbly@discourse.org>
Date: Mon, 23 Feb 2026 15:38:06 -0500
Subject: [PATCH 021/168] DEV: Clarify reference to other chat channels
 (#37992)

---
 plugins/chat/config/locales/server.en.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/chat/config/locales/server.en.yml b/plugins/chat/config/locales/server.en.yml
index 93fe7665fdf11..e4caff7607e3c 100644
--- a/plugins/chat/config/locales/server.en.yml
+++ b/plugins/chat/config/locales/server.en.yml
@@ -264,18 +264,18 @@ en:
           one: "[%{site_name}] New thread message in %{channel}"
           other: "[%{site_name}] New thread messages in %{channel}"
         watched_threads:
-          one: "[%{site_name}] New thread messages in %{channel} and %{count} other"
-          other: "[%{site_name}] New thread messages in %{channel} and %{count} others"
+          one: "[%{site_name}] New thread messages in %{channel} and %{count} other channel"
+          other: "[%{site_name}] New thread messages in %{channel} and %{count} other channels"
         chat_dm_1:
           one: "[%{site_name}] New message from %{name}"
           other: "[%{site_name}] New messages from %{name}"
         chat_dm_2: "[%{site_name}] New messages from %{name_1} and %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] New messages from %{name} and %{count} others"
+        chat_dm_3_or_more: "[%{site_name}] New messages from %{name} and %{count} other direct message channels"
         chat_channel_1:
           one: "[%{site_name}] New message in %{channel}"
           other: "[%{site_name}] New messages in %{channel}"
         chat_channel_2: "[%{site_name}] New messages in %{channel_1} and %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] New messages in %{channel} and %{count} others"
+        chat_channel_3_or_more: "[%{site_name}] New messages in %{channel} and %{count} other channels"
         chat_channel_and_dm: "[%{site_name}] New messages in %{channel} and from %{name}"
       unsubscribe: "This chat summary is sent from %{site_link} when you are away. Change your %{email_preferences_link}, or %{unsubscribe_link} to unsubscribe."
       unsubscribe_no_link: "This chat summary is sent from %{site_link} when you are away. Change your %{email_preferences_link}."

From b6c7992e2f39e13136bc8dc4740c710e3526d1fd Mon Sep 17 00:00:00 2001
From: David McClure <mcwumbly@discourse.org>
Date: Mon, 23 Feb 2026 15:38:19 -0500
Subject: [PATCH 022/168] DEV: Update link to strftime docs (#37991)

---
 config/locales/server.en.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index cf47b90cebe67..a3abf74071b36 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -9,17 +9,17 @@ en:
 
   datetime_formats: &datetime_formats
     formats:
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
+      # Format directives: https://ruby-doc.org/core/strftime_formatting_rdoc.html
       short: "%m-%d-%Y"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
+      # Format directives: https://ruby-doc.org/core/strftime_formatting_rdoc.html
       short_no_year: "%B %-d"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
+      # Format directives: https://ruby-doc.org/core/strftime_formatting_rdoc.html
       date_only: "%B %-d, %Y"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
+      # Format directives: https://ruby-doc.org/core/strftime_formatting_rdoc.html
       long: "%B %-d, %Y, %l:%M%P"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
+      # Format directives: https://ruby-doc.org/core/strftime_formatting_rdoc.html
       no_day: "%B %Y"
-      # Format directives: https://ruby-doc.org/core/Time.html#method-i-strftime
+      # Format directives: https://ruby-doc.org/core/strftime_formatting_rdoc.html
       calendar_ics: "%Y%m%dT%H%M%SZ"
   date:
     # Do not remove the brackets and commas and do not translate the first month name. It should be "null".

From 18fded7300cc7c575beac751d8b95c6c78759b3b Mon Sep 17 00:00:00 2001
From: David McClure <mcwumbly@discourse.org>
Date: Mon, 23 Feb 2026 15:39:04 -0500
Subject: [PATCH 023/168] DEV: Improve copy for discourse_local_dates_enabled
 (#37962)

---
 plugins/discourse-local-dates/config/locales/server.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-local-dates/config/locales/server.en.yml b/plugins/discourse-local-dates/config/locales/server.en.yml
index d891ff0eb469f..6a15d03130e94 100644
--- a/plugins/discourse-local-dates/config/locales/server.en.yml
+++ b/plugins/discourse-local-dates/config/locales/server.en.yml
@@ -1,6 +1,6 @@
 en:
   site_settings:
-    discourse_local_dates_enabled: "Enable the discourse-local-dates feature. This will add support to local timezone aware dates in posts using the [date] element"
+    discourse_local_dates_enabled: "Enable the 'discourse-local-dates' plugin. This allows people to use '[date]' in posts to show readers dates in their local timezone"
     discourse_local_dates_default_formats: "Frequently used date time formats, see: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Default list of timezones, must be a valid <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
     discourse_local_dates_email_format: "Format used to display a date in emails, examples: 'LLLL', 'llll' or 'YYYY-MM-DDTHH:mm:ss[Z]'. See: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"

From 2a6fd61af3189c5d7601bdc042944441e7529139 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 23 Feb 2026 15:53:44 -0500
Subject: [PATCH 024/168] UX: only show global email disabled message in admin
 and preference areas (#37998)

Currently when `disable_emails` is true, we show this banner on every
page:

<img width="2228" height="274" alt="image"
src="https://github.com/user-attachments/assets/9282cfff-dd17-4880-82bd-5375b0983df1"
/>

But it's now much easier to set up Discourse without email, so this
message can be irritating if it's globally persisted everywhere. This
change scopes it admin areas (/admin and /review) and in preferences
like /my/preferences/emails and my/preferences/notifications so that if
someone is confused about email not working, they'll still likely see
it, but it's not a nuisance otherwise.
---
 .../app/components/global-notice.gjs          | 16 ++++++++---
 .../tests/acceptance/email-notice-test.js     | 28 +++++++++++--------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/frontend/discourse/app/components/global-notice.gjs b/frontend/discourse/app/components/global-notice.gjs
index 8528c8163bd81..599e483457ac3 100644
--- a/frontend/discourse/app/components/global-notice.gjs
+++ b/frontend/discourse/app/components/global-notice.gjs
@@ -81,6 +81,16 @@ export default class GlobalNotice extends Component {
     return !this.router.currentRouteName.startsWith("wizard.");
   }
 
+  get #showEmailsDisabledNotice() {
+    const routeName = this.router.currentRouteName;
+    return (
+      routeName?.startsWith("admin") ||
+      routeName?.startsWith("review") ||
+      routeName === "preferences.emails" ||
+      routeName === "preferences.notifications"
+    );
+  }
+
   get notices() {
     let notices = [];
 
@@ -147,8 +157,7 @@ export default class GlobalNotice extends Component {
           text: i18n("emails_are_disabled"),
           id: "alert-emails-disabled",
           options: {
-            dismissable: true,
-            persistentDismiss: false,
+            visibility: () => this.#showEmailsDisabledNotice,
           },
         })
       );
@@ -158,8 +167,7 @@ export default class GlobalNotice extends Component {
           text: i18n("emails_are_disabled_non_staff"),
           id: "alert-emails-disabled",
           options: {
-            dismissable: true,
-            persistentDismiss: false,
+            visibility: () => this.#showEmailsDisabledNotice,
           },
         })
       );
diff --git a/frontend/discourse/tests/acceptance/email-notice-test.js b/frontend/discourse/tests/acceptance/email-notice-test.js
index 1e718439d53fc..8400de56ce61d 100644
--- a/frontend/discourse/tests/acceptance/email-notice-test.js
+++ b/frontend/discourse/tests/acceptance/email-notice-test.js
@@ -19,10 +19,17 @@ acceptance("Email Disabled Banner", function (needs) {
 
   test("when enabled", async function (assert) {
     this.siteSettings.disable_emails = "yes";
+
     await visit("/latest");
     assert
       .dom(".alert-emails-disabled")
-      .exists("alert is displayed when email disabled");
+      .doesNotExist("alert is not displayed on non-admin routes");
+
+    updateCurrentUser({ admin: true });
+    await visit("/admin");
+    assert
+      .dom(".alert-emails-disabled")
+      .exists("alert is displayed on admin routes when email disabled");
     assert
       .dom(".alert-emails-disabled .text")
       .hasText(i18n("emails_are_disabled"), "alert uses the correct text");
@@ -30,22 +37,19 @@ acceptance("Email Disabled Banner", function (needs) {
 
   test("when non-staff", async function (assert) {
     this.siteSettings.disable_emails = "non-staff";
-    await visit("/");
+
+    await visit("/latest");
     assert
       .dom(".alert-emails-disabled")
-      .exists("alert is displayed when email disabled for non-staff");
-    assert
-      .dom(".alert-emails-disabled .text")
-      .hasText(
-        i18n("emails_are_disabled_non_staff"),
-        "alert uses the correct text"
-      );
+      .doesNotExist("alert is not displayed on non-admin routes");
 
-    updateCurrentUser({ moderator: true });
-    await visit("/");
+    updateCurrentUser({ admin: true });
+    await visit("/admin");
     assert
       .dom(".alert-emails-disabled")
-      .exists("alert is displayed to staff when email disabled for non-staff");
+      .exists(
+        "alert is displayed on admin routes when email disabled for non-staff"
+      );
     assert
       .dom(".alert-emails-disabled .text")
       .hasText(

From af5329588e9ceae0218cadbd45070ee8e085a18a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 23 Feb 2026 22:00:16 +0100
Subject: [PATCH 025/168] FEATURE: Pin chat messages (#37985)

Allow staff to pin important messages in chat channels. Pinned messages
appear in a dedicated panel accessible from the channel navbar. Members
of allowed groups (admins/moderators by default) can pin and unpin
messages via the message actions menu.

Pinned messages show "pinned by" attribution, track unread state per
user, and auto-unpin when the original message is trashed. Real-time
updates via MessageBus keep the pinned list in sync.

Gated behind the chat_pinned_messages upcoming change (experimental).
---
 .../chat/api/channel_pins_controller.rb       |  90 ++++++++++
 .../scheduled/chat/delete_old_messages.rb     |  16 +-
 plugins/chat/app/models/chat/channel.rb       |   5 +
 plugins/chat/app/models/chat/message.rb       |   4 +
 .../chat/app/models/chat/pinned_message.rb    |  34 ++++
 .../chat/user_chat_channel_membership.rb      |  19 +++
 .../chat/app/queries/chat/messages_query.rb   |   1 +
 .../base_channel_membership_serializer.rb     |  16 +-
 .../chat/channel_pins_serializer.rb           |  21 +++
 .../serializers/chat/channel_serializer.rb    |  12 +-
 .../serializers/chat/message_serializer.rb    |   9 +
 .../chat/pinned_message_serializer.rb         |  22 +++
 .../app/services/chat/list_channel_pins.rb    |  55 +++++++
 .../app/services/chat/mark_pins_as_read.rb    |  36 ++++
 plugins/chat/app/services/chat/pin_message.rb |  56 +++++++
 plugins/chat/app/services/chat/publisher.rb   |  19 +++
 .../chat/app/services/chat/trash_message.rb   |  15 +-
 .../chat/app/services/chat/unpin_message.rb   |  46 ++++++
 .../javascripts/discourse/chat-route-map.js   |   1 +
 .../chat-message-actions-desktop.gjs          |   7 +-
 .../discourse/components/chat-message.gjs     |  20 ++-
 .../components/chat-pinned-messages-list.gjs  | 155 ++++++++++++++++++
 .../chat/drawer-routes/channel-pins.gjs       |  51 ++++++
 .../chat/drawer-routes/channel-threads.gjs    |   2 +-
 .../components/chat/drawer-routes/channel.gjs |   1 +
 .../components/chat/message/info.gjs          |  13 +-
 .../components/chat/navbar/actions.gjs        |   4 +
 .../chat/navbar/close-pins-button.gjs         |  24 +++
 .../chat/navbar/pinned-messages-button.gjs    |  42 +++++
 .../chat/pinned-messages-list/header.gjs      |  40 +++++
 .../components/chat/routes/channel-pins.gjs   |  14 ++
 .../components/chat/routes/channel.gjs        |   1 +
 .../components/chat/thread-list/header.gjs    |   2 +-
 .../lib/chat-channel-subscription-manager.js  |  46 ++++++
 .../discourse/lib/chat-message-container.js   |   4 +
 .../discourse/lib/chat-message-interactor.js  |  58 +++++++
 .../discourse/models/chat-channel.js          |  16 ++
 .../discourse/models/chat-message.js          |   3 +
 .../models/user-chat-channel-membership.js    |   6 +
 .../discourse/routes/chat/channel/pins.js     |  26 +++
 .../discourse/services/chat-api.js            |  35 ++++
 .../discourse/services/chat-drawer-router.js  |  26 +++
 .../discourse/templates/chat/channel/pins.gjs |   8 +
 .../stylesheets/common/base-common.scss       |   8 +-
 .../stylesheets/common/chat-message.scss      |   9 +
 .../common/chat-pinned-messages.scss          | 103 ++++++++++++
 .../chat/assets/stylesheets/common/index.scss |   1 +
 plugins/chat/config/locales/client.en.yml     |   9 +
 plugins/chat/config/locales/server.en.yml     |   5 +
 plugins/chat/config/routes.rb                 |   5 +
 plugins/chat/config/settings.yml              |  15 ++
 ...60122134202_create_chat_pinned_messages.rb |  20 +++
 ...ins_at_to_user_chat_channel_memberships.rb |   7 +
 plugins/chat/lib/chat/channel_fetcher.rb      |   2 +
 plugins/chat/lib/chat/guardian_extensions.rb  |  15 ++
 .../chat_pinned_message_fabricator.rb         |   7 +
 .../delete_old_chat_messages_spec.rb          |  40 +++++
 .../spec/lib/chat/guardian_extensions_spec.rb |  77 +++++++++
 .../spec/models/chat/pinned_message_spec.rb   |  35 ++++
 .../chat/user_chat_channel_membership_spec.rb |  69 ++++++++
 .../chat/api/channel_pins_controller_spec.rb  | 112 +++++++++++++
 ..._notifications_settings_controller_spec.rb |   1 +
 .../services/chat/list_channel_pins_spec.rb   |  74 +++++++++
 .../services/chat/mark_pins_as_read_spec.rb   |  60 +++++++
 .../spec/services/chat/pin_message_spec.rb    |  76 +++++++++
 .../spec/services/chat/trash_message_spec.rb  |  16 ++
 .../spec/services/chat/unpin_message_spec.rb  |  64 ++++++++
 .../schemas/user_chat_channel_membership.json |   4 +-
 .../chat/spec/system/pinned_messages_spec.rb  | 130 +++++++++++++++
 .../components/chat-message-test.gjs          |  11 ++
 .../upcoming_changes/chat_pinned_messages.png | Bin 0 -> 10354 bytes
 71 files changed, 2036 insertions(+), 20 deletions(-)
 create mode 100644 plugins/chat/app/controllers/chat/api/channel_pins_controller.rb
 create mode 100644 plugins/chat/app/models/chat/pinned_message.rb
 create mode 100644 plugins/chat/app/serializers/chat/channel_pins_serializer.rb
 create mode 100644 plugins/chat/app/serializers/chat/pinned_message_serializer.rb
 create mode 100644 plugins/chat/app/services/chat/list_channel_pins.rb
 create mode 100644 plugins/chat/app/services/chat/mark_pins_as_read.rb
 create mode 100644 plugins/chat/app/services/chat/pin_message.rb
 create mode 100644 plugins/chat/app/services/chat/unpin_message.rb
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjs
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjs
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjs
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjs
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjs
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-pins.gjs
 create mode 100644 plugins/chat/assets/javascripts/discourse/routes/chat/channel/pins.js
 create mode 100644 plugins/chat/assets/javascripts/discourse/templates/chat/channel/pins.gjs
 create mode 100644 plugins/chat/assets/stylesheets/common/chat-pinned-messages.scss
 create mode 100644 plugins/chat/db/migrate/20260122134202_create_chat_pinned_messages.rb
 create mode 100644 plugins/chat/db/migrate/20260122214226_add_last_viewed_pins_at_to_user_chat_channel_memberships.rb
 create mode 100644 plugins/chat/spec/fabricators/chat_pinned_message_fabricator.rb
 create mode 100644 plugins/chat/spec/models/chat/pinned_message_spec.rb
 create mode 100644 plugins/chat/spec/models/chat/user_chat_channel_membership_spec.rb
 create mode 100644 plugins/chat/spec/requests/chat/api/channel_pins_controller_spec.rb
 create mode 100644 plugins/chat/spec/services/chat/list_channel_pins_spec.rb
 create mode 100644 plugins/chat/spec/services/chat/mark_pins_as_read_spec.rb
 create mode 100644 plugins/chat/spec/services/chat/pin_message_spec.rb
 create mode 100644 plugins/chat/spec/services/chat/unpin_message_spec.rb
 create mode 100644 plugins/chat/spec/system/pinned_messages_spec.rb
 create mode 100644 public/images/upcoming_changes/chat_pinned_messages.png

diff --git a/plugins/chat/app/controllers/chat/api/channel_pins_controller.rb b/plugins/chat/app/controllers/chat/api/channel_pins_controller.rb
new file mode 100644
index 0000000000000..5a5d5c6191ee1
--- /dev/null
+++ b/plugins/chat/app/controllers/chat/api/channel_pins_controller.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+class Chat::Api::ChannelPinsController < Chat::ApiController
+  def index
+    raise Discourse::NotFound unless SiteSetting.chat_pinned_messages
+
+    Chat::ListChannelPins.call(service_params) do
+      on_success do |pins:, membership:|
+        render_serialized({ pins:, membership: }, Chat::ChannelPinsSerializer, root: false)
+      end
+      on_model_not_found(:channel) { raise Discourse::NotFound }
+      on_model_not_found(:membership) do |pins:|
+        render_serialized({ pins:, membership: nil }, Chat::ChannelPinsSerializer, root: false)
+      end
+      on_failed_policy(:can_view_channel) { raise Discourse::InvalidAccess }
+      on_failed_contract do |contract|
+        render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
+      end
+      on_failure { render(json: failed_json, status: :unprocessable_entity) }
+    end
+  end
+
+  def mark_read
+    raise Discourse::NotFound unless SiteSetting.chat_pinned_messages
+
+    Chat::MarkPinsAsRead.call(params: { channel_id: params[:channel_id] }, guardian: guardian) do
+      on_success { render json: success_json }
+      on_model_not_found(:channel) { raise Discourse::NotFound }
+      on_model_not_found(:membership) { raise Discourse::NotFound }
+      on_failed_policy(:can_access_channel) { raise Discourse::InvalidAccess }
+      on_failed_contract do |contract|
+        render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
+      end
+      on_failure { render(json: failed_json, status: :unprocessable_entity) }
+    end
+  end
+
+  def create
+    raise Discourse::NotFound unless SiteSetting.chat_pinned_messages
+
+    Chat::PinMessage.call(service_params) do
+      on_success { render(json: success_json) }
+      on_failure { render(json: failed_json, status: :unprocessable_entity) }
+      on_model_not_found(:message) { raise Discourse::NotFound }
+      on_failed_policy(:can_pin) { raise Discourse::InvalidAccess }
+      on_failed_policy(:within_pin_limit) do
+        render(
+          json:
+            failed_json.merge(
+              error:
+                I18n.t(
+                  "chat.errors.pin_limit_reached",
+                  limit: Chat::PinnedMessage::MAX_PINS_PER_CHANNEL,
+                ),
+            ),
+          status: :unprocessable_entity,
+        )
+      end
+      on_failed_policy(:not_already_pinned) do
+        render(
+          json: failed_json.merge(error: I18n.t("chat.errors.message_already_pinned")),
+          status: :unprocessable_entity,
+        )
+      end
+      on_failed_contract do |contract|
+        render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
+      end
+    end
+  end
+
+  def destroy
+    raise Discourse::NotFound unless SiteSetting.chat_pinned_messages
+
+    Chat::UnpinMessage.call(service_params) do
+      on_success { render(json: success_json) }
+      on_failure { render(json: failed_json, status: :unprocessable_entity) }
+      on_model_not_found(:message) { raise Discourse::NotFound }
+      on_model_not_found(:pin) do
+        render(
+          json: failed_json.merge(error: I18n.t("chat.errors.message_not_pinned")),
+          status: :unprocessable_entity,
+        )
+      end
+      on_failed_policy(:can_unpin) { raise Discourse::InvalidAccess }
+      on_failed_contract do |contract|
+        render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/app/jobs/scheduled/chat/delete_old_messages.rb b/plugins/chat/app/jobs/scheduled/chat/delete_old_messages.rb
index 0a706b3875bfb..20498cdb0e0de 100644
--- a/plugins/chat/app/jobs/scheduled/chat/delete_old_messages.rb
+++ b/plugins/chat/app/jobs/scheduled/chat/delete_old_messages.rb
@@ -18,9 +18,11 @@ def delete_public_channel_messages
         return unless valid_day_value?(:chat_channel_retention_days)
 
         ::Chat::MessageDestroyer.new.destroy_in_batches(
-          ::Chat::Message.in_public_channel.with_deleted.created_before(
-            ::SiteSetting.chat_channel_retention_days.days.ago,
-          ),
+          ::Chat::Message
+            .in_public_channel
+            .with_deleted
+            .created_before(::SiteSetting.chat_channel_retention_days.days.ago)
+            .where.not(id: ::Chat::PinnedMessage.select(:chat_message_id)),
         )
       end
 
@@ -28,9 +30,11 @@ def delete_dm_channel_messages
         return unless valid_day_value?(:chat_dm_retention_days)
 
         ::Chat::MessageDestroyer.new.destroy_in_batches(
-          ::Chat::Message.in_dm_channel.with_deleted.created_before(
-            ::SiteSetting.chat_dm_retention_days.days.ago,
-          ),
+          ::Chat::Message
+            .in_dm_channel
+            .with_deleted
+            .created_before(::SiteSetting.chat_dm_retention_days.days.ago)
+            .where.not(id: ::Chat::PinnedMessage.select(:chat_message_id)),
         )
       end
 
diff --git a/plugins/chat/app/models/chat/channel.rb b/plugins/chat/app/models/chat/channel.rb
index 3472d3ce64b9a..32c18dc7084fd 100644
--- a/plugins/chat/app/models/chat/channel.rb
+++ b/plugins/chat/app/models/chat/channel.rb
@@ -25,6 +25,7 @@ class Channel < ActiveRecord::Base
                class_name: "Chat::Message",
                foreign_key: :last_message_id,
                optional: true
+    has_many :pinned_messages, class_name: "Chat::PinnedMessage", foreign_key: :chat_channel_id
 
     def last_message
       super || NullMessage.new
@@ -145,6 +146,10 @@ def leave(user)
       self.remove(user)
     end
 
+    def pinned_messages_count
+      pinned_messages.size
+    end
+
     def url
       "#{Discourse.base_url}/chat/c/#{self.slug || "-"}/#{self.id}"
     end
diff --git a/plugins/chat/app/models/chat/message.rb b/plugins/chat/app/models/chat/message.rb
index 918cae3d2e6c5..0bb54f7ae9dae 100644
--- a/plugins/chat/app/models/chat/message.rb
+++ b/plugins/chat/app/models/chat/message.rb
@@ -57,6 +57,10 @@ class Message < ActiveRecord::Base
              dependent: :destroy,
              class_name: "Chat::Mention",
              foreign_key: :chat_message_id
+    has_one :pinned_message,
+            class_name: "Chat::PinnedMessage",
+            foreign_key: :chat_message_id,
+            dependent: :destroy
     has_many :user_mentions,
              dependent: :destroy,
              class_name: "Chat::UserMention",
diff --git a/plugins/chat/app/models/chat/pinned_message.rb b/plugins/chat/app/models/chat/pinned_message.rb
new file mode 100644
index 0000000000000..da79edd0b3288
--- /dev/null
+++ b/plugins/chat/app/models/chat/pinned_message.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Chat
+  class PinnedMessage < ActiveRecord::Base
+    self.table_name = "chat_pinned_messages"
+
+    MAX_PINS_PER_CHANNEL = 20
+
+    belongs_to :chat_message, class_name: "Chat::Message"
+    belongs_to :chat_channel, class_name: "Chat::Channel"
+    belongs_to :user, foreign_key: :pinned_by_id
+
+    validates :chat_message_id, uniqueness: true
+
+    scope :for_channel, ->(channel) { where(chat_channel: channel).order(created_at: :desc) }
+  end
+end
+
+# == Schema Information
+#
+# Table name: chat_pinned_messages
+#
+#  id              :bigint           not null, primary key
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  chat_channel_id :bigint           not null
+#  chat_message_id :bigint           not null
+#  pinned_by_id    :bigint           not null
+#
+# Indexes
+#
+#  idx_chat_pinned_messages_channel_created       (chat_channel_id,created_at DESC)
+#  index_chat_pinned_messages_on_chat_message_id  (chat_message_id) UNIQUE
+#
diff --git a/plugins/chat/app/models/chat/user_chat_channel_membership.rb b/plugins/chat/app/models/chat/user_chat_channel_membership.rb
index 736d4439f7337..1b9dd2f0b7a58 100644
--- a/plugins/chat/app/models/chat/user_chat_channel_membership.rb
+++ b/plugins/chat/app/models/chat/user_chat_channel_membership.rb
@@ -17,6 +17,24 @@ class UserChatChannelMembership < ActiveRecord::Base
     def mark_read!(new_last_read_id = nil)
       update!(last_read_message_id: new_last_read_id || chat_channel.last_message_id)
     end
+
+    def has_unseen_pins?
+      pins = chat_channel.pinned_messages
+
+      if pins.loaded?
+        others = pins.reject { |pin| pin.pinned_by_id == user_id }
+        return false if others.empty?
+        return true if last_viewed_pins_at.nil?
+        others.any? { |pin| pin.created_at > last_viewed_pins_at }
+      else
+        others = pins.where.not(pinned_by_id: user_id)
+        if last_viewed_pins_at.nil?
+          others.exists?
+        else
+          others.where("created_at > ?", last_viewed_pins_at).exists?
+        end
+      end
+    end
   end
 end
 
@@ -28,6 +46,7 @@ def mark_read!(new_last_read_id = nil)
 #  following                           :boolean          default(FALSE), not null
 #  join_mode                           :integer          default("manual"), not null
 #  last_viewed_at                      :datetime         not null
+#  last_viewed_pins_at                 :datetime
 #  muted                               :boolean          default(FALSE), not null
 #  notification_level                  :integer          default("mention"), not null
 #  starred                             :boolean          default(FALSE), not null
diff --git a/plugins/chat/app/queries/chat/messages_query.rb b/plugins/chat/app/queries/chat/messages_query.rb
index e4a8bf5a347f9..7dfcea64a6b71 100644
--- a/plugins/chat/app/queries/chat/messages_query.rb
+++ b/plugins/chat/app/queries/chat/messages_query.rb
@@ -107,6 +107,7 @@ def self.base_query(channel:)
           .includes(uploads: { optimized_videos: :optimized_upload })
           .includes(chat_channel: :chatable)
           .includes(thread: %i[original_message last_message])
+          .includes(:pinned_message)
           .where(chat_channel_id: channel.id)
 
       user_includes = SiteSetting.enable_user_status ? %i[user_status user_option] : %i[user_option]
diff --git a/plugins/chat/app/serializers/chat/base_channel_membership_serializer.rb b/plugins/chat/app/serializers/chat/base_channel_membership_serializer.rb
index 9dac232236fb4..14e77bb0c4662 100644
--- a/plugins/chat/app/serializers/chat/base_channel_membership_serializer.rb
+++ b/plugins/chat/app/serializers/chat/base_channel_membership_serializer.rb
@@ -8,7 +8,9 @@ class BaseChannelMembershipSerializer < ApplicationSerializer
                :chat_channel_id,
                :last_read_message_id,
                :last_viewed_at,
-               :starred
+               :last_viewed_pins_at,
+               :starred,
+               :has_unseen_pins
 
     def starred
       object.starred
@@ -17,5 +19,17 @@ def starred
     def include_starred?
       scope&.authenticated?
     end
+
+    def has_unseen_pins
+      object.has_unseen_pins?
+    end
+
+    def include_has_unseen_pins?
+      SiteSetting.chat_pinned_messages && scope&.authenticated?
+    end
+
+    def include_last_viewed_pins_at?
+      SiteSetting.chat_pinned_messages && scope&.authenticated?
+    end
   end
 end
diff --git a/plugins/chat/app/serializers/chat/channel_pins_serializer.rb b/plugins/chat/app/serializers/chat/channel_pins_serializer.rb
new file mode 100644
index 0000000000000..893f7cda4286e
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/channel_pins_serializer.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Chat
+  class ChannelPinsSerializer < ApplicationSerializer
+    attributes :pinned_messages, :membership
+
+    def pinned_messages
+      ActiveModel::ArraySerializer.new(
+        object[:pins],
+        each_serializer: Chat::PinnedMessageSerializer,
+        scope: scope,
+      )
+    end
+
+    def membership
+      return if !object[:membership]
+
+      Chat::UserChannelMembershipSerializer.new(object[:membership], scope: scope, root: false)
+    end
+  end
+end
diff --git a/plugins/chat/app/serializers/chat/channel_serializer.rb b/plugins/chat/app/serializers/chat/channel_serializer.rb
index 68cdc5f1f5f18..088f12828f748 100644
--- a/plugins/chat/app/serializers/chat/channel_serializer.rb
+++ b/plugins/chat/app/serializers/chat/channel_serializer.rb
@@ -23,7 +23,8 @@ class ChannelSerializer < ApplicationSerializer
                :memberships_count,
                :current_user_membership,
                :meta,
-               :threading_enabled
+               :threading_enabled,
+               :pinned_messages_count
 
     has_one :last_message, serializer: Chat::LastMessageSerializer, embed: :objects
 
@@ -46,6 +47,14 @@ def memberships_count
       object.user_count
     end
 
+    def pinned_messages_count
+      object.pinned_messages.size
+    end
+
+    def include_pinned_messages_count?
+      SiteSetting.chat_pinned_messages
+    end
+
     def chatable_url
       object.chatable_url
     end
@@ -140,6 +149,7 @@ def meta
       data[:can_delete_self] = scope.can_delete_own_chats?(object.chatable)
       data[:can_delete_others] = scope.can_delete_other_chats?(object.chatable)
       data[:can_remove_members] = scope.can_remove_members?(object)
+      data[:can_manage_pins] = scope.can_manage_chat_channel_pins?(object)
 
       data
     end
diff --git a/plugins/chat/app/serializers/chat/message_serializer.rb b/plugins/chat/app/serializers/chat/message_serializer.rb
index d8f52e052ddb9..b821acdfa76e3 100644
--- a/plugins/chat/app/serializers/chat/message_serializer.rb
+++ b/plugins/chat/app/serializers/chat/message_serializer.rb
@@ -30,6 +30,7 @@ class MessageSerializer < ::ApplicationSerializer
             blocks
             channel
             thread_title
+            pinned
           ]
       ),
     )
@@ -216,6 +217,14 @@ def thread_title
       object.thread&.title
     end
 
+    def pinned
+      object.pinned_message.present?
+    end
+
+    def include_pinned?
+      SiteSetting.chat_pinned_messages
+    end
+
     def thread
       Chat::ThreadSerializer.new(
         object.thread,
diff --git a/plugins/chat/app/serializers/chat/pinned_message_serializer.rb b/plugins/chat/app/serializers/chat/pinned_message_serializer.rb
new file mode 100644
index 0000000000000..a718d9b11af93
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/pinned_message_serializer.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Chat
+  class PinnedMessageSerializer < ::ApplicationSerializer
+    attributes :id, :chat_message_id, :pinned_at
+
+    has_one :pinned_by, serializer: ::BasicUserSerializer, embed: :objects
+    has_one :message, serializer: Chat::MessageSerializer, embed: :objects
+
+    def pinned_at
+      object.created_at
+    end
+
+    def pinned_by
+      object.user
+    end
+
+    def message
+      object.chat_message
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/list_channel_pins.rb b/plugins/chat/app/services/chat/list_channel_pins.rb
new file mode 100644
index 0000000000000..a2355e6e83e2f
--- /dev/null
+++ b/plugins/chat/app/services/chat/list_channel_pins.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Chat
+  class ListChannelPins
+    include Service::Base
+
+    params do
+      attribute :channel_id, :integer
+
+      validates :channel_id, presence: true
+    end
+
+    model :channel
+    policy :can_view_channel
+    model :membership, optional: true
+    model :pins
+
+    private
+
+    def fetch_channel(params:)
+      Chat::Channel.find_by(id: params.channel_id)
+    end
+
+    def can_view_channel(guardian:, channel:)
+      guardian.can_preview_chat_channel?(channel)
+    end
+
+    def fetch_membership(channel:, guardian:)
+      channel.membership_for(guardian.user)
+    end
+
+    def fetch_pins(channel:)
+      user_includes =
+        if SiteSetting.enable_user_status
+          %i[user_status user_option primary_group]
+        else
+          %i[user_option primary_group]
+        end
+
+      Chat::PinnedMessage.for_channel(channel).includes(
+        chat_message: [
+          :revisions,
+          :bookmarks,
+          { uploads: { optimized_videos: :optimized_upload } },
+          { chat_channel: :chatable },
+          :thread,
+          { user: user_includes },
+          { user_mentions: { user: user_includes } },
+          { reactions: :user },
+          { in_reply_to: [:user] },
+        ],
+      )
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/mark_pins_as_read.rb b/plugins/chat/app/services/chat/mark_pins_as_read.rb
new file mode 100644
index 0000000000000..b08115f3f1e69
--- /dev/null
+++ b/plugins/chat/app/services/chat/mark_pins_as_read.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Chat
+  class MarkPinsAsRead
+    include Service::Base
+
+    params do
+      attribute :channel_id, :integer
+
+      validates :channel_id, presence: true
+    end
+
+    model :channel
+    model :membership
+    policy :can_access_channel
+    step :update_last_viewed_at
+
+    private
+
+    def fetch_channel(params:)
+      Chat::Channel.find_by(id: params.channel_id)
+    end
+
+    def fetch_membership(guardian:, channel:)
+      channel.membership_for(guardian.user)
+    end
+
+    def can_access_channel(guardian:, channel:)
+      guardian.can_preview_chat_channel?(channel)
+    end
+
+    def update_last_viewed_at(membership:)
+      membership.update!(last_viewed_pins_at: Time.zone.now)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/pin_message.rb b/plugins/chat/app/services/chat/pin_message.rb
new file mode 100644
index 0000000000000..289eead46fd9b
--- /dev/null
+++ b/plugins/chat/app/services/chat/pin_message.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Chat
+  class PinMessage
+    include Service::Base
+
+    params do
+      attribute :message_id, :integer
+      attribute :channel_id, :integer
+
+      validates :message_id, presence: true
+      validates :channel_id, presence: true
+    end
+
+    model :message
+    policy :can_pin
+    policy :within_pin_limit
+    policy :not_already_pinned
+
+    model :pin, :create_pin
+    step :publish_pin_event
+
+    private
+
+    def fetch_message(params:)
+      Chat::Message.includes(:chat_channel).find_by(
+        id: params.message_id,
+        chat_channel_id: params.channel_id,
+      )
+    end
+
+    def can_pin(guardian:, message:)
+      guardian.can_manage_chat_message_pin?(message)
+    end
+
+    def within_pin_limit(message:)
+      message.chat_channel.pinned_messages.count < Chat::PinnedMessage::MAX_PINS_PER_CHANNEL
+    end
+
+    def not_already_pinned(message:)
+      !message.pinned_message.present?
+    end
+
+    def create_pin(message:, guardian:)
+      Chat::PinnedMessage.create(
+        chat_message: message,
+        chat_channel: message.chat_channel,
+        pinned_by_id: guardian.user.id,
+      )
+    end
+
+    def publish_pin_event(message:, pin:)
+      Chat::Publisher.publish_pin!(message.chat_channel, message, pin)
+    end
+  end
+end
diff --git a/plugins/chat/app/services/chat/publisher.rb b/plugins/chat/app/services/chat/publisher.rb
index 5d368bb86a930..5987ac2fefe98 100644
--- a/plugins/chat/app/services/chat/publisher.rb
+++ b/plugins/chat/app/services/chat/publisher.rb
@@ -462,6 +462,25 @@ def self.publish_archive_status(
       )
     end
 
+    def self.publish_pin!(chat_channel, chat_message, pin)
+      publish_to_channel!(
+        chat_channel,
+        {
+          type: :pin,
+          chat_message_id: chat_message.id,
+          pinned_at: pin.created_at.iso8601(3),
+          pinned_by_id: pin.pinned_by_id,
+        },
+      )
+    end
+
+    def self.publish_unpin!(chat_channel, chat_message, unpinned_by)
+      publish_to_channel!(
+        chat_channel,
+        { type: :unpin, chat_message_id: chat_message.id, unpinned_by_id: unpinned_by.id },
+      )
+    end
+
     def self.publish_notice(user_id:, channel_id:, text_content: nil, type: nil, data: nil)
       # Notices are either plain text sent to the client, or a "type" with data. The
       # client will then translate that type and data into a front-end component.
diff --git a/plugins/chat/app/services/chat/trash_message.rb b/plugins/chat/app/services/chat/trash_message.rb
index 03365150f9f66..ca27120069f6c 100644
--- a/plugins/chat/app/services/chat/trash_message.rb
+++ b/plugins/chat/app/services/chat/trash_message.rb
@@ -29,8 +29,11 @@ class TrashMessage
     model :message
     policy :invalid_access
 
+    model :pinned_message, optional: true
+
     transaction do
       step :trash_message
+      step :destroy_pin
       step :destroy_notifications
       step :update_last_message_ids
       step :update_tracking_state
@@ -56,6 +59,14 @@ def trash_message(message:, guardian:)
       message.trash!(guardian.user)
     end
 
+    def fetch_pinned_message(message:)
+      message.pinned_message
+    end
+
+    def destroy_pin(pinned_message:)
+      pinned_message&.destroy!
+    end
+
     def destroy_notifications(message:)
       Notification.where(
         id:
@@ -82,10 +93,12 @@ def update_last_message_ids(message:)
       message.chat_channel.update_last_message_id!
     end
 
-    def publish_events(guardian:, message:)
+    def publish_events(guardian:, message:, pinned_message:)
       DiscourseEvent.trigger(:chat_message_trashed, message, message.chat_channel, guardian.user)
       Chat::Publisher.publish_delete!(message.chat_channel, message)
 
+      Chat::Publisher.publish_unpin!(message.chat_channel, message, guardian.user) if pinned_message
+
       if message.thread.present?
         Chat::Publisher.publish_thread_original_message_metadata!(message.thread)
       end
diff --git a/plugins/chat/app/services/chat/unpin_message.rb b/plugins/chat/app/services/chat/unpin_message.rb
new file mode 100644
index 0000000000000..67e6f3a9f1707
--- /dev/null
+++ b/plugins/chat/app/services/chat/unpin_message.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Chat
+  class UnpinMessage
+    include Service::Base
+
+    params do
+      attribute :message_id, :integer
+      attribute :channel_id, :integer
+
+      validates :message_id, presence: true
+      validates :channel_id, presence: true
+    end
+
+    model :message
+    policy :can_unpin
+    model :pin
+    step :destroy_pin
+    step :publish_unpin_event
+
+    private
+
+    def fetch_message(params:)
+      Chat::Message.includes(:chat_channel).find_by(
+        id: params.message_id,
+        chat_channel_id: params.channel_id,
+      )
+    end
+
+    def can_unpin(guardian:, message:)
+      guardian.can_manage_chat_message_pin?(message)
+    end
+
+    def fetch_pin(message:)
+      message.pinned_message
+    end
+
+    def destroy_pin(pin:)
+      pin.destroy!
+    end
+
+    def publish_unpin_event(message:, guardian:)
+      Chat::Publisher.publish_unpin!(message.chat_channel, message, guardian.user)
+    end
+  end
+end
diff --git a/plugins/chat/assets/javascripts/discourse/chat-route-map.js b/plugins/chat/assets/javascripts/discourse/chat-route-map.js
index 1d740512e1c14..3313c8c755036 100644
--- a/plugins/chat/assets/javascripts/discourse/chat-route-map.js
+++ b/plugins/chat/assets/javascripts/discourse/chat-route-map.js
@@ -12,6 +12,7 @@ export default function () {
       this.route("thread", { path: "/t/:threadId" }, function () {
         this.route("near-message", { path: "/:messageId" });
       });
+      this.route("pins");
     });
 
     this.route("direct-messages");
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs
index ddfdab886152a..aea9e9d0eb1a0 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs
@@ -75,7 +75,12 @@ export default class ChatMessageActionsDesktop extends Component {
       return;
     }
 
-    const boundary = container.closest(".chat-messages-scroller");
+    const boundary = this.messageContainer.closest(".chat-messages-scroller");
+
+    if (!boundary) {
+      return;
+    }
+
     this.size = boundary.clientWidth < REDUCED_WIDTH_THRESHOLD ? REDUCED : FULL;
 
     next(() => {
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs
index 7eed8dcf5dfa0..6a7b983700d6e 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs
@@ -141,7 +141,11 @@ export default class ChatMessage extends Component {
   }
 
   get shouldRenderOpenEmojiPickerButton() {
-    return this.chat.userCanInteractWithChat && this.site.desktopView;
+    return (
+      this.args.interactive !== false &&
+      this.chat.userCanInteractWithChat &&
+      this.site.desktopView
+    );
   }
 
   get secondaryActionsIsExpanded() {
@@ -339,7 +343,7 @@ export default class ChatMessage extends Component {
   }
 
   _setActiveMessage() {
-    if (this.args.disableMouseEvents) {
+    if (this.args.disableMouseEvents || this.args.interactive === false) {
       return;
     }
 
@@ -396,6 +400,10 @@ export default class ChatMessage extends Component {
 
   @action
   onLongPressEnd(element, event) {
+    if (this.args.interactive === false) {
+      return;
+    }
+
     if (event.target.tagName === "IMG") {
       return;
     }
@@ -430,6 +438,10 @@ export default class ChatMessage extends Component {
   get hideUserInfo() {
     const message = this.args.message;
 
+    if (message.pinned) {
+      return false;
+    }
+
     const previousMessage = message.previousMessage;
 
     if (!previousMessage) {
@@ -561,6 +573,7 @@ export default class ChatMessage extends Component {
           (if @message.deletedAt "-deleted")
           (if @message.selected "-selected")
           (if @message.error "-errored")
+          (if (eq @interactive false) "-not-interactive")
           (if this.showThreadIndicator "has-thread-indicator")
           (if this.hideUserInfo "-user-info-hidden")
           (if this.hasReply "has-reply")
@@ -579,6 +592,8 @@ export default class ChatMessage extends Component {
         }}
         ...attributes
       >
+        {{yield to="top"}}
+
         {{#if this.show}}
           {{#if this.pane.selectingMessages}}
             <Input
@@ -627,6 +642,7 @@ export default class ChatMessage extends Component {
                 <ChatMessageInfo
                   @message={{@message}}
                   @show={{not this.hideUserInfo}}
+                  @context={{@context}}
                   @threadContext={{this.threadContext}}
                   @dateMode={{@dateMode}}
                 />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjs
new file mode 100644
index 0000000000000..add30eb6d9df1
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjs
@@ -0,0 +1,155 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { LinkTo } from "@ember/routing";
+import { service } from "@ember/service";
+import { modifier as modifierFn } from "ember-modifier";
+import icon from "discourse/helpers/d-icon";
+import { i18n } from "discourse-i18n";
+import ChatMessage from "discourse/plugins/chat/discourse/components/chat-message";
+
+export default class ChatPinnedMessagesList extends Component {
+  @service messageBus;
+  @service chatApi;
+  @service currentUser;
+
+  @tracked pinnedMessages = this.args.pinnedMessages || [];
+
+  subscribe = modifierFn(() => {
+    const channel = this.args.channel;
+
+    this.messageBus.subscribe(
+      `/chat/${channel.id}`,
+      this.onMessage,
+      channel.channelMessageBusLastId
+    );
+
+    this.#markPinsAsRead(channel);
+
+    return () => {
+      this.messageBus.unsubscribe(`/chat/${channel.id}`, this.onMessage);
+      this.#markPinsAsRead(channel);
+    };
+  });
+
+  onMessage = (busData) => {
+    switch (busData.type) {
+      case "pin":
+        this.handlePinMessage(busData);
+        break;
+      case "unpin":
+        this.handleUnpinMessage(busData);
+        break;
+    }
+  };
+
+  isUnseen = (pin) => {
+    if (pin.pinned_by?.id === this.currentUser?.id) {
+      return false;
+    }
+
+    if (!this.#lastViewedPinsAtSnapshot) {
+      return true;
+    }
+
+    const pinnedAt = new Date(pin.pinned_at);
+    const lastViewed = new Date(this.#lastViewedPinsAtSnapshot);
+    return pinnedAt > lastViewed;
+  };
+
+  decorateMessage = (pin) => {
+    pin.message.isUnseen = this.isUnseen(pin);
+    return pin.message;
+  };
+
+  pinnedByText = (pin) => {
+    if (pin.pinned_by?.id === this.currentUser?.id) {
+      return i18n("chat.pinned_messages.pinned_by_you");
+    }
+    return i18n("chat.pinned_messages.pinned_by_user", {
+      username: pin.pinned_by?.username,
+    });
+  };
+
+  routeModels = (pin) => {
+    return [...this.args.channel.routeModels, pin.message.id];
+  };
+
+  #lastViewedPinsAtSnapshot =
+    this.args.channel.currentUserMembership?.lastViewedPinsAt;
+
+  handlePinMessage(data) {
+    const existingPin = this.pinnedMessages.find(
+      (pin) => pin.message.id === data.chat_message_id
+    );
+
+    if (existingPin) {
+      return;
+    }
+
+    this.chatApi.pinnedMessages(this.args.channel).then((pinnedMessages) => {
+      this.pinnedMessages = pinnedMessages;
+
+      // If current user pinned this message, update timestamp so it doesn't show as unseen
+      if (
+        this.args.channel.currentUserMembership &&
+        data.pinned_by_id === this.currentUser.id
+      ) {
+        this.args.channel.currentUserMembership.lastViewedPinsAt = new Date();
+      }
+    });
+  }
+
+  #markPinsAsRead(channel) {
+    if (channel.currentUserMembership) {
+      channel.currentUserMembership.lastViewedPinsAt = new Date();
+      channel.currentUserMembership.hasUnseenPins = false;
+      this.chatApi.markPinsAsRead(channel.id).catch(() => {});
+    }
+  }
+
+  handleUnpinMessage(data) {
+    this.pinnedMessages = this.pinnedMessages.filter(
+      (pin) => pin.message.id !== data.chat_message_id
+    );
+  }
+
+  <template>
+    <div
+      class="chat-pinned-messages-list chat-messages-scroller"
+      {{this.subscribe}}
+    >
+      <div class="chat-pinned-messages-list__items">
+        {{#each this.pinnedMessages as |pin|}}
+          <LinkTo
+            @route="chat.channel.near-message"
+            @models={{this.routeModels pin}}
+            class="chat-pinned-message"
+          >
+            <ChatMessage
+              @message={{this.decorateMessage pin}}
+              @context="pinned"
+              @includeSeparator={{false}}
+              @interactive={{false}}
+            >
+              <:top>
+                <div class="chat-pinned-message__pinned-by">
+                  {{#if (this.isUnseen pin)}}
+                    {{icon
+                      "thumbtack"
+                      class="chat-pinned-message__pinned-by-icon"
+                    }}
+                  {{/if}}
+                  <span>{{this.pinnedByText pin}}</span>
+                </div>
+              </:top>
+            </ChatMessage>
+          </LinkTo>
+        {{else}}
+          <div class="chat-pinned-messages-list__empty">
+            {{i18n "chat.no_pinned_messages"}}
+          </div>
+        {{/each}}
+      </div>
+    </div>
+  </template>
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjs
new file mode 100644
index 0000000000000..59e2f706d0666
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjs
@@ -0,0 +1,51 @@
+import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import replaceEmoji from "discourse/helpers/replace-emoji";
+import { i18n } from "discourse-i18n";
+import Navbar from "discourse/plugins/chat/discourse/components/chat/navbar";
+import ChatPinnedMessagesList from "discourse/plugins/chat/discourse/components/chat-pinned-messages-list";
+
+export default class ChatDrawerRoutesChannelPins extends Component {
+  @service chat;
+  @service chatStateManager;
+
+  backLinkTitle = i18n("chat.return_to_list");
+
+  get title() {
+    return htmlSafe(
+      i18n("chat.pinned_messages.title") +
+        " - " +
+        replaceEmoji(this.args.model.channel.escapedTitle)
+    );
+  }
+
+  <template>
+    <div class="c-drawer-routes --channel-pins">
+      {{#if @model}}
+        <Navbar @onClick={{this.chat.toggleDrawer}} as |navbar|>
+          <navbar.BackButton
+            @title={{this.backLinkTitle}}
+            @route="chat.channel"
+            @routeModels={{@model.channel.routeModels}}
+          />
+          <navbar.Title @title={{this.title}} @icon="thumbtack" />
+          <navbar.Actions as |a|>
+            <a.ToggleDrawerButton />
+            <a.FullPageButton />
+            <a.CloseDrawerButton />
+          </navbar.Actions>
+        </Navbar>
+
+        {{#if this.chatStateManager.isDrawerExpanded}}
+          <div class="chat-drawer-content">
+            <ChatPinnedMessagesList
+              @channel={{@model.channel}}
+              @pinnedMessages={{@model.pinnedMessages}}
+            />
+          </div>
+        {{/if}}
+      {{/if}}
+    </div>
+  </template>
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs
index 6fe1972501476..d265037eb54a9 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs
@@ -16,7 +16,7 @@ export default class ChatDrawerRoutesChannelThreads extends Component {
     return htmlSafe(
       i18n("chat.threads.list") +
         " - " +
-        replaceEmoji(this.args.model.channel.title)
+        replaceEmoji(this.args.model.channel.escapedTitle)
     );
   }
 
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel.gjs
index 76e5308e95ae3..d1eb7a714d261 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel.gjs
@@ -49,6 +49,7 @@ export default class ChatDrawerRoutesChannel extends Component {
             {{/if}}
 
             <a.ThreadsListButton @channel={{@model.channel}} />
+            <a.PinnedMessagesButton @channel={{@model.channel}} />
             <a.ToggleDrawerButton />
             <a.FullPageButton />
             <a.CloseDrawerButton />
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs
index 4eddcc87d3cf8..aa0508fdd6b7a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs
@@ -10,7 +10,7 @@ import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
 import { bind } from "discourse/lib/decorators";
 import { prioritizeNameInUx } from "discourse/lib/settings";
-import { and } from "discourse/truth-helpers";
+import { and, eq, not } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
 import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";
 import formatChatDate from "../../../helpers/format-chat-date";
@@ -155,6 +155,17 @@ export default class ChatMessageInfo extends Component {
           </span>
         {{/if}}
 
+        {{#if this.siteSettings.chat_pinned_messages}}
+          {{#if (and @message.pinned (not (eq @context "pinned")))}}
+            <span
+              class="chat-message-info__pinned"
+              title={{i18n "chat.pinned"}}
+            >
+              {{icon "thumbtack"}}
+            </span>
+          {{/if}}
+        {{/if}}
+
         {{#if this.isFlagged}}
           <span class="chat-message-info__flag">
             {{#if @message.reviewableId}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs
index e2c13dd60f378..e4fbce851c782 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/actions.gjs
@@ -1,6 +1,7 @@
 import { hash } from "@ember/helper";
 import BrowseChannelsButton from "./browse-channels-button";
 import CloseDrawerButton from "./close-drawer-button";
+import ClosePinsButton from "./close-pins-button";
 import CloseThreadButton from "./close-thread-button";
 import CloseThreadsButton from "./close-threads-button";
 import Filter from "./filter";
@@ -8,6 +9,7 @@ import FullPageButton from "./full-page-button";
 import NewChannelButton from "./new-channel-button";
 import NewDirectMessageButton from "./new-direct-message-button";
 import OpenDrawerButton from "./open-drawer-button";
+import PinnedMessagesButton from "./pinned-messages-button";
 import ThreadSettingsButton from "./thread-settings-button";
 import ThreadTrackingDropdown from "./thread-tracking-dropdown";
 import ThreadsListButton from "./threads-list-button";
@@ -24,8 +26,10 @@ const ChatNavbarActions = <template>
         ThreadTrackingDropdown=ThreadTrackingDropdown
         CloseThreadButton=CloseThreadButton
         CloseThreadsButton=CloseThreadsButton
+        ClosePinsButton=ClosePinsButton
         ThreadSettingsButton=ThreadSettingsButton
         ThreadsListButton=ThreadsListButton
+        PinnedMessagesButton=PinnedMessagesButton
         CloseDrawerButton=CloseDrawerButton
         ToggleDrawerButton=ToggleDrawerButton
         FullPageButton=FullPageButton
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjs
new file mode 100644
index 0000000000000..cbf199f0b5eee
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjs
@@ -0,0 +1,24 @@
+import Component from "@glimmer/component";
+import { LinkTo } from "@ember/routing";
+import { service } from "@ember/service";
+import icon from "discourse/helpers/d-icon";
+import { i18n } from "discourse-i18n";
+
+export default class ChatNavbarClosePinsButton extends Component {
+  @service site;
+
+  closeButtonTitle = i18n("chat.pinned_messages.close");
+
+  <template>
+    {{#if this.site.desktopView}}
+      <LinkTo
+        class="c-navbar__close-pins-button btn-transparent btn btn-icon no-text"
+        @route="chat.channel"
+        @models={{@channel.routeModels}}
+        title={{this.closeButtonTitle}}
+      >
+        {{icon "xmark"}}
+      </LinkTo>
+    {{/if}}
+  </template>
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjs
new file mode 100644
index 0000000000000..c899f54b8ad9d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjs
@@ -0,0 +1,42 @@
+import Component from "@glimmer/component";
+import { on } from "@ember/modifier";
+import { LinkTo } from "@ember/routing";
+import { service } from "@ember/service";
+import icon from "discourse/helpers/d-icon";
+import { i18n } from "discourse-i18n";
+
+export default class ChatNavbarPinnedMessagesButton extends Component {
+  @service router;
+  @service siteSettings;
+
+  pinnedMessagesLabel = i18n("chat.pinned_messages.title");
+
+  handleClick = (event) => {
+    event.stopPropagation();
+  };
+
+  get showButton() {
+    return (
+      this.siteSettings.chat_pinned_messages &&
+      this.args.channel?.hasPinnedMessages &&
+      this.router.currentRoute?.name !== "chat.channel.pins"
+    );
+  }
+
+  <template>
+    {{#if this.showButton}}
+      <LinkTo
+        @route="chat.channel.pins"
+        @models={{@channel.routeModels}}
+        title={{this.pinnedMessagesLabel}}
+        class="c-navbar__pinned-messages-btn btn no-text btn-transparent"
+        {{on "click" this.handleClick}}
+      >
+        {{icon "thumbtack"}}
+        {{#if @channel.hasUnseenPins}}
+          <span class="c-navbar__pinned-messages-btn__unread-indicator"></span>
+        {{/if}}
+      </LinkTo>
+    {{/if}}
+  </template>
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjs
new file mode 100644
index 0000000000000..f182bf09aaa08
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjs
@@ -0,0 +1,40 @@
+import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import replaceEmoji from "discourse/helpers/replace-emoji";
+import { i18n } from "discourse-i18n";
+import Navbar from "discourse/plugins/chat/discourse/components/chat/navbar";
+
+export default class ChatPinnedMessagesListHeader extends Component {
+  @service site;
+
+  pinnedMessagesTitle = i18n("chat.pinned_messages.title");
+
+  get title() {
+    let title = replaceEmoji(this.pinnedMessagesTitle);
+
+    if (this.site.mobileView) {
+      title += " - " + replaceEmoji(this.args.channel.escapedTitle);
+    }
+
+    return htmlSafe(title);
+  }
+
+  <template>
+    <Navbar as |navbar|>
+      {{#if this.site.mobileView}}
+        <navbar.BackButton
+          @route="chat.channel"
+          @routeModels={{@channel.routeModels}}
+          @title={{i18n "chat.return_to_channel"}}
+        />
+      {{/if}}
+
+      <navbar.Title @title={{this.title}} @icon="thumbtack" />
+
+      <navbar.Actions as |action|>
+        <action.ClosePinsButton @channel={{@channel}} />
+      </navbar.Actions>
+    </Navbar>
+  </template>
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-pins.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-pins.gjs
new file mode 100644
index 0000000000000..b1b687bb176cb
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-pins.gjs
@@ -0,0 +1,14 @@
+import ChatPinnedMessagesListHeader from "discourse/plugins/chat/discourse/components/chat/pinned-messages-list/header";
+import ChatPinnedMessagesList from "discourse/plugins/chat/discourse/components/chat-pinned-messages-list";
+
+const ChatRoutesChannelPins = <template>
+  <div class="c-routes --channel-pins c-channel-pins">
+    <ChatPinnedMessagesListHeader @channel={{@channel}} />
+    <ChatPinnedMessagesList
+      @channel={{@channel}}
+      @pinnedMessages={{@pinnedMessages}}
+    />
+  </div>
+</template>;
+
+export default ChatRoutesChannelPins;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel.gjs
index 17670042c8911..a3d72d6e9f720 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel.gjs
@@ -51,6 +51,7 @@ export default class ChatRoutesChannel extends Component {
           {{/if}}
 
           <a.OpenDrawerButton />
+          <a.PinnedMessagesButton @channel={{@channel}} />
           <a.ThreadsListButton @channel={{@channel}} />
         </navbar.Actions>
       </Navbar>
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjs
index e9bf8bf550523..8371609adaa62 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjs
@@ -14,7 +14,7 @@ export default class ChatThreadListHeader extends Component {
     let title = replaceEmoji(this.threadListTitle);
 
     if (this.site.mobileView) {
-      title += " - " + replaceEmoji(this.args.channel.title);
+      title += " - " + replaceEmoji(this.args.channel.escapedTitle);
     }
 
     return htmlSafe(title);
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js
index 676a8f85e3f70..dcefbdd90afe7 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js
@@ -80,6 +80,12 @@ export default class ChatChannelSubscriptionManager {
       case "notice":
         this.handleNotice(busData);
         break;
+      case "pin":
+        this.handlePinMessage(busData);
+        break;
+      case "unpin":
+        this.handleUnpinMessage(busData);
+        break;
     }
 
     this.channel.channelMessageBusLastId = lastMessageBusId;
@@ -246,4 +252,44 @@ export default class ChatChannelSubscriptionManager {
       }
     }
   }
+
+  handlePinMessage(data) {
+    const alreadyApplied = this.channel.pendingOptimisticPins.delete(
+      data.chat_message_id
+    );
+
+    const message = this.messagesManager.findMessage(data.chat_message_id);
+    if (message) {
+      message.pinned = true;
+    }
+
+    if (!alreadyApplied) {
+      this.channel.pinnedMessagesCount++;
+    }
+
+    if (
+      this.channel.currentUserMembership &&
+      data.pinned_by_id !== this.currentUser?.id
+    ) {
+      this.channel.currentUserMembership.hasUnseenPins = true;
+    }
+  }
+
+  handleUnpinMessage(data) {
+    const alreadyApplied = this.channel.pendingOptimisticUnpins.delete(
+      data.chat_message_id
+    );
+
+    const message = this.messagesManager.findMessage(data.chat_message_id);
+    if (message) {
+      message.pinned = false;
+    }
+
+    if (!alreadyApplied) {
+      this.channel.pinnedMessagesCount = Math.max(
+        0,
+        this.channel.pinnedMessagesCount - 1
+      );
+    }
+  }
 }
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-container.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-container.js
index ccf5aef3f14e4..0268c5fe3959e 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/chat-message-container.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-container.js
@@ -1,10 +1,14 @@
 import { MESSAGE_CONTEXT_THREAD } from "discourse/plugins/chat/discourse/components/chat-message";
 
+export const MESSAGE_CONTEXT_PINNED = "pinned";
+
 export default function chatMessageContainer(id, context) {
   let selector;
 
   if (context === MESSAGE_CONTEXT_THREAD) {
     selector = `.chat-thread .chat-message-container[data-id="${id}"]`;
+  } else if (context === MESSAGE_CONTEXT_PINNED) {
+    selector = `.chat-pinned-messages-list .chat-message-container[data-id="${id}"]`;
   } else {
     selector = `.chat-channel .chat-message-container[data-id="${id}"]`;
   }
diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
index b6a0f05a7497e..f0b405b88fef3 100644
--- a/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-message-interactor.js
@@ -156,6 +156,13 @@ export default class ChatemojiReactions {
     );
   }
 
+  get canPinMessage() {
+    if (!this.siteSettings.chat_pinned_messages) {
+      return false;
+    }
+    return this.message.channel?.canManagePins;
+  }
+
   get canRebakeMessage() {
     return (
       this.currentUser.staff &&
@@ -216,6 +223,22 @@ export default class ChatemojiReactions {
       });
     }
 
+    if (this.canPinMessage && !this.message.pinned) {
+      buttons.push({
+        id: "pin",
+        name: i18n("chat.pin_message"),
+        icon: "thumbtack",
+      });
+    }
+
+    if (this.canPinMessage && this.message.pinned) {
+      buttons.push({
+        id: "unpin",
+        name: i18n("chat.unpin_message"),
+        icon: "thumbtack",
+      });
+    }
+
     if (this.canFlagMessage) {
       buttons.push({
         id: "flag",
@@ -420,6 +443,41 @@ export default class ChatemojiReactions {
       .catch(popupAjaxError);
   }
 
+  @action
+  pin() {
+    this.message.pinned = true;
+    this.message.channel.pinnedMessagesCount++;
+    this.message.channel.pendingOptimisticPins.add(this.message.id);
+
+    return this.chatApi
+      .pinMessage(this.message.channel.id, this.message.id)
+      .catch((error) => {
+        this.message.pinned = false;
+        this.message.channel.pinnedMessagesCount--;
+        this.message.channel.pendingOptimisticPins.delete(this.message.id);
+        popupAjaxError(error);
+      });
+  }
+
+  @action
+  unpin() {
+    this.message.pinned = false;
+    this.message.channel.pinnedMessagesCount = Math.max(
+      0,
+      this.message.channel.pinnedMessagesCount - 1
+    );
+    this.message.channel.pendingOptimisticUnpins.add(this.message.id);
+
+    return this.chatApi
+      .unpinMessage(this.message.channel.id, this.message.id)
+      .catch((error) => {
+        this.message.pinned = true;
+        this.message.channel.pinnedMessagesCount++;
+        this.message.channel.pendingOptimisticUnpins.delete(this.message.id);
+        popupAjaxError(error);
+      });
+  }
+
   @action
   reply() {
     this.composer.replyTo(this.message);
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-channel.js b/plugins/chat/assets/javascripts/discourse/models/chat-channel.js
index 3d67f81182817..8ef662bc83d88 100644
--- a/plugins/chat/assets/javascripts/discourse/models/chat-channel.js
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-channel.js
@@ -72,9 +72,12 @@ export default class ChatChannel {
   @tracked threadingEnabled;
   @tracked draft;
   @tracked newestMessage;
+  @tracked pinnedMessagesCount;
 
   threadsManager = new ChatThreadsManager(getOwnerWithFallback(this));
   messagesManager = new ChatMessagesManager(getOwnerWithFallback(this));
+  pendingOptimisticPins = new Set();
+  pendingOptimisticUnpins = new Set();
 
   @tracked _currentUserMembership;
   @tracked _lastMessage;
@@ -100,6 +103,7 @@ export default class ChatChannel {
 
     this.chatable = this.#initChatable(args.chatable ?? []);
     this.tracking = new ChatTrackingState(getOwnerWithFallback(this));
+    this.pinnedMessagesCount = args.pinned_messages_count ?? 0;
 
     if (args.archive_completed || args.archive_failed) {
       this.archive = ChatChannelArchive.create(args);
@@ -161,6 +165,10 @@ export default class ChatChannel {
     return this.meta?.can_remove_members;
   }
 
+  get canManagePins() {
+    return this.meta?.can_manage_pins;
+  }
+
   get escapedTitle() {
     return escapeExpression(this.title);
   }
@@ -227,6 +235,14 @@ export default class ChatChannel {
     );
   }
 
+  get hasPinnedMessages() {
+    return this.pinnedMessagesCount > 0;
+  }
+
+  get hasUnseenPins() {
+    return this.currentUserMembership?.hasUnseenPins ?? false;
+  }
+
   async stageMessage(message) {
     message.id = guid();
     message.staged = true;
diff --git a/plugins/chat/assets/javascripts/discourse/models/chat-message.js b/plugins/chat/assets/javascripts/discourse/models/chat-message.js
index d656ebdc0e180..008359ba5e7da 100644
--- a/plugins/chat/assets/javascripts/discourse/models/chat-message.js
+++ b/plugins/chat/assets/javascripts/discourse/models/chat-message.js
@@ -53,6 +53,7 @@ export default class ChatMessage {
   @tracked manager;
   @tracked deletedById;
   @tracked streaming;
+  @tracked pinned;
   @trackedArray reactions;
 
   @tracked _deletedAt;
@@ -103,6 +104,8 @@ export default class ChatMessage {
     if (args.thread) {
       this.thread = args.thread;
     }
+
+    this.pinned = args.pinned ?? false;
   }
 
   get url() {
diff --git a/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js b/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js
index 3117199668d8f..c3021fc69980b 100644
--- a/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js
+++ b/plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js
@@ -11,7 +11,9 @@ export default class UserChatChannelMembership {
   @tracked notificationLevel;
   @tracked lastReadMessageId;
   @tracked lastViewedAt;
+  @tracked lastViewedPinsAt;
   @tracked starred;
+  @tracked hasUnseenPins;
   @tracked user;
 
   constructor(args = {}) {
@@ -20,7 +22,11 @@ export default class UserChatChannelMembership {
     this.notificationLevel = args.notification_level;
     this.lastReadMessageId = args.last_read_message_id;
     this.lastViewedAt = new Date(args.last_viewed_at);
+    this.lastViewedPinsAt = args.last_viewed_pins_at
+      ? new Date(args.last_viewed_pins_at)
+      : null;
     this.starred = args.starred;
+    this.hasUnseenPins = args.has_unseen_pins;
     this.user = this.#initUserModel(args.user);
   }
 
diff --git a/plugins/chat/assets/javascripts/discourse/routes/chat/channel/pins.js b/plugins/chat/assets/javascripts/discourse/routes/chat/channel/pins.js
new file mode 100644
index 0000000000000..46905b8e9152d
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/routes/chat/channel/pins.js
@@ -0,0 +1,26 @@
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import DiscourseRoute from "discourse/routes/discourse";
+
+export default class ChatChannelPins extends DiscourseRoute {
+  @service chatStateManager;
+  @service chat;
+  @service chatApi;
+
+  async model() {
+    const channel = this.modelFor("chat.channel");
+    const pinnedMessages = await this.chatApi.pinnedMessages(channel);
+    return { channel, pinnedMessages };
+  }
+
+  @action
+  activate() {
+    this.chat.activeMessage = null;
+    this.chatStateManager.openSidePanel();
+  }
+
+  @action
+  deactivate() {
+    this.chatStateManager.closeSidePanel();
+  }
+}
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-api.js b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
index 4c285b2d9516b..618b3631264ba 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-api.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-api.js
@@ -1,5 +1,6 @@
 import Service, { service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
+import ChatMessage from "discourse/plugins/chat/discourse/models/chat-message";
 import UserChatChannelMembership from "discourse/plugins/chat/discourse/models/user-chat-channel-membership";
 import Collection from "../lib/collection";
 
@@ -628,6 +629,40 @@ export default class ChatApi extends Service {
     return this.#deleteRequest(`/channels/${channelId}/memberships/${userId}`);
   }
 
+  pinMessage(channelId, messageId) {
+    return this.#postRequest(
+      `/channels/${channelId}/messages/${messageId}/pin`
+    );
+  }
+
+  unpinMessage(channelId, messageId) {
+    return this.#deleteRequest(
+      `/channels/${channelId}/messages/${messageId}/pin`
+    );
+  }
+
+  async pinnedMessages(channel) {
+    const response = await this.#getRequest(`/channels/${channel.id}/pins`);
+    const pinnedMessages = response.pinned_messages.map((pin) => {
+      const message = ChatMessage.create(channel, pin.message);
+      message.channel = channel;
+      return { ...pin, message };
+    });
+
+    if (response.membership && channel.currentUserMembership) {
+      channel.currentUserMembership.hasUnseenPins =
+        response.membership.has_unseen_pins;
+      channel.currentUserMembership.lastViewedPinsAt =
+        response.membership.last_viewed_pins_at;
+    }
+
+    return pinnedMessages;
+  }
+
+  markPinsAsRead(channelId) {
+    return this.#putRequest(`/channels/${channelId}/pins/read`);
+  }
+
   get #basePath() {
     return "/chat/api";
   }
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-drawer-router.js b/plugins/chat/assets/javascripts/discourse/services/chat-drawer-router.js
index dd74ce0ed551d..8a95bfbeb385d 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-drawer-router.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-drawer-router.js
@@ -5,6 +5,7 @@ import ChatDrawerRoutesBrowse from "discourse/plugins/chat/discourse/components/
 import ChatDrawerRoutesChannel from "discourse/plugins/chat/discourse/components/chat/drawer-routes/channel";
 import ChatDrawerRoutesChannelInfoMembers from "discourse/plugins/chat/discourse/components/chat/drawer-routes/channel-info-members";
 import ChatDrawerRoutesChannelInfoSettings from "discourse/plugins/chat/discourse/components/chat/drawer-routes/channel-info-settings";
+import ChatDrawerRoutesChannelPins from "discourse/plugins/chat/discourse/components/chat/drawer-routes/channel-pins";
 import ChatDrawerRoutesChannelThread from "discourse/plugins/chat/discourse/components/chat/drawer-routes/channel-thread";
 import ChatDrawerRoutesChannelThreads from "discourse/plugins/chat/discourse/components/chat/drawer-routes/channel-threads";
 import ChatDrawerRoutesChannels from "discourse/plugins/chat/discourse/components/chat/drawer-routes/channels";
@@ -155,6 +156,29 @@ const ROUTES = {
       this.chat.activeChannel = null;
     },
   },
+  "chat.channel.pins": {
+    name: ChatDrawerRoutesChannelPins,
+
+    extractParams: (route) => {
+      return {
+        channelId: route.parent.params.channelId,
+      };
+    },
+
+    async model(params) {
+      const channel = await this.chatChannelsManager.find(params.channelId);
+      const pinnedMessages = await this.chatApi.pinnedMessages(channel);
+      return { channel, pinnedMessages };
+    },
+
+    afterModel(model) {
+      this.chat.activeChannel = model.channel;
+    },
+
+    deactivate() {
+      this.chat.activeChannel = null;
+    },
+  },
   "chat.direct-messages": {
     name: ChatDrawerRoutesDirectMessages,
   },
@@ -266,6 +290,8 @@ export default class ChatDrawerRouter extends Service {
   @service router;
   @service chatHistory;
   @service chat;
+  // eslint-disable-next-line discourse/no-unused-services -- used in ROUTES model functions
+  @service chatApi;
   @service siteSettings;
   @service chatChannelsManager;
 
diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat/channel/pins.gjs b/plugins/chat/assets/javascripts/discourse/templates/chat/channel/pins.gjs
new file mode 100644
index 0000000000000..c6025c2245812
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/templates/chat/channel/pins.gjs
@@ -0,0 +1,8 @@
+import ChannelPins from "discourse/plugins/chat/discourse/components/chat/routes/channel-pins";
+
+export default <template>
+  <ChannelPins
+    @channel={{@model.channel}}
+    @pinnedMessages={{@model.pinnedMessages}}
+  />
+</template>
diff --git a/plugins/chat/assets/stylesheets/common/base-common.scss b/plugins/chat/assets/stylesheets/common/base-common.scss
index 40535ef08587e..9833778bad54c 100644
--- a/plugins/chat/assets/stylesheets/common/base-common.scss
+++ b/plugins/chat/assets/stylesheets/common/base-common.scss
@@ -147,11 +147,11 @@ html.ios-device.has-full-page-chat body {
       margin: 0;
     }
   }
+}
 
-  .chat-time {
-    color: var(--primary-high);
-    font-size: var(--font-down-2);
-  }
+.chat-time {
+  color: var(--primary-high);
+  font-size: var(--font-down-2);
 }
 
 .chat-emoji-avatar {
diff --git a/plugins/chat/assets/stylesheets/common/chat-message.scss b/plugins/chat/assets/stylesheets/common/chat-message.scss
index 4a31602c0c217..8c5cf09f88036 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message.scss
@@ -264,4 +264,13 @@
   .chat-message-reaction-list .chat-message-react-btn {
     visibility: hidden;
   }
+
+  &.-not-interactive {
+    .chat-message-content a,
+    .chat-message-reaction-list,
+    .chat-message-thread-indicator,
+    .chat-message-info__date {
+      pointer-events: none;
+    }
+  }
 }
diff --git a/plugins/chat/assets/stylesheets/common/chat-pinned-messages.scss b/plugins/chat/assets/stylesheets/common/chat-pinned-messages.scss
new file mode 100644
index 0000000000000..0258334b6b238
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/common/chat-pinned-messages.scss
@@ -0,0 +1,103 @@
+.c-navbar__title .d-icon-thumbtack,
+.chat-message-actions .d-icon-thumbtack {
+  transform: rotate(45deg);
+}
+
+.chat-pinned-messages-list {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  overflow-y: scroll;
+  box-sizing: border-box;
+  overscroll-behavior: contain;
+
+  @include chat-scrollbar;
+
+  &.chat-messages-scroller {
+    @include chat-height(
+      calc(var(--chat-header-offset) + env(safe-area-inset-bottom))
+    );
+  }
+}
+
+.chat-pinned-messages-list__empty {
+  padding: 2rem;
+  text-align: center;
+  color: var(--primary-medium);
+}
+
+.chat-pinned-message {
+  display: block;
+  margin-inline: 1rem 0.75rem;
+  border-bottom: 1px solid var(--content-border-color);
+
+  &,
+  &:hover,
+  &:visited,
+  &:active {
+    color: var(--primary);
+    text-decoration: none;
+  }
+
+  .chat-message-container {
+    background-color: transparent;
+  }
+
+  .chat-user-avatar {
+    width: auto;
+  }
+
+  .chat-message-container:not(.-user-info-hidden) .chat-message {
+    padding-inline: 0;
+  }
+
+  .no-touch &:hover,
+  .touch &:active {
+    background-color: var(--d-hover);
+    margin-inline: 0;
+    padding-inline: 1rem 0.75rem;
+  }
+
+  &__pinned-by {
+    display: flex;
+    align-items: center;
+    gap: 0.25em;
+    padding: 0.5em 0 0;
+    color: var(--primary-medium);
+    font-size: var(--font-down-1);
+  }
+
+  &__pinned-by-icon {
+    color: var(--tertiary);
+    transform: rotate(45deg);
+  }
+}
+
+.chat-message-info__pinned {
+  color: var(--primary-medium);
+  margin-left: 0.25rem;
+
+  .d-icon {
+    font-size: var(--font-down-2);
+    transform: rotate(45deg);
+  }
+}
+
+.c-navbar__pinned-messages-btn {
+  position: relative;
+
+  .d-icon {
+    transform: rotate(45deg);
+  }
+
+  &__unread-indicator {
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    width: 8px;
+    height: 8px;
+    background: var(--tertiary);
+    border-radius: 50%;
+    border: 2px solid var(--secondary);
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/common/index.scss b/plugins/chat/assets/stylesheets/common/index.scss
index b479caac3e009..d3ada729e037d 100644
--- a/plugins/chat/assets/stylesheets/common/index.scss
+++ b/plugins/chat/assets/stylesheets/common/index.scss
@@ -75,3 +75,4 @@
 @import "chat-channel-filter-bar";
 @import "chat-search";
 @import "edit-category-chat";
+@import "chat-pinned-messages";
diff --git a/plugins/chat/config/locales/client.en.yml b/plugins/chat/config/locales/client.en.yml
index 47f254f5f44a7..e2832762d10de 100644
--- a/plugins/chat/config/locales/client.en.yml
+++ b/plugins/chat/config/locales/client.en.yml
@@ -65,6 +65,15 @@ en:
       starred: "Starred"
       starred_channels: "Starred channels"
       starred_channels_empty: "You haven't starred any channels yet. Star channels to see them here for quick access."
+      pinned_messages:
+        title: "Pinned messages"
+        close: "Close pinned messages"
+        pinned_by_you: "Pinned by you"
+        pinned_by_user: "Pinned by %{username}"
+      no_pinned_messages: "No pinned messages in this channel."
+      pin_message: "Pin message"
+      unpin_message: "Unpin message"
+      pinned: "Pinned"
       browse_all_channels: "Browse all channels"
       see_in: "See in"
       open_channel_menu: "Open channel menu"
diff --git a/plugins/chat/config/locales/server.en.yml b/plugins/chat/config/locales/server.en.yml
index e4caff7607e3c..0c32054c88412 100644
--- a/plugins/chat/config/locales/server.en.yml
+++ b/plugins/chat/config/locales/server.en.yml
@@ -2,6 +2,7 @@ en:
   site_settings:
     chat_separate_sidebar_mode: "Show separate sidebar modes for forum and chat."
     chat_enabled: "Enable chat."
+    chat_pinned_messages: "Enable pinned messages in chat channels."
     enable_public_channels: "Enable public channels based on categories."
     chat_allowed_groups: "Users in these groups can chat. Note that admins and moderators can always access chat."
     chat_channel_retention_days: "Chat messages in regular channels will be retained for this many days. Set to '0' to retain messages forever."
@@ -17,6 +18,7 @@ en:
     chat_archive_destination_topic_status: "The status that the destination topic should be once a channel archive is completed. This only applies when the destination topic is a new topic, not an existing one."
     direct_message_enabled_groups: "Allow users within these groups to create user-to-user Personal Chats. Note: staff can always create Personal Chats, and users will be able to reply to Personal Chats initiated by users who have permission to create them."
     chat_message_flag_allowed_groups: "Users in these groups are allowed to flag chat messages. Note that admins and moderators can always flag chat messages."
+    chat_pinning_messages_allowed_groups: "Users in these groups are allowed to pin chat messages in channels that they can access. Note that admins and moderators can always pin chat messages. Any member of a group chat or DM can pin messages there."
     max_mentions_per_chat_message: "Maximum number of @name notifications a user can use in a chat message."
     chat_max_direct_message_users: "Users cannot add more than this number of other users when creating a new direct message. Set to 0 to only allow messages to oneself. Staff are exempt from this setting."
     chat_allow_archiving_channels: "Allow staff to archive messages to a topic when closing a channel."
@@ -100,6 +102,9 @@ en:
       thread_invalid_for_channel: "Thread is not part of the provided channel."
       thread_does_not_match_parent: "Thread does not match parent message."
       invalid_direct_message: "You are not allowed to create this direct message."
+      pin_limit_reached: "This channel has reached the maximum number of pinned messages (%{limit})."
+      message_already_pinned: "This message is already pinned."
+      message_not_pinned: "This message is not pinned."
     reviewables:
       message_already_handled: "Thanks, but we've already reviewed this message and determined it does not need to be flagged again."
       actions:
diff --git a/plugins/chat/config/routes.rb b/plugins/chat/config/routes.rb
index e507873c17cde..92bffa4d1da63 100644
--- a/plugins/chat/config/routes.rb
+++ b/plugins/chat/config/routes.rb
@@ -36,6 +36,11 @@
     put "/channels/:channel_id/notifications-settings/me" =>
           "channels_current_user_notifications_settings#update"
 
+    get "/channels/:channel_id/pins" => "channel_pins#index"
+    put "/channels/:channel_id/pins/read" => "channel_pins#mark_read"
+    post "/channels/:channel_id/messages/:message_id/pin" => "channel_pins#create"
+    delete "/channels/:channel_id/messages/:message_id/pin" => "channel_pins#destroy"
+
     # Category chatables controller hints. Only used by staff members, we don't want to leak category permissions.
     get "/category-chatables/:id/permissions" => "category_chatables#permissions",
         :format => :json,
diff --git a/plugins/chat/config/settings.yml b/plugins/chat/config/settings.yml
index 6600a050f3aa2..cae36e38d2fd9 100644
--- a/plugins/chat/config/settings.yml
+++ b/plugins/chat/config/settings.yml
@@ -2,6 +2,13 @@ chat:
   chat_enabled:
     default: true
     client: true
+  chat_pinned_messages:
+    default: false
+    hidden: true
+    client: true
+    upcoming_change:
+      status: "experimental"
+      impact: "feature,all_members"
   enable_public_channels:
     default: true
     client: true
@@ -102,6 +109,14 @@ chat:
     refresh: true
     validator: "Chat::DirectMessageEnabledGroupsValidator"
     area: "group_permissions"
+  chat_pinning_messages_allowed_groups:
+    default: "1|2" # @admins, @moderators
+    mandatory_values: "1|2" # @admins, @moderators
+    type: group_list
+    list_type: compact
+    allow_any: false
+    refresh: true
+    area: "group_permissions"
   chat_message_flag_allowed_groups:
     default: "1|2|11" # @admins, @moderators, @trust_level_1
     mandatory_values: "1|2" # @admins, @moderators
diff --git a/plugins/chat/db/migrate/20260122134202_create_chat_pinned_messages.rb b/plugins/chat/db/migrate/20260122134202_create_chat_pinned_messages.rb
new file mode 100644
index 0000000000000..8c030dad4ea88
--- /dev/null
+++ b/plugins/chat/db/migrate/20260122134202_create_chat_pinned_messages.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class CreateChatPinnedMessages < ActiveRecord::Migration[7.2]
+  def change
+    create_table :chat_pinned_messages do |t|
+      t.bigint :chat_message_id, null: false
+      t.bigint :chat_channel_id, null: false
+      t.bigint :pinned_by_id, null: false
+      t.timestamps
+    end
+
+    add_index :chat_pinned_messages, :chat_message_id, unique: true
+    add_index :chat_pinned_messages,
+              %i[chat_channel_id created_at],
+              order: {
+                created_at: :desc,
+              },
+              name: "idx_chat_pinned_messages_channel_created"
+  end
+end
diff --git a/plugins/chat/db/migrate/20260122214226_add_last_viewed_pins_at_to_user_chat_channel_memberships.rb b/plugins/chat/db/migrate/20260122214226_add_last_viewed_pins_at_to_user_chat_channel_memberships.rb
new file mode 100644
index 0000000000000..1bb7105060eb5
--- /dev/null
+++ b/plugins/chat/db/migrate/20260122214226_add_last_viewed_pins_at_to_user_chat_channel_memberships.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddLastViewedPinsAtToUserChatChannelMemberships < ActiveRecord::Migration[7.2]
+  def change
+    add_column :user_chat_channel_memberships, :last_viewed_pins_at, :datetime
+  end
+end
diff --git a/plugins/chat/lib/chat/channel_fetcher.rb b/plugins/chat/lib/chat/channel_fetcher.rb
index fecdf75dba829..75c64bb83069d 100644
--- a/plugins/chat/lib/chat/channel_fetcher.rb
+++ b/plugins/chat/lib/chat/channel_fetcher.rb
@@ -225,6 +225,7 @@ def self.secured_public_channels(guardian, options = { following: true })
           options.merge(include_archives: true, filter_on_category_name: true),
         )
 
+      channels = channels.includes(:pinned_messages) if SiteSetting.chat_pinned_messages
       channels = channels.to_a
       preload_custom_fields_for(channels)
       channels
@@ -267,6 +268,7 @@ def self.secured_direct_message_channels_search(user_id, guardian, options = {})
           )
 
       query = query.includes(chatable: [{ users: :user_status }]) if SiteSetting.enable_user_status
+      query = query.includes(:pinned_messages) if SiteSetting.chat_pinned_messages
 
       if options[:filter]
         filter_term = options[:filter].downcase
diff --git a/plugins/chat/lib/chat/guardian_extensions.rb b/plugins/chat/lib/chat/guardian_extensions.rb
index 8754bb01cde81..fd8dda4d28d98 100644
--- a/plugins/chat/lib/chat/guardian_extensions.rb
+++ b/plugins/chat/lib/chat/guardian_extensions.rb
@@ -274,5 +274,20 @@ def can_delete_category?(category)
     def can_remove_members?(channel)
       is_admin? && (channel.category_channel? || channel.direct_message_group?)
     end
+
+    def can_manage_chat_channel_pins?(channel)
+      return false unless can_chat?
+      return false unless can_preview_chat_channel?(channel)
+
+      if channel.direct_message_channel?
+        true
+      else
+        @user.in_any_groups?(SiteSetting.chat_pinning_messages_allowed_groups_map)
+      end
+    end
+
+    def can_manage_chat_message_pin?(message)
+      can_manage_chat_channel_pins?(message.chat_channel)
+    end
   end
 end
diff --git a/plugins/chat/spec/fabricators/chat_pinned_message_fabricator.rb b/plugins/chat/spec/fabricators/chat_pinned_message_fabricator.rb
new file mode 100644
index 0000000000000..7fea7b90f1d54
--- /dev/null
+++ b/plugins/chat/spec/fabricators/chat_pinned_message_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:chat_pinned_message, class_name: "Chat::PinnedMessage") do
+  chat_message { Fabricate(:chat_message) }
+  chat_channel { |attrs| attrs[:chat_message].chat_channel }
+  user { Fabricate(:user) }
+end
diff --git a/plugins/chat/spec/jobs/scheduled/delete_old_chat_messages_spec.rb b/plugins/chat/spec/jobs/scheduled/delete_old_chat_messages_spec.rb
index e460a538db9c6..4d7c40effdbc3 100644
--- a/plugins/chat/spec/jobs/scheduled/delete_old_chat_messages_spec.rb
+++ b/plugins/chat/spec/jobs/scheduled/delete_old_chat_messages_spec.rb
@@ -90,6 +90,26 @@
   end
 
   describe "public channels" do
+    context "when a message is pinned" do
+      fab!(:old_pinned_message) do
+        Fabricate(:chat_message, chat_channel: public_channel, created_at: base_date - 400.days)
+      end
+      fab!(:pin) do
+        Fabricate(
+          :chat_pinned_message,
+          chat_message: old_pinned_message,
+          chat_channel: public_channel,
+        )
+      end
+
+      it "does not delete the pinned message" do
+        SiteSetting.chat_channel_retention_days = 20
+        described_class.new.execute
+
+        expect(Chat::Message.exists?(old_pinned_message.id)).to eq(true)
+      end
+    end
+
     it "deletes public messages correctly" do
       SiteSetting.chat_channel_retention_days = 20
       described_class.new.execute
@@ -123,6 +143,26 @@
   end
 
   describe "dm channels" do
+    context "when a message is pinned" do
+      fab!(:old_pinned_dm_message) do
+        Fabricate(:chat_message, chat_channel: dm_channel, created_at: base_date - 400.days)
+      end
+      fab!(:dm_pin) do
+        Fabricate(
+          :chat_pinned_message,
+          chat_message: old_pinned_dm_message,
+          chat_channel: dm_channel,
+        )
+      end
+
+      it "does not delete the pinned message" do
+        SiteSetting.chat_dm_retention_days = 20
+        described_class.new.execute
+
+        expect(Chat::Message.exists?(old_pinned_dm_message.id)).to eq(true)
+      end
+    end
+
     it "deletes public messages correctly" do
       SiteSetting.chat_dm_retention_days = 20
       described_class.new.execute
diff --git a/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
index 990f5e71a120b..21aff8ca1a778 100644
--- a/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
+++ b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
@@ -926,4 +926,81 @@
       end
     end
   end
+
+  describe "#can_manage_chat_message_pin?" do
+    fab!(:pin_channel, :chat_channel)
+    fab!(:message) { Fabricate(:chat_message, chat_channel: pin_channel) }
+    fab!(:pin_dm_channel) { Fabricate(:direct_message_channel, users: [user, Fabricate(:user)]) }
+    fab!(:dm_message) { Fabricate(:chat_message, chat_channel: pin_dm_channel) }
+
+    context "when user cannot chat" do
+      before { SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:admins] }
+
+      it "returns false" do
+        expect(guardian.can_manage_chat_message_pin?(message)).to eq(false)
+      end
+    end
+
+    context "for category channels" do
+      context "when user is not staff" do
+        it "returns false" do
+          expect(guardian.can_manage_chat_message_pin?(message)).to eq(false)
+        end
+      end
+
+      context "when user is staff" do
+        it "returns true" do
+          expect(staff_guardian.can_manage_chat_message_pin?(message)).to eq(true)
+        end
+      end
+
+      context "when user is in pinning group but cannot access the channel" do
+        fab!(:private_group, :group)
+        fab!(:private_category) { Fabricate(:private_category, group: private_group) }
+        fab!(:private_pin_channel) { Fabricate(:category_channel, chatable: private_category) }
+        fab!(:private_message) { Fabricate(:chat_message, chat_channel: private_pin_channel) }
+
+        before do
+          SiteSetting.chat_pinning_messages_allowed_groups = "#{Group::AUTO_GROUPS[:trust_level_0]}"
+        end
+
+        it "returns false" do
+          expect(guardian.can_manage_chat_message_pin?(private_message)).to eq(false)
+        end
+      end
+
+      context "when user is in pinning group and can access the channel" do
+        fab!(:accessible_group, :group)
+        fab!(:accessible_category) { Fabricate(:private_category, group: accessible_group) }
+        fab!(:accessible_channel) { Fabricate(:category_channel, chatable: accessible_category) }
+        fab!(:accessible_message) { Fabricate(:chat_message, chat_channel: accessible_channel) }
+
+        before do
+          accessible_group.add(user)
+          SiteSetting.chat_pinning_messages_allowed_groups = "#{Group::AUTO_GROUPS[:trust_level_0]}"
+        end
+
+        it "returns true" do
+          expect(guardian.can_manage_chat_message_pin?(accessible_message)).to eq(true)
+        end
+      end
+    end
+
+    context "for direct message channels" do
+      context "when user is a member" do
+        it "returns true" do
+          expect(guardian.can_manage_chat_message_pin?(dm_message)).to eq(true)
+        end
+      end
+
+      context "when user is not a member" do
+        fab!(:other_user) { Fabricate(:user, group_ids: [chatters.id], refresh_auto_groups: true) }
+        let(:other_guardian) { Guardian.new(other_user) }
+
+        it "returns false" do
+          expect(other_guardian.can_manage_chat_message_pin?(dm_message)).to eq(false)
+        end
+      end
+    end
+  end
 end
diff --git a/plugins/chat/spec/models/chat/pinned_message_spec.rb b/plugins/chat/spec/models/chat/pinned_message_spec.rb
new file mode 100644
index 0000000000000..2e915c6c7d88d
--- /dev/null
+++ b/plugins/chat/spec/models/chat/pinned_message_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::PinnedMessage do
+  describe "associations" do
+    it { is_expected.to belong_to(:chat_message).class_name("Chat::Message") }
+    it { is_expected.to belong_to(:chat_channel).class_name("Chat::Channel") }
+    it { is_expected.to belong_to(:user).with_foreign_key(:pinned_by_id) }
+  end
+
+  describe "validations" do
+    subject { Fabricate(:chat_pinned_message) }
+
+    it { is_expected.to validate_uniqueness_of(:chat_message_id) }
+  end
+
+  describe ".for_channel" do
+    fab!(:channel, :chat_channel)
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel) }
+    fab!(:other_channel, :chat_channel)
+    fab!(:other_message) { Fabricate(:chat_message, chat_channel: other_channel) }
+
+    before do
+      Fabricate(:chat_pinned_message, chat_message: message_1, chat_channel: channel)
+      Fabricate(:chat_pinned_message, chat_message: message_2, chat_channel: channel)
+      Fabricate(:chat_pinned_message, chat_message: other_message, chat_channel: other_channel)
+    end
+
+    it "returns pins for the specified channel ordered by created_at desc" do
+      pins = described_class.for_channel(channel)
+      expect(pins.count).to eq(2)
+      expect(pins.map(&:chat_message_id)).to contain_exactly(message_1.id, message_2.id)
+    end
+  end
+end
diff --git a/plugins/chat/spec/models/chat/user_chat_channel_membership_spec.rb b/plugins/chat/spec/models/chat/user_chat_channel_membership_spec.rb
new file mode 100644
index 0000000000000..feb3a1a12ed60
--- /dev/null
+++ b/plugins/chat/spec/models/chat/user_chat_channel_membership_spec.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UserChatChannelMembership do
+  describe "#has_unseen_pins?" do
+    fab!(:channel, :chat_channel)
+    fab!(:user)
+    fab!(:membership) do
+      Fabricate(:user_chat_channel_membership, chat_channel: channel, user: user)
+    end
+
+    context "when channel has no pins" do
+      it "returns false" do
+        expect(membership.has_unseen_pins?).to eq(false)
+      end
+    end
+
+    context "when user has never viewed pins" do
+      fab!(:message) { Fabricate(:chat_message, chat_channel: channel) }
+      fab!(:pin) { Fabricate(:chat_pinned_message, chat_channel: channel, chat_message: message) }
+
+      it "returns true" do
+        expect(membership.has_unseen_pins?).to eq(true)
+      end
+    end
+
+    context "when user viewed pins before new pin was added" do
+      fab!(:message) { Fabricate(:chat_message, chat_channel: channel) }
+
+      before do
+        membership.update!(last_viewed_pins_at: 1.hour.ago)
+        Fabricate(:chat_pinned_message, chat_channel: channel, chat_message: message)
+      end
+
+      it "returns true" do
+        expect(membership.has_unseen_pins?).to eq(true)
+      end
+    end
+
+    context "when the only unseen pin was created by the user" do
+      fab!(:message) { Fabricate(:chat_message, chat_channel: channel) }
+
+      before do
+        Fabricate(:chat_pinned_message, chat_channel: channel, chat_message: message, user: user)
+      end
+
+      it "returns false" do
+        expect(membership.has_unseen_pins?).to eq(false)
+      end
+    end
+
+    context "when user viewed pins after all pins were created" do
+      fab!(:message) { Fabricate(:chat_message, chat_channel: channel, created_at: 2.hours.ago) }
+
+      before do
+        Fabricate(
+          :chat_pinned_message,
+          chat_channel: channel,
+          chat_message: message,
+          created_at: 2.hours.ago,
+        )
+        membership.update!(last_viewed_pins_at: 1.hour.ago)
+      end
+
+      it "returns false" do
+        expect(membership.has_unseen_pins?).to eq(false)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/channel_pins_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channel_pins_controller_spec.rb
new file mode 100644
index 0000000000000..43850540f5638
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/channel_pins_controller_spec.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::ChannelPinsController do
+  fab!(:admin)
+  fab!(:user)
+  fab!(:channel, :chat_channel)
+  fab!(:message) { Fabricate(:chat_message, chat_channel: channel) }
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_pinned_messages = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    sign_in(admin)
+  end
+
+  describe "#index" do
+    fab!(:pin) { Fabricate(:chat_pinned_message, chat_message: message, chat_channel: channel) }
+
+    it "returns pinned messages for the channel" do
+      Fabricate(:user_chat_channel_membership, chat_channel: channel, user: admin)
+      get "/chat/api/channels/#{channel.id}/pins"
+
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["pinned_messages"].length).to eq(1)
+      expect(response.parsed_body["pinned_messages"][0]["chat_message_id"]).to eq(message.id)
+    end
+
+    it "does not mark pins as read" do
+      membership = Fabricate(:user_chat_channel_membership, chat_channel: channel, user: admin)
+
+      get "/chat/api/channels/#{channel.id}/pins"
+
+      expect(membership.reload.last_viewed_pins_at).to be_nil
+    end
+
+    context "when user cannot access channel" do
+      before { sign_in(user) }
+
+      it "returns 403" do
+        channel.update!(chatable: Fabricate(:private_category, group: Fabricate(:group)))
+        get "/chat/api/channels/#{channel.id}/pins"
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+
+  describe "#mark_read" do
+    it "marks pins as read for the current user" do
+      membership = Fabricate(:user_chat_channel_membership, chat_channel: channel, user: admin)
+      expect(membership.last_viewed_pins_at).to be_nil
+
+      freeze_time do
+        put "/chat/api/channels/#{channel.id}/pins/read"
+
+        expect(response.status).to eq(200)
+        expect(membership.reload.last_viewed_pins_at).to eq_time(Time.zone.now)
+      end
+    end
+
+    context "when user cannot access channel" do
+      before { sign_in(user) }
+
+      it "returns 404" do
+        channel.update!(chatable: Fabricate(:private_category, group: Fabricate(:group)))
+        put "/chat/api/channels/#{channel.id}/pins/read"
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+
+  describe "#create" do
+    it "pins a message" do
+      post "/chat/api/channels/#{channel.id}/messages/#{message.id}/pin"
+
+      expect(response.status).to eq(200)
+      expect(Chat::PinnedMessage.exists?(chat_message_id: message.id)).to eq(true)
+    end
+
+    context "when user is not staff" do
+      before { sign_in(user) }
+
+      it "returns 403" do
+        post "/chat/api/channels/#{channel.id}/messages/#{message.id}/pin"
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+
+  describe "#destroy" do
+    fab!(:pin) { Fabricate(:chat_pinned_message, chat_message: message, chat_channel: channel) }
+
+    it "unpins a message" do
+      delete "/chat/api/channels/#{channel.id}/messages/#{message.id}/pin"
+
+      expect(response.status).to eq(200)
+      expect(Chat::PinnedMessage.exists?(chat_message_id: message.id)).to eq(false)
+    end
+
+    context "when user is not staff" do
+      before { sign_in(user) }
+
+      it "returns 403" do
+        delete "/chat/api/channels/#{channel.id}/messages/#{message.id}/pin"
+
+        expect(response.status).to eq(403)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat/api/channels_current_user_notifications_settings_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_current_user_notifications_settings_controller_spec.rb
index 729778c150973..5ae6546d13419 100644
--- a/plugins/chat/spec/requests/chat/api/channels_current_user_notifications_settings_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_current_user_notifications_settings_controller_spec.rb
@@ -6,6 +6,7 @@
   before do
     SiteSetting.chat_enabled = true
     SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    SiteSetting.chat_pinned_messages = true
   end
 
   describe "#update" do
diff --git a/plugins/chat/spec/services/chat/list_channel_pins_spec.rb b/plugins/chat/spec/services/chat/list_channel_pins_spec.rb
new file mode 100644
index 0000000000000..86d796678ed56
--- /dev/null
+++ b/plugins/chat/spec/services/chat/list_channel_pins_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::ListChannelPins do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:channel_id) }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:chatters, :group)
+    fab!(:user) { Fabricate(:user, group_ids: [chatters.id]) }
+    fab!(:channel, :chat_channel)
+    fab!(:membership) do
+      Fabricate(:user_chat_channel_membership, chat_channel: channel, user: user)
+    end
+    fab!(:message_1) { Fabricate(:chat_message, chat_channel: channel) }
+    fab!(:message_2) { Fabricate(:chat_message, chat_channel: channel) }
+    fab!(:pin_1) { Fabricate(:chat_pinned_message, chat_channel: channel, chat_message: message_1) }
+    fab!(:pin_2) { Fabricate(:chat_pinned_message, chat_channel: channel, chat_message: message_2) }
+
+    let(:guardian) { Guardian.new(user) }
+    let(:params) { { channel_id: channel.id } }
+    let(:dependencies) { { guardian: } }
+
+    before { SiteSetting.chat_allowed_groups = chatters }
+
+    context "when params are not valid" do
+      let(:params) { {} }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when channel is not found" do
+      let(:params) { { channel_id: -1 } }
+
+      it { is_expected.to fail_to_find_a_model(:channel) }
+    end
+
+    context "when user cannot access channel" do
+      fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
+
+      before { channel.update!(chatable: private_category) }
+
+      it { is_expected.to fail_a_policy(:can_view_channel) }
+    end
+
+    context "when all conditions are met" do
+      it { is_expected.to run_successfully }
+
+      it "returns pinned messages" do
+        expect(result[:pins]).to contain_exactly(pin_1, pin_2)
+      end
+
+      it "returns membership" do
+        expect(result[:membership]).to eq(membership)
+      end
+
+      context "when user has no membership" do
+        before { membership.destroy! }
+
+        it { is_expected.to run_successfully }
+
+        it "returns pinned messages" do
+          expect(result[:pins]).to contain_exactly(pin_1, pin_2)
+        end
+
+        it "returns nil membership" do
+          expect(result[:membership]).to be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/mark_pins_as_read_spec.rb b/plugins/chat/spec/services/chat/mark_pins_as_read_spec.rb
new file mode 100644
index 0000000000000..8810acf4d3213
--- /dev/null
+++ b/plugins/chat/spec/services/chat/mark_pins_as_read_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::MarkPinsAsRead do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:channel_id) }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:chatters, :group)
+    fab!(:user) { Fabricate(:user, group_ids: [chatters.id]) }
+    fab!(:channel, :chat_channel)
+    fab!(:membership) do
+      Fabricate(:user_chat_channel_membership, chat_channel: channel, user: user)
+    end
+
+    let(:guardian) { Guardian.new(user) }
+    let(:params) { { channel_id: channel.id } }
+    let(:dependencies) { { guardian: } }
+
+    before { SiteSetting.chat_allowed_groups = chatters }
+
+    context "when params are not valid" do
+      let(:params) { {} }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when channel is not found" do
+      let(:params) { { channel_id: -1 } }
+
+      it { is_expected.to fail_to_find_a_model(:channel) }
+    end
+
+    context "when membership is not found" do
+      before { membership.destroy! }
+
+      it { is_expected.to fail_to_find_a_model(:membership) }
+    end
+
+    context "when user cannot access channel" do
+      fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
+
+      before { channel.update!(chatable: private_category) }
+
+      it { is_expected.to fail_a_policy(:can_access_channel) }
+    end
+
+    context "when all conditions are met" do
+      it { is_expected.to run_successfully }
+
+      it "updates last_viewed_pins_at timestamp" do
+        freeze_time
+        result
+        expect(membership.reload.last_viewed_pins_at).to be_within(1.second).of(Time.zone.now)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/pin_message_spec.rb b/plugins/chat/spec/services/chat/pin_message_spec.rb
new file mode 100644
index 0000000000000..ea2ebcfa4fadb
--- /dev/null
+++ b/plugins/chat/spec/services/chat/pin_message_spec.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::PinMessage do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:message_id) }
+    it { is_expected.to validate_presence_of(:channel_id) }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:current_user, :admin)
+    fab!(:channel, :chat_channel)
+    fab!(:message) { Fabricate(:chat_message, chat_channel: channel) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { message_id: message.id, channel_id: channel.id } }
+    let(:dependencies) { { guardian: } }
+
+    context "when params are not valid" do
+      let(:params) { {} }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when message is not found" do
+      let(:params) { { message_id: -1, channel_id: channel.id } }
+
+      it { is_expected.to fail_to_find_a_model(:message) }
+    end
+
+    context "when user cannot pin" do
+      fab!(:current_user, :user)
+
+      it { is_expected.to fail_a_policy(:can_pin) }
+    end
+
+    context "when pin limit is reached" do
+      before do
+        Chat::PinnedMessage::MAX_PINS_PER_CHANNEL.times do
+          Fabricate(:chat_pinned_message, chat_channel: channel)
+        end
+      end
+
+      it { is_expected.to fail_a_policy(:within_pin_limit) }
+    end
+
+    context "when message is already pinned" do
+      before { Fabricate(:chat_pinned_message, chat_message: message, chat_channel: channel) }
+
+      it { is_expected.to fail_a_policy(:not_already_pinned) }
+    end
+
+    context "when all conditions are met" do
+      it { is_expected.to run_successfully }
+
+      it "creates a pinned message record" do
+        expect { result }.to change { Chat::PinnedMessage.count }.by(1)
+
+        pin = Chat::PinnedMessage.last
+        expect(pin.chat_message_id).to eq(message.id)
+        expect(pin.chat_channel_id).to eq(channel.id)
+        expect(pin.pinned_by_id).to eq(current_user.id)
+      end
+
+      it "publishes a MessageBus event" do
+        messages = MessageBus.track_publish { result }
+        pin_event = messages.find { |m| m.data["type"] == "pin" }
+
+        expect(pin_event).to be_present
+        expect(pin_event.channel).to eq("/chat/#{channel.id}")
+        expect(pin_event.data["chat_message_id"]).to eq(message.id)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/trash_message_spec.rb b/plugins/chat/spec/services/chat/trash_message_spec.rb
index 31519765c93c8..6f17929970097 100644
--- a/plugins/chat/spec/services/chat/trash_message_spec.rb
+++ b/plugins/chat/spec/services/chat/trash_message_spec.rb
@@ -201,6 +201,22 @@
           end
         end
 
+        context "when message is pinned" do
+          fab!(:pin) do
+            Fabricate(
+              :chat_pinned_message,
+              chat_message: message,
+              chat_channel: message.chat_channel,
+            )
+          end
+
+          it "destroys the pin" do
+            pin_id = pin.id
+            expect { result }.to change { Chat::PinnedMessage.count }.by(-1)
+            expect(Chat::PinnedMessage.find_by(id: pin_id)).to be_nil
+          end
+        end
+
         context "when message is already deleted" do
           before { message.trash! }
 
diff --git a/plugins/chat/spec/services/chat/unpin_message_spec.rb b/plugins/chat/spec/services/chat/unpin_message_spec.rb
new file mode 100644
index 0000000000000..173cb470b7d1c
--- /dev/null
+++ b/plugins/chat/spec/services/chat/unpin_message_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::UnpinMessage do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:message_id) }
+    it { is_expected.to validate_presence_of(:channel_id) }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:current_user, :admin)
+    fab!(:channel, :chat_channel)
+    fab!(:message) { Fabricate(:chat_message, chat_channel: channel) }
+    fab!(:pin) { Fabricate(:chat_pinned_message, chat_message: message, chat_channel: channel) }
+
+    let(:guardian) { Guardian.new(current_user) }
+    let(:params) { { message_id: message.id, channel_id: channel.id } }
+    let(:dependencies) { { guardian: } }
+
+    context "when params are not valid" do
+      let(:params) { {} }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when message is not found" do
+      let(:params) { { message_id: -1, channel_id: channel.id } }
+
+      it { is_expected.to fail_to_find_a_model(:message) }
+    end
+
+    context "when user cannot unpin" do
+      fab!(:current_user, :user)
+
+      it { is_expected.to fail_a_policy(:can_unpin) }
+    end
+
+    context "when message is not pinned" do
+      before { pin.destroy! }
+
+      it { is_expected.to fail_to_find_a_model(:pin) }
+    end
+
+    context "when all conditions are met" do
+      it { is_expected.to run_successfully }
+
+      it "destroys the pinned message record" do
+        pin_id = pin.id
+        expect { result }.to change { Chat::PinnedMessage.count }.by(-1)
+        expect(Chat::PinnedMessage.find_by(id: pin_id)).to be_nil
+      end
+
+      it "publishes a MessageBus event" do
+        messages = MessageBus.track_publish { result }
+        unpin_event = messages.find { |m| m.data["type"] == "unpin" }
+
+        expect(unpin_event).to be_present
+        expect(unpin_event.channel).to eq("/chat/#{channel.id}")
+        expect(unpin_event.data["chat_message_id"]).to eq(message.id)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json b/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json
index 48b77132a5161..80c99cc9c7a5f 100644
--- a/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json
+++ b/plugins/chat/spec/support/api/schemas/user_chat_channel_membership.json
@@ -15,6 +15,7 @@
     "notification_level": { "type": "string" },
     "following": { "type": "boolean" },
     "starred": { "type": "boolean" },
+    "has_unseen_pins": { "type": "boolean" },
     "user": {
       "type": ["object", "null"],
       "required": ["id", "name", "avatar_template", "username"],
@@ -27,6 +28,7 @@
         "has_chat_enabled": { "type": "boolean" }
       }
     },
-    "last_viewed_at": { "type": "datetime" }
+    "last_viewed_at": { "type": "datetime" },
+    "last_viewed_pins_at": { "type": ["datetime", "null"] }
   }
 }
diff --git a/plugins/chat/spec/system/pinned_messages_spec.rb b/plugins/chat/spec/system/pinned_messages_spec.rb
new file mode 100644
index 0000000000000..3a9cf112b2260
--- /dev/null
+++ b/plugins/chat/spec/system/pinned_messages_spec.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+RSpec.describe "Chat pinned messages", type: :system do
+  fab!(:admin)
+  fab!(:channel, :chat_channel)
+  fab!(:message) { Fabricate(:chat_message, chat_channel: channel, message: "Important message") }
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+  let(:channel_page) { PageObjects::Pages::ChatChannel.new }
+
+  before do
+    chat_system_bootstrap
+    SiteSetting.chat_pinned_messages = true
+    channel.add(admin)
+    sign_in(admin)
+  end
+
+  it "allows staff to pin and unpin messages" do
+    chat_page.visit_channel(channel)
+
+    channel_page.messages.find(id: message.id).secondary_action("pin")
+
+    expect(page).to have_css(".chat-message-info__pinned")
+    expect(page).to have_css(".c-navbar__pinned-messages-btn")
+
+    find(".c-navbar__pinned-messages-btn").click
+    expect(page).to have_css(".c-routes.--channel-pins")
+    expect(page).to have_content("Important message")
+
+    find(".c-navbar__close-pins-button").click
+    channel_page.messages.find(id: message.id).secondary_action("unpin")
+
+    expect(page).to have_no_css(".chat-message-info__pinned")
+  end
+
+  it "shows unread indicator for unseen pins" do
+    chat_page.visit_channel(channel)
+
+    # Another user pins the message while admin is viewing
+    pin =
+      Chat::PinnedMessage.create!(
+        chat_message: message,
+        chat_channel: channel,
+        user: Fabricate(:admin),
+      )
+    Chat::Publisher.publish_pin!(channel, message, pin)
+
+    expect(page).to have_css(".c-navbar__pinned-messages-btn__unread-indicator")
+
+    find(".c-navbar__pinned-messages-btn").click
+    expect(page).to have_css(".c-routes.--channel-pins")
+
+    find(".c-navbar__close-pins-button").click
+
+    expect(page).to have_no_css(".c-navbar__pinned-messages-btn__unread-indicator")
+  end
+
+  it "marks pins as read when viewing the panel" do
+    Chat::PinnedMessage.create!(
+      chat_message: message,
+      chat_channel: channel,
+      user: Fabricate(:admin),
+    )
+
+    chat_page.visit_channel(channel)
+    expect(page).to have_css(".c-navbar__pinned-messages-btn__unread-indicator")
+
+    find(".c-navbar__pinned-messages-btn").click
+    expect(page).to have_css(".c-routes.--channel-pins")
+
+    # Reload while panel is open — pins should stay marked as read
+    page.refresh
+
+    chat_page.visit_channel(channel)
+    expect(page).to have_no_css(".c-navbar__pinned-messages-btn__unread-indicator")
+  end
+
+  it "shows unseen pin icon in the panel for pins not yet viewed" do
+    other_user = Fabricate(:admin)
+    Chat::PinnedMessage.create!(chat_message: message, chat_channel: channel, user: other_user)
+
+    chat_page.visit_channel(channel)
+    find(".c-navbar__pinned-messages-btn").click
+    expect(page).to have_css(".c-routes.--channel-pins")
+    expect(page).to have_css(".chat-pinned-message__pinned-by-icon")
+
+    find(".c-navbar__close-pins-button").click
+    find(".c-navbar__pinned-messages-btn").click
+    expect(page).to have_css(".c-routes.--channel-pins")
+    expect(page).to have_no_css(".chat-pinned-message__pinned-by-icon")
+  end
+
+  context "when viewing pinned messages attribution" do
+    it "shows 'Pinned by you' when current user pinned the message" do
+      chat_page.visit_channel(channel)
+      channel_page.messages.find(id: message.id).secondary_action("pin")
+      find(".c-navbar__pinned-messages-btn").click
+
+      expect(page).to have_css(".c-routes.--channel-pins")
+      expect(page).to have_css(
+        ".chat-pinned-message__pinned-by",
+        text: I18n.t("js.chat.pinned_messages.pinned_by_you"),
+      )
+    end
+
+    context "when another user pinned the message" do
+      fab!(:other_user, :user)
+
+      before do
+        channel.add(other_user)
+        Chat::PinnedMessage.create!(
+          chat_message: message,
+          chat_channel: channel,
+          pinned_by_id: other_user.id,
+        )
+      end
+
+      it "shows 'Pinned by [username]'" do
+        chat_page.visit_channel(channel)
+        find(".c-navbar__pinned-messages-btn").click
+
+        expect(page).to have_css(".c-routes.--channel-pins")
+        expect(page).to have_css(
+          ".chat-pinned-message__pinned-by",
+          text: I18n.t("js.chat.pinned_messages.pinned_by_user", username: other_user.username),
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/chat/test/javascripts/components/chat-message-test.gjs b/plugins/chat/test/javascripts/components/chat-message-test.gjs
index cccc3358c5f14..c668d10bfa6ad 100644
--- a/plugins/chat/test/javascripts/components/chat-message-test.gjs
+++ b/plugins/chat/test/javascripts/components/chat-message-test.gjs
@@ -87,6 +87,17 @@ module("Discourse Chat | Component | chat-message", function (hooks) {
       .exists("has the correct css class");
   });
 
+  test("Non-interactive message", async function (assert) {
+    this.message = new ChatFabricators(getOwner(this)).message();
+    await render(
+      <template>
+        <ChatMessage @message={{this.message}} @interactive={{false}} />
+      </template>
+    );
+
+    assert.dom(".chat-message-container.-not-interactive").exists();
+  });
+
   test("Message with streaming", async function (assert) {
     // admin
     this.currentUser.admin = true;
diff --git a/public/images/upcoming_changes/chat_pinned_messages.png b/public/images/upcoming_changes/chat_pinned_messages.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2ddbba0717351a5c8b6803af96dcbc61ad49882
GIT binary patch
literal 10354
zcmeI2RZts1_vnKZcbA~SC3s1&;=vtCDehjJ0xj+moZ{}*;w}YBa4CV}?plf#Xu19V
zb6@Y%|2}>%duDf!?eEO&oY~nJEe#kx4h;?f0KivPlGgzM(BJ?7Y9SWdzm=W)IXwUX
z<w8qMPl1`4SwKL5n3#BWcGk_!je~<jU0t0S1e%(f>hJI8;o&JMDXFWiU0PaVWoH{2
z8d_Xj1hKFP2?-4h41D<TL0Vec!ongvJiM>3FFQLsF)`7~%BrlajFXcS3Wdta$t5Qz
zFDxwR>gsZHbDNo&iHL~&`0>NU#Kg$RsG_1mTU%R6Ny*sQxVN{LMSz1{mKRv6&2B8p
z7Nx}SNtNACmR(Djp-_{<R)Qs7nN5<1-A#%yM?F73e{^(|JyelhUxeLThAmKzPe?GO
zu~JoE$HMEKe`*}Ot`uHhrfXrQYhn7v-U_*~dT@3!x;XC>9}!yc>E!Za>u5i}ySaO6
zq-AWdA351KH^HK1%>pxI^eG@s9c8wU0a-@?L+U^l!L$+0EU(mXbLNOLr$Kx#nOu`u
z#1&~`I$2)3(S0Zb8T+!Rn^PnXfw;ho9+|B2y102iyuH0yM5H97Bu7R@#>U2Sa&p4L
z!t(O+W@ctuT3Wigx@>H0{QUe13JM$?99&&phlhuwqN1v+t6AAtH8eD8YHC_rThr3g
zy1Tm-6%{{y`czq286O|d$H!-2V9?amq@toCDk>Tq8!Ij@?&;|n6cp6Z(9qG*(bLmY
zTwFXcF)=<quBD|_S63Gt9PI4uj6@=rmzP&pSJ&3o%6`Sw0|0DN%JMRL@0U*(H#BIp
ziGnX>EO8Y=d1qWYYmmY+w1c$Q4g8$S^YUuW0Xqs#D#kv<QxcV`_oTwa8f2rk(|27t
zIUSEFqazf-X-T{Q?qtv=l?OUc(*Fn@IS+tNC@=(>RAsCIa9+3kxQiu`07O9~fy_hx
ze~WHLggqlbCwWI&AB2(=3bgvDk$9ui`v?QniXfC;U*C6#>7S-Mn%OXauEuNxw>XC8
zP`|l+0@{2jMr45b#aB`w-x~@V*-X?=v6Arl{Pqri(Z7A@cQcdsP$Wg{V%7dm7b0KU
ztNe4v>`_zw905!g!Jocjm`s@5gUoc;E5r93TfQT)HA$Wwy_sOva7y$LKF>fwf7)>Y
z1Cx0xr*)P33ab}cj4<m&N}k(8%$x~<1<c|-Xe^ocsZJ?fq{VaI2%}o=xOam?<mKdw
zva!W>SZ;or`tz-p?Jam&T}Uiu+UC5z(TTvwH_;>4RWdDSOeyLWSYh{_O=;eF%fx8`
z`B>-M-#$D-H)cI>fruKu0738TKXWr_E0<Lh@@3mI@nU@+vzB@f6V?76C*(%NBvOng
zyC;|z!GZ+41L4W5O;&A^4ssS$2)^Ps3W9Is{h}M<B|9irL>Cbrb2d4;lm}=ube4JF
zL(e*-4yV@gJ<_5gMXj;7?m~str`LXMYigjN65u4|?a(OD6&k)cuR0UXY7hNcRre|L
z=l5%}gm=6{8F6Z>gu9t)Cfxi6^5E%AE|9jBiY2*ttfCb+_8Fz_Hy@Akem#2?ai`3$
zPOOgWEQ1HOx#~0Y8X^eBL!A>3!++ibV#h;(S8C)BP=l=HC`c)J#|&^|Uw{k2oS+gD
z>Hp&LQwE{?cxKO*ijryvAoqn4pRv8`^)+^POyu+=gtSO9(-n>)WPR{neT!gMsV0Bl
zUNY)7K2g7@r&NR)#!b^+K7arNfCA-Y-(CYKH8b*8HqgEquDkZ|zAN7HY?`vRcgl5y
zo7iGCdQ3!+QH{9=v=wql<m{MS#R`Z@QtB_m3OFcG*o*H!xPRnlgWUv(T5q==-90N9
z8Msr3cKqTLna9W`+sI4DBxe99I9^O8i5Hc7EXG&vo!IMFDYQ1}ex}F<veQb5p0LPU
zp*?dWOf{v34;DMIIjiNM>uB~h*J6ErH35a~C<~lY(kmqfsAFUb_VcsQzvweelX4%6
z3{m{u9clo%E{^Q`wBCjK6z8{r?b3@IVrJg(oVXlADG9!aUJz6lxd*m|nu>CCkNzXm
zjsJG%+GFCp0rT2_XPu5(Ay(0kAAwaYJ*nwAA;*(ts9E_j+|62JuvQP;oJ*5#wHUOg
zH?vH}TPS}<V;Q$Bprz{nH>?-UvHF%mF85=sDBBHdv?>l?!2RkgpDAa~1V)^}zKF75
zf#B^>RXlfGzsP$%_bPh_7RP958Chl`92wiGFt&<MM>JnjhLLUpQ@(R1nEROE-s2+8
z!7B@s6{=vkfz+*qA6G@J1zntZwnTyhou|2qM9=pwCbW>_^t5<9$OkpV%W2n%JCV8)
zEH_LwQ(oh77Iz&_LTY|WmZi6oJt5_}d2bWCO1)Qgxj8`9>Ty4#?PU1HmLC_R%HXfF
zi0L%HuKxC#2=y!SQkx+XHPjmu=s|c%+<3)5dU=f|g5LRxxE`<uTW3rBdc*(8MDPo|
z{`YD$HeKBSXh4%+wB}ao*1W>XlKOopT!F?CmSIFh_7?_2{jvs<lRz^+3dVcU^FHx7
zGoqu$bvYb{YkiMx&y84zJ;}lB_6U7%XnwNLtw?lA4w6i@dtrUuhKQB>@nlz`X8v+t
z)vZFceI5@Mey7bAlDgQwLMm2W2*0qM=aOLFRcoHL2r}|+zKCW&ZvVQobO_aFN3)$a
zg|#HrnWruJItf_DYB^tc?Z-feu?eRH3)5D#Wnla+v*jl5<=e3jse*eFCDChl!jdc~
z)ml<}Iu;Jj!0o@%hi4lYOEdR$O44%HQTa`vX9P5+cCQj6uHse}nJMe(vThQhei$z?
zm+g=rxgaM)kh5S3W~ACf5^%2X?l)C4oEj!!h$grlE35_jYGieXnNU>1rR_vvs8n@U
z*!%+)b9D-^nQo38Z@OC-mpM~9F=Ur{WT6Df%>DB-QJYB5w1H!UkRpDBaMInNDqYHF
zXHNGH7VR8GD_E`$rm0TgeNl{W^5>pQyfJX?EzNIAbg&GhYx`d6Eg$<NeD<#>6T3m?
z-(Eg^>?SmV0g0$FngBi~-`lN@7Tu!pcmX-RV;^+tKSZJ@u_Vl1R`_Od`x^XTtH9Me
zv4kGwI=E7O3d|8(ZEe=aXZSnu9*UoyXouicvII$&ahA_WN$M;^wsJ)?{Js$EDHUTh
z_pcmCyk}~J|CgXC3ukM8$G?>Fu;PbIxNd*M5xuFSC;YvKYpW(Mk#(0!FB{q0#%K5J
zS`H@>wj1&3&VAN0{1x(}_?0@jl+isK)?U<6z0u@q@;j!*<R8suEk~jOzH{FVh+dfA
zlcB3ta+33S6)B0fxU}D~i0+d<DXF2G9GWGkWf+u|S?kK3*{O&Ms9ec8oibx{(1)+;
zO+TKVn@pTXP)BA#+gK<GdVBpJk49^s#%K8<{E@&e<}ms$lDLbio~n0qf-IMN*WW-L
zF&&6ALVW6l)8>kOYeVK1Uw&@1tLbG`><*+t$i-(`Ak}yb{Cwoo{q@z4t|o<}faQ}N
zBk!RCtBQc{$sy-4bL?U|J-r8>f<cf$IP-fg*GBqV#V`EmP>reCg7qW?lo59iid#(f
zs&){;F2q9hbI?Wsbmd(hJ+3soKTi%Gi~>cS`qwZ>!-Iu(v8eua7I;upj9o0q|7r{G
zxC_&~afJB(9sipbYKG#d_5a%ttM$OaYa_O?s{P^#BQY`n>6kk-XO6hzv=I<3iC{D{
zn3r`B!AqH&8)Y=+CD&`oB}A9bg}%J1&Q``0WLC1%6WJgGH0-qlt8C?ntDKQOKB6`A
zlWTd)iVE@rwT?q+<k7r{lw%c+l*Q`TFk~AE^H!{*GGHj#DoI;CPS0^(70JcyFptNr
z#25*TOQwirUYX~1jw8dRA%D@I>B*DfEy<bSf1`2}$?~Jc`Q+06Qs(hK+pL5Jv*0a5
z1;y^F^RfB~VoMdpwT1S8N<L_*>#=~XQ4+qxKyt?7nC%7XvY=c@u(bX`3z4}0a&F6j
z&fE24-NgH%hb&2F`8$PC?pxBOLi<pvO60H70VaX_iuDU<-ci<8E8ew%Qq#drSo{X{
z{aIetl$xC(1OH6lXOzOk8=rx<0@F~lTPi4TtJ@KJaGUW1efGkP<5WY`AH1jU7h9B@
zb_-~HKH4typl=&vs$jIPZtMTin7qX3I;RxzzdP)ka_yfB(8xfg2kp_iz6mdQyIw-S
zo!p@2!A9P1s+hS@s+-D@ldCcwQcmXte@*ph0Ic$-?Qe@W38|o)y3*`X90OD0n0*8{
zu{xQZH5U=kXR~H0x7#2lQZT=;)XJb|`@}=Rw~ek6$FGuLhqgU&Kan4fLJyQ2_I8D^
zE+EjbhiDBgvxZFNRmuG!o(utH)KCGnIMM~_IXEA}=@fI*=Q(5*BhdVZmfhRj+^C<~
zsc(=9a7Q(bfoL{$PoTz5Ih5oDs&1MY0gD3e90uxkg_P<1KU0n2PUMXuUl5GaDsR!u
zGlb_goydih>G->XH-6YfWm=m$ML%VE15MB`U%it2wBfq;Au(m{h0&bBajUfHmZeNP
zx<!ZdRIxKsSm;fXbEIV$NyTB~Et4Zocqm<{bclw`9Gn~BR7)tz9WF|RM_@p;A<xj|
zlcWoE(pQY@T5Y|-=zqx<FpwSx=;b6dh$U**(hET9n@6Rdr2=|42gJrW2KY<A1l(ng
zTa)aOI}j}=KGf-~y@kUSzbWTmAC_A2OQx#D`FkceT+Z?f*SSIi5uI)|vI)<fo(G9I
zlIyaRj|43T_PJYQI&*<gse>^e-E^SnuiR5q%2uc!egw_9?5~{ta1?WY3F4@^BnN^p
zd1lT^pvggKdAS<rSsO+&^$CmCSTluiod(p@LJ~6n+!yLATNG3YOxHcMc<nef>&i1-
zhIrh)j}~vy8zsKV-Ob_WuIT|p=wM3=suU16U0ab63{&m3woQkNBTAKdb66bGFhFI`
zn&C$UnaVmd%@4bah|bFs3y&xAwc5}7z&|UE1NdZbt)=>*1&O#<QX75+7kKRAQX8Ei
z1|47LG_$8YELv3HC>_m9ENB<OXx^j|!kp7HBh&E?Y1GhafsBZ-f<X4uv1Asu<Qzdx
zW2dAT5PdTD)5v7>T2=WxJEEqRw2d%z$Hl9$M&#iAuivM4Z_Q{6S;5X}bN*FRwdbM6
zy8|{vOFK<mP|G}AUO`U?e$IX-ie<FqsvI;%!6Iu^ExNhbt+;)7b8MCXBD-f4#-p@6
zHbX^>_?m5y2<%$)UOl}VnLT5xZ>p#9)Qi^#*S?;-tc%ABO{VNK=7imdFEG{UrhTWL
zTK@4=!gvXAR!$wFAE@%$lGDEVIx<s`6eb`(ja3WwoN4yoU7U0^-*kf#Y+{`J4f1$u
z{Mfeljr2TuhmEq81&q#hU|%rA#ITtmsLbY|;@-|W3{y+FE^%Jgqm)P5!K6({iNmyO
zjGgAF^GXap1A{DIZ7*zjbVo2OX|^1+FORW)20rfw2)`aDJ~Q@5)jLj(hrhA&UVWM)
zogz%N@J`GHAuMj%m_2?<A5?xU1qK*W28tWQ`-<Xjkhwb*#=oZAqb?duMG((!oDBV@
zv)3c?w(m(mws`5gz^+OA2=QI|>RBTFI!~mOBfO`Uw2uLd*q9ylcbaq$Q(Xy~@|id*
z*lFZ(*6pz0yT=ZPrtc`OpQyfxgzVSa$5-pLA@K(lKI*X$s(GsXi;o0;7JL;NH7<bl
zs>{d;u4xl5l~ne}Gk4FL8f^SCBzKz&LFf8NqEV&9^0uA})yCg(49vj<0$pZ0lqcXo
zhXIdilSxzBkCjkC+rkYYm?%{|oiJiM>UDkc#2NZXB;xC_AGIs-z^QA1XaBm}i(MW{
zF>{8$Q!XCgaTFp2(H>=C-2*s+mip;s5tj;jBeQrlgGPBJ3nS3{!idl<DqgonKw;fH
z2+{wN-3~nSU0fq$7p3;+@4ZjB-MLnm*z9IxSGf`q>LyPxMkYeJd36uD@_C(LqwEnQ
z(Jb~qm6=vN1dK_g#zme;ntSt>G-S0^^H@as?@8A4WYD_D(YKxN<<lr1HeKm_ik&d5
zn>4c-t5oBJs+1zL$5D>ipkZwLi(z_}L!Cc{sVX9_<5|xql7~p-N<hpm|H-n#W6Is)
ztAOK9EDR2rq-(_ksH?8F+V0)w;~s>hdYIq>8}+it#?uKQbBuqR9cUZH^*!o=c9si}
z7yry>D8=?6m-^i^4c8Ogh*k>I+f(Ln(UorNzuug%=Uii4k5Q?v5_Cl&=HV?!^a)!B
z@*cg8ni@X9jljGtRTi|s(iTUg<ypxdREmta0M62;8v~lb+a(Tj9>4REbsm|EySqF*
zXLZKQ4`dmh+?MQ+AEwJcCDyCO&6q^<!`}J`60p)rzX4}QU}k}m@T0uljY`&8erUTA
zhTIef$UmLXeO`9s|27`<_M=t5!;UdAY_I6ASjoa+TT<V?b;b9}*+XE9;&bRc1?80N
zn=h~g#ea!B{7CHB4I4PqE}4ZoCj50H0Ot}&Z{1eT?tVXFvR@XE>Qvb?Tq&u6_}R6y
zd6f1EfBut>y!s0N8c;OD&?33$etX3I%2+BDr2fcVwPKZs8TK`39e=IIY_9?Fz&euc
zW6k%XouSk7!j;2|-SDgokX=qU&+U1>fu9^OZ<bZ!u&mvqbsl)=dbr+K)2F2|*IW{?
z=IG|e4>7#)uE{PJnHnDvQLm9iOqniVex_t3eEQTAaN$6Mvjh1ngf~2sph_Alu!)6%
zcl>ZV0OnbJ`I6)bZ5`LNA2$>{o5_JS)-ObL=4V=oTN=K_-`P&Ec=h{PdAW3B_qy33
zgi68YwSM&QezacpKC0oU9bdYcj5+)}Cl(V;4oF8^r98Oe)3Ysk6^lZdA`?vkNS3&m
zKWWs)X~ZU&Ut8XwTDCnI#IG#uf@%`?+d2KolG0ow^|T6S%LtwsP4Z0*ko9}@`!Cs-
zU0=G>a;5?NR`S|@>m1<$(BdS<VkJm8SCLzIG|4Y8oXB+_E1blESw&+ivnconEmoFL
zsxq?*`)<897Nw_`+R(NhD}Aa>HBtS+A^%`gvVATGeZoYfIu_GkO*m=~Z4}XVx51eE
zTDv`vN;KX@Snl(;4_$D9f-Tz6lHMbO21lw_T7Aq-0+F-_)w`AV%!Hd3t+RNDiQ3EQ
z<*W`gxPSTQji{?*eM?h?HJ=VkLQ(kcd${HaqgKP<M47?VWzoXl@&kJ(NqDwF^X{V7
z-59&6kmqkC{1KXwX|_3ZDRb$`eXuxPo0AU`dZnn2p$d1s*YTznW`{-XzSsBsFrET(
zQ}=MbL#@DIMdV~!6-<8Ee9i&FHmQbM+-^Ld0ukT;hHMf6Lq6$BE^qv~qNpZUQCWNN
zw{CD1$KZd-Kh`N8E%fd~Myu*K7-X((-NDJp{6}0Yep$P0RSG2s*B;83G9=;(b2Gkf
z$=StsvtDO!Bb4TMv+c>`jU42hLGsQi$e|4v-eXzOTJZ6(GPy+b@MLzdH}L7mtIy@F
zQQKMHVAY+<i-sF(!?&NuUg&Xi-2n1Gs@|!k2W)Yiy1*T~&JHPsY&(%JNffqJUwqN#
zH$}zfw-9g|`Gw(Er6<#h{WVxFba2yr;j6Or@r6u9*?Gp8qfOxB<IdY^oefXTJMGb9
zrK0jTC-TpX4Vxvx^sY`N_2Malg0Jhfj;0f=KhlrqoW*i6oRedF*KRmoT&r|I9u#{t
zTjg#Z`&g&(D@{pYqJO)eV)s667(tD$6S^}i3#;vzJ=z$w#p%<x><)L@%a!bJhkka4
zGG*T;UKyo^qxr>c)#Nx~jvojJsBz;Fb}Bo;OjyGGK#bSu@yoc!zo=ZVaOmH@a8xJJ
zU~i}-uPHqSOI%*}tq$`G+#=jnVTPu>Dig%Ud{&vfqX0tlJ9Ie+D3XuXu(ec4H+*l%
z@MlfrR+pg<IYvv)O;$g@84J?wsM~38`;b~BZZB;29(^??ri6CmNIT$sQ`m+3<^;)m
zqY;^JkqE+3UHr1~q;#3+87(up14+qLR2oY-Nf!Wnm;w<Tq~^IxtgP2NnMe92cO1U*
zc|)5tG~`8Dw>RQGDnT@NW;)qcw-T<_gMRL-qv*y;YOj+$czVlu;BRAIq~pM+Q`|I$
zJ5J`F%!;5FdM=FceC?%48)|EBv|Af~xQ)&^Yumdm5x6R~PoxxF9y4$5k?jjlc0>Ea
ztkFlG8fo7BM4?&xFK+cSNTUkf*TnKiwy!T1#K)PwuxATNuk{+c`~f^Lmoah-x)AY1
z$CR*dGR)R;n|mnJTy_53sq|YjF<ioATg95y*UV@Q-YEW!XZ$(cx(RhM#rLix-JjnC
zbYuoOry~kH5kB9hC!F*{ruhcMjc(d?KpY1a29V2|><&EWz4_@HpSk+GP}QxzN)n;V
ztQqw$#9!}|eMvF83)H6A$ce0<o;00-4!t?Yb%9*;9$7NNd$rFP0e^8qIjMKikvd>_
z;S_B58?2C|{o~4#vnX3km1`@^6s<|{6z?Oj<WgQAJt%Hp{HMC5QNOzs-fW6}{?L4U
zKtoI%_-7?cHuZ~^R&aHH`H(XTCR%|<3dA4P_0(Z=rji@J<EnEmryz`YXk!xiaVyh@
zPkMBaa`3w=h>aORUg@*duG{d}d$#$pzg;qMPg*#qKaUdT&6GV)bjaqkti7uilKo3~
z$*c_%toDnbGPXRswL=BGB$Y~XMbXYd(V6ZqdiHHrwEA9GL)3jJZpZXtCa<a3mtr-&
zz^b?-A{$R!jsfARJ0)Y^_D2y<Q)X|_EzRH+3sWd}lZ^!<c0fO+q}{Du@p=^YEBH55
z$Df6~*ij1ZA8f|#q~(Nr*l(5A!m4wyt5bd+sr~Y;i92=qvX|(@y7UMp<H^}NR2q<a
zy4`;NZtS2xrlZ-S2Lb>~s+$5IZ%)sy^h!}CY&nZ945Ck|aMsCi*Mi+tNTl|+4{7y*
z2!AXF6;ohAw%}qgVe4Jx+xVkW8cct|-G8i~tqxW{Ee{v*gV}PDN_Ta@OfKv^tVyPK
z_^pKVMb4^&%`9ass{^b>;ooK!7sBfIG?n1+^4qCXL5s+X0{d`YhP>PYRyxiPc4Ku4
z!x&!?6mwf5PT^M_;ad14IU}!xneDVbP8|rOs|Z!%BJqG#C^AXiF}3#;&Jb{k;SepY
zPB^|bfRBPYJus#alXBtQXCO;NIEvOMBouh~Sq*5ymX14q;^>aqhliho1@9c(@RO!7
zj;bZ%d5S*RrAmwVTvha#+%upX3UVj=M*L18a1smdghxVM$4MnwmM;Vt+0qLb5IKT8
zBrA<XSq$_^h7KVsEW?|u5xVBKAtjkpk|`wA*gT(HopK8$)ZI!kN(EYNg%`;X`nK8q
z7%Q0Utcm0Oixe*|_9dA|aD>#dntXggmcCkEM2Qz(ka9I(2zI%X)UpKJZJX#{f<L*K
zJGqUcUU4yOLW3NSeX}NKcnibJvEW16FM)TL5K<Ulw)e*bJ@~Lx;x-!mc}*Y~Z&hp>
zG0(noXaKbHlh4%7r_z5!hdD~qfWnshR+=|61>AD|w>`>G1~65;1JDt?WO7%H3+J5@
z%$aR9$pI?v$hpwpGq-+T=s41T8qUlROAms!?ogN6!Qq0-+=?BDj$9Cxx&x3G-nes!
zeoMg#f6cKKM=!bg{xt;r%bkv8(EV$BUARb~9``dL9IfTXqpV#0;0*z}X|`_(>dE)C
zmae@^npgA)_Suf01YRymP@OKn3p3<lcEMKmM~j|5HuPmINW^Q_US&s#&IZwtaD@3)
zJ4=@oHv<!RfdQMSUQcYsP<9(CuvIkLNRFab&{K`v8Of|2-r}$vr)_;by{JQFGb7tY
ztyuFz=-f13-f#T72@eKHB>g=wium?Jb4P!vSo`{y(SB{S^C&k4MbEV9WFA%siChBv
zBgQ|n=rBln7ZG8cV5&ZR-^5JnKPRg<m#s)ghoJ#0<5rUlNPw4@a%CQt?h|qN8Jxm}
zZsEPAv!ku682yWa%|31Nfe++iCG}L1?vFHYV0-x_4KbVTbVom#jbA5Ht(E;F_%+s4
zlhz5g%@GQsdMO-s&h06Mv(4bv&HeAO>C^G`jh7&hn3f?^uRM^Jme2LEyMPELoTpOa
z$VLFO4qUI~!7V;LtusAXrSk1cRKNz(&z>{499F!$G*k^O=?k{(B|6tUy$|)uqlPlR
zBnI+jo)2)w57HAagdxaaHAN0)1#eDiAtbOr;=qj)WEz70KarQT3NX$*`@A!V5Q$<=
zev^K!p_dg*?>>86$Zx+Vjw&(#0s;vTz@!Oj{K3ViE;9J<ZDLC%x{yQPR5Q*k!^gHH
z_4qvRIOt*Lo4<-y8xJdG9PLQ=wR5-}NsmN(M)NQC>Xp$jt#*rIF`72*MVhPgyD$Ee
z#0ykgZ5xBMA={m?v8<t4hRUy(EEI?_t{lBJQJ@*_Mqj%mpf}6QYa-4@I{^0K!u9<!
z-o*jZUyI`}-FYI&oc1>r@Y4t4%^;VS8VL$m_jFD1=n@YsZ9Xi!G5UJF$cX#6i#Yg(
z>E*J6uZ^0o|3C_~l-SCBcf)7X$h6XG90SwQi4t-o=ZvcA5&_a+tLvg_Ox7O70bsl_
zhPjtUqIv)y-l({v{i{|tP4?yz^SdWKIA|hh3$yG50^Eqfeh5GA-5Ti)-%57s+`h8W
z0WJyAk8B)5#2C7mViRoZ3q82Tw`mY{e{f(v^{Ek65Fl}C#JGjZ-o<Q)o)GPAi6UWP
z#otQ*_Zur+UHcLEUMf;LLzfU7+-mUaxPHyzL*YTh`=<EC(iFBOv`wl*xh58=mmx4!
zDnpt`wh!hMz_Uo^yq?)yT*r7l0(UZ+?R?KHEZF(ME$|786$4>KZ?E&Lx!E(AEcqSM
z{KgV^IY)n39Q{UHbw2I&ENaSGy4m&!SAO?Vd%AN8T6VJb%QA+Xhqdkibnd+*`wQ3d
z+Ul1Jq?`9g&`)B_E*Tc!mLvA%DBOGxPT!cUdZ!y_$TGf73l!|FBjUyaA4oRJT}v1g
zc)h1Hm<IuBHjGPTW%C19tRQe<{C8dt&dni*JWOtBv0}7ZTBCBXI%*+xYMtp!<aKgf
zhU+gpn(!YyQM2<E7-a8)y2ZU33m$dxAUe22V1A~)sKSRgukF|#H#_)K*>3Ly`Hx5@
z7rVqCRbDb)iXmZ2k2|FA&A*Sk7u9^O_F0k1iE_d#emRMoAwj)#VEX=dO}>~|=jx_x
z!XCmAxAilkL(Y*yc#Sul*L#WnrF_{bT&#B+LTZg;cG*3g{PA~Gp14sAS1c-jH|7LW
zR%w4MNmD$tB16%ql+JMnmNaQ5cce0w%%y}qe=0QXkf!@5@W-9x*Y&7BO?(6a31*kT
zrvNt}@bu)jviqLuz>I9i-Nl{3ZxQQ(0S`U(yw|t%Y08fkgOh`TMLkVD#>G?B$5tKM
zkGp;Iy(?6=Z}%L-N+P~}#b3$0pvNz0QR%;5$X>bk=`?1OJR=MUQ2kL~B@!TbcUQbb
zP4H?W9sBGoYilCC%(!o+E`9wW@LrC$&IfbPe+M|8+H-KS<`eT?f5V|QVd7H5g>E9F
zp$-4Nh1A$3#V~YXnFA3Z3)emFt6C4@0wM74Q&|y;$vb4={FeoNrdjW9UL~@@khwrw
z1^Ap;Jy`NQBRkcqWW?R*s_S5$fiNho^M9uPVQV{PiBrAZho2q-mX2!ER}9a*dNYhx
zPQA`2B|M<A!9XVJ|Bn9;0$CfUa{?&;{tyim{;jL~Vs;n|CpyHk^9q-SK}taAVguB4
zOf$q&hgczSH$@nhSGbUvY#}IjmKc?8EB?Q#|0VEW0{=e<)P59W0|0_8sCGAQc&?X8
ze*y%=2Bcxpv&0x;vhi^K8DdMX@DMmr2?)<CoQlq(5Hxg%g+|Au2%|d0`roO3^+cfE
Yd4k`wG5?zVcMkxR6*T1QWz9qX4{1smDF6Tf

literal 0
HcmV?d00001


From 0d07d7fd5578cca97d87412297d2d6c7a9050b39 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 24 Feb 2026 10:49:14 +1000
Subject: [PATCH 026/168] FIX: Multisite prevent anons from downloading files
 (#37979)

Fixes an issue where, on the upload show route, the current user wass
cached when calling the endpoint, but then not looked up again when
calling RailsMultisite::ConnectionManagement.with_connection with the
site param. This meant that in theory an a logged in user on SITE A
could download a file on SITE B even though they would be anonymous
on SITE B, because the current user was cached at the start of the
request.

This commit fixes the issue by looking up the current user again when
switching to the other site.
---
 app/controllers/uploads_controller.rb         |  40 ++++--
 .../uploads_controller_multisite_spec.rb      | 123 ++++++++++++++++--
 2 files changed, 139 insertions(+), 24 deletions(-)

diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index db17bc89671c9..5b9808a46972f 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -112,21 +112,35 @@ def show
 
     return render_404 if !RailsMultisite::ConnectionManagement.has_db?(params[:site])
 
-    RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db|
-      return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
-
-      if upload =
-           Upload.find_by(sha1: params[:sha]) ||
-             Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
-        unless Discourse.store.internal?
-          local_store = FileStore::LocalStore.new
-          return render_404 unless local_store.has_been_uploaded?(upload.url)
+    begin
+      request_site_current_user =
+        request.env.delete(Auth::DefaultCurrentUserProvider::CURRENT_USER_KEY)
+
+      RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db|
+        begin
+          # current_user here refers to the user for the site that we are operating on
+          # using with_connection. If DB for the target site matches the current site
+          # for the request, then current_user will be the same as the request_site_current_user
+          return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
+
+          upload =
+            Upload.find_by(sha1: params[:sha]) ||
+              Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
+
+          if upload.present?
+            if !Discourse.store.internal?
+              local_store = FileStore::LocalStore.new
+              return render_404 unless local_store.has_been_uploaded?(upload.url)
+            end
+
+            send_file_local_upload(upload)
+          else
+            render_404
+          end
         end
-
-        send_file_local_upload(upload)
-      else
-        render_404
       end
+    ensure
+      request.env[Auth::DefaultCurrentUserProvider::CURRENT_USER_KEY] = request_site_current_user
     end
   end
 
diff --git a/spec/requests/uploads_controller_multisite_spec.rb b/spec/requests/uploads_controller_multisite_spec.rb
index 5da918411116c..2bdfdd7c67f00 100644
--- a/spec/requests/uploads_controller_multisite_spec.rb
+++ b/spec/requests/uploads_controller_multisite_spec.rb
@@ -2,19 +2,120 @@
 
 RSpec.describe UploadsController, type: %i[multisite request] do
   let!(:user) { Fabricate(:user) }
-  let(:upload) { Fabricate(:upload_s3) }
-
-  before do
-    setup_s3
-    SiteSetting.secure_uploads = true
-    upload.update(secure: true)
-    sign_in(user)
-    freeze_time
+
+  before { freeze_time }
+
+  describe "show_short" do
+    before { sign_in(user) }
+
+    context "when s3 uploads is enabled" do
+      before { setup_s3 }
+
+      fab!(:upload, :upload_s3)
+
+      context "when secure uploads is enabled and the upload is secure" do
+        before do
+          SiteSetting.secure_uploads = true
+          upload.update(secure: true)
+        end
+
+        it "redirects to the signed_url_for_path with the multisite DB name in the url" do
+          get(upload.short_path)
+
+          expect(response).to redirect_to(/#{RailsMultisite::ConnectionManagement.current_db}/)
+        end
+      end
+    end
   end
 
-  it "redirects to the signed_url_for_path with the multisite DB name in the url" do
-    get upload.short_path
+  describe "show" do
+    let!(:user) { Fabricate(:user) }
+    let(:upload) do
+      UploadCreator.new(file_from_fixtures("logo.jpg"), "logo.jpg").create_for(user.id)
+    end
+
+    context "when user is signed in" do
+      before { sign_in(user) }
+
+      it "returns a 200" do
+        get(
+          "/uploads/#{RailsMultisite::ConnectionManagement.current_db}/#{upload.sha1}.#{upload.extension}",
+        )
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context "when user is not signed in" do
+      context "when prevent_anons_from_downloading_files is enabled" do
+        before { SiteSetting.prevent_anons_from_downloading_files = true }
+
+        it "returns a 404" do
+          get(
+            "/uploads/#{RailsMultisite::ConnectionManagement.current_db}/#{upload.sha1}.#{upload.extension}",
+          )
+          expect(response).to have_http_status(:not_found)
+        end
+      end
+    end
+
+    context "when requesting an upload from a different site (logged in on request site, anon on target site)" do
+      before do
+        sign_in(user)
+        RailsMultisite::ConnectionManagement.with_connection("second") do
+          second_user =
+            Fabricate(
+              :user,
+              username: "s2_#{SecureRandom.hex(3)}",
+              email: "s2_#{SecureRandom.hex(4)}@example.com",
+            )
+          upload =
+            UploadCreator.new(file_from_fixtures("logo.jpg"), "logo.jpg").create_for(second_user.id)
+          @upload_on_second_sha1 = upload.sha1
+          @upload_on_second_extension = upload.extension
+        end
+        RailsMultisite::ConnectionManagement.establish_connection(db: "default")
+      end
+
+      it "returns 200 when prevent_anons_from_downloading_files is false" do
+        get("/uploads/second/#{@upload_on_second_sha1}.#{@upload_on_second_extension}")
+        expect(response).to have_http_status(:ok)
+      end
+
+      context "when prevent_anons_from_downloading_files is enabled" do
+        before { SiteSetting.prevent_anons_from_downloading_files = true }
+
+        it "returns 404 because current_user is evaluated for target site (anon on target)" do
+          get("/uploads/second/#{@upload_on_second_sha1}.#{@upload_on_second_extension}")
+          expect(response).to have_http_status(:not_found)
+        end
+      end
+    end
+
+    context "when requesting an upload from a different site as anonymous (anon on target site)" do
+      before do
+        RailsMultisite::ConnectionManagement.with_connection("second") do
+          second_user =
+            Fabricate(
+              :user,
+              username: "s2a_#{SecureRandom.hex(3)}",
+              email: "s2a_#{SecureRandom.hex(4)}@example.com",
+            )
+          upload =
+            UploadCreator.new(file_from_fixtures("logo.jpg"), "logo.jpg").create_for(second_user.id)
+          @upload_on_second_sha1 = upload.sha1
+          @upload_on_second_extension = upload.extension
+        end
+        RailsMultisite::ConnectionManagement.establish_connection(db: "default")
+      end
+
+      context "when prevent_anons_from_downloading_files is enabled" do
+        before { SiteSetting.prevent_anons_from_downloading_files = true }
 
-    expect(response).to redirect_to(/#{RailsMultisite::ConnectionManagement.current_db}/)
+        it "returns 404 because current_user is nil on target site" do
+          get("/uploads/second/#{@upload_on_second_sha1}.#{@upload_on_second_extension}")
+          expect(response).to have_http_status(:not_found)
+        end
+      end
+    end
   end
 end

From 4ecbaf0699aaaf85696c0d73873919f2d6a68005 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Tue, 24 Feb 2026 02:20:38 +0100
Subject: [PATCH 027/168] UX: Admin dashboard & reports improvements (#37598)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Reorganise the admin reports listing page — reports are now grouped
into logical sections (Engagement, Traffic, Members, Content,
Moderation, Security) instead of a flat alphabetical list.
Plugin-provided reports are grouped under their plugin name.
* Hide legacy/deprecated reports from the listing via a new
Report::LEGACY_REPORTS constant, while keeping them accessible by direct
URL. Legacy reports show an info banner warning they are deprecated.
* Filter out reports from disabled plugins — the reports listing now
resolves which plugin each report belongs to (via source file path) and
excludes reports whose plugin is disabled. Each report also exposes
plugin and plugin_display_name metadata.
* Simplify reports page layout — removed the dashboard settings tab from
the reports page header, replaced hideTabs logic with showHeader that
only renders the DPageHeader on the index route (not on individual
report pages). Removed the separate dashboard-reports
route/controller/template entirely.

Screenshots
<img width="1454" height="1494" alt="Screenshot 2026-02-13 at 12 00
05 pm"
src="https://github.com/user-attachments/assets/60b62563-1ebe-43f6-a13c-695eb640488c"
/>
<img width="1459" height="845" alt="Screenshot 2026-02-13 at 12 00
16 pm"
src="https://github.com/user-attachments/assets/01ed2d0c-4105-4189-b653-f39074a40a43"
/>
<img width="1442" height="1086" alt="Screenshot 2026-02-23 at 2 34
16 pm"
src="https://github.com/user-attachments/assets/b324c67d-b09c-41b5-8840-f5966486eaa8"
/>
---
 .../stylesheets/admin/admin_report.scss       |   4 +
 .../admin/admin_section_landing_page.scss     |   1 -
 app/models/report.rb                          |  20 ++-
 app/queries/reports/list_query.rb             |  62 ++++++-
 config/locales/client.en.yml                  |  11 +-
 config/locales/server.en.yml                  |   1 +
 config/site_settings.yml                      |   9 +
 .../admin/components/admin-report.gjs         |   9 +
 .../admin/components/admin-reports.gjs        | 158 +++++++++++++++++-
 .../admin/controllers/admin-reports.js        |   9 +
 .../admin/routes/admin/dashboard-reports.js   |  18 +-
 .../admin/templates/admin-reports.gjs         |  66 +++++---
 .../admin/templates/admin/dashboard.gjs       |   6 +
 spec/queries/reports/list_query_spec.rb       |  70 ++++++++
 spec/system/admin_reports_spec.rb             |  20 +++
 15 files changed, 421 insertions(+), 43 deletions(-)

diff --git a/app/assets/stylesheets/admin/admin_report.scss b/app/assets/stylesheets/admin/admin_report.scss
index 770655677d439..910bc79cfc95c 100644
--- a/app/assets/stylesheets/admin/admin_report.scss
+++ b/app/assets/stylesheets/admin/admin_report.scss
@@ -279,3 +279,7 @@
     }
   }
 }
+
+.admin-reports-group {
+  margin-block: var(--space-4) var(--space-8);
+}
diff --git a/app/assets/stylesheets/admin/admin_section_landing_page.scss b/app/assets/stylesheets/admin/admin_section_landing_page.scss
index 5dc907fc9edda..63cf6129a6027 100644
--- a/app/assets/stylesheets/admin/admin_section_landing_page.scss
+++ b/app/assets/stylesheets/admin/admin_section_landing_page.scss
@@ -4,7 +4,6 @@
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(16em, 1fr));
   gap: 1em 2em;
-  margin-top: 1em;
   padding-top: 1em;
 
   .admin-section-landing-item {
diff --git a/app/models/report.rb b/app/models/report.rb
index 57c51399064c4..4f90d1e46d153 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -53,6 +53,20 @@ def self.hidden?(type, admin:)
     yellow: "#FFCD56",
   }
 
+  LEGACY_REPORTS = %w[
+    bookmarks
+    likes
+    moderator_warning_private_messages
+    notify_moderators_private_messages
+    notify_user_private_messages
+    post_edits
+    profile_views
+    system_private_messages
+    top_users_by_likes_received_from_inferior_trust_level
+    top_users_by_likes_received_from_a_variety_of_people
+    user_to_user_private_messages
+  ]
+
   include Reports::AssociatedAccountsByProvider
   include Reports::Bookmarks
   include Reports::ConsolidatedApiRequests
@@ -123,7 +137,8 @@ def self.hidden?(type, admin:)
                 :primary_color,
                 :secondary_color,
                 :filters,
-                :available_filters
+                :available_filters,
+                :legacy
 
   def self.default_days
     30
@@ -244,6 +259,7 @@ def as_json(options = nil)
       higher_is_better: self.higher_is_better,
       modes: self.modes,
     }.tap do |json|
+      json[:legacy] = self.legacy if self.legacy
       json[:icon] = self.icon if self.icon
       json[:error] = self.error if self.error
       json[:total] = self.total if self.total
@@ -284,6 +300,8 @@ def self._get(type, opts = nil)
     report.filters = opts[:filters] if opts[:filters]
     report.labels = Report.default_labels
 
+    report.legacy = LEGACY_REPORTS.include?(type) if SiteSetting.reporting_improvements
+
     report
   end
 
diff --git a/app/queries/reports/list_query.rb b/app/queries/reports/list_query.rb
index 71aeeeb94799c..3f411b2ef6341 100644
--- a/app/queries/reports/list_query.rb
+++ b/app/queries/reports/list_query.rb
@@ -10,15 +10,31 @@ def initialize(name)
         @type = name.to_s.gsub("report_", "")
       end
 
-      def to_h(admin:)
-        return if Report.hidden?(type, admin:)
+      def visible?(admin:)
+        return false if Report.hidden?(type, admin:)
 
-        {
+        if SiteSetting.reporting_improvements
+          return false if plugin_report? && plugin_disabled?
+          return false if Report::LEGACY_REPORTS.include?(type)
+        end
+
+        true
+      end
+
+      def to_h
+        result = {
           type:,
           title:,
           description:,
           description_link: I18n.t("reports.#{type}.description_link", default: "").presence,
         }
+
+        if SiteSetting.reporting_improvements && plugin_report?
+          result[:plugin] = plugin_name
+          result[:plugin_display_name] = plugin_display_name
+        end
+
+        result
       end
 
       private
@@ -41,6 +57,43 @@ def legacy?
         SiteSetting.use_legacy_pageviews &&
           type.in?(%w[consolidated_page_views consolidated_page_views_browser_detection])
       end
+
+      def plugin_name
+        return @plugin_name if defined?(@plugin_name)
+
+        @plugin_name = resolve_plugin_name
+      end
+
+      def resolve_plugin_name
+        return unless Report.singleton_class.method_defined?(@name)
+
+        source_path = Report.method(@name).source_location.first
+        return unless source_path&.include?("/plugins/")
+
+        # Extract plugin name from path like /plugins/discourse-ai/...
+        match = source_path.match(%r{/plugins/([^/]+)/})
+        match[1] if match
+      rescue NameError
+        nil
+      end
+
+      def plugin_instance
+        return @plugin_instance if defined?(@plugin_instance)
+        @plugin_instance = plugin_name && Discourse.plugins_by_name[plugin_name]
+      end
+
+      def plugin_display_name
+        plugin_instance&.humanized_name
+      end
+
+      def plugin_report?
+        plugin_name.present?
+      end
+
+      def plugin_disabled?
+        return true unless plugin_instance
+        !plugin_instance.enabled?
+      end
     end
 
     def self.call(admin:)
@@ -62,7 +115,8 @@ def self.call(admin:)
 
       reports_methods
         .filter_map do |report_name|
-          Reports::ListQuery::FormattedReport.new(report_name).to_h(admin:)
+          report = Reports::ListQuery::FormattedReport.new(report_name)
+          report.to_h if report.visible?(admin:)
         end
         .sort_by { |report| report[:title] }
     end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index a4d74fe9d343c..94e83205b5304 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5903,9 +5903,16 @@ en:
 
       reports:
         title: "List of available reports"
-        meta_doc: "Reports are a powerful tool to help you understand what’s happening on your site. They can help you identify trends, spot problems, and make decisions based on data."
         sidebar_title: "Reports"
         back: "Back to all reports"
+        group_engagement: "Engagement"
+        group_traffic: "Traffic"
+        group_members: "Members"
+        group_content: "Content & Health"
+        group_moderation: "Moderation"
+        group_security: "Security"
+        group_other: "Other"
+        legacy_warning: "This is a legacy report. It will be retired soon. If you need help finding the replacement, contact support."
 
       config_sections:
         account:
@@ -6256,7 +6263,7 @@ en:
           header_description: "Reports are a powerful tool to help you understand what’s happening on your site. They can help you identify trends, spot problems, and make decisions based on data."
           sub_pages:
             settings:
-              title: "Dashboard settings"
+              title: "Settings"
         badges:
           title: "Badges"
           header_description: "Badges reward users for their activities, contributions, and achievements to recognize, validate, and encourage positive behavior and engagement within the community"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a3abf74071b36..7e87ede68ddea 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2757,6 +2757,7 @@ en:
     enable_simplified_category_creation: "Enables a simplified category creation flow with fewer options and a cleaner interface."
     enable_custom_splash_screen: "Allows customizing the loading splash screen with your own SVG image. Upload an image via the 'splash screen image' setting. Warning: This may negatively impact LCP scores and Google indexing."
     modernize_foundation_theme: "This change introduces design modifcations to the Foundation theme in Discourse."
+    reporting_improvements: "Improvements to navigation, design, and usability for Discourse's admin reports."
 
     errors:
       invalid_css_color: "Invalid color. Enter a color name or hex value."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index b26acfbd97f6b..7e133dba28818 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4205,6 +4205,15 @@ dashboard:
     client: true
 
 experimental:
+  reporting_improvements:
+    default: false
+    client: true
+    hidden: true
+    area: "experimental"
+    upcoming_change:
+      status: "experimental"
+      impact: "feature,staff"
+      learn_more_url: "https://meta.discourse.org/t/-/395768"
   enable_auto_grid_images:
     default: false
     client: true
diff --git a/frontend/discourse/admin/components/admin-report.gjs b/frontend/discourse/admin/components/admin-report.gjs
index 510a58b459bcd..eb78c426f3d58 100644
--- a/frontend/discourse/admin/components/admin-report.gjs
+++ b/frontend/discourse/admin/components/admin-report.gjs
@@ -40,6 +40,7 @@ import { exportEntity } from "discourse/lib/export-csv";
 import { outputExportResult } from "discourse/lib/export-result";
 import { makeArray } from "discourse/lib/helpers";
 import ReportLoader from "discourse/lib/reports-loader";
+import { and } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
 
 const TABLE_OPTIONS = {
@@ -544,6 +545,14 @@ export default class AdminReport extends Component {
       {{#unless this.isHidden}}
         {{#if this.isEnabled}}
           <ConditionalLoadingSection @isLoading={{this.isLoading}}>
+            {{#if
+              (and this.siteSettings.reporting_improvements this.model.legacy)
+            }}
+              <div class="alert alert-info">
+                {{icon "triangle-exclamation"}}
+                <span>{{i18n "admin.reports.legacy_warning"}}</span>
+              </div>
+            {{/if}}
             {{#if this.showHeader}}
               <div class="header">
                 {{#if this.showTitle}}
diff --git a/frontend/discourse/admin/components/admin-reports.gjs b/frontend/discourse/admin/components/admin-reports.gjs
index 42f871ae76f60..6a66f753bc398 100644
--- a/frontend/discourse/admin/components/admin-reports.gjs
+++ b/frontend/discourse/admin/components/admin-reports.gjs
@@ -9,6 +9,65 @@ import { ajax } from "discourse/lib/ajax";
 import { bind } from "discourse/lib/decorators";
 import { i18n } from "discourse-i18n";
 
+const REPORT_GROUPS = {
+  engagement: [
+    "daily_engaged_users",
+    "dau_by_mau",
+    "mobile_visits",
+    "new_contributors",
+    "signups",
+    "topic_view_stats",
+    "visits",
+  ],
+  traffic: [
+    "consolidated_page_views",
+    "consolidated_page_views_browser_detection",
+    "page_view_anon_browser_reqs",
+    "page_view_anon_reqs",
+    "page_view_crawler_reqs",
+    "page_view_legacy_total_reqs",
+    "page_view_logged_in_reqs",
+    "page_view_logged_in_browser_reqs",
+    "page_view_total_reqs",
+    "site_traffic",
+    "top_traffic_sources",
+  ],
+  members: [
+    "top_ignored_users",
+    "top_referrers",
+    "top_users_by_likes_received",
+    "trust_level_growth",
+    "users_by_trust_level",
+    "users_by_type",
+  ],
+  content: [
+    "posts",
+    "time_to_first_response",
+    "top_referred_topics",
+    "top_uploads",
+    "topics",
+    "topics_with_no_response",
+    "trending_search",
+    "user_to_user_private_messages_with_replies",
+  ],
+  moderation: [
+    "flags",
+    "flags_status",
+    "moderators_activity",
+    "user_flagging_ratio",
+  ],
+  security: [
+    "associated_accounts_by_provider",
+    "consolidated_api_requests",
+    "emails",
+    "staff_logins",
+    "suspicious_logins",
+    "web_crawlers",
+    "web_hook_events_daily_aggregate",
+  ],
+  other: [],
+};
+
 export default class AdminReports extends Component {
   @service siteSettings;
 
@@ -30,6 +89,69 @@ export default class AdminReports extends Component {
     return reports.filter((report) => !hiddenReports.includes(report.type));
   }
 
+  @bind
+  groupReports(reports) {
+    if (!reports) {
+      return [];
+    }
+
+    const groupedReports = [];
+    const assignedReports = new Set();
+
+    const coreReports = reports.filter((report) => !report.plugin);
+    const pluginReports = reports.filter((report) => report.plugin);
+
+    for (const [groupKey, groupReportTypes] of Object.entries(REPORT_GROUPS)) {
+      const groupReports = coreReports.filter((report) =>
+        groupReportTypes.includes(report.type)
+      );
+
+      if (groupReports.length > 0) {
+        groupedReports.push({
+          key: groupKey,
+          name: i18n(`admin.reports.group_${groupKey}`),
+          reports: groupReports,
+        });
+        groupReports.forEach((r) => assignedReports.add(r.type));
+      }
+    }
+
+    const unassignedCoreReports = coreReports.filter(
+      (report) => !assignedReports.has(report.type)
+    );
+    if (unassignedCoreReports.length > 0) {
+      const otherGroup = groupedReports.find((g) => g.key === "other");
+      if (otherGroup) {
+        otherGroup.reports.push(...unassignedCoreReports);
+      } else {
+        groupedReports.push({
+          key: "other",
+          name: i18n("admin.reports.group_other"),
+          reports: unassignedCoreReports,
+        });
+      }
+    }
+
+    const pluginGroups = new Map();
+    for (const report of pluginReports) {
+      const pluginName = report.plugin;
+      if (!pluginGroups.has(pluginName)) {
+        pluginGroups.set(pluginName, []);
+      }
+      pluginGroups.get(pluginName).push(report);
+    }
+
+    for (const [pluginName, pluginReportsList] of pluginGroups) {
+      groupedReports.push({
+        key: `plugin-${pluginName}`,
+        name: pluginReportsList[0].plugin_display_name || pluginName,
+        reports: pluginReportsList,
+      });
+    }
+
+    return groupedReports;
+  }
+
   <template>
     <AsyncContent @asyncData={{this.loadReports}}>
       <:content as |reports|>
@@ -40,16 +162,34 @@ export default class AdminReports extends Component {
           @noResultsMessage={{i18n "admin.filter_reports_no_results"}}
         >
           <:content as |filteredReports|>
-            <AdminSectionLandingWrapper class="admin-reports-list">
-              {{#each filteredReports as |report|}}
-                <AdminSectionLandingItem
-                  @titleLabelTranslated={{report.title}}
-                  @descriptionLabelTranslated={{report.description}}
-                  @titleRoute="adminReports.show"
-                  @titleRouteModel={{report.type}}
-                />
+            {{#if this.siteSettings.reporting_improvements}}
+              {{#each (this.groupReports filteredReports) as |group|}}
+                <section class="admin-reports-group">
+                  <h2 class="admin-reports-group__title">{{group.name}}</h2>
+                  <AdminSectionLandingWrapper class="admin-reports-list">
+                    {{#each group.reports as |report|}}
+                      <AdminSectionLandingItem
+                        @titleLabelTranslated={{report.title}}
+                        @descriptionLabelTranslated={{report.description}}
+                        @titleRoute="adminReports.show"
+                        @titleRouteModel={{report.type}}
+                      />
+                    {{/each}}
+                  </AdminSectionLandingWrapper>
+                </section>
               {{/each}}
-            </AdminSectionLandingWrapper>
+            {{else}}
+              <AdminSectionLandingWrapper class="admin-reports-list">
+                {{#each filteredReports as |report|}}
+                  <AdminSectionLandingItem
+                    @titleLabelTranslated={{report.title}}
+                    @descriptionLabelTranslated={{report.description}}
+                    @titleRoute="adminReports.show"
+                    @titleRouteModel={{report.type}}
+                  />
+                {{/each}}
+              </AdminSectionLandingWrapper>
+            {{/if}}
           </:content>
         </AdminFilterControls>
       </:content>
diff --git a/frontend/discourse/admin/controllers/admin-reports.js b/frontend/discourse/admin/controllers/admin-reports.js
index 478554f75006d..da792f4cad3bb 100644
--- a/frontend/discourse/admin/controllers/admin-reports.js
+++ b/frontend/discourse/admin/controllers/admin-reports.js
@@ -3,6 +3,15 @@ import { service } from "@ember/service";
 
 export default class AdminReportsController extends Controller {
   @service router;
+  @service siteSettings;
+
+  get reportingImprovements() {
+    return this.siteSettings.reporting_improvements;
+  }
+
+  get showHeader() {
+    return this.router.currentRouteName === "adminReports.index";
+  }
 
   get hideTabs() {
     return ["adminReports.show"].includes(this.router.currentRouteName);
diff --git a/frontend/discourse/admin/routes/admin/dashboard-reports.js b/frontend/discourse/admin/routes/admin/dashboard-reports.js
index cdcf818b23fdb..1942cab35aacc 100644
--- a/frontend/discourse/admin/routes/admin/dashboard-reports.js
+++ b/frontend/discourse/admin/routes/admin/dashboard-reports.js
@@ -1,12 +1,26 @@
+import { service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import DiscourseRoute from "discourse/routes/discourse";
 
 export default class AdminDashboardReportsRoute extends DiscourseRoute {
+  @service router;
+  @service siteSettings;
+
+  beforeModel() {
+    if (this.siteSettings.reporting_improvements) {
+      this.router.replaceWith("adminReports");
+    }
+  }
+
   model() {
-    return ajax("/admin/reports");
+    if (!this.siteSettings.reporting_improvements) {
+      return ajax("/admin/reports");
+    }
   }
 
   setupController(controller, model) {
-    controller.setProperties({ model: model.reports, filter: null });
+    if (!this.siteSettings.reporting_improvements) {
+      controller.setProperties({ model: model.reports, filter: null });
+    }
   }
 }
diff --git a/frontend/discourse/admin/templates/admin-reports.gjs b/frontend/discourse/admin/templates/admin-reports.gjs
index 53a105ee28c8d..7773969048478 100644
--- a/frontend/discourse/admin/templates/admin-reports.gjs
+++ b/frontend/discourse/admin/templates/admin-reports.gjs
@@ -4,30 +4,48 @@ import NavItem from "discourse/components/nav-item";
 import { i18n } from "discourse-i18n";
 
 export default <template>
-  <DPageHeader
-    @titleLabel={{i18n "admin.config.reports.title"}}
-    @descriptionLabel={{i18n "admin.config.reports.header_description"}}
-    @learnMoreUrl="https://meta.discourse.org/t/-/240233"
-    @hideTabs={{@controller.hideTabs}}
-  >
-    <:breadcrumbs>
-      <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
-      <DBreadcrumbsItem
-        @path="/admin/reports"
-        @label={{i18n "admin.config.reports.title"}}
-      />
-    </:breadcrumbs>
-    <:tabs>
-      <NavItem
-        @route="adminReports.dashboardSettings"
-        @label="admin.config.reports.sub_pages.settings.title"
-      />
-      <NavItem
-        @route="adminReports.index"
-        @label="admin.config.reports.title"
-      />
-    </:tabs>
-  </DPageHeader>
+  {{#if @controller.reportingImprovements}}
+    {{#if @controller.showHeader}}
+      <DPageHeader
+        @titleLabel={{i18n "admin.config.reports.title"}}
+        @descriptionLabel={{i18n "admin.config.reports.header_description"}}
+        @learnMoreUrl="https://meta.discourse.org/t/-/240233"
+      >
+        <:breadcrumbs>
+          <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+          <DBreadcrumbsItem
+            @path="/admin/reports"
+            @label={{i18n "admin.config.reports.title"}}
+          />
+        </:breadcrumbs>
+      </DPageHeader>
+    {{/if}}
+  {{else}}
+    <DPageHeader
+      @titleLabel={{i18n "admin.config.reports.title"}}
+      @descriptionLabel={{i18n "admin.config.reports.header_description"}}
+      @learnMoreUrl="https://meta.discourse.org/t/-/240233"
+      @hideTabs={{@controller.hideTabs}}
+    >
+      <:breadcrumbs>
+        <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />
+        <DBreadcrumbsItem
+          @path="/admin/reports"
+          @label={{i18n "admin.config.reports.title"}}
+        />
+      </:breadcrumbs>
+      <:tabs>
+        <NavItem
+          @route="adminReports.dashboardSettings"
+          @label="admin.config.reports.sub_pages.settings.title"
+        />
+        <NavItem
+          @route="adminReports.index"
+          @label="admin.config.reports.title"
+        />
+      </:tabs>
+    </DPageHeader>
+  {{/if}}
 
   <div class="admin-container admin-config-page__main-area">
     {{outlet}}
diff --git a/frontend/discourse/admin/templates/admin/dashboard.gjs b/frontend/discourse/admin/templates/admin/dashboard.gjs
index 499b568080e0d..d8387608e3dbd 100644
--- a/frontend/discourse/admin/templates/admin/dashboard.gjs
+++ b/frontend/discourse/admin/templates/admin/dashboard.gjs
@@ -41,6 +41,12 @@ export default <template>
   />
   <nav>
     <ul class="nav nav-pills">
+      <li class="navigation-item settings">
+        <LinkTo @route="adminReports.dashboardSettings" class="navigation-link">
+          {{i18n "admin.config.reports.sub_pages.settings.title"}}
+        </LinkTo>
+      </li>
+
       <li class="navigation-item general">
         <LinkTo @route="admin.dashboard.general" class="navigation-link">
           {{i18n "admin.dashboard.general_tab"}}
diff --git a/spec/queries/reports/list_query_spec.rb b/spec/queries/reports/list_query_spec.rb
index f53f84db68312..717bce4254ca8 100644
--- a/spec/queries/reports/list_query_spec.rb
+++ b/spec/queries/reports/list_query_spec.rb
@@ -98,5 +98,75 @@
         expect(result.map { |r| r[:type] }).not_to include(*Report::ADMIN_ONLY_REPORTS)
       end
     end
+
+    context "when reporting_improvements is enabled" do
+      before { SiteSetting.reporting_improvements = true }
+
+      it "sorts reports by title" do
+        expect(result.map { |r| r[:title] }[0..4]).to eq(
+          [
+            I18n.t("reports.staff_logins.title"),
+            I18n.t("reports.page_view_anon_browser_reqs.title"),
+            I18n.t("reports.associated_accounts_by_provider.title"),
+            I18n.t("reports.consolidated_api_requests.title"),
+            I18n.t("reports.dau_by_mau.title"),
+          ],
+        )
+      end
+
+      it "excludes legacy reports" do
+        report_types = result.map { |r| r[:type] }
+        expect(report_types).not_to include(*Report::LEGACY_REPORTS)
+      end
+
+      it "does not include plugin name for core reports" do
+        topics_report = result.find { |r| r[:type] == "topics" }
+        expect(topics_report[:plugin]).to be_nil
+      end
+
+      context "with a plugin report" do
+        let(:plugin) { Plugin::Instance.new }
+
+        before do
+          Report.add_report("test_plugin_report") { |report| }
+          Discourse.plugins_by_name["test-plugin"] = plugin
+
+          I18n.backend.store_translations(
+            :en,
+            { reports: { test_plugin_report: { title: "Test Plugin Report" } } },
+          )
+        end
+
+        after do
+          if Report.singleton_class.method_defined?(:report_test_plugin_report)
+            Report.singleton_class.remove_method(:report_test_plugin_report)
+          end
+          Discourse.plugins_by_name.delete("test-plugin")
+        end
+
+        it "is not visible when the source plugin is disabled" do
+          plugin.stubs(:enabled?).returns(false)
+
+          formatted = Reports::ListQuery::FormattedReport.new(:report_test_plugin_report)
+          formatted.stubs(:resolve_plugin_name).returns("test-plugin")
+
+          expect(formatted.visible?(admin: true)).to eq(false)
+        end
+
+        it "is visible when the source plugin is enabled" do
+          plugin.stubs(:enabled?).returns(true)
+          plugin.stubs(:humanized_name).returns("Test Plugin")
+
+          formatted = Reports::ListQuery::FormattedReport.new(:report_test_plugin_report)
+          formatted.stubs(:resolve_plugin_name).returns("test-plugin")
+
+          expect(formatted.visible?(admin: true)).to eq(true)
+
+          result = formatted.to_h
+          expect(result[:plugin]).to eq("test-plugin")
+          expect(result[:plugin_display_name]).to eq("Test Plugin")
+        end
+      end
+    end
   end
 end
diff --git a/spec/system/admin_reports_spec.rb b/spec/system/admin_reports_spec.rb
index f198980ed9867..cab5ca7513137 100644
--- a/spec/system/admin_reports_spec.rb
+++ b/spec/system/admin_reports_spec.rb
@@ -21,4 +21,24 @@
       expect(page).to have_current_path("/admin/reports/site_traffic")
     end
   end
+
+  context "with legacy reports" do
+    before { SiteSetting.reporting_improvements = true }
+    it "does not list bookmarks on the index page but allows direct access with a warning" do
+      visit "/admin/reports"
+
+      expect(page).to have_no_css(
+        ".admin-section-landing-item__title",
+        text: I18n.t("reports.bookmarks.title"),
+      )
+
+      visit "/admin/reports/bookmarks"
+
+      expect(page).to have_css(".admin-report")
+      expect(page).to have_css(
+        ".alert.alert-info",
+        text: I18n.t("admin_js.admin.reports.legacy_warning"),
+      )
+    end
+  end
 end

From 029519ce15422b2f037abc791c722ca14bbf228b Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Tue, 24 Feb 2026 10:10:45 +0800
Subject: [PATCH 028/168] FIX: Scope thread lookup by channel_id in chat thread
 messages service (#37978)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

What is the problem?

- The chat plugin routes thread message requests through
  `/chat/api/channels/:channel_id/threads/:thread_id/messages`, where
  `channel_id` is part of the URL hierarchy.
- `Chat::ListChannelThreadMessages` ignores the `channel_id` route
  parameter entirely, looking up threads globally via `thread_id` alone
  in `fetch_thread`.
- This violates REST hierarchy semantics — a request with a mismatched
  `channel_id` still succeeds — and is inconsistent with every other
  thread-scoped service (`Chat::LookupThread`,
  `Chat::UpdateUserThreadLastRead`, etc.) which all scope by both IDs.
- Additionally, unlike peer services, it does not enforce that threading
  is enabled for the channel.

What is the solution?

- Add `channel_id` to the service contract with presence validation.
- Scope `fetch_thread` by both `thread_id` and `channel_id` so
  mismatched pairs return a 404.
- Add a `threading_enabled_for_channel` policy check after
  `can_view_thread`, matching the pattern in `Chat::LookupThread`
  (with `thread.force` support for forced threads like AI bot DMs).
- Add the corresponding `on_failed_policy` handler in
  `Chat::Api::ChannelThreadMessagesController`.
- Update `ChatSDK::Thread#messages` to resolve and pass `channel_id`
  to the service, and handle the new policy failure.
---
 .../api/channel_thread_messages_controller.rb   |  1 +
 .../chat/list_channel_thread_messages.rb        | 13 +++++++++++--
 plugins/chat/lib/chat_sdk/thread.rb             |  7 ++++++-
 .../chat/list_channel_thread_messages_spec.rb   | 17 ++++++++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb b/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
index 8c1cd17b179a8..e67d37c46e359 100644
--- a/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channel_thread_messages_controller.rb
@@ -22,6 +22,7 @@ def index
       on_failure { render(json: failed_json, status: :unprocessable_entity) }
       on_failed_policy(:target_message_exists) { raise Discourse::NotFound }
       on_failed_policy(:can_view_thread) { raise Discourse::InvalidAccess }
+      on_failed_policy(:threading_enabled_for_channel) { raise Discourse::NotFound }
       on_model_not_found(:thread) { raise Discourse::NotFound }
       on_failed_contract do |contract|
         render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
diff --git a/plugins/chat/app/services/chat/list_channel_thread_messages.rb b/plugins/chat/app/services/chat/list_channel_thread_messages.rb
index 3d19113bdcb28..e4332ab05bd5d 100644
--- a/plugins/chat/app/services/chat/list_channel_thread_messages.rb
+++ b/plugins/chat/app/services/chat/list_channel_thread_messages.rb
@@ -20,6 +20,7 @@ class ListChannelThreadMessages
 
     params do
       attribute :thread_id, :integer
+      attribute :channel_id, :integer
       # If this is not present, then we just fetch messages with page_size
       # and direction.
       attribute :target_message_id, :integer # (optional)
@@ -30,7 +31,7 @@ class ListChannelThreadMessages
       attribute :fetch_from_first_message, :boolean # (optional)
       attribute :target_date, :string # (optional)
 
-      validates :thread_id, presence: true
+      validates :thread_id, :channel_id, presence: true
       validates :page_size,
                 numericality: {
                   greater_than_or_equal_to: 1,
@@ -56,6 +57,7 @@ def include_target_message_id?
 
     model :thread
     policy :can_view_thread
+    policy :threading_enabled_for_channel
     model :membership, optional: true
     model :target_message_id, optional: true
     policy :target_message_exists, class_name: Chat::Thread::Policy::MessageExistence
@@ -65,13 +67,20 @@ def include_target_message_id?
     private
 
     def fetch_thread(params:)
-      ::Chat::Thread.strict_loading.includes(channel: :chatable).find_by(id: params.thread_id)
+      ::Chat::Thread
+        .strict_loading
+        .includes(channel: :chatable)
+        .find_by(id: params.thread_id, channel_id: params.channel_id)
     end
 
     def can_view_thread(guardian:, thread:)
       guardian.user == Discourse.system_user || guardian.can_preview_chat_channel?(thread.channel)
     end
 
+    def threading_enabled_for_channel(thread:)
+      thread.channel.threading_enabled || thread.force
+    end
+
     def fetch_membership(thread:, guardian:)
       thread.membership_for(guardian.user)
     end
diff --git a/plugins/chat/lib/chat_sdk/thread.rb b/plugins/chat/lib/chat_sdk/thread.rb
index 324affad913c6..30ff2ec8c7756 100644
--- a/plugins/chat/lib/chat_sdk/thread.rb
+++ b/plugins/chat/lib/chat_sdk/thread.rb
@@ -73,11 +73,13 @@ def self.update(...)
       new.update(...)
     end
 
-    def messages(thread_id:, guardian:, direction: "future", **params)
+    def messages(thread_id:, guardian:, channel_id: nil, direction: "future", **params)
+      channel_id ||= ::Chat::Thread.where(id: thread_id).pick(:channel_id)
       Chat::ListChannelThreadMessages.call(
         guardian:,
         params: {
           thread_id:,
+          channel_id:,
           direction:,
           **params,
         },
@@ -85,6 +87,9 @@ def messages(thread_id:, guardian:, direction: "future", **params)
         on_success { |messages:| messages }
         on_failed_contract { |contract| raise contract.errors.full_messages.join(", ") }
         on_failed_policy(:can_view_thread) { raise "Guardian can't view thread" }
+        on_failed_policy(:threading_enabled_for_channel) do
+          raise "Threading is not enabled for this channel"
+        end
         on_failed_policy(:target_message_exists) { raise "Target message doesn't exist" }
         on_failure { raise "Unexpected error" }
       end
diff --git a/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb b/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb
index aecbc6a292836..7cfd7fd47b910 100644
--- a/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb
+++ b/plugins/chat/spec/services/chat/list_channel_thread_messages_spec.rb
@@ -7,6 +7,7 @@
     let(:options) { OpenStruct.new(max_page_size: Chat::MessagesQuery::MAX_PAGE_SIZE) }
 
     it { is_expected.to validate_presence_of(:thread_id) }
+    it { is_expected.to validate_presence_of(:channel_id) }
     it { is_expected.to allow_values(1, options.max_page_size, nil).for(:page_size) }
     it { is_expected.not_to allow_values(0).for(:page_size) }
     it do
@@ -90,7 +91,7 @@
     let(:guardian) { user.guardian }
     let(:thread_id) { thread.id }
     let(:optional_params) { {} }
-    let(:params) { { thread_id:, **optional_params } }
+    let(:params) { { thread_id:, channel_id: thread.channel_id, **optional_params } }
     let(:dependencies) { { guardian: } }
 
     before { thread.channel.add(user) }
@@ -107,6 +108,20 @@
       it { is_expected.to fail_to_find_a_model(:thread) }
     end
 
+    context "when thread exists but belongs to a different channel" do
+      fab!(:other_thread, :chat_thread)
+
+      let(:thread_id) { other_thread.id }
+
+      it { is_expected.to fail_to_find_a_model(:thread) }
+    end
+
+    context "when threading is not enabled for the channel" do
+      before { thread.channel.update!(threading_enabled: false) }
+
+      it { is_expected.to fail_a_policy(:threading_enabled_for_channel) }
+    end
+
     context "when user cannot view the thread" do
       fab!(:thread) { Fabricate(:chat_thread, channel: Fabricate(:private_category_channel)) }
 

From 26cf65c1c7fc5a6cef3c9fbfd2a494157382eced Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 24 Feb 2026 12:16:14 +1000
Subject: [PATCH 029/168] DEV: Make chat_pinned_messages_allowed_groups depend
 on main setting (#38003)

Followup af5329588e9ceae0218cadbd45070ee8e085a18a

Hide the chat_pinned_messages_allowed_groups setting if
chat_pinned_messages is disabled, to avoid confusion about the setting
being ignored when the main setting is disabled.
---
 plugins/chat/config/settings.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/chat/config/settings.yml b/plugins/chat/config/settings.yml
index cae36e38d2fd9..cf16aa82e1213 100644
--- a/plugins/chat/config/settings.yml
+++ b/plugins/chat/config/settings.yml
@@ -117,6 +117,9 @@ chat:
     allow_any: false
     refresh: true
     area: "group_permissions"
+    depends_on:
+      - "chat_pinned_messages"
+    depends_behavior: "hidden"
   chat_message_flag_allowed_groups:
     default: "1|2|11" # @admins, @moderators, @trust_level_1
     mandatory_values: "1|2" # @admins, @moderators

From 13f10fd1107a3606dfdb2eb78f0822d284ff532b Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 24 Feb 2026 13:38:14 +1000
Subject: [PATCH 030/168] UX: Add missing report descriptions (#38006)

So they match all other reports in the list
---
 plugins/discourse-calendar/config/locales/server.en.yml | 1 +
 plugins/discourse-solved/config/locales/server.en.yml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/discourse-calendar/config/locales/server.en.yml b/plugins/discourse-calendar/config/locales/server.en.yml
index f2a3eed01cc7d..329ff0a03ff31 100644
--- a/plugins/discourse-calendar/config/locales/server.en.yml
+++ b/plugins/discourse-calendar/config/locales/server.en.yml
@@ -2,6 +2,7 @@ en:
   reports:
     currently_away:
       title: Users currently away
+      description: "Users who are currently on holiday or leave, which can be filtered by group."
       labels:
         username: Username
 
diff --git a/plugins/discourse-solved/config/locales/server.en.yml b/plugins/discourse-solved/config/locales/server.en.yml
index 3d400ea7d31eb..5daa66314d625 100644
--- a/plugins/discourse-solved/config/locales/server.en.yml
+++ b/plugins/discourse-solved/config/locales/server.en.yml
@@ -28,6 +28,7 @@ en:
   reports:
     accepted_solutions:
       title: "Accepted solutions"
+      description: "How many topics had a solution accepted per day in a date range, with optional category filter and a 30-day comparison total."
       xaxis: "Day"
       yaxis: "Total"
   solved:

From b23cd3b567921d0b6990fe9393ef5fe749d698a7 Mon Sep 17 00:00:00 2001
From: Michael Brown <michael.brown@discourse.org>
Date: Tue, 24 Feb 2026 01:20:04 -0500
Subject: [PATCH 031/168] DOCS: amend documented required PostgreSQL version
 (#37931)

---
 docs/INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index fe09d4ecca729..2830873afa5f7 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -25,7 +25,7 @@ Hosting Rails applications is complicated. Even if you already have Postgres, Re
 
 ### Software Requirements
 
-- [Postgres 13](https://www.postgresql.org/download/)
+- [PostgreSQL](https://www.postgresql.org/download/) (with major version matching the [version deployed in our docker images](https://github.com/discourse/discourse_docker/blob/main/image/base/Dockerfile))
 - [Redis 7](https://redis.io/download)
 - [Ruby 3.2+](https://www.ruby-lang.org/en/downloads/)
 ## Security

From 2e472a7e9ec9fe053d25644c3bb7c6da613f4937 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 24 Feb 2026 16:31:03 +1000
Subject: [PATCH 032/168] DEV: Remove experimental_hashtag_search_result_limit
 setting (#38009)

Data shows this is not used anywhere, don't need to keep it around.
---
 app/services/hashtag_autocomplete_service.rb | 6 +-----
 config/site_settings.yml                     | 5 -----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/services/hashtag_autocomplete_service.rb b/app/services/hashtag_autocomplete_service.rb
index 94272235ad147..0986719449055 100644
--- a/app/services/hashtag_autocomplete_service.rb
+++ b/app/services/hashtag_autocomplete_service.rb
@@ -262,11 +262,7 @@ def lookup(slugs, types_in_priority_order)
   #                        bother searching subsequent types if the first types in
   #                        the array already reach the limit.
   # @returns {Array} The results as HashtagItems
-  def search(
-    term,
-    types_in_priority_order,
-    limit: SiteSetting.experimental_hashtag_search_result_limit
-  )
+  def search(term, types_in_priority_order, limit: 20)
     raise Discourse::InvalidParameters.new(:order) if !types_in_priority_order.is_a?(Array)
     limit = [limit, SEARCH_MAX_LIMIT].min
     types_in_priority_order =
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7e133dba28818..25f0ac0594e8d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4235,11 +4235,6 @@ experimental:
     default: false
     client: true
     area: "experimental"
-  experimental_hashtag_search_result_limit:
-    default: 20
-    client: true
-    hidden: true
-    area: "experimental"
   enable_form_templates:
     client: true
     default: false

From 38ea155d12912338cd95797f93761fd33a657c41 Mon Sep 17 00:00:00 2001
From: David McClure <mcwumbly@discourse.org>
Date: Tue, 24 Feb 2026 02:23:12 -0500
Subject: [PATCH 033/168] DEV: Update warning text for min and max username
 length (#37963)

This reverts commit a6d0d257bb3919d6a133341b52b2fe1902cfe9b5.

Per feedback:
https://github.com/discourse/discourse/pull/37961#issuecomment-3937019163
---
 config/locales/server.en.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 7e87ede68ddea..15bf5e6c880c9 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2805,12 +2805,12 @@ en:
       reply_by_email_disabled: "You must first enable 'reply by email' before enabling this setting."
       discourse_connect_url_is_empty: "You must set a 'discourse connect url' before enabling this setting."
       enable_local_logins_disabled: "You must first enable 'enable local logins' before enabling this setting."
-      min_username_length_exists: "You cannot set the minimum username length above the shortest username (%{username})."
-      min_group_name_length_exists: "You cannot set the minimum group name length above the shortest group name (%{group_name})."
-      min_username_length_range: "You cannot set the minimum above the maximum."
-      max_username_length_exists: "You cannot set the maximum username length below the longest username (%{username})."
-      max_group_name_length_exists: "You cannot set the maximum group name length below the longest group name (%{group_name})."
-      max_username_length_range: "You cannot set the maximum below the minimum."
+      min_username_length_exists: "You cannot set 'min username length' above the shortest username (%{username})."
+      min_group_name_length_exists: "You cannot set 'min username length' above the shortest group name (%{group_name})."
+      min_username_length_range: "You cannot set 'min username length' above 'max username length'."
+      max_username_length_exists: "You cannot set 'max username length' below the longest username (%{username})."
+      max_group_name_length_exists: "You cannot set 'max username length' below the longest group name (%{group_name})."
+      max_username_length_range: "You cannot set the 'max username length' below 'min username length'."
       invalid_hex_value: "Color values have to be 6-digit hexadecimal codes."
       empty_selectable_avatars: "You must first upload at least two selectable avatars before enabling this setting."
       category_search_priority:

From 174ad83901a6641248de133d267dc6ae2364d818 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 24 Feb 2026 17:50:33 +1000
Subject: [PATCH 034/168] FIX: Redirect old data explorer URLs to the new ones
 (#38004)

Followup e14af1c251c6206ec627bd7a72c52c914fe4c1d9

People often bookmark data explorer queries or add them to their
sidebar. In the previous commit, we changed the URLs for queries to
follow the admin plugin URL guidelines, but didn't redirect old URLs to
the new ones.

This commit adds those redirects, so that old URLs will still
function and users won't lose access to their bookmarked queries.

Also changes the Edit label to View on the query list to make
it clearer that you can Run or Edit the query in the same place.
---
 docs/developer-guides/lib/api.rb              |  2 +-
 .../discourse/explorer-legacy-route-map.js    |  4 +-
 .../routes/admin-plugins/explorer/index.js    | 17 +----
 .../explorer/{ => queries}/details.js         |  2 +-
 .../admin-plugins/explorer/queries/index.js   | 12 +++
 .../admin-plugins/show/explorer/index.gjs     | 21 ++---
 .../config/locales/client.en.yml              |  1 +
 .../discourse-data-explorer/config/routes.rb  |  8 +-
 .../integration/custom_api_key_scopes_spec.rb |  8 +-
 .../spec/requests/query_controller_spec.rb    | 76 +++++++++++--------
 .../spec/system/query_runner_spec.rb          | 18 +++--
 .../javascripts/discourse/components/poll.gjs |  2 +-
 12 files changed, 99 insertions(+), 72 deletions(-)
 rename plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/{ => queries}/details.js (93%)
 create mode 100644 plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries/index.js

diff --git a/docs/developer-guides/lib/api.rb b/docs/developer-guides/lib/api.rb
index c1a9b12170c26..435fc801d4ba9 100644
--- a/docs/developer-guides/lib/api.rb
+++ b/docs/developer-guides/lib/api.rb
@@ -55,7 +55,7 @@ def self.trash_topic(topic_id:)
   def self.fetch_current_state
     result =
       client.post(
-        "/admin/plugins/explorer/queries/#{DATA_EXPLORER_QUERY_ID}/run",
+        "/admin/plugins/discourse-data-explorer/queries/#{DATA_EXPLORER_QUERY_ID}/run",
         { params: { category_id: CATEGORY_ID.to_s }.to_json },
       ).body
 
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/explorer-legacy-route-map.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/explorer-legacy-route-map.js
index d3f3cddb9e910..8b793f78f8f9d 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/explorer-legacy-route-map.js
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/explorer-legacy-route-map.js
@@ -3,7 +3,9 @@ export default {
   path: "/plugins",
   map() {
     this.route("explorer", function () {
-      this.route("details", { path: "/:query_id" });
+      this.route("queries", function () {
+        this.route("details", { path: "/:query_id" });
+      });
     });
   },
 };
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/index.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/index.js
index 6e8af457c588e..a6dd333837a60 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/index.js
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/index.js
@@ -6,20 +6,7 @@ const PLUGIN_ID = "discourse-data-explorer";
 export default class AdminPluginsExplorerIndexRoute extends Route {
   @service router;
 
-  beforeModel(transition) {
-    const { id, ...queryParams } = transition.to.queryParams;
-    if (id) {
-      this.router.transitionTo(
-        "adminPlugins.show.explorer.details",
-        PLUGIN_ID,
-        id,
-        { queryParams }
-      );
-      return;
-    }
-
-    this.router.transitionTo("adminPlugins.show.explorer", PLUGIN_ID, {
-      queryParams,
-    });
+  beforeModel() {
+    this.router.replaceWith("adminPlugins.show.explorer", PLUGIN_ID);
   }
 }
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/details.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries/details.js
similarity index 93%
rename from plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/details.js
rename to plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries/details.js
index 7bd954b7e9355..85b66e76cb42e 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/details.js
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries/details.js
@@ -7,7 +7,7 @@ export default class AdminPluginsExplorerQueriesDetailsRoute extends Route {
   @service router;
 
   beforeModel(transition) {
-    this.router.transitionTo(
+    this.router.replaceWith(
       "adminPlugins.show.explorer.details",
       PLUGIN_ID,
       transition.to.params.query_id,
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries/index.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries/index.js
new file mode 100644
index 0000000000000..6c69f4ad7f474
--- /dev/null
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries/index.js
@@ -0,0 +1,12 @@
+import Route from "@ember/routing/route";
+import { service } from "@ember/service";
+
+const PLUGIN_ID = "discourse-data-explorer";
+
+export default class AdminPluginsExplorerQueriesIndexRoute extends Route {
+  @service router;
+
+  beforeModel() {
+    this.router.replaceWith("adminPlugins.show.explorer", PLUGIN_ID);
+  }
+}
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/index.gjs
index 1437b7a623a7e..f8536b8c52a5f 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/index.gjs
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/index.gjs
@@ -199,15 +199,18 @@ export default <template>
                           -
                         {{/if}}
                       </td>
-                      <td class="d-table__cell-actions">
-                        <LinkTo
-                          {{on "click" @controller.scrollTop}}
-                          @route="adminPlugins.show.explorer.details"
-                          @model={{query.id}}
-                          class="btn btn-default btn-small"
-                        >
-                          {{i18n "edit"}}
-                        </LinkTo>
+                      <td class="d-table__cell-controls">
+                        <div class="d-table__cell-actions">
+                          <LinkTo
+                            {{on "click" @controller.scrollTop}}
+                            @route="adminPlugins.show.explorer.details"
+                            @model={{query.id}}
+                            class="btn btn-default btn-small"
+                          >
+                            {{i18n "explorer.view"}}
+                          </LinkTo>
+                        </div>
+
                       </td>
                     </tr>
                   {{else}}
diff --git a/plugins/discourse-data-explorer/config/locales/client.en.yml b/plugins/discourse-data-explorer/config/locales/client.en.yml
index a78e77372b0a9..cb8ba055cc063 100644
--- a/plugins/discourse-data-explorer/config/locales/client.en.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.en.yml
@@ -61,6 +61,7 @@ en:
           null_: "Null"
       export: "Export"
       view_json: "View JSON"
+      view: "View"
       save: "Save changes"
       saverun: "Save changes and run"
       run: "Run"
diff --git a/plugins/discourse-data-explorer/config/routes.rb b/plugins/discourse-data-explorer/config/routes.rb
index 5b4a78c31f85e..b3f11d7f95a08 100644
--- a/plugins/discourse-data-explorer/config/routes.rb
+++ b/plugins/discourse-data-explorer/config/routes.rb
@@ -27,7 +27,9 @@
       }
 
   mount DiscourseDataExplorer::Engine, at: "/admin/plugins/discourse-data-explorer"
-  mount DiscourseDataExplorer::Engine,
-        at: "/admin/plugins/explorer",
-        as: :legacy_discourse_data_explorer
+  get "/admin/plugins/explorer" => redirect("/admin/plugins/discourse-data-explorer")
+  get "/admin/plugins/explorer/queries" =>
+        redirect("/admin/plugins/discourse-data-explorer/queries")
+  get "/admin/plugins/explorer/queries/:id" =>
+        redirect("/admin/plugins/discourse-data-explorer/queries/%{id}")
 end
diff --git a/plugins/discourse-data-explorer/spec/integration/custom_api_key_scopes_spec.rb b/plugins/discourse-data-explorer/spec/integration/custom_api_key_scopes_spec.rb
index 9f311103cfe62..e7fdffb798c9f 100644
--- a/plugins/discourse-data-explorer/spec/integration/custom_api_key_scopes_spec.rb
+++ b/plugins/discourse-data-explorer/spec/integration/custom_api_key_scopes_spec.rb
@@ -66,7 +66,7 @@
 
   it "can only run the queries they're allowed to run" do
     expect {
-      post "/admin/plugins/explorer/queries/#{query1.id}/run.json",
+      post "/admin/plugins/discourse-data-explorer/queries/#{query1.id}/run.json",
            headers: {
              "Api-Key" => single_query_api_key.key,
              "Api-Username" => admin.username,
@@ -77,7 +77,7 @@
     expect(response.parsed_body["columns"]).to eq(["query1_res"])
 
     expect {
-      post "/admin/plugins/explorer/queries/#{query2.id}/run.json",
+      post "/admin/plugins/discourse-data-explorer/queries/#{query2.id}/run.json",
            headers: {
              "Api-Key" => single_query_api_key.key,
              "Api-Username" => admin.username,
@@ -88,7 +88,7 @@
 
   it "can run all queries if they're not restricted to any queries" do
     expect {
-      post "/admin/plugins/explorer/queries/#{query1.id}/run.json",
+      post "/admin/plugins/discourse-data-explorer/queries/#{query1.id}/run.json",
            headers: {
              "Api-Key" => all_queries_api_key.key,
              "Api-Username" => admin.username,
@@ -99,7 +99,7 @@
     expect(response.parsed_body["columns"]).to eq(["query1_res"])
 
     expect {
-      post "/admin/plugins/explorer/queries/#{query2.id}/run.json",
+      post "/admin/plugins/discourse-data-explorer/queries/#{query2.id}/run.json",
            headers: {
              "Api-Key" => all_queries_api_key.key,
              "Api-Username" => admin.username,
diff --git a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
index 9724d55d79fb8..e8df25acb2bf7 100644
--- a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
+++ b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
@@ -28,25 +28,25 @@ def make_query(sql, opts = {}, group_ids = [])
       before { SiteSetting.data_explorer_enabled = false }
 
       it "denies every request" do
-        get "/admin/plugins/explorer/queries.json"
+        get "/admin/plugins/discourse-data-explorer/queries.json"
         expect(response.status).to eq(404)
 
-        get "/admin/plugins/explorer/schema.json"
+        get "/admin/plugins/discourse-data-explorer/schema.json"
         expect(response.status).to eq(404)
 
-        get "/admin/plugins/explorer/queries/3.json"
+        get "/admin/plugins/discourse-data-explorer/queries/3.json"
         expect(response.status).to eq(404)
 
-        post "/admin/plugins/explorer/queries.json", params: { id: 3 }
+        post "/admin/plugins/discourse-data-explorer/queries.json", params: { id: 3 }
         expect(response.status).to eq(404)
 
-        post "/admin/plugins/explorer/queries/3/run.json"
+        post "/admin/plugins/discourse-data-explorer/queries/3/run.json"
         expect(response.status).to eq(404)
 
-        put "/admin/plugins/explorer/queries/3.json"
+        put "/admin/plugins/discourse-data-explorer/queries/3.json"
         expect(response.status).to eq(404)
 
-        delete "/admin/plugins/explorer/queries/3.json"
+        delete "/admin/plugins/discourse-data-explorer/queries/3.json"
         expect(response.status).to eq(404)
       end
     end
@@ -54,7 +54,7 @@ def make_query(sql, opts = {}, group_ids = [])
     describe "#index" do
       it "behaves nicely with no user created queries" do
         DiscourseDataExplorer::Query.destroy_all
-        get "/admin/plugins/explorer/queries.json"
+        get "/admin/plugins/discourse-data-explorer/queries.json"
         expect(response.status).to eq(200)
         expect(response_json["queries"].count).to eq(DiscourseDataExplorer::Queries.default.count)
       end
@@ -63,7 +63,7 @@ def make_query(sql, opts = {}, group_ids = [])
         DiscourseDataExplorer::Query.destroy_all
         make_query("SELECT 1 as value", name: "B")
         make_query("SELECT 1 as value", name: "A")
-        get "/admin/plugins/explorer/queries.json"
+        get "/admin/plugins/discourse-data-explorer/queries.json"
         expect(response.status).to eq(200)
         expect(response_json["queries"].length).to eq(
           DiscourseDataExplorer::Queries.default.count + 2,
@@ -77,7 +77,7 @@ def make_query(sql, opts = {}, group_ids = [])
         make_query("SELECT 1 as value", name: "A", hidden: false)
         make_query("SELECT 1 as value", name: "B", hidden: true)
         make_query("SELECT 1 as value", name: "C", hidden: true)
-        get "/admin/plugins/explorer/queries.json"
+        get "/admin/plugins/discourse-data-explorer/queries.json"
         expect(response.status).to eq(200)
         expect(response_json["queries"].length).to eq(
           DiscourseDataExplorer::Queries.default.count + 1,
@@ -87,7 +87,7 @@ def make_query(sql, opts = {}, group_ids = [])
       it "merges default query data with persisted last_run_at and groups" do
         freeze_time
 
-        post "/admin/plugins/explorer/queries/-1/run.json"
+        post "/admin/plugins/discourse-data-explorer/queries/-1/run.json"
         expect(response.status).to eq(200)
 
         # Run persists the default query in the local DB; update it to assert index merges it
@@ -95,7 +95,7 @@ def make_query(sql, opts = {}, group_ids = [])
         persisted = DiscourseDataExplorer::Query.find_by(id: -1)
         persisted.update!(last_run_at: 3.days.ago, groups: [group])
 
-        get "/admin/plugins/explorer/queries.json"
+        get "/admin/plugins/discourse-data-explorer/queries.json"
         expect(response.status).to eq(200)
 
         expect(response_json["queries"].count).to eq(DiscourseDataExplorer::Queries.default.count)
@@ -106,10 +106,10 @@ def make_query(sql, opts = {}, group_ids = [])
       end
 
       it "doesn't show double-ups of default queries" do
-        post "/admin/plugins/explorer/queries/-1/run.json"
+        post "/admin/plugins/discourse-data-explorer/queries/-1/run.json"
         expect(response.status).to eq(200)
 
-        get "/admin/plugins/explorer/queries.json"
+        get "/admin/plugins/discourse-data-explorer/queries.json"
         expect(response.status).to eq(200)
         expect(response_json["queries"].count).to eq(DiscourseDataExplorer::Queries.default.count)
       end
@@ -121,7 +121,7 @@ def make_query(sql, opts = {}, group_ids = [])
 
       it "allows group to access system query" do
         query = DiscourseDataExplorer::Query.find(-4)
-        put "/admin/plugins/explorer/queries/#{query.id}.json",
+        put "/admin/plugins/discourse-data-explorer/queries/#{query.id}.json",
             params: {
               "query" => {
                 "name" => query.name,
@@ -140,7 +140,7 @@ def make_query(sql, opts = {}, group_ids = [])
 
       it "returns a proper json error for invalid updates" do
         query = DiscourseDataExplorer::Query.find(-4)
-        put "/admin/plugins/explorer/queries/#{query.id}",
+        put "/admin/plugins/discourse-data-explorer/queries/#{query.id}",
             params: {
               "query" => {
                 "name" => "",
@@ -155,14 +155,14 @@ def make_query(sql, opts = {}, group_ids = [])
 
     describe "#destroy" do
       it "returns 404 when query does not exist" do
-        delete "/admin/plugins/explorer/queries/999999.json"
+        delete "/admin/plugins/discourse-data-explorer/queries/999999.json"
         expect(response.status).to eq(404)
       end
 
       it "hides the query" do
         query = make_query("SELECT 1 as value")
 
-        delete "/admin/plugins/explorer/queries/#{query.id}.json"
+        delete "/admin/plugins/discourse-data-explorer/queries/#{query.id}.json"
 
         expect(response.status).to eq(200)
         expect(query.reload.hidden).to eq(true)
@@ -172,7 +172,7 @@ def make_query(sql, opts = {}, group_ids = [])
     describe "#run" do
       def run_query(id, params = {}, explain = false)
         params = Hash[params.map { |a| [a[0], a[1].to_s] }]
-        post "/admin/plugins/explorer/queries/#{id}/run.json",
+        post "/admin/plugins/discourse-data-explorer/queries/#{id}/run.json",
              params: {
                params: params.to_json,
                explain: explain,
@@ -239,7 +239,7 @@ def run_query(id, params = {}, explain = false)
         SQL
 
         # Test with hash format
-        post "/admin/plugins/explorer/queries/#{query.id}/run.json",
+        post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.json",
              params: {
                params: {
                  foo: 42,
@@ -256,7 +256,11 @@ def run_query(id, params = {}, explain = false)
       it "can accept empty hash for parameters" do
         query = make_query "SELECT 23 as my_value"
 
-        post "/admin/plugins/explorer/queries/#{query.id}/run.json", params: { params: {} }
+        post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.json",
+             params: {
+               params: {
+               },
+             }
         expect(response.status).to eq(200)
         expect(response_json["success"]).to eq(true)
         expect(response_json["columns"]).to eq(["my_value"])
@@ -265,7 +269,7 @@ def run_query(id, params = {}, explain = false)
 
       context "when rate limited" do
         def unlimited_request(query_id, headers = {})
-          post "/admin/plugins/explorer/queries/#{query_id}/run.json",
+          post "/admin/plugins/discourse-data-explorer/queries/#{query_id}/run.json",
                params: {
                  params: {}.to_json,
                },
@@ -275,7 +279,7 @@ def unlimited_request(query_id, headers = {})
         end
 
         def limited_request(query_id, headers = {})
-          post "/admin/plugins/explorer/queries/#{query_id}/run.json",
+          post "/admin/plugins/discourse-data-explorer/queries/#{query_id}/run.json",
                params: {
                  params: {}.to_json,
                },
@@ -464,7 +468,10 @@ def limited_request(query_id, headers = {})
 
       it "can export data in CSV format" do
         query = make_query("SELECT 23 as my_value")
-        post "/admin/plugins/explorer/queries/#{query.id}/run.json", params: { download: 1 }
+        post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.json",
+             params: {
+               download: 1,
+             }
         expect(response.status).to eq(200)
       end
 
@@ -484,10 +491,16 @@ def limited_request(query_id, headers = {})
           run_query query.id
           expect(response_json["rows"].count).to eq(2)
 
-          post "/admin/plugins/explorer/queries/#{query.id}/run.json", params: { limit: 1 }
+          post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.json",
+               params: {
+                 limit: 1,
+               }
           expect(response_json["rows"].count).to eq(1)
 
-          post "/admin/plugins/explorer/queries/#{query.id}/run.json", params: { limit: "ALL" }
+          post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.json",
+               params: {
+                 limit: "ALL",
+               }
           expect(response_json["rows"].count).to eq(3)
         end
 
@@ -501,10 +514,13 @@ def limited_request(query_id, headers = {})
             SELECT id FROM posts
             SQL
 
-            post "/admin/plugins/explorer/queries/#{query.id}/run.csv", params: { download: 1 }
+            post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.csv",
+                 params: {
+                   download: 1,
+                 }
             expect(response.body.split("\n").count).to eq(3)
 
-            post "/admin/plugins/explorer/queries/#{query.id}/run.csv",
+            post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.csv",
                  params: {
                    download: 1,
                    limit: 1,
@@ -512,7 +528,7 @@ def limited_request(query_id, headers = {})
             expect(response.body.split("\n").count).to eq(2)
 
             # The value `ALL` is not supported in csv exports.
-            post "/admin/plugins/explorer/queries/#{query.id}/run.csv",
+            post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.csv",
                  params: {
                    download: 1,
                    limit: "ALL",
@@ -550,7 +566,7 @@ def limited_request(query_id, headers = {})
 
     it "cannot access admin endpoints" do
       query = make_query("SELECT 1 as value")
-      post "/admin/plugins/explorer/queries/#{query.id}/run.json"
+      post "/admin/plugins/discourse-data-explorer/queries/#{query.id}/run.json"
       expect(response.status).to eq(403)
     end
 
diff --git a/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb b/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
index 88b7cacd303d3..39ee055c37b92 100644
--- a/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
@@ -68,20 +68,24 @@
       )
     end
 
-    it "redirects to the new url format" do
-      visit("/admin/plugins/explorer/?id=#{query_1.id}")
+    it "redirects /explorer/queries/:id to the new url format" do
+      visit("/admin/plugins/explorer/queries/#{query_1.id}")
 
       expect(page).to have_current_path(
         "/admin/plugins/discourse-data-explorer/queries/#{query_1.id}",
       )
     end
 
-    it "redirects to the new url format with params" do
-      visit("/admin/plugins/explorer/?id=#{query_1.id}&params=%7B%22limit%22%3A%2210%22%7D")
+    it "redirects /explorer/queries to the new url format" do
+      visit("/admin/plugins/explorer/queries")
 
-      expect(page).to have_current_path(
-        "/admin/plugins/discourse-data-explorer/queries/#{query_1.id}?params=%7B%22limit%22%3A%2210%22%7D",
-      )
+      expect(page).to have_current_path("/admin/plugins/discourse-data-explorer/queries")
+    end
+
+    it "redirects /explorer to the new url format" do
+      visit("/admin/plugins/explorer")
+
+      expect(page).to have_current_path("/admin/plugins/discourse-data-explorer/queries")
     end
   end
 
diff --git a/plugins/poll/assets/javascripts/discourse/components/poll.gjs b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
index d32d23e46f627..e46ef15fb2de2 100644
--- a/plugins/poll/assets/javascripts/discourse/components/poll.gjs
+++ b/plugins/poll/assets/javascripts/discourse/components/poll.gjs
@@ -643,7 +643,7 @@ export default class PollComponent extends Component {
 
     // This uses the Data Explorer plugin export as CSV route
     // There is detection to check if the plugin is enabled before showing the button
-    ajax(`/admin/plugins/explorer/queries/${queryID}/run.csv`, {
+    ajax(`/admin/plugins/discourse-data-explorer/queries/${queryID}/run.csv`, {
       type: "POST",
       data: {
         // needed for data-explorer route compatibility

From e907eb9e109eb6cfaa9df837dd2a38ceb7ae2cc4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Feb 2026 11:11:27 +0100
Subject: [PATCH 035/168] FIX: prevents channel enumeration through search
 (#38012)

We don't consider it as a security issue but we prefer to avoid it's
when possible. This commit also properly tests the controller index
action.
---
 .../controllers/chat/api/search_controller.rb |   2 +-
 .../chat/api/search_controller_spec.rb        | 146 ++++++++++++++++++
 2 files changed, 147 insertions(+), 1 deletion(-)
 create mode 100644 plugins/chat/spec/requests/chat/api/search_controller_spec.rb

diff --git a/plugins/chat/app/controllers/chat/api/search_controller.rb b/plugins/chat/app/controllers/chat/api/search_controller.rb
index 9fd36fac4053e..a5179ac3693f7 100644
--- a/plugins/chat/app/controllers/chat/api/search_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/search_controller.rb
@@ -18,7 +18,7 @@ def index
       end
       on_failure { render(json: failed_json, status: :unprocessable_entity) }
       on_model_not_found(:channel) { raise Discourse::NotFound }
-      on_failed_policy(:can_view_channel) { raise Discourse::InvalidAccess }
+      on_failed_policy(:can_view_channel) { raise Discourse::NotFound }
       on_failed_contract do |contract|
         render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
       end
diff --git a/plugins/chat/spec/requests/chat/api/search_controller_spec.rb b/plugins/chat/spec/requests/chat/api/search_controller_spec.rb
new file mode 100644
index 0000000000000..8bfbf3f0d768a
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/search_controller_spec.rb
@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::SearchController do
+  fab!(:current_user, :user)
+  fab!(:channel, :chat_channel)
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    channel.add(current_user)
+  end
+
+  describe "#index" do
+    context "when not logged in" do
+      it "returns a 403" do
+        get "/chat/api/search.json", params: { query: "test" }
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    context "when logged in" do
+      before { sign_in(current_user) }
+
+      context "when chat is disabled" do
+        it "returns a 404" do
+          SiteSetting.chat_enabled = false
+
+          get "/chat/api/search.json", params: { query: "test" }
+
+          expect(response.status).to eq(404)
+        end
+      end
+
+      context "when query is missing" do
+        it "returns a 400" do
+          get "/chat/api/search.json", params: {}
+
+          expect(response.status).to eq(400)
+        end
+      end
+
+      context "when limit is invalid" do
+        it "returns a 400 when limit is 0" do
+          get "/chat/api/search.json", params: { query: "test", limit: 0 }
+
+          expect(response.status).to eq(400)
+        end
+
+        it "returns a 400 when limit exceeds maximum" do
+          get "/chat/api/search.json", params: { query: "test", limit: 41 }
+
+          expect(response.status).to eq(400)
+        end
+      end
+
+      context "when offset is negative" do
+        it "returns a 400" do
+          get "/chat/api/search.json", params: { query: "test", offset: -1 }
+
+          expect(response.status).to eq(400)
+        end
+      end
+
+      context "when sort is invalid" do
+        it "returns a 400" do
+          get "/chat/api/search.json", params: { query: "test", sort: "invalid" }
+
+          expect(response.status).to eq(400)
+        end
+      end
+
+      context "when channel_id refers to a non-existent channel" do
+        it "returns a 404" do
+          get "/chat/api/search.json", params: { query: "test", channel_id: -999 }
+
+          expect(response.status).to eq(404)
+        end
+      end
+
+      context "when channel_id refers to an existing channel the user cannot access" do
+        fab!(:private_channel, :private_category_channel)
+
+        it "returns a 404" do
+          get "/chat/api/search.json", params: { query: "test", channel_id: private_channel.id }
+
+          expect(response.status).to eq(404)
+        end
+      end
+
+      context "when searching with valid params" do
+        fab!(:message_1) do
+          Fabricate(:chat_message, chat_channel: channel, message: "hello world foo bar")
+        end
+
+        before { SearchIndexer.enable }
+        after { SearchIndexer.disable }
+
+        it "returns matching messages" do
+          SearchIndexer.index(message_1)
+
+          get "/chat/api/search.json", params: { query: "hello world" }
+
+          expect(response.status).to eq(200)
+          expect(response.parsed_body["messages"].map { |m| m["id"] }).to include(message_1.id)
+        end
+
+        it "returns metadata with pagination info" do
+          SearchIndexer.index(message_1)
+
+          get "/chat/api/search.json", params: { query: "hello world", limit: 5, offset: 0 }
+
+          expect(response.status).to eq(200)
+          meta = response.parsed_body["meta"]
+          expect(meta).to have_key("has_more")
+          expect(meta["limit"]).to eq(5)
+          expect(meta["offset"]).to eq(0)
+        end
+
+        it "scopes results to a specific channel" do
+          other_channel = Fabricate(:chat_channel)
+          other_channel.add(current_user)
+          other_message =
+            Fabricate(:chat_message, chat_channel: other_channel, message: "hello world baz")
+          SearchIndexer.index(message_1)
+          SearchIndexer.index(other_message)
+
+          get "/chat/api/search.json", params: { query: "hello world", channel_id: channel.id }
+
+          expect(response.status).to eq(200)
+          ids = response.parsed_body["messages"].map { |m| m["id"] }
+          expect(ids).to include(message_1.id)
+          expect(ids).not_to include(other_message.id)
+        end
+
+        it "accepts sort parameter" do
+          SearchIndexer.index(message_1)
+
+          get "/chat/api/search.json", params: { query: "hello world", sort: "latest" }
+
+          expect(response.status).to eq(200)
+        end
+      end
+    end
+  end
+end

From 8225d94bb31fc7f53f8c6bdaff184c2f5017eeaf Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Feb 2026 11:15:06 +0100
Subject: [PATCH 036/168] FIX: prevents destroy post action to leak post
 (#38015)

It was possible to get the content of a post you no longer have access
to by destroying a post action during the interval where the post has
been made unaccessible and during the `post_undo_action_window_mins`
limit.

We consider this security in depth but not really exploitable.
---
 app/controllers/post_actions_controller.rb    |  6 +++++-
 spec/requests/post_actions_controller_spec.rb | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/controllers/post_actions_controller.rb b/app/controllers/post_actions_controller.rb
index 966af4d4baec1..333f8258ea455 100644
--- a/app/controllers/post_actions_controller.rb
+++ b/app/controllers/post_actions_controller.rb
@@ -48,7 +48,11 @@ def destroy
     if result.failed?
       render_json_error(result)
     else
-      render_post_json(result.post, add_raw: false)
+      if !guardian.can_see_post?(result.post)
+        head :no_content
+      else
+        render_post_json(result.post, add_raw: false)
+      end
     end
   end
 
diff --git a/spec/requests/post_actions_controller_spec.rb b/spec/requests/post_actions_controller_spec.rb
index d23cd4a524bdb..92e64b9a1ffa1 100644
--- a/spec/requests/post_actions_controller_spec.rb
+++ b/spec/requests/post_actions_controller_spec.rb
@@ -72,6 +72,27 @@
 
           expect(response).to be_forbidden
         end
+
+        it "does not return post content when the user can no longer see the post" do
+          restricted_category = Fabricate(:category, read_restricted: true)
+          post.topic.update!(category: restricted_category)
+
+          delete "/post_actions/#{post.id}.json",
+                 params: {
+                   post_action_type_id: PostActionType.types[:like],
+                 }
+
+          expect(response.status).to eq(204)
+          expect(response.body).to be_blank
+          expect(
+            PostAction.exists?(
+              user_id: user.id,
+              post_id: post.id,
+              post_action_type_id: PostActionType.types[:like],
+              deleted_at: nil,
+            ),
+          ).to eq(false)
+        end
       end
     end
   end

From e7604b67c1adfe1a364d06ce53a5741ca4c39bc9 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Tue, 24 Feb 2026 11:21:06 +0100
Subject: [PATCH 037/168] UX: styling adjustments for BlogStyle TC in Horizon
 (#37342)

Since the ToC has to be so specific, Horizon needs to use this
specificity for the BlogStyle TC.
---
 themes/horizon/scss/compatibility.scss | 6 ++++++
 themes/horizon/scss/topic.scss         | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/themes/horizon/scss/compatibility.scss b/themes/horizon/scss/compatibility.scss
index 88182c3b83a5b..105af54d65130 100644
--- a/themes/horizon/scss/compatibility.scss
+++ b/themes/horizon/scss/compatibility.scss
@@ -64,3 +64,9 @@
     grid-template-columns: auto auto;
   }
 }
+
+// TC: Blog Style
+body:not(.d-toc-installed).blog-post .container.posts,
+body.d-toc-installed.blog-post .container.posts {
+  grid-template-columns: var(--blog-width) 0;
+}
diff --git a/themes/horizon/scss/topic.scss b/themes/horizon/scss/topic.scss
index 1d581e84713d1..42dc9f89d0eb6 100644
--- a/themes/horizon/scss/topic.scss
+++ b/themes/horizon/scss/topic.scss
@@ -13,8 +13,6 @@
 }
 
 .timeline-container .topic-timeline {
-  min-width: unset;
-
   .timeline-scrollarea {
     border-left: 1px solid var(--accent-color);
 

From 50f17d2299e5be482c76aad6b7c1634013637141 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Feb 2026 11:21:29 +0100
Subject: [PATCH 038/168] FIX: prevents message enumeration (#38014)

The interaction controller create action could allow message enumeration
as it wouldn't return 404 when the message is not accessible. We don't
consider this a security issues but prefer to fix it. This commit also
adds missing tests for the controller action.
---
 ...annels_messages_interactions_controller.rb |   1 +
 .../chat/create_message_interaction.rb        |   4 +-
 ...s_messages_interactions_controller_spec.rb | 161 ++++++++++++++++++
 .../chat/create_message_interaction_spec.rb   |   5 +-
 4 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 plugins/chat/spec/requests/chat/api/channels_messages_interactions_controller_spec.rb

diff --git a/plugins/chat/app/controllers/chat/api/channels_messages_interactions_controller.rb b/plugins/chat/app/controllers/chat/api/channels_messages_interactions_controller.rb
index db6123c1c987c..f4d1a94651238 100644
--- a/plugins/chat/app/controllers/chat/api/channels_messages_interactions_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_messages_interactions_controller.rb
@@ -8,6 +8,7 @@ def create
       end
       on_failure { render(json: failed_json, status: :unprocessable_entity) }
       on_model_not_found(:message) { raise Discourse::NotFound }
+      on_failed_policy(:can_interact_with_message) { raise Discourse::NotFound }
       on_model_not_found(:action) { raise Discourse::NotFound }
       on_failed_contract do |contract|
         render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
diff --git a/plugins/chat/app/services/chat/create_message_interaction.rb b/plugins/chat/app/services/chat/create_message_interaction.rb
index 983c67ebd10c3..42483c3b58d2b 100644
--- a/plugins/chat/app/services/chat/create_message_interaction.rb
+++ b/plugins/chat/app/services/chat/create_message_interaction.rb
@@ -18,9 +18,11 @@ class CreateMessageInteraction
     params do
       attribute :message_id, :integer
       attribute :action_id, :string
+      attribute :channel_id, :integer
 
       validates :action_id, presence: true
       validates :message_id, presence: true
+      validates :channel_id, presence: true
     end
 
     model :message
@@ -35,7 +37,7 @@ class CreateMessageInteraction
     private
 
     def fetch_message(params:)
-      Chat::Message.find_by(id: params.message_id)
+      Chat::Message.find_by(id: params.message_id, chat_channel_id: params.channel_id)
     end
 
     def fetch_action(params:, message:)
diff --git a/plugins/chat/spec/requests/chat/api/channels_messages_interactions_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_messages_interactions_controller_spec.rb
new file mode 100644
index 0000000000000..b3fb1433ce55b
--- /dev/null
+++ b/plugins/chat/spec/requests/chat/api/channels_messages_interactions_controller_spec.rb
@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::Api::ChannelsMessagesInteractionsController do
+  fab!(:current_user, :user)
+  fab!(:channel, :private_category_channel)
+  fab!(:message) do
+    Fabricate(
+      :chat_message,
+      chat_channel: channel,
+      user: Discourse.system_user,
+      blocks: [
+        {
+          type: "actions",
+          elements: [
+            {
+              action_id: "xxx",
+              value: "foo",
+              type: "button",
+              text: {
+                type: "plain_text",
+                text: "Click Me",
+              },
+            },
+          ],
+        },
+      ],
+    )
+  end
+
+  before do
+    SiteSetting.chat_enabled = true
+    SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    sign_in(current_user)
+  end
+
+  describe "#create" do
+    context "when user has access to the channel" do
+      fab!(:accessible_channel, :category_channel)
+      fab!(:accessible_message) do
+        Fabricate(
+          :chat_message,
+          chat_channel: accessible_channel,
+          user: Discourse.system_user,
+          blocks: [
+            {
+              type: "actions",
+              elements: [
+                {
+                  action_id: "xxx",
+                  value: "foo",
+                  type: "button",
+                  text: {
+                    type: "plain_text",
+                    text: "Click Me",
+                  },
+                },
+              ],
+            },
+          ],
+        )
+      end
+
+      before { accessible_channel.add(current_user) }
+
+      it "creates an interaction and returns serialized data" do
+        post "/chat/api/channels/#{accessible_channel.id}/messages/#{accessible_message.id}/interactions",
+             params: {
+               action_id: "xxx",
+             }
+
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["interaction"]).to include(
+          "user" => hash_including("id" => current_user.id),
+          "message" => hash_including("id" => accessible_message.id),
+          "channel" => hash_including("id" => accessible_channel.id),
+          "action" => hash_including("action_id" => "xxx"),
+        )
+      end
+
+      it "returns 404 when action_id does not match any block element" do
+        post "/chat/api/channels/#{accessible_channel.id}/messages/#{accessible_message.id}/interactions",
+             params: {
+               action_id: "nonexistent",
+             }
+
+        expect(response.status).to eq(404)
+      end
+
+      it "returns 400 when action_id is missing" do
+        post "/chat/api/channels/#{accessible_channel.id}/messages/#{accessible_message.id}/interactions",
+             params: {
+             }
+
+        expect(response.status).to eq(400)
+      end
+    end
+
+    context "when user is not logged in" do
+      before { sign_out }
+
+      it "returns 404" do
+        post "/chat/api/channels/#{channel.id}/messages/#{message.id}/interactions",
+             params: {
+               action_id: "xxx",
+             }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when chat is disabled" do
+      before { SiteSetting.chat_enabled = false }
+
+      it "returns 404" do
+        post "/chat/api/channels/#{channel.id}/messages/#{message.id}/interactions",
+             params: {
+               action_id: "xxx",
+             }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when message exists in a channel the user cannot access" do
+      it "returns 404 to avoid leaking message existence" do
+        post "/chat/api/channels/#{channel.id}/messages/#{message.id}/interactions",
+             params: {
+               action_id: "xxx",
+             }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when message does not exist" do
+      it "returns 404" do
+        post "/chat/api/channels/#{channel.id}/messages/-999/interactions",
+             params: {
+               action_id: "xxx",
+             }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
+    context "when message exists but in a different channel than the URL" do
+      fab!(:other_channel, :category_channel)
+
+      before { other_channel.add(current_user) }
+
+      it "returns 404 to avoid cross-channel message lookup" do
+        post "/chat/api/channels/#{other_channel.id}/messages/#{message.id}/interactions",
+             params: {
+               action_id: "xxx",
+             }
+
+        expect(response.status).to eq(404)
+      end
+    end
+  end
+end
diff --git a/plugins/chat/spec/services/chat/create_message_interaction_spec.rb b/plugins/chat/spec/services/chat/create_message_interaction_spec.rb
index 9ca0cbc0de233..a99b72af2f09c 100644
--- a/plugins/chat/spec/services/chat/create_message_interaction_spec.rb
+++ b/plugins/chat/spec/services/chat/create_message_interaction_spec.rb
@@ -4,6 +4,7 @@
   describe described_class::Contract, type: :model do
     it { is_expected.to validate_presence_of :message_id }
     it { is_expected.to validate_presence_of :action_id }
+    it { is_expected.to validate_presence_of :channel_id }
   end
 
   describe ".call" do
@@ -34,7 +35,9 @@
     end
 
     let(:guardian) { Guardian.new(current_user) }
-    let(:params) { { message_id: message.id, action_id: "xxx" } }
+    let(:params) do
+      { message_id: message.id, action_id: "xxx", channel_id: message.chat_channel_id }
+    end
     let(:dependencies) { { guardian: } }
 
     context "when all steps pass" do

From f7dbda9d1cc0c70fdd58c9a9ba990eea0fc48c93 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Feb 2026 11:44:33 +0100
Subject: [PATCH 039/168] FIX: Require join permission to invite users to chat
 channel (#38016)

The invite endpoint only checked if the actor could preview the channel,
allowing read-only users to send high-priority invitation notifications
to other users. This tightens the policy to require join-level
authorization and adds rate limiting (5/minute) to prevent notification
flooding.
---
 .../chat/api/channels_invites_controller.rb   |  4 ++-
 .../services/chat/invite_users_to_channel.rb  |  6 ++--
 .../api/channels_invites_controller_spec.rb   | 28 ++++++++++++++++++-
 .../chat/invite_users_to_channel_spec.rb      | 17 +++++++++--
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/plugins/chat/app/controllers/chat/api/channels_invites_controller.rb b/plugins/chat/app/controllers/chat/api/channels_invites_controller.rb
index 9c295d1727bbb..879f389fbff5c 100644
--- a/plugins/chat/app/controllers/chat/api/channels_invites_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_invites_controller.rb
@@ -2,10 +2,12 @@
 
 class Chat::Api::ChannelsInvitesController < Chat::ApiController
   def create
+    RateLimiter.new(current_user, "invite_to_chat_channel", 5, 1.minute).performed!
+
     Chat::InviteUsersToChannel.call(service_params) do
       on_success { render(json: success_json) }
       on_failure { render(json: failed_json, status: :unprocessable_entity) }
-      on_failed_policy(:can_view_channel) { raise Discourse::InvalidAccess }
+      on_failed_policy(:can_join_channel) { raise Discourse::InvalidAccess }
       on_model_not_found(:channel) { raise Discourse::NotFound }
       on_failed_contract do |contract|
         render(json: failed_json.merge(errors: contract.errors.full_messages), status: :bad_request)
diff --git a/plugins/chat/app/services/chat/invite_users_to_channel.rb b/plugins/chat/app/services/chat/invite_users_to_channel.rb
index 61f6178e9a0d3..5edcc1db798cc 100644
--- a/plugins/chat/app/services/chat/invite_users_to_channel.rb
+++ b/plugins/chat/app/services/chat/invite_users_to_channel.rb
@@ -27,7 +27,7 @@ class InviteUsersToChannel
     end
 
     model :channel
-    policy :can_view_channel
+    policy :can_join_channel
     model :users, optional: true
     step :send_invite_notifications
 
@@ -37,8 +37,8 @@ def fetch_channel(params:)
       ::Chat::Channel.find_by(id: params.channel_id)
     end
 
-    def can_view_channel(guardian:, channel:)
-      guardian.can_preview_chat_channel?(channel)
+    def can_join_channel(guardian:, channel:)
+      guardian.can_join_chat_channel?(channel)
     end
 
     def fetch_users(params:)
diff --git a/plugins/chat/spec/requests/chat/api/channels_invites_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channels_invites_controller_spec.rb
index fb74c80f227b8..d4ca0c36f7d50 100644
--- a/plugins/chat/spec/requests/chat/api/channels_invites_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channels_invites_controller_spec.rb
@@ -50,7 +50,7 @@
       end
     end
 
-    describe "current user can't view channel" do
+    describe "current user can't join channel" do
       fab!(:channel_1, :private_category_channel)
 
       it "returns a 403" do
@@ -60,6 +60,32 @@
       end
     end
 
+    describe "current user can view but not join channel" do
+      fab!(:group)
+
+      before do
+        channel_1.chatable.set_permissions(group => :readonly)
+        channel_1.chatable.save!
+        group.add(current_user)
+      end
+
+      it "returns a 403" do
+        post "/chat/api/channels/#{channel_1.id}/invites?user_ids=#{user_1.id},#{user_2.id}"
+
+        expect(response.status).to eq(403)
+      end
+    end
+
+    describe "rate limiting" do
+      it "rate limits invites" do
+        RateLimiter.enable
+
+        6.times { post "/chat/api/channels/#{channel_1.id}/invites?user_ids=#{user_1.id}" }
+
+        expect(response.status).to eq(429)
+      end
+    end
+
     describe "channel doesn’t exist" do
       it "returns a 404" do
         post "/chat/api/channels/-1/invites?user_ids=#{user_1.id},#{user_2.id}"
diff --git a/plugins/chat/spec/services/chat/invite_users_to_channel_spec.rb b/plugins/chat/spec/services/chat/invite_users_to_channel_spec.rb
index 3d2b120a78c23..80a9cb52ef4fc 100644
--- a/plugins/chat/spec/services/chat/invite_users_to_channel_spec.rb
+++ b/plugins/chat/spec/services/chat/invite_users_to_channel_spec.rb
@@ -83,11 +83,24 @@
       it { is_expected.to fail_to_find_a_model(:channel) }
     end
 
-    context "when current user can't view channel" do
+    context "when current user can't join channel" do
       fab!(:current_user, :user)
       fab!(:channel_1, :private_category_channel)
 
-      it { is_expected.to fail_a_policy(:can_view_channel) }
+      it { is_expected.to fail_a_policy(:can_join_channel) }
+    end
+
+    context "when current user can view but not join channel" do
+      fab!(:current_user, :user)
+      fab!(:channel_1, :category_channel)
+
+      before do
+        channel_1.chatable.set_permissions(group_1 => :readonly)
+        channel_1.chatable.save!
+        group_1.add(current_user)
+      end
+
+      it { is_expected.to fail_a_policy(:can_join_channel) }
     end
   end
 end

From 08df9a7ebb3850f506979836bd059fcf48b7059a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <loic@discourse.org>
Date: Tue, 24 Feb 2026 12:30:38 +0100
Subject: [PATCH 040/168] DEV: Fix the `lock` step when using contracts
 (#38019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Recently, the `lock` step from our Ruby service framework has been
extended to be able to work with keys from the global context when the
key isn’t present in the `params`.

The implementation is flawed because we usually get a contract object in
the `params` key of the context, and currently we call
`public_send(key)` on it. This actually raises an error when the key
doesn’t exist on the contract.

The fix is rather simple, we just use `try` instead, that way if the
method doesn’t exist, it returns `nil`, allowing us to get the key from
the global context as expected.
---
 lib/service/base/lock_step.rb   | 2 +-
 spec/lib/service/runner_spec.rb | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/service/base/lock_step.rb b/lib/service/base/lock_step.rb
index 61aa200650eeb..80b3640d0517e 100644
--- a/lib/service/base/lock_step.rb
+++ b/lib/service/base/lock_step.rb
@@ -38,7 +38,7 @@ def lock_name
         [
           context.__service_class__.to_s.underscore,
           *keys.flat_map do |key|
-            value = context[:params].public_send(key) || context[key]
+            value = context[:params].try(key) || context[key]
             [key, value.try(:id) || value]
           end,
         ].join(":")
diff --git a/spec/lib/service/runner_spec.rb b/spec/lib/service/runner_spec.rb
index 32fcaeb0426ff..4018e60072dc9 100644
--- a/spec/lib/service/runner_spec.rb
+++ b/spec/lib/service/runner_spec.rb
@@ -184,13 +184,14 @@ def locked_step
   class LockWithModelService
     include Service::Base
 
+    params { attribute :topic_id, :integer }
     model :topic
     lock(:topic) { step :locked_step }
 
     private
 
-    def fetch_topic
-      OpenStruct.new(id: 123)
+    def fetch_topic(params:)
+      OpenStruct.new(id: params.topic_id)
     end
 
     def locked_step
@@ -533,9 +534,9 @@ def request
         end
       end
 
-      context "when the lock key resolves from context" do
+      context "when the lock key resolves from context (not params)" do
         let(:service) { LockWithModelService }
-        let(:dependencies) { { params: {} } }
+        let(:dependencies) { { params: { topic_id: 123 } } }
         let(:actions) { <<-BLOCK }
             proc do
               on_success { :success }

From 97bf164592696599c142f3e58e127bfa3e1e2580 Mon Sep 17 00:00:00 2001
From: Renato Atilio <renato@discourse.org>
Date: Tue, 24 Feb 2026 10:08:34 -0300
Subject: [PATCH 041/168] FEATURE: consolidate composer toolbar list and add
 check list (#37336)

This PR merges the bulleted and numbered list buttons into a single
Lists dropdown menu in the composer toolbar and introduces a new
checklist option to the dropdown.

 * Combines individual list buttons into a single "Lists" dropdown
* Adds a new checklist option within the list menu (integrated via the
checklist plugin)
 * ProseMirror/Rich Editor:
* Added logic for checklist continuation on Enter and exit on double
Enter
* Implemented Backspace handling to manage checkbox removal and line
joining
* Added cursor positioning constraints to prevent selection before the
checkbox
     * Added handler to toggle the check when clicked

Updated `addComposerToolbarPopupMenuOption` to allow plugins to register
custom options specifically within a popup menu through its identifier

<img width="467" height="190" alt="image"
src="https://github.com/user-attachments/assets/91205405-3d6f-4e04-85f5-800e6b9d95b4"
/>
---
 .../common/toolbar-popup-menu-options.scss    |  18 +-
 config/locales/client.en.yml                  |   1 +
 .../discourse/app/components/d-editor.gjs     |   4 +-
 .../components/toolbar-popup-menu-options.gjs |   2 +-
 .../lib/composer/rich-editor-extensions.js    |   1 +
 .../discourse/app/lib/composer/toolbar.js     |  99 ++--
 frontend/discourse/app/lib/plugin-api.gjs     |  14 +
 frontend/discourse/app/services/composer.js   |  24 +-
 .../components/prosemirror-editor.gjs         |   2 +
 .../prosemirror/lib/text-manipulation.js      |  60 +-
 .../integration/components/d-editor-test.gjs  |  25 +-
 .../discourse/initializers/checklist.js       |  16 +
 .../javascripts/lib/rich-editor-extension.js  | 532 +++++++++++++++++-
 .../assets/stylesheets/checklist.scss         |   3 +-
 .../checklist/config/locales/client.en.yml    |   5 +
 .../page_objects/components/rich_checklist.rb |  40 ++
 .../spec/system/rich_editor_extension_spec.rb | 141 +++++
 .../integration/rich-editor-extension-test.js |  19 +-
 .../composer/prosemirror_toolbar_spec.rb      |  10 +-
 19 files changed, 913 insertions(+), 103 deletions(-)
 create mode 100644 plugins/checklist/config/locales/client.en.yml
 create mode 100644 plugins/checklist/spec/system/page_objects/components/rich_checklist.rb
 create mode 100644 plugins/checklist/spec/system/rich_editor_extension_spec.rb

diff --git a/app/assets/stylesheets/common/toolbar-popup-menu-options.scss b/app/assets/stylesheets/common/toolbar-popup-menu-options.scss
index 0ea31c18b2e23..e0f1cba36efb1 100644
--- a/app/assets/stylesheets/common/toolbar-popup-menu-options.scss
+++ b/app/assets/stylesheets/common/toolbar-popup-menu-options.scss
@@ -30,7 +30,9 @@
   }
 }
 
-.toolbar-menu__options-content {
+.toolbar-menu__options-content,
+.toolbar-menu__list-content,
+.toolbar-menu__heading-content {
   .dropdown-menu {
     .btn {
       &.--active {
@@ -58,16 +60,10 @@
   }
 }
 
-.toolbar-menu__heading-content {
+.toolbar-menu__heading-content,
+.toolbar-menu__list-content {
   .dropdown-menu {
     .btn {
-      &.--active {
-        .d-button-label__active-icon {
-          visibility: visible;
-          margin-left: auto;
-        }
-      }
-
       &:hover,
       &:focus,
       &:focus-visible {
@@ -106,7 +102,11 @@
         font-size: var(--font-down-1-rem);
       }
     }
+  }
+}
 
+.toolbar-menu__heading-content {
+  .dropdown-menu {
     .btn[data-name="heading-1"] {
       .d-button-label__text,
       .d-icon[class*="d-icon-discourse"] {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 94e83205b5304..968dccf86fcc5 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3153,6 +3153,7 @@ en:
       upload_description: "enter upload description here"
       olist_title: "Numbered list"
       ulist_title: "Bulleted list"
+      list_title: "Lists"
       list_item: "List item"
       toggle_direction: "Toggle direction"
       apply_wrap_title: "Apply wrap"
diff --git a/frontend/discourse/app/components/d-editor.gjs b/frontend/discourse/app/components/d-editor.gjs
index cc59f83a96ba8..2d5caba62010c 100644
--- a/frontend/discourse/app/components/d-editor.gjs
+++ b/frontend/discourse/app/components/d-editor.gjs
@@ -196,13 +196,13 @@ export default class DEditor extends Component {
       keymap[sc] = () => {
         const customAction = shortcuts[sc].shortcutAction;
 
+        const toolbarEvent = this.newToolbarEvent();
         if (customAction) {
-          const toolbarEvent = this.newToolbarEvent();
           if (!button.condition || button.condition(toolbarEvent)) {
             customAction(toolbarEvent);
           }
         } else {
-          button.action(button);
+          button.action(toolbarEvent);
         }
         return false;
       };
diff --git a/frontend/discourse/app/components/toolbar-popup-menu-options.gjs b/frontend/discourse/app/components/toolbar-popup-menu-options.gjs
index 2256c3901da71..94679072d6b09 100644
--- a/frontend/discourse/app/components/toolbar-popup-menu-options.gjs
+++ b/frontend/discourse/app/components/toolbar-popup-menu-options.gjs
@@ -33,7 +33,7 @@ export default class ToolbarPopupmenuOptions extends Component {
   }
 
   #convertMenuOption(content) {
-    if (content.condition) {
+    if (content.condition !== false) {
       const label = this.#calculateLabel(content);
       const title = this.#calculateTitle(content);
 
diff --git a/frontend/discourse/app/lib/composer/rich-editor-extensions.js b/frontend/discourse/app/lib/composer/rich-editor-extensions.js
index 04150df20c9cd..dd471a9254653 100644
--- a/frontend/discourse/app/lib/composer/rich-editor-extensions.js
+++ b/frontend/discourse/app/lib/composer/rich-editor-extensions.js
@@ -32,6 +32,7 @@
  * @property {typeof import('prosemirror-history')} pmHistory
  * @property {typeof import('prosemirror-transform')} pmTransform
  * @property {typeof import('prosemirror-commands')} pmCommands
+ * @property {typeof import('prosemirror-schema-list')} pmSchemaList
  * @property {import('prosemirror-model').Schema} schema
  * @property {() => PluginContext} getContext
  */
diff --git a/frontend/discourse/app/lib/composer/toolbar.js b/frontend/discourse/app/lib/composer/toolbar.js
index 872ff25cf9419..3853ffb96fd3e 100644
--- a/frontend/discourse/app/lib/composer/toolbar.js
+++ b/frontend/discourse/app/lib/composer/toolbar.js
@@ -1,5 +1,5 @@
 // @ts-check
-import { action } from "@ember/object";
+import { customPopupMenuOptions } from "discourse/lib/composer/custom-popup-menu-options";
 import { translateModKey } from "discourse/lib/utilities";
 import { waitForClosedKeyboard } from "discourse/lib/wait-for-keyboard";
 import { PLATFORM_KEY_MODIFIER } from "discourse/services/keyboard-shortcuts";
@@ -134,6 +134,10 @@ export class ToolbarBase {
 
     // Popup menu option item shortcut bindings and title text.
     if (buttonAttrs.popupMenu) {
+      // Default action passes toolbarEvent to option.action
+      buttonAttrs.popupMenu.action ??= (option) =>
+        option.action(this.context.newToolbarEvent());
+
       buttonAttrs.popupMenu.options()?.forEach((option) => {
         if (option.shortcut) {
           const shortcutKeyTranslated = translateModKey(
@@ -181,6 +185,8 @@ export class ToolbarBase {
  * Standard editor toolbar with default buttons
  */
 export default class Toolbar extends ToolbarBase {
+  #listOptions;
+
   constructor(opts) {
     super(opts);
 
@@ -269,7 +275,8 @@ export default class Toolbar extends ToolbarBase {
 
                 return false;
               },
-              action: this.onHeadingMenuAction.bind(this),
+              action: (toolbarEvent) =>
+                toolbarEvent.applyHeading(headingLevel, "heading"),
             });
           }
           headingOptions.push({
@@ -281,11 +288,10 @@ export default class Toolbar extends ToolbarBase {
             showActiveIcon: true,
             shortcut: "Alt+0",
             active: ({ state }) => state?.inParagraph,
-            action: this.onHeadingMenuAction.bind(this),
+            action: (toolbarEvent) => toolbarEvent.applyHeading(0, "heading"),
           });
           return headingOptions;
         },
-        action: this.onHeadingMenuAction.bind(this),
       },
     });
 
@@ -325,28 +331,25 @@ export default class Toolbar extends ToolbarBase {
         active: ({ state }) => state.inCode || state.inCodeBlock,
       });
 
-      this.addButton({
-        id: "bullet",
-        group: "extras",
-        icon: "list-ul",
-        shortcut: "Shift+8",
-        title: "composer.ulist_title",
-        perform: (e) => e.applyList("* ", "list_item"),
-        active: ({ state }) => state.inBulletList,
-      });
-
       this.addButton({
         id: "list",
         group: "extras",
-        icon: "list-ol",
-        shortcut: "Shift+7",
-        title: "composer.olist_title",
-        perform: (e) =>
-          e.applyList(
-            (i) => (!i ? "1. " : `${parseInt(i, 10) + 1}. `),
-            "list_item"
-          ),
-        active: ({ state }) => state.inOrderedList,
+        active: ({ state }) => {
+          return this.getListPopupMenuOptions().some((option) =>
+            option.active({ state })
+          );
+        },
+        icon: ({ state }) => {
+          return (
+            this.getListPopupMenuOptions().find((option) =>
+              option.active({ state })
+            )?.icon || "list-ul"
+          );
+        },
+        title: "composer.list_title",
+        popupMenu: {
+          options: () => this.getListPopupMenuOptions(),
+        },
       });
     }
 
@@ -362,16 +365,46 @@ export default class Toolbar extends ToolbarBase {
     }
   }
 
-  @action
-  onHeadingMenuAction(menuItem) {
-    let level;
-
-    if (menuItem.name === "heading-paragraph") {
-      level = 0;
-    } else {
-      level = parseInt(menuItem.name.split("-")[1], 10);
-    }
+  getListPopupMenuOptions() {
+    this.#listOptions ??= [
+      {
+        name: "list-bullet",
+        icon: "list-ul",
+        label: "composer.ulist_title",
+        shortcut: "Shift+8",
+        showActiveIcon: true,
+        active: ({ state }) => state?.inBulletList,
+        action: (toolbarEvent) => {
+          if (
+            !toolbarEvent.commands?.toggleBulletList ||
+            !toolbarEvent.commands.toggleBulletList()
+          ) {
+            toolbarEvent.applyList("* ", "list_item");
+          }
+        },
+      },
+      {
+        name: "list-ordered",
+        icon: "list-ol",
+        label: "composer.olist_title",
+        shortcut: "Shift+7",
+        showActiveIcon: true,
+        active: ({ state }) => state?.inOrderedList,
+        action: (toolbarEvent) => {
+          if (
+            !toolbarEvent.commands?.toggleOrderedList ||
+            !toolbarEvent.commands.toggleOrderedList()
+          ) {
+            toolbarEvent.applyList(
+              (i) => (!i ? "1. " : `${parseInt(i, 10) + 1}. `),
+              "list_item"
+            );
+          }
+        },
+      },
+      ...customPopupMenuOptions.filter((option) => option.menu === "list"),
+    ];
 
-    this.context.newToolbarEvent().applyHeading(level, "heading");
+    return this.#listOptions;
   }
 }
diff --git a/frontend/discourse/app/lib/plugin-api.gjs b/frontend/discourse/app/lib/plugin-api.gjs
index 188055f9ae03b..9e4506cc78ab9 100644
--- a/frontend/discourse/app/lib/plugin-api.gjs
+++ b/frontend/discourse/app/lib/plugin-api.gjs
@@ -848,6 +848,8 @@ class _PluginApi {
    * @returns {boolean} - Whether the button should be displayed.
    *
    * @param {Object} opts - An Object.
+   * @param {string} [opts.menu] - Target menu: 'list' for list dropdown, omit for options popup (default).
+   * @param {string} [opts.name] - Unique identifier for the option.
    * @param {string} opts.icon - The name of the FontAwesome icon to display for the button.
    * @param {string} opts.label - The I18n translation key for the button's label.
    * @param {string} opts.shortcut - The keyboard shortcut to apply, NOTE: this will unconditionally add CTRL/META key (eg: m means CTRL+m).
@@ -866,6 +868,18 @@ class _PluginApi {
    *     return composer.editingPost;
    *   }
    * });
+   *
+   * @example
+   * // Add option to list dropdown
+   * api.addComposerToolbarPopupMenuOption({
+   *   menu: 'list',
+   *   name: 'my-custom-list',
+   *   icon: 'list-check',
+   *   label: 'my_plugin.custom_list',
+   *   action: (toolbarEvent) => {
+   *     toolbarEvent.applyList("- [x] ", "list_item");
+   *   }
+   * });
    **/
   addComposerToolbarPopupMenuOption(opts) {
     addPopupMenuOption(opts);
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.js
index bd563c676c24e..65823de552155 100644
--- a/frontend/discourse/app/services/composer.js
+++ b/frontend/discourse/app/services/composer.js
@@ -487,13 +487,14 @@ export default class ComposerService extends Service {
         }),
       ];
 
-      return options
-        .concat(
-          customPopupMenuOptions
-            .map((option) => this._setupPopupMenuOption({ ...option }))
-            .filter((o) => o)
-        )
-        .concat(secondaryOptions);
+      return [
+        ...options,
+        ...customPopupMenuOptions
+          .filter((option) => !option.menu)
+          .map((option) => this._setupPopupMenuOption({ ...option }))
+          .filter(Boolean),
+        ...secondaryOptions,
+      ];
     }
   }
 
@@ -725,12 +726,9 @@ export default class ComposerService extends Service {
       menuItem
     );
     if (typeof menuItem.action === "function") {
-      // note: due to the way args are passed to actions we need
-      // to create the explicity toolbarEvent as a fallback for no
-      // event
-      // Long term we want to avoid needing this awkwardness and pass
-      // the event explicitly
-      return menuItem.action(this.toolbarEvent || toolbarEvent);
+      // toolbarEvent is passed when triggered via keyboard shortcut,
+      // otherwise fall back to stored toolbarEvent from menu open
+      return menuItem.action(toolbarEvent ?? this.toolbarEvent);
     } else {
       return (
         this.actions?.[menuItem.action]?.bind(this) || // Legacy-style contributions from themes/plugins
diff --git a/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs b/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs
index c938cb0d77fa6..a5424d09785bc 100644
--- a/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs
+++ b/frontend/discourse/app/static/prosemirror/components/prosemirror-editor.gjs
@@ -17,6 +17,7 @@ import * as ProsemirrorHistory from "prosemirror-history";
 import { history } from "prosemirror-history";
 import { keymap } from "prosemirror-keymap";
 import * as ProsemirrorModel from "prosemirror-model";
+import * as ProsemirrorSchemaList from "prosemirror-schema-list";
 import * as ProsemirrorState from "prosemirror-state";
 import { EditorState } from "prosemirror-state";
 import * as ProsemirrorTransform from "prosemirror-transform";
@@ -106,6 +107,7 @@ export default class ProsemirrorEditor extends Component {
       pmView: ProsemirrorView,
       pmHistory: ProsemirrorHistory,
       pmTransform: ProsemirrorTransform,
+      pmSchemaList: ProsemirrorSchemaList,
       pmCommands: ProsemirrorCommands,
       getContext: () => ({
         placeholder: this.args.placeholder,
diff --git a/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js b/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js
index 4b94070275c26..afed1b07813ee 100644
--- a/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js
+++ b/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js
@@ -5,7 +5,11 @@ import { isEmpty } from "@ember/utils";
 import { TrackedObject } from "@ember-compat/tracked-built-ins";
 import { lift, setBlockType, toggleMark, wrapIn } from "prosemirror-commands";
 import { Slice } from "prosemirror-model";
-import { liftListItem, sinkListItem } from "prosemirror-schema-list";
+import {
+  liftListItem,
+  sinkListItem,
+  wrapInList,
+} from "prosemirror-schema-list";
 import { Selection, TextSelection } from "prosemirror-state";
 import { bind } from "discourse/lib/decorators";
 import escapeRegExp from "discourse/lib/escape-regexp";
@@ -186,26 +190,63 @@ export default class ProsemirrorTextManipulation {
   applyList(_selection, head, exampleKey) {
     let command;
 
-    const isInside = (type) => {
+    const findParentList = () => {
       const $from = this.view.state.selection.$from;
       for (let depth = $from.depth; depth > 0; depth--) {
-        const parent = $from.node(depth);
-        if (parent.type === type) {
-          return true;
+        const node = $from.node(depth);
+        if (
+          node.type === this.schema.nodes.bullet_list ||
+          node.type === this.schema.nodes.ordered_list
+        ) {
+          return {
+            node,
+            pos: $from.before(depth),
+            type: node.type,
+          };
         }
       }
-      return false;
+      return null;
     };
 
     if (exampleKey === "list_item") {
-      const nodeType =
+      const targetType =
         head === "* "
           ? this.schema.nodes.bullet_list
           : this.schema.nodes.ordered_list;
 
-      command = isInside(this.schema.nodes.list_item) ? lift : wrapIn(nodeType);
+      const parentList = findParentList();
+
+      if (parentList) {
+        if (parentList.type === targetType) {
+          // Same list type - toggle off (lift)
+          command = liftListItem(this.schema.nodes.list_item);
+        } else {
+          // Different list type - convert selection
+          // We achieve this by lifting out of the current list, then wrapping in the new type
+          command = (state, dispatch) => {
+            if (dispatch) {
+              const liftCmd = liftListItem(this.schema.nodes.list_item);
+              let lifted = false;
+              liftCmd(state, (tr) => {
+                dispatch(tr);
+                lifted = true;
+              });
+
+              if (lifted) {
+                // If lift succeeded, now wrap in the new list type
+                // We need to re-fetch state from view since dispatch updated it
+                wrapInList(targetType)(this.view.state, dispatch);
+              }
+            }
+            return true;
+          };
+        }
+      } else {
+        // Not in a list - wrap in the target type
+        command = wrapInList(targetType);
+      }
     } else if (exampleKey === "blockquote_text") {
-      command = isInside(this.schema.nodes.blockquote)
+      command = inNode(this.view.state, this.schema.nodes.blockquote)
         ? lift
         : wrapIn(this.schema.nodes.blockquote);
     } else {
@@ -213,6 +254,7 @@ export default class ProsemirrorTextManipulation {
     }
 
     command?.(this.view.state, this.view.dispatch);
+    this.focus();
   }
 
   applyHeading(_selection, level) {
diff --git a/frontend/discourse/tests/integration/components/d-editor-test.gjs b/frontend/discourse/tests/integration/components/d-editor-test.gjs
index 03f8cabe239c6..f5280e7927630 100644
--- a/frontend/discourse/tests/integration/components/d-editor-test.gjs
+++ b/frontend/discourse/tests/integration/components/d-editor-test.gjs
@@ -567,12 +567,14 @@ third line`
     async function (assert, textarea) {
       const example = i18n("composer.list_item");
 
-      await click(`button.bullet`);
+      await click(`button.list`);
+      await click('.btn[data-name="list-bullet"]');
       assert.strictEqual(this.value, `hello world.\n\n* ${example}`);
       assert.strictEqual(textarea.selectionStart, 14);
       assert.strictEqual(textarea.selectionEnd, 16 + example.length);
 
-      await click(`button.bullet`);
+      await click(`button.list`);
+      await click('.btn[data-name="list-bullet"]');
       assert.strictEqual(this.value, `hello world.\n\n${example}`);
     }
   );
@@ -583,12 +585,14 @@ third line`
       textarea.selectionStart = 6;
       textarea.selectionEnd = 11;
 
-      await click(`button.bullet`);
+      await click(`button.list`);
+      await click('.btn[data-name="list-bullet"]');
       assert.strictEqual(this.value, `hello\n\n* world\n\n.`);
       assert.strictEqual(textarea.selectionStart, 7);
       assert.strictEqual(textarea.selectionEnd, 14);
 
-      await click(`button.bullet`);
+      await click(`button.list`);
+      await click('.btn[data-name="list-bullet"]');
       assert.strictEqual(this.value, `hello\n\nworld\n\n.`);
       assert.strictEqual(textarea.selectionStart, 7);
       assert.strictEqual(textarea.selectionEnd, 12);
@@ -603,12 +607,14 @@ third line`
       textarea.selectionStart = 0;
       textarea.selectionEnd = 20;
 
-      await click(`button.bullet`);
+      await click(`button.list`);
+      await click('.btn[data-name="list-bullet"]');
       assert.strictEqual(this.value, "Hello\n\nWorld\n\nEvil");
       assert.strictEqual(textarea.selectionStart, 0);
       assert.strictEqual(textarea.selectionEnd, 18);
 
-      await click(`button.bullet`);
+      await click(`button.list`);
+      await click('.btn[data-name="list-bullet"]');
       assert.strictEqual(this.value, "* Hello\n\n* World\n\n* Evil");
       assert.strictEqual(textarea.selectionStart, 0);
       assert.strictEqual(textarea.selectionEnd, 24);
@@ -621,11 +627,13 @@ third line`
       const example = i18n("composer.list_item");
 
       await click(`button.list`);
+      await click('.btn[data-name="list-ordered"]');
       assert.strictEqual(this.value, `hello world.\n\n1. ${example}`);
       assert.strictEqual(textarea.selectionStart, 14);
       assert.strictEqual(textarea.selectionEnd, 17 + example.length);
 
       await click(`button.list`);
+      await click('.btn[data-name="list-ordered"]');
       assert.strictEqual(this.value, `hello world.\n\n${example}`);
       assert.strictEqual(textarea.selectionStart, 14);
       assert.strictEqual(textarea.selectionEnd, 14 + example.length);
@@ -639,11 +647,13 @@ third line`
       textarea.selectionEnd = 11;
 
       await click(`button.list`);
+      await click('.btn[data-name="list-ordered"]');
       assert.strictEqual(this.value, `hello\n\n1. world\n\n.`);
       assert.strictEqual(textarea.selectionStart, 7);
       assert.strictEqual(textarea.selectionEnd, 15);
 
       await click(`button.list`);
+      await click('.btn[data-name="list-ordered"]');
       assert.strictEqual(this.value, `hello\n\nworld\n\n.`);
       assert.strictEqual(textarea.selectionStart, 7);
       assert.strictEqual(textarea.selectionEnd, 12);
@@ -659,11 +669,13 @@ third line`
       textarea.selectionEnd = 18;
 
       await click(`button.list`);
+      await click('.btn[data-name="list-ordered"]');
       assert.strictEqual(this.value, "1. Hello\n\n2. World\n\n3. Evil");
       assert.strictEqual(textarea.selectionStart, 0);
       assert.strictEqual(textarea.selectionEnd, 27);
 
       await click(`button.list`);
+      await click('.btn[data-name="list-ordered"]');
       assert.strictEqual(this.value, "Hello\n\nWorld\n\nEvil");
       assert.strictEqual(textarea.selectionStart, 0);
       assert.strictEqual(textarea.selectionEnd, 18);
@@ -678,6 +690,7 @@ third line`
       textarea.selectionEnd = 8;
 
       await click("button.list");
+      await click('.btn[data-name="list-ordered"]');
       assert.strictEqual(this.value, "1. existing");
 
       document.execCommand("undo");
diff --git a/plugins/checklist/assets/javascripts/discourse/initializers/checklist.js b/plugins/checklist/assets/javascripts/discourse/initializers/checklist.js
index d65ee040d1e30..a187c8b183f9e 100644
--- a/plugins/checklist/assets/javascripts/discourse/initializers/checklist.js
+++ b/plugins/checklist/assets/javascripts/discourse/initializers/checklist.js
@@ -10,6 +10,22 @@ function initializePlugin(api) {
   if (siteSettings.checklist_enabled) {
     api.decorateCookedElement(checklistSyntax);
     api.registerRichEditorExtension(richEditorExtension);
+
+    api.addComposerToolbarPopupMenuOption({
+      menu: "list",
+      name: "list-checklist",
+      icon: "list-check",
+      label: "checklist.composer.checklist",
+      showActiveIcon: true,
+      active: ({ state }) => state?.inCheckList,
+      action: (toolbarEvent) => {
+        if (toolbarEvent.commands?.toggleChecklist) {
+          toolbarEvent.commands.toggleChecklist();
+        } else {
+          toolbarEvent.applyList("- [ ] ", "list_item");
+        }
+      },
+    });
   }
 }
 
diff --git a/plugins/checklist/assets/javascripts/lib/rich-editor-extension.js b/plugins/checklist/assets/javascripts/lib/rich-editor-extension.js
index adb8a2320078f..f9366eedf5d20 100644
--- a/plugins/checklist/assets/javascripts/lib/rich-editor-extension.js
+++ b/plugins/checklist/assets/javascripts/lib/rich-editor-extension.js
@@ -1,8 +1,5 @@
 /** @type {RichEditorExtension} */
 const extension = {
-  // TODO(renato): make the checkbox clickable
-  // TODO(renato): auto-continue checkbox list on ENTER
-  // TODO(renato): apply .has-checkbox style to the <li> to avoid :has
   nodeSpec: {
     check: {
       attrs: { checked: { default: false } },
@@ -23,9 +20,7 @@ const extension = {
       parseDOM: [
         {
           tag: "span.chcklst-box",
-          getAttrs: (dom) => {
-            return { checked: hasCheckedClass(dom.className) };
-          },
+          getAttrs: (dom) => ({ checked: hasCheckedClass(dom.className) }),
         },
       ],
     },
@@ -34,12 +29,16 @@ const extension = {
   inputRules: [
     {
       match: /(^|\s)\[(x? ?)]$/,
-      handler: (state, match, start, end) =>
-        state.tr.replaceWith(
-          start + match[1].length,
-          end,
-          state.schema.nodes.check.create({ checked: match[2] === "x" })
-        ),
+      handler: (state, match, start, end) => {
+        const checkNode = state.schema.nodes.check.create({
+          checked: match[2] === "x",
+        });
+        const spaceNode = state.schema.text(" ");
+        return state.tr.replaceWith(start + match[1].length, end, [
+          checkNode,
+          spaceNode,
+        ]);
+      },
     },
   ],
 
@@ -58,6 +57,515 @@ const extension = {
       state.write(node.attrs.checked ? "[x]" : "[ ]");
     },
   },
+
+  plugins({
+    pmState: { Plugin },
+    pmView: { Decoration, DecorationSet },
+    schema,
+    utils: { changedDescendants },
+  }) {
+    const checkType = schema.nodes.check;
+    const listItemType = schema.nodes.list_item;
+    const bulletListType = schema.nodes.bullet_list;
+
+    const startsWithCheck = (node) =>
+      node?.isTextblock && node.firstChild?.type === checkType;
+
+    const findBulletListContext = ($from) => {
+      for (let depth = $from.depth; depth > 0; depth--) {
+        if ($from.node(depth).type === listItemType) {
+          if ($from.node(depth - 1)?.type === bulletListType) {
+            return { bulletListDepth: depth - 1, listItemDepth: depth };
+          }
+          return null;
+        }
+      }
+      return null;
+    };
+
+    const inBulletListItem = (doc, pos) =>
+      findBulletListContext(doc.resolve(pos)) !== null;
+
+    const ensureSpaceAfterChecks = (tr, oldState, newState) => {
+      const positionsToInsert = [];
+
+      changedDescendants(oldState.doc, newState.doc, (node, pos) => {
+        if (!startsWithCheck(node) || !inBulletListItem(newState.doc, pos)) {
+          return;
+        }
+
+        const secondChild = node.childCount > 1 ? node.child(1) : null;
+        const hasSpaceAfter =
+          secondChild?.isText && secondChild.text?.[0] === " ";
+
+        if (!hasSpaceAfter) {
+          positionsToInsert.push(pos + 1 + node.firstChild.nodeSize);
+        }
+      });
+
+      for (let i = positionsToInsert.length - 1; i >= 0; i--) {
+        tr.insert(positionsToInsert[i], schema.text(" "));
+      }
+    };
+
+    const exitChecklist = (tr, ctx) => {
+      const { bulletListDepth, listItemDepth } = ctx;
+      const { selection } = tr;
+      const { $from } = selection;
+      const bulletList = $from.node(bulletListDepth);
+      const listItemIndex = $from.index(bulletListDepth);
+      const prevListItem = bulletList.child(listItemIndex - 1);
+      const bulletListStart = $from.before(bulletListDepth);
+
+      tr.delete($from.before(listItemDepth), $from.after(listItemDepth));
+
+      let prevOffset = 1;
+      for (let i = 0; i < listItemIndex - 1; i++) {
+        prevOffset += bulletList.child(i).nodeSize;
+      }
+      const prevItemStart = tr.mapping.map(bulletListStart + prevOffset);
+      tr.delete(prevItemStart, prevItemStart + prevListItem.nodeSize);
+
+      const mappedListStart = tr.mapping.map(bulletListStart);
+      const listAfter = tr.doc.nodeAt(mappedListStart);
+
+      if (listAfter && listAfter.childCount > 0) {
+        const listEnd = mappedListStart + listAfter.nodeSize;
+        tr.insert(listEnd, schema.nodes.paragraph.create());
+        tr.setSelection(
+          selection.constructor.near(tr.doc.resolve(listEnd + 1))
+        );
+      } else {
+        tr.replaceWith(
+          mappedListStart,
+          mappedListStart + (listAfter?.nodeSize || 0),
+          schema.nodes.paragraph.create()
+        );
+        tr.setSelection(
+          selection.constructor.near(tr.doc.resolve(mappedListStart + 1))
+        );
+      }
+      return tr;
+    };
+
+    const handleChecklistContinuation = (tr, transactions) => {
+      if (!transactions.some((t) => t.docChanged)) {
+        return null;
+      }
+
+      const { selection } = tr;
+      const { $from } = selection;
+
+      if (!selection.empty) {
+        return null;
+      }
+
+      const parent = $from.parent;
+      if (!parent.isTextblock || parent.content.size !== 0) {
+        return null;
+      }
+
+      const ctx = findBulletListContext($from);
+      if (!ctx) {
+        return null;
+      }
+
+      const bulletList = $from.node(ctx.bulletListDepth);
+      const listItemIndex = $from.index(ctx.bulletListDepth);
+      if (listItemIndex === 0) {
+        return null;
+      }
+
+      const prevParagraph = bulletList.child(listItemIndex - 1).firstChild;
+      if (!startsWithCheck(prevParagraph)) {
+        return null;
+      }
+
+      if (prevParagraph.content.size > 2) {
+        const checkNode = checkType.create({ checked: false });
+        tr.insert($from.pos, [checkNode, schema.text(" ")]);
+        tr.setSelection(
+          selection.constructor.near(tr.doc.resolve($from.pos + 2))
+        );
+        return tr;
+      }
+
+      return exitChecklist(tr, ctx);
+    };
+
+    const adjustCursorPosition = (tr) => {
+      const { doc, selection } = tr;
+      const { $from } = selection;
+
+      if (!selection.empty) {
+        return null;
+      }
+
+      const parent = $from.parent;
+      if (!startsWithCheck(parent) || !inBulletListItem(doc, $from.pos)) {
+        return null;
+      }
+
+      const checkSize = parent.firstChild.nodeSize;
+      const secondChild = parent.childCount > 1 ? parent.child(1) : null;
+      const hasSpaceAfter =
+        secondChild?.isText && secondChild.text?.[0] === " ";
+      const minPos = hasSpaceAfter ? checkSize + 1 : checkSize;
+
+      if ($from.parentOffset < minPos) {
+        tr.setSelection(
+          selection.constructor.near(doc.resolve($from.start() + minPos))
+        );
+        return tr;
+      }
+
+      return null;
+    };
+
+    return [
+      new Plugin({
+        props: {
+          handleClickOn(view, pos, node, nodePos) {
+            if (node.type.name === "check") {
+              view.dispatch(
+                view.state.tr.setNodeMarkup(nodePos, null, {
+                  checked: !node.attrs.checked,
+                })
+              );
+              return true;
+            }
+            return false;
+          },
+
+          handleKeyDown(view, event) {
+            if (event.key !== "Backspace" && event.key !== "ArrowLeft") {
+              return false;
+            }
+
+            const { state, dispatch } = view;
+            const { selection } = state;
+            const { $from } = selection;
+
+            // Only handle at position 2 (right after check+space) in a checklist
+            if (
+              !selection.empty ||
+              $from.parentOffset !== 2 ||
+              !startsWithCheck($from.parent) ||
+              !inBulletListItem(state.doc, $from.pos)
+            ) {
+              return false;
+            }
+
+            if (event.key === "Backspace") {
+              const ctx = findBulletListContext($from);
+
+              const checkStart = $from.start();
+              let tr = state.tr.delete(checkStart, checkStart + 2);
+
+              if (ctx) {
+                const listItemPos = tr.mapping.map(
+                  $from.before(ctx.listItemDepth)
+                );
+                const $listItem = tr.doc.resolve(listItemPos);
+
+                if ($listItem.nodeBefore?.type === listItemType) {
+                  tr = tr.join(listItemPos, 2);
+                }
+              }
+
+              dispatch(tr);
+              return true;
+            }
+
+            const beforeTextblock = $from.before();
+            if (beforeTextblock > 0) {
+              dispatch(
+                state.tr.setSelection(
+                  selection.constructor.near(
+                    state.doc.resolve(beforeTextblock),
+                    -1
+                  )
+                )
+              );
+              return true;
+            }
+
+            return false;
+          },
+        },
+
+        appendTransaction(transactions, oldState, newState) {
+          const isFullReplace = transactions.some(
+            (t) =>
+              t.steps.length === 1 &&
+              t.steps[0].from === 0 &&
+              t.steps[0].to === oldState.doc.content.size
+          );
+          if (isFullReplace) {
+            return null;
+          }
+
+          const tr = newState.tr;
+          ensureSpaceAfterChecks(tr, oldState, newState);
+
+          return (
+            handleChecklistContinuation(tr, transactions) ??
+            adjustCursorPosition(tr) ??
+            (tr.docChanged ? tr : null)
+          );
+        },
+      }),
+
+      // Decoration plugin to add has-checkbox class to checklist items
+      new Plugin({
+        props: {
+          decorations(state) {
+            const decorations = [];
+
+            state.doc.descendants((node, pos, parent) => {
+              if (
+                node.type === listItemType &&
+                parent?.type === bulletListType &&
+                startsWithCheck(node.firstChild)
+              ) {
+                decorations.push(
+                  Decoration.node(pos, pos + node.nodeSize, {
+                    class: "has-checkbox",
+                  })
+                );
+              }
+            });
+
+            return DecorationSet.create(state.doc, decorations);
+          },
+        },
+      }),
+    ];
+  },
+
+  commands: ({ schema, pmSchemaList }) => {
+    const checkType = schema.nodes.check;
+    const bulletListType = schema.nodes.bullet_list;
+    const orderedListType = schema.nodes.ordered_list;
+    const listItemType = schema.nodes.list_item;
+
+    const listItemHasCheck = (listItem) => {
+      const p = listItem.firstChild;
+      return p?.isTextblock && p.firstChild?.type === checkType;
+    };
+
+    const findListContext = (state) => {
+      const { $from, $to } = state.selection;
+      for (let depth = $from.depth; depth > 0; depth--) {
+        if ($from.node(depth).type === listItemType) {
+          const list = $from.node(depth - 1);
+          if (list?.type === bulletListType || list?.type === orderedListType) {
+            return {
+              listDepth: depth - 1,
+              listItemDepth: depth,
+              listType: list.type,
+              list,
+              listStart: $from.before(depth - 1),
+              $from,
+              $to,
+            };
+          }
+        }
+      }
+      return null;
+    };
+
+    const forEachSelectedItem = (ctx, callback) => {
+      const { list, listStart, $from, $to } = ctx;
+      const collapsed = $from.pos === $to.pos;
+
+      list.forEach((item, offset) => {
+        const itemStart = listStart + 1 + offset;
+        const itemEnd = itemStart + item.nodeSize;
+        const inSelection = collapsed
+          ? $from.pos >= itemStart && $from.pos <= itemEnd
+          : !(itemEnd <= $from.pos || itemStart >= $to.pos);
+
+        if (inSelection) {
+          callback(item, itemStart);
+        }
+      });
+    };
+
+    const hasCheckInSelection = (ctx) => {
+      if (!ctx || ctx.listType !== bulletListType) {
+        return false;
+      }
+      let found = false;
+      forEachSelectedItem(ctx, (item) => {
+        if (listItemHasCheck(item)) {
+          found = true;
+        }
+      });
+      return found;
+    };
+
+    const removeChecksFromSelection = (state, ctx) => {
+      const toDelete = [];
+      forEachSelectedItem(ctx, (item, itemStart) => {
+        if (listItemHasCheck(item)) {
+          const textblock = item.firstChild;
+          const checkSize = textblock.firstChild.nodeSize;
+          const second = textblock.childCount > 1 ? textblock.child(1) : null;
+          const hasSpace = second?.isText && second.text?.[0] === " ";
+          toDelete.push({
+            from: itemStart + 2,
+            to: itemStart + 2 + checkSize + (hasSpace ? 1 : 0),
+          });
+        }
+      });
+
+      let tr = state.tr;
+      for (let i = toDelete.length - 1; i >= 0; i--) {
+        tr = tr.delete(toDelete[i].from, toDelete[i].to);
+      }
+      return tr;
+    };
+
+    const addChecksToSelection = (state, ctx) => {
+      const toInsert = [];
+      forEachSelectedItem(ctx, (item, itemStart) => {
+        if (!listItemHasCheck(item) && item.firstChild?.isTextblock) {
+          toInsert.push(itemStart + 2);
+        }
+      });
+
+      let tr = state.tr;
+      let offset = 0;
+      for (const pos of toInsert) {
+        const check = checkType.create({ checked: false });
+        const space = schema.text(" ");
+        tr = tr.insert(pos + offset, [check, space]);
+        offset += check.nodeSize + space.nodeSize;
+      }
+      return tr;
+    };
+
+    return {
+      toggleBulletList() {
+        return (state, dispatch) => {
+          const ctx = findListContext(state);
+          if (hasCheckInSelection(ctx)) {
+            if (dispatch) {
+              dispatch(removeChecksFromSelection(state, ctx));
+            }
+            return true;
+          }
+          return false;
+        };
+      },
+
+      toggleOrderedList() {
+        return (state, dispatch, view) => {
+          const ctx = findListContext(state);
+          if (!hasCheckInSelection(ctx)) {
+            return false;
+          }
+
+          if (!dispatch) {
+            return true;
+          }
+
+          const liftListItem = pmSchemaList?.liftListItem;
+          const wrapInList = pmSchemaList?.wrapInList;
+          if (!liftListItem || !wrapInList) {
+            return false;
+          }
+
+          dispatch(removeChecksFromSelection(state, ctx));
+          if (view) {
+            liftListItem(listItemType)(view.state, dispatch);
+            wrapInList(orderedListType)(view.state, dispatch);
+          }
+          return true;
+        };
+      },
+
+      toggleChecklist() {
+        return (state, dispatch, view) => {
+          const ctx = findListContext(state);
+          const wrapInList = pmSchemaList?.wrapInList;
+          const liftListItem = pmSchemaList?.liftListItem;
+
+          if (hasCheckInSelection(ctx)) {
+            if (!dispatch || !liftListItem) {
+              return !!liftListItem;
+            }
+            dispatch(removeChecksFromSelection(state, ctx));
+            if (view) {
+              liftListItem(listItemType)(view.state, dispatch);
+            }
+            return true;
+          }
+
+          if (ctx?.listType === bulletListType) {
+            if (dispatch) {
+              dispatch(addChecksToSelection(state, ctx));
+            }
+            return true;
+          }
+
+          if (ctx?.listType === orderedListType) {
+            if (!dispatch || !liftListItem || !wrapInList) {
+              return !!(liftListItem && wrapInList);
+            }
+            liftListItem(listItemType)(state, dispatch);
+            if (view) {
+              wrapInList(bulletListType)(view.state, dispatch);
+              const newCtx = findListContext(view.state);
+              if (newCtx) {
+                dispatch(addChecksToSelection(view.state, newCtx));
+              }
+            }
+            return true;
+          }
+
+          if (!wrapInList) {
+            return false;
+          }
+          if (!dispatch) {
+            return wrapInList(bulletListType)(state, undefined);
+          }
+
+          wrapInList(bulletListType)(state, dispatch);
+          if (view) {
+            const newCtx = findListContext(view.state);
+            if (newCtx) {
+              dispatch(addChecksToSelection(view.state, newCtx));
+            }
+          }
+          return true;
+        };
+      },
+    };
+  },
+
+  state: ({ schema, utils: { inNode } }, viewState) => {
+    const { $from } = viewState.selection;
+    let inCheckList = false;
+
+    for (let depth = $from.depth; depth > 0; depth--) {
+      const node = $from.node(depth);
+      if (node.type === schema.nodes.list_item) {
+        if ($from.node(depth - 1)?.type === schema.nodes.bullet_list) {
+          const p = node.firstChild;
+          inCheckList =
+            p?.isTextblock && p.firstChild?.type === schema.nodes.check;
+        }
+        break;
+      }
+    }
+
+    return {
+      inCheckList,
+      inBulletList: !inCheckList && inNode(viewState, schema.nodes.bullet_list),
+    };
+  },
 };
 
 const CHECKED_REGEX = /\bchecked\b/;
diff --git a/plugins/checklist/assets/stylesheets/checklist.scss b/plugins/checklist/assets/stylesheets/checklist.scss
index 238a9e0e66ab2..a1519e93416af 100644
--- a/plugins/checklist/assets/stylesheets/checklist.scss
+++ b/plugins/checklist/assets/stylesheets/checklist.scss
@@ -83,8 +83,7 @@ ul li.has-checkbox {
 }
 
 .ProseMirror {
-  // TODO(renato): this is temporary, we should use `has-checkbox` instead
-  li:has(p:first-of-type > span.chcklst-box) {
+  ul > li.has-checkbox {
     list-style-type: none;
 
     .chcklst-box:first-of-type {
diff --git a/plugins/checklist/config/locales/client.en.yml b/plugins/checklist/config/locales/client.en.yml
new file mode 100644
index 0000000000000..4c5f683d2d1ec
--- /dev/null
+++ b/plugins/checklist/config/locales/client.en.yml
@@ -0,0 +1,5 @@
+en:
+  js:
+    checklist:
+      composer:
+        checklist: "Check list"
diff --git a/plugins/checklist/spec/system/page_objects/components/rich_checklist.rb b/plugins/checklist/spec/system/page_objects/components/rich_checklist.rb
new file mode 100644
index 0000000000000..88c0f82e2aac2
--- /dev/null
+++ b/plugins/checklist/spec/system/page_objects/components/rich_checklist.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class RichChecklist < PageObjects::Components::Base
+      CHECKBOX_SELECTOR = ".chcklst-box"
+      UNCHECKED_SELECTOR = "#{CHECKBOX_SELECTOR}.fa.fa-square-o"
+      CHECKED_SELECTOR = "#{CHECKBOX_SELECTOR}.checked.fa.fa-square-check-o"
+
+      def initialize(rich_editor)
+        @rich_editor = rich_editor
+      end
+
+      def click_checkbox(index = 0)
+        @rich_editor.find_all(CHECKBOX_SELECTOR)[index].click
+        self
+      end
+
+      def has_checkboxes?(count:)
+        @rich_editor.has_css?(CHECKBOX_SELECTOR, count: count)
+      end
+
+      def has_no_checkboxes?
+        @rich_editor.has_no_css?(CHECKBOX_SELECTOR)
+      end
+
+      def has_checked?(count: 1)
+        @rich_editor.has_css?(CHECKED_SELECTOR, count: count)
+      end
+
+      def has_unchecked?(count: 1)
+        @rich_editor.has_css?(UNCHECKED_SELECTOR, count: count)
+      end
+
+      def has_items?(count:)
+        @rich_editor.has_css?("ul li", count: count)
+      end
+    end
+  end
+end
diff --git a/plugins/checklist/spec/system/rich_editor_extension_spec.rb b/plugins/checklist/spec/system/rich_editor_extension_spec.rb
new file mode 100644
index 0000000000000..2b5f4171e246b
--- /dev/null
+++ b/plugins/checklist/spec/system/rich_editor_extension_spec.rb
@@ -0,0 +1,141 @@
+# frozen_string_literal: true
+
+describe "Composer - ProseMirror editor - Checklist extension", type: :system do
+  fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
+  let(:composer) { PageObjects::Components::Composer.new }
+  let(:rich) { composer.rich_editor }
+  let(:checklist) { PageObjects::Components::RichChecklist.new(rich) }
+
+  before do
+    sign_in(user)
+    SiteSetting.rich_editor = true
+  end
+
+  def open_composer_and_toggle_rich_editor
+    page.visit "/new-topic"
+    expect(composer).to be_opened
+    composer.toggle_rich_editor
+  end
+
+  def click_checklist_toolbar_option
+    find(".toolbar__button.list").click
+    find("button[data-name='list-checklist']").click
+  end
+
+  describe "checklist functionality" do
+    it "toggles checked state when clicking checkbox" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      rich.send_keys("[ ] Item 1")
+      expect(checklist).to have_unchecked(count: 1)
+
+      checklist.click_checkbox
+      expect(checklist).to have_checked(count: 1)
+    end
+
+    it "shows checklist option in toolbar" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      find(".toolbar__button.list").click
+
+      expect(page).to have_css("button[data-name='list-checklist']")
+    end
+  end
+
+  describe "checklist structure" do
+    it "creates proper list structure with toolbar" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      click_checklist_toolbar_option
+      rich.send_keys("First item")
+
+      expect(checklist).to have_items(count: 1)
+      expect(checklist).to have_checkboxes(count: 1)
+    end
+
+    it "continues checklist on Enter" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      click_checklist_toolbar_option
+      rich.send_keys("First item")
+      rich.send_keys(:enter)
+
+      expect(checklist).to have_items(count: 2)
+      expect(checklist).to have_checkboxes(count: 2)
+    end
+
+    it "allows double-Enter to escape checklist" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      click_checklist_toolbar_option
+      rich.send_keys("First item")
+      rich.send_keys(:enter)
+
+      expect(checklist).to have_checkboxes(count: 2)
+
+      rich.send_keys(:enter)
+
+      expect(checklist).to have_checkboxes(count: 1)
+      expect(checklist).to have_items(count: 1)
+    end
+  end
+
+  describe "backspace behavior" do
+    it "joins with previous item when backspacing at start of checklist item with content" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      click_checklist_toolbar_option
+      rich.send_keys("First item")
+      rich.send_keys(:enter)
+      rich.send_keys("Second item")
+
+      expect(checklist).to have_checkboxes(count: 2)
+      expect(checklist).to have_items(count: 2)
+
+      rich.send_keys(:home)
+      rich.send_keys(:backspace)
+
+      expect(checklist).to have_checkboxes(count: 1)
+      expect(rich).to have_text("First itemSecond item")
+    end
+
+    it "joins with previous item when backspacing on empty checklist item" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      click_checklist_toolbar_option
+      rich.send_keys("First item")
+      rich.send_keys(:enter)
+
+      expect(checklist).to have_checkboxes(count: 2)
+
+      rich.send_keys(:backspace)
+
+      expect(checklist).to have_checkboxes(count: 1)
+      expect(rich).to have_text("First item")
+    end
+
+    it "removes checkbox when backspacing on first/only checklist item" do
+      open_composer_and_toggle_rich_editor
+      rich.click
+
+      click_checklist_toolbar_option
+      rich.send_keys("Only item")
+
+      expect(checklist).to have_checkboxes(count: 1)
+      expect(checklist).to have_items(count: 1)
+
+      rich.send_keys(:home)
+      rich.send_keys(:backspace)
+
+      expect(checklist).to have_no_checkboxes
+      expect(rich).to have_text("Only item")
+    end
+  end
+end
diff --git a/plugins/checklist/test/javascripts/integration/rich-editor-extension-test.js b/plugins/checklist/test/javascripts/integration/rich-editor-extension-test.js
index 505316932fd02..d2c95174f6c33 100644
--- a/plugins/checklist/test/javascripts/integration/rich-editor-extension-test.js
+++ b/plugins/checklist/test/javascripts/integration/rich-editor-extension-test.js
@@ -43,7 +43,7 @@ module(
       ],
       "handles checkboxes in lists": [
         "* [ ] unchecked list item\n* [x] checked list item",
-        `<ul data-tight="true"><li><p>${unchecked} unchecked list item</p></li><li><p>${checked} checked list item</p></li></ul>`,
+        `<ul data-tight="true"><li class="has-checkbox"><p>${unchecked} unchecked list item</p></li><li class="has-checkbox"><p>${checked} checked list item</p></li></ul>`,
         "* [ ] unchecked list item\n* [x] checked list item",
       ],
       "handles checkboxes with formatting": [
@@ -51,21 +51,26 @@ module(
         `<p>${unchecked} <em>italics</em> and ${checked} <strong>bold</strong></p>`,
         "[ ] *italics* and [x] **bold**",
       ],
-      "does not render escaped opening bracket as checkbox": [
+      "does not render escaped checkbox": [
         "\\[x] not a checkbox",
         "<p>[x] not a checkbox</p>",
         "\\[x\\] not a checkbox",
       ],
-      "does not render escaped closing bracket as checkbox": [
-        "[x\\] not a checkbox",
-        "<p>[x] not a checkbox</p>",
-        "\\[x\\] not a checkbox",
-      ],
       "handles escaped checkbox followed by real checkbox": [
         "\\[x] escaped [x] real",
         `<p>[x] escaped ${checked} real</p>`,
         "\\[x\\] escaped [x] real",
       ],
+      "preserves checkbox state in ordered lists": [
+        "1. [ ] unchecked\n2. [x] checked",
+        `<ol data-tight="true"><li><p>${unchecked} unchecked</p></li><li><p>${checked} checked</p></li></ol>`,
+        "1. [ ] unchecked\n2. [x] checked",
+      ],
+      "handles nested list with checkboxes": [
+        "* [ ] parent\n  * [x] child",
+        `<ul data-tight="true"><li class="has-checkbox"><p>${unchecked} parent</p><ul data-tight="true"><li class="has-checkbox"><p>${checked} child</p></li></ul></li></ul>`,
+        "* [ ] parent\n  * [x] child",
+      ],
     }).forEach(([name, [markdown, html, expectedMarkdown]]) => {
       test(name, async function (assert) {
         await testMarkdown(assert, markdown, html, expectedMarkdown);
diff --git a/spec/system/composer/prosemirror_toolbar_spec.rb b/spec/system/composer/prosemirror_toolbar_spec.rb
index 28c8c9863d0c9..adc67add78f23 100644
--- a/spec/system/composer/prosemirror_toolbar_spec.rb
+++ b/spec/system/composer/prosemirror_toolbar_spec.rb
@@ -11,7 +11,6 @@
       expect(page).to have_css(".toolbar__button.italic.--active", count: 0)
       expect(page).to have_css(".toolbar__button.heading.--active", count: 0)
       expect(page).to have_css(".toolbar__button.link.--active", count: 0)
-      expect(page).to have_css(".toolbar__button.bullet.--active", count: 0)
       expect(page).to have_css(".toolbar__button.list.--active", count: 0)
       expect(page).to have_css(".toolbar__button.code.--active", count: 0)
       expect(page).to have_css(".toolbar__button.blockquote.--active", count: 0)
@@ -22,16 +21,9 @@
       expect(page).to have_css(".toolbar__button.bold.--active", count: 1)
       expect(page).to have_css(".toolbar__button.italic.--active", count: 1)
       expect(page).to have_css(".toolbar__button.link.--active", count: 1)
-      expect(page).to have_css(".toolbar__button.bullet.--active", count: 1)
-      expect(page).to have_css(".toolbar__button.list.--active", count: 0)
+      expect(page).to have_css(".toolbar__button.list.--active", count: 1)
       expect(page).to have_css(".toolbar__button.code.--active", count: 1)
       expect(page).to have_css(".toolbar__button.blockquote.--active", count: 1)
-
-      page.find(".toolbar__button.bullet").click
-      page.find(".toolbar__button.list").click
-
-      expect(page).to have_css(".toolbar__button.list.--active", count: 1)
-      expect(page).to have_css(".toolbar__button.bullet.--active", count: 0)
     end
   end
 

From 13fd9a0497685229f9929d77e1536bc3ea789a4f Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Feb 2026 14:11:21 +0100
Subject: [PATCH 042/168] DEV: Move chat message rebake into a service object
 (#38020)

Previously the rebake endpoint in Chat::ChatController used
before_action callbacks to look up the message before checking channel
access. This ordering allowed distinguishing whether a message existed
in an inaccessible channel via differing HTTP status codes (403 vs 404).

This commit extracts the rebake logic into a Chat::RebakeMessage service
following the Service::Base pattern. The service checks channel access
before message lookup, ensuring unauthorized users always receive 403
regardless of message existence. It also removes the now-unused
find_chat_message and preloaded_chat_message_query private methods from
the controller.
---
 .../app/controllers/chat/chat_controller.rb   | 53 +++--------
 .../chat/app/services/chat/rebake_message.rb  | 59 ++++++++++++
 .../spec/requests/chat_controller_spec.rb     | 94 +++++--------------
 .../spec/services/chat/rebake_message_spec.rb | 85 +++++++++++++++++
 4 files changed, 184 insertions(+), 107 deletions(-)
 create mode 100644 plugins/chat/app/services/chat/rebake_message.rb
 create mode 100644 plugins/chat/spec/services/chat/rebake_message_spec.rb

diff --git a/plugins/chat/app/controllers/chat/chat_controller.rb b/plugins/chat/app/controllers/chat/chat_controller.rb
index 1af55e9d3c636..90fa502460438 100644
--- a/plugins/chat/app/controllers/chat/chat_controller.rb
+++ b/plugins/chat/app/controllers/chat/chat_controller.rb
@@ -2,12 +2,8 @@
 
 module Chat
   class ChatController < ::Chat::BaseController
-    # Other endpoints use set_channel_and_chatable_with_access_check, but
-    # these endpoints require a standalone find because they need to be
-    # able to get deleted channels and recover them.
-    before_action :find_chat_message, only: %i[rebake]
     before_action :set_channel_and_chatable_with_access_check,
-                  except: %i[respond set_user_chat_status dismiss_retention_reminder]
+                  except: %i[respond set_user_chat_status dismiss_retention_reminder rebake]
 
     def respond
       render
@@ -27,9 +23,20 @@ def react
     end
 
     def rebake
-      guardian.ensure_can_rebake_chat_message!(@message)
-      @message.rebake!(invalidate_oneboxes: true)
-      render json: success_json
+      Chat::RebakeMessage.call(service_params) do
+        on_success { render(json: success_json) }
+        on_failure { render(json: failed_json, status: :unprocessable_entity) }
+        on_model_not_found(:channel) { raise Discourse::NotFound }
+        on_failed_policy(:can_access_channel) { raise Discourse::InvalidAccess }
+        on_model_not_found(:message) { raise Discourse::NotFound }
+        on_failed_policy(:can_rebake) { raise Discourse::InvalidAccess }
+        on_failed_contract do |contract|
+          render(
+            json: failed_json.merge(errors: contract.errors.full_messages),
+            status: :bad_request,
+          )
+        end
+      end
     end
 
     def set_user_chat_status
@@ -70,35 +77,5 @@ def quote_messages
         ).generate_markdown
       render json: success_json.merge(markdown: markdown)
     end
-
-    private
-
-    def preloaded_chat_message_query
-      query =
-        Chat::Message
-          .includes(in_reply_to: [:user, chat_webhook_event: [:incoming_chat_webhook]])
-          .includes(:revisions)
-          .includes(user: :primary_group)
-          .includes(chat_webhook_event: :incoming_chat_webhook)
-          .includes(reactions: :user)
-          .includes(:bookmarks)
-          .includes(uploads: { optimized_videos: :optimized_upload })
-          .includes(chat_channel: :chatable)
-          .includes(:thread)
-          .includes(:chat_mentions)
-
-      query = query.includes(user: :user_status) if SiteSetting.enable_user_status
-
-      query
-    end
-
-    def find_chat_message
-      @message = preloaded_chat_message_query.with_deleted
-      @message = @message.where(chat_channel_id: params[:chat_channel_id]) if params[
-        :chat_channel_id
-      ]
-      @message = @message.find_by(id: params[:message_id])
-      raise Discourse::NotFound unless @message
-    end
   end
 end
diff --git a/plugins/chat/app/services/chat/rebake_message.rb b/plugins/chat/app/services/chat/rebake_message.rb
new file mode 100644
index 0000000000000..afde79d3b0fd4
--- /dev/null
+++ b/plugins/chat/app/services/chat/rebake_message.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Chat
+  # Service responsible for rebaking a chat message.
+  #
+  # @example
+  #  Chat::RebakeMessage.call(params: { message_id: 2, chat_channel_id: 1 }, guardian: guardian)
+  #
+  class RebakeMessage
+    include Service::Base
+
+    # @!method self.call(guardian:, params:)
+    #   @param [Guardian] guardian
+    #   @param [Hash] params
+    #   @option params [Integer] :message_id
+    #   @option params [Integer] :chat_channel_id
+    #   @return [Service::Base::Context]
+
+    params do
+      attribute :message_id, :integer
+      attribute :chat_channel_id, :integer
+
+      validates :message_id, presence: true
+      validates :chat_channel_id, presence: true
+    end
+
+    model :channel
+    policy :can_access_channel
+    model :message
+    policy :can_rebake
+
+    step :rebake_message
+
+    private
+
+    def fetch_channel(params:)
+      Chat::Channel.includes(:chatable).find_by(id: params.chat_channel_id)
+    end
+
+    def can_access_channel(guardian:, channel:)
+      guardian.can_join_chat_channel?(channel)
+    end
+
+    def fetch_message(params:, channel:)
+      Chat::Message
+        .includes(chat_channel: :chatable)
+        .with_deleted
+        .find_by(id: params.message_id, chat_channel_id: channel.id)
+    end
+
+    def can_rebake(guardian:, message:)
+      guardian.can_rebake_chat_message?(message)
+    end
+
+    def rebake_message(message:)
+      message.rebake!(invalidate_oneboxes: true)
+    end
+  end
+end
diff --git a/plugins/chat/spec/requests/chat_controller_spec.rb b/plugins/chat/spec/requests/chat_controller_spec.rb
index aca6fe419cfa3..58c67622df36c 100644
--- a/plugins/chat/spec/requests/chat_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat_controller_spec.rb
@@ -33,88 +33,44 @@ def flag_message(message, flagger, flag_type: ReviewableScore.types[:off_topic])
   describe "#rebake" do
     fab!(:chat_message) { Fabricate(:chat_message, chat_channel: chat_channel, user: user) }
 
-    context "as staff" do
-      it "rebakes the post" do
-        sign_in(Fabricate(:admin))
-
-        expect_enqueued_with(
-          job: Jobs::Chat::ProcessMessage,
-          args: {
-            chat_message_id: chat_message.id,
-          },
-        ) do
-          put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
-
-          expect(response.status).to eq(200)
-        end
+    it "works" do
+      sign_in(admin)
+      put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
+      expect(response.status).to eq(200)
+    end
+
+    context "when message does not exist" do
+      it "returns a 404" do
+        sign_in(admin)
+        put "/chat/#{chat_channel.id}/-999/rebake.json"
+        expect(response.status).to eq(404)
       end
+    end
 
-      it "does not interfere with core's guardian can_rebake? for posts" do
-        sign_in(Fabricate(:admin))
-        put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
-        expect(response.status).to eq(200)
-        post = Fabricate(:post)
-        put "/posts/#{post.id}/rebake.json"
-        expect(response.status).to eq(200)
+    context "when channel does not exist" do
+      it "returns a 404" do
+        sign_in(admin)
+        put "/chat/-999/#{chat_message.id}/rebake.json"
+        expect(response.status).to eq(404)
       end
+    end
 
-      it "does not rebake the post when channel is read_only" do
-        chat_message.chat_channel.update!(status: :read_only)
-        sign_in(Fabricate(:admin))
+    context "when user cannot access the channel" do
+      fab!(:inaccessible_channel, :private_category_channel)
 
-        put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
+      it "returns a 403" do
+        sign_in(Fabricate(:user))
+        put "/chat/#{inaccessible_channel.id}/-999/rebake.json"
         expect(response.status).to eq(403)
       end
-
-      context "when cooked has changed" do
-        it "marks the message as dirty" do
-          sign_in(Fabricate(:admin))
-          chat_message.update!(message: "new content")
-
-          expect_enqueued_with(
-            job: Jobs::Chat::ProcessMessage,
-            args: {
-              chat_message_id: chat_message.id,
-            },
-          ) do
-            put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
-
-            expect(response.status).to eq(200)
-          end
-        end
-      end
     end
 
-    context "when not staff" do
-      it "forbids non staff to rebake" do
+    context "when user cannot rebake" do
+      it "returns a 403" do
         sign_in(Fabricate(:user))
         put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
         expect(response.status).to eq(403)
       end
-
-      context "as TL3 user" do
-        it "forbids less then TL4 user tries to rebake" do
-          sign_in(Fabricate(:user, trust_level: TrustLevel[3]))
-          put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
-          expect(response.status).to eq(403)
-        end
-      end
-
-      context "as TL4 user" do
-        it "allows TL4 users to rebake" do
-          sign_in(Fabricate(:user, trust_level: TrustLevel[4]))
-          put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
-          expect(response.status).to eq(200)
-        end
-
-        it "does not rebake the post when channel is read_only" do
-          chat_message.chat_channel.update!(status: :read_only)
-          sign_in(Fabricate(:user, trust_level: TrustLevel[4]))
-
-          put "/chat/#{chat_channel.id}/#{chat_message.id}/rebake.json"
-          expect(response.status).to eq(403)
-        end
-      end
     end
   end
 
diff --git a/plugins/chat/spec/services/chat/rebake_message_spec.rb b/plugins/chat/spec/services/chat/rebake_message_spec.rb
new file mode 100644
index 0000000000000..bf681ef005993
--- /dev/null
+++ b/plugins/chat/spec/services/chat/rebake_message_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+RSpec.describe Chat::RebakeMessage do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:message_id) }
+    it { is_expected.to validate_presence_of(:chat_channel_id) }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:admin)
+    fab!(:message, :chat_message)
+
+    let(:guardian) { Guardian.new(admin) }
+    let(:params) { { message_id: message.id, chat_channel_id: message.chat_channel_id } }
+    let(:dependencies) { { guardian: } }
+
+    before do
+      SiteSetting.chat_enabled = true
+      SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
+    end
+
+    context "when params are not valid" do
+      let(:params) { {} }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when the channel does not exist" do
+      let(:params) { { message_id: message.id, chat_channel_id: -1 } }
+
+      it { is_expected.to fail_to_find_a_model(:channel) }
+    end
+
+    context "when the user cannot access the channel" do
+      fab!(:private_channel) do
+        Fabricate(
+          :private_category_channel,
+          group: Fabricate(:group),
+          chatable: Fabricate(:private_category, group: Fabricate(:group)),
+        )
+      end
+
+      let(:current_user) { Fabricate(:user) }
+      let(:guardian) { Guardian.new(current_user) }
+      let(:params) { { message_id: -999, chat_channel_id: private_channel.id } }
+
+      it { is_expected.to fail_a_policy(:can_access_channel) }
+    end
+
+    context "when the message does not exist" do
+      let(:params) { { message_id: -1, chat_channel_id: message.chat_channel_id } }
+
+      it { is_expected.to fail_to_find_a_model(:message) }
+    end
+
+    context "when the message does not belong to the channel" do
+      let(:other_channel) { Fabricate(:category_channel) }
+      let(:params) { { message_id: message.id, chat_channel_id: other_channel.id } }
+
+      it { is_expected.to fail_to_find_a_model(:message) }
+    end
+
+    context "when the user does not have permission to rebake" do
+      let(:current_user) { Fabricate(:user) }
+      let(:guardian) { Guardian.new(current_user) }
+
+      it { is_expected.to fail_a_policy(:can_rebake) }
+    end
+
+    context "when the user has permission to rebake" do
+      it { is_expected.to run_successfully }
+
+      it "enqueues a process message job" do
+        expect_enqueued_with(
+          job: Jobs::Chat::ProcessMessage,
+          args: {
+            chat_message_id: message.id,
+          },
+        ) { result }
+      end
+    end
+  end
+end

From cf726be8d178b370263bfed04e13897e4b717c31 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Feb 2026 14:11:32 +0100
Subject: [PATCH 043/168] FIX: Enforce allow_membership_requests setting in
 groups controller (#38017)

The request_membership action did not check the group's
allow_membership_requests setting, allowing any logged-in user who could
see the group to submit a membership request. Also prevents existing
group members from submitting requests.
---
 app/controllers/groups_controller.rb    |  3 +++
 spec/requests/groups_controller_spec.rb | 33 ++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 257332b84106e..918d8cbcbe3d0 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -610,6 +610,9 @@ def request_membership
 
     group = find_group(:name)
 
+    raise Discourse::InvalidAccess unless group.allow_membership_requests?
+    raise Discourse::InvalidAccess if group.users.exists?(id: current_user.id)
+
     begin
       GroupRequest.create!(group: group, user: current_user, reason: params[:reason])
     rescue ActiveRecord::RecordNotUnique
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index a5be5a6682798..ab19a26536b24 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -2507,20 +2507,41 @@ def expect_type_to_return_right_groups(type, expected_group_ids)
   describe "#request_membership" do
     fab!(:new_user, :user)
 
+    before { group.update_column(:allow_membership_requests, true) }
+
     it "requires the user to log in" do
       post "/groups/#{group.name}/request_membership.json"
       expect(response.status).to eq(403)
     end
 
-    it "requires a reason" do
+    it "rejects the request when allow_membership_requests is false" do
+      group.update!(allow_membership_requests: false)
+      sign_in(new_user)
+
+      post "/groups/#{group.name}/request_membership.json", params: { reason: "Please add me" }
+
+      expect(response.status).to eq(403)
+      expect(GroupRequest.where(group: group, user: new_user).exists?).to eq(false)
+    end
+
+    it "rejects the request when the user is already a group member" do
       sign_in(user)
 
+      post "/groups/#{group.name}/request_membership.json", params: { reason: "Please add me" }
+
+      expect(response.status).to eq(403)
+      expect(GroupRequest.where(group: group, user: user).exists?).to eq(false)
+    end
+
+    it "requires a reason" do
+      sign_in(new_user)
+
       post "/groups/#{group.name}/request_membership.json"
       expect(response.status).to eq(400)
     end
 
     it "checks for duplicates" do
-      sign_in(user)
+      sign_in(new_user)
 
       post "/groups/#{group.name}/request_membership.json", params: { reason: "Please add me in" }
 
@@ -2532,7 +2553,7 @@ def expect_type_to_return_right_groups(type, expected_group_ids)
     end
 
     it "limits the character count of the reason" do
-      sign_in(user)
+      sign_in(new_user)
 
       post "/groups/#{group.name}/request_membership.json",
            params: {
@@ -2550,7 +2571,7 @@ def expect_type_to_return_right_groups(type, expected_group_ids)
       owner2 = Fabricate(:user, last_seen_at: 1.day.ago)
       [owner1, owner2].each { |owner| group.add_owner(owner) }
 
-      sign_in(user)
+      sign_in(new_user)
 
       post "/groups/#{group.name}/request_membership.json", params: { reason: "Please add me in" }
 
@@ -2562,7 +2583,7 @@ def expect_type_to_return_right_groups(type, expected_group_ids)
 
       expect(body["relative_url"]).to eq(topic.relative_url)
       expect(post.topic.custom_fields["requested_group_id"].to_i).to eq(group.id)
-      expect(post.user).to eq(user)
+      expect(post.user).to eq(new_user)
 
       expect(topic.title).to eq(
         I18n.t("groups.request_membership_pm.title", group_name: group.name),
@@ -2570,7 +2591,7 @@ def expect_type_to_return_right_groups(type, expected_group_ids)
 
       expect(post.raw).to start_with("Please add me in")
       expect(topic.archetype).to eq(Archetype.private_message)
-      expect(topic.allowed_users).to contain_exactly(user, owner1, owner2)
+      expect(topic.allowed_users).to contain_exactly(new_user, owner1, owner2)
       expect(topic.allowed_groups).to eq([])
     end
   end

From 867a59a1bd7420eac8f81c23359f02de2301a8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 24 Feb 2026 14:27:50 +0100
Subject: [PATCH 044/168] FIX: Exclude notify_moderators PMs from personal
 message rate limit (#38021)

When a user flags a post with "Something Else", Discourse creates a
private message to moderators containing the flag details. This PM is
created with the flagger as the topic owner, which causes it to count
against the user's `max_personal_messages_per_day` rate limit.

This means users who have exhausted their daily PM quota cannot flag
posts with the "Something Else" reason, even though the flag itself has
its own independent rate limits (`max_flags_per_day` with trust level
multipliers). The error message ("You've reached the maximum messages
allowed per day") is also confusing in a flagging context.

This fix excludes topics with the `notify_moderators` subtype from the
PM per-day rate limit check in `Topic#limit_private_messages_per_day`.
Flag-generated PMs are system-initiated side effects, not user-initiated
messages, and should not count against the personal message quota.

https://meta.discourse.org/t/257002
---
 app/models/topic.rb                  |  1 +
 spec/lib/post_action_creator_spec.rb | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index a723c64d4ce12..7995d3ca58de2 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -520,6 +520,7 @@ def limit_topics_per_day
 
   def limit_private_messages_per_day
     return unless private_message?
+    return if subtype == TopicSubtype.notify_moderators
     apply_per_day_rate_limit_for("pms", :max_personal_messages_per_day)
   end
 
diff --git a/spec/lib/post_action_creator_spec.rb b/spec/lib/post_action_creator_spec.rb
index 44a07de66291d..a3c4be90442d9 100644
--- a/spec/lib/post_action_creator_spec.rb
+++ b/spec/lib/post_action_creator_spec.rb
@@ -17,6 +17,27 @@
 
       expect { PostActionCreator.like(user, post) }.to raise_error(RateLimiter::LimitExceeded)
     end
+
+    it "does not count notify_moderators PM against personal message rate limit" do
+      SiteSetting.max_personal_messages_per_day = 1
+      SiteSetting.max_topics_per_day = 0
+      SiteSetting.max_topics_in_first_day = 0
+      SiteSetting.rate_limit_create_topic = 0
+      SiteSetting.rate_limit_create_post = 0
+      SiteSetting.rate_limit_new_user_create_post = 0
+
+      archetype = Archetype.private_message
+
+      create_post(user:, archetype:, target_usernames: [admin.username])
+
+      expect { create_post(user:, archetype:, target_usernames: [admin.username]) }.to raise_error(
+        RateLimiter::LimitExceeded,
+      )
+
+      reason = "This is a 'something else' flag."
+      result = PostActionCreator.notify_moderators(user, post, reason)
+      expect(result).to be_success
+    end
   end
 
   describe "messaging" do

From be1231fbb1d2f78bf2b07b67bd02f9dc5d1d278c Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Tue, 24 Feb 2026 14:37:54 +0100
Subject: [PATCH 045/168] DEV: Move admin data-explorer code to the admin
 bundle (#38022)

---
 .../templates/admin-plugins/show/explorer/details.gjs     | 8 ++++----
 .../templates/admin-plugins/show/explorer/index.gjs       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename plugins/discourse-data-explorer/assets/javascripts/{discourse => admin}/templates/admin-plugins/show/explorer/details.gjs (95%)
 rename plugins/discourse-data-explorer/assets/javascripts/{discourse => admin}/templates/admin-plugins/show/explorer/index.gjs (98%)

diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/details.gjs b/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs
similarity index 95%
rename from plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/details.gjs
rename to plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs
index f1e325de7ccf1..231004485aa1c 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/details.gjs
+++ b/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs
@@ -12,10 +12,10 @@ import icon from "discourse/helpers/d-icon";
 import draggable from "discourse/modifiers/draggable";
 import MultiSelect from "discourse/select-kit/components/multi-select";
 import { i18n } from "discourse-i18n";
-import CodeView from "../../../../components/code-view";
-import ExplorerSchema from "../../../../components/explorer-schema";
-import ParamInputForm from "../../../../components/param-input-form";
-import QueryResultsWrapper from "../../../../components/query-results-wrapper";
+import CodeView from "discourse/plugins/discourse-data-explorer/discourse/components/code-view";
+import ExplorerSchema from "discourse/plugins/discourse-data-explorer/discourse/components/explorer-schema";
+import ParamInputForm from "discourse/plugins/discourse-data-explorer/discourse/components/param-input-form";
+import QueryResultsWrapper from "discourse/plugins/discourse-data-explorer/discourse/components/query-results-wrapper";
 
 export default class QueriesDetails extends Component {
   get showDestroyQuery() {
diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
similarity index 98%
rename from plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/index.gjs
rename to plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
index f8536b8c52a5f..be9ffb29918a2 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/admin-plugins/show/explorer/index.gjs
+++ b/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
@@ -11,7 +11,7 @@ import ageWithTooltip from "discourse/helpers/age-with-tooltip";
 import icon from "discourse/helpers/d-icon";
 import { not } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
-import ShareReport from "../../../../components/share-report";
+import ShareReport from "discourse/plugins/discourse-data-explorer/discourse/components/share-report";
 
 export default <template>
   <div class="admin-detail">

From d818ef3c730374d141a54e3f662fdb60d8e44290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 24 Feb 2026 14:39:01 +0100
Subject: [PATCH 046/168] DEV: route bulk tag actions through PostRevisor
 (#37848)

Bulk tag operations (change, append, remove) were directly manipulating
tag records via DiscourseTagging and TopicTag, bypassing PostRevisor
entirely. This meant callbacks, plugin hooks, and other side effects
tied to the revision pipeline were not triggered.

This refactors the three bulk tag actions to go through
`first_post.revise` instead, using `silent: true` to avoid sending
notifications and `skip_revision: true` to avoid creating revision
records, preserving the existing quiet behavior.

Also adds eager loading of first_post and tags to avoid N+1 queries,
simplifies tag input handling by normalizing both tag_ids and tag_names
into a single code path, and refactors `notification_is_disabled?` in
PostActionNotifier for readability.
---
 app/services/post_action_notifier.rb    | 23 ++++--
 lib/post_revisor.rb                     |  2 +-
 lib/topics_bulk_action.rb               | 97 +++++++++++++------------
 spec/lib/post_revisor_spec.rb           | 12 +--
 spec/lib/topics_bulk_action_spec.rb     | 65 +++++++++++++++--
 spec/requests/topics_controller_spec.rb |  2 +
 6 files changed, 133 insertions(+), 68 deletions(-)

diff --git a/app/services/post_action_notifier.rb b/app/services/post_action_notifier.rb
index 698d2362935fb..e35f8b10d43cd 100644
--- a/app/services/post_action_notifier.rb
+++ b/app/services/post_action_notifier.rb
@@ -161,14 +161,21 @@ def self.add_post_revision_notifier_recipients(&block)
   private
 
   def self.notification_is_disabled?(post_revision)
+    if SiteSetting.disable_system_edit_notifications &&
+         post_revision.user_id == Discourse::SYSTEM_USER_ID
+      return true
+    end
+
     modifications = post_revision.modifications
-    (
-      SiteSetting.disable_system_edit_notifications &&
-        post_revision.user_id == Discourse::SYSTEM_USER_ID
-    ) ||
-      (
-        SiteSetting.disable_category_edit_notifications &&
-          modifications&.dig("category_id").present?
-      ) || (SiteSetting.disable_tags_edit_notifications && modifications&.dig("tags").present?)
+
+    if SiteSetting.disable_category_edit_notifications && modifications&.dig("category_id").present?
+      return true
+    end
+
+    if SiteSetting.disable_tags_edit_notifications && modifications&.dig("tags").present?
+      return true
+    end
+
+    false
   end
 end
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index b65bf9119624a..c94d162014a7c 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -68,7 +68,7 @@ def apply_tag_changes(tag_value)
         removed_tags = prev_tags - persisted_tag_names
         diff_tags = added_tags | removed_tags
 
-        if diff_tags.present?
+        if diff_tags.present? && !self.silent
           Jobs.enqueue(:notify_tag_change, post_id: post.id, notified_user_ids:, diff_tags:)
 
           PostRevisor.create_small_action_for_tag_changes(
diff --git a/lib/topics_bulk_action.rb b/lib/topics_bulk_action.rb
index fdc050a6dbf9c..3264283495e67 100644
--- a/lib/topics_bulk_action.rb
+++ b/lib/topics_bulk_action.rb
@@ -251,75 +251,72 @@ def delete
   end
 
   def change_tags
-    tag_ids, tag_names = extract_tag_params
+    tags = resolve_tag_names || []
 
-    topics.each do |t|
-      if guardian.can_edit?(t)
-        success =
-          if tag_ids.present?
-            DiscourseTagging.tag_topic_by_ids(t, guardian, tag_ids)
-          elsif tag_names.present?
-            DiscourseTagging.tag_topic_by_names(t, guardian, tag_names)
-          else
-            t.tags = []
-            true
-          end
-
-        if success
-          @changed_ids << t.id
-        else
-          t.errors.full_messages.each { |msg| @errors[msg] += 1 }
-        end
+    topics_with_tags.each do |t|
+      next unless guardian.can_edit?(t)
+      next unless t.first_post
+
+      if t.first_post.revise(@user, { tags: tags }, bulk_tag_opts)
+        @changed_ids << t.id
+      else
+        t.errors.full_messages.each { |msg| @errors[msg] += 1 }
       end
     end
   end
 
   def append_tags
-    tag_ids, tag_names = extract_tag_params
+    tags = resolve_tag_names || []
 
-    topics.each do |t|
-      if guardian.can_edit?(t)
-        success =
-          if tag_ids.present?
-            DiscourseTagging.tag_topic_by_ids(t, guardian, tag_ids, append: true)
-          elsif tag_names.present?
-            DiscourseTagging.tag_topic_by_names(t, guardian, tag_names, append: true)
-          else
-            true
-          end
-
-        if success
-          @changed_ids << t.id
-        else
-          t.errors.full_messages.each { |msg| @errors[msg] += 1 }
-        end
+    return if tags.blank?
+
+    topics_with_tags.each do |t|
+      next unless guardian.can_edit?(t)
+      next unless t.first_post
+
+      merged = t.tags.map(&:name) | tags
+      if t.first_post.revise(@user, { tags: merged }, bulk_tag_opts)
+        @changed_ids << t.id
+      else
+        t.errors.full_messages.each { |msg| @errors[msg] += 1 }
       end
     end
   end
 
-  def extract_tag_params
+  def remove_tags
+    topics_with_tags.each do |t|
+      next unless guardian.can_edit?(t)
+      next unless t.first_post
+
+      if t.first_post.revise(@user, { tags: [] }, bulk_tag_opts)
+        @changed_ids << t.id
+      else
+        t.errors.full_messages.each { |msg| @errors[msg] += 1 }
+      end
+    end
+  end
+
+  def resolve_tag_names
     if @operation[:tag_ids].present?
-      [@operation[:tag_ids], nil]
+      Tag.where(id: @operation[:tag_ids]).pluck(:name)
     elsif @operation[:tags].present?
       Discourse.deprecate(
         "the tags param for bulk actions is deprecated, use tag_ids instead",
         since: "2026.01",
         drop_from: "2026.07",
       )
-      tag_names = @operation[:tags]
-      [nil, tag_names]
-    else
-      [nil, nil]
+      @operation[:tags]
     end
   end
 
-  def remove_tags
-    topics.each do |t|
-      if guardian.can_edit?(t)
-        TopicTag.where(topic_id: t.id).in_batches.destroy_all
-        @changed_ids << t.id
-      end
-    end
+  def bulk_tag_opts
+    {
+      bypass_bump: true,
+      validate_post: false,
+      bypass_rate_limiter: true,
+      skip_revision: true,
+      silent: true,
+    }
   end
 
   def guardian
@@ -330,6 +327,10 @@ def topics
     @topics ||= Topic.where(id: @topic_ids)
   end
 
+  def topics_with_tags
+    @topics_with_tags ||= topics.includes(:first_post, :tags)
+  end
+
   def dismiss_topics_since_date
     new_topic_duration_minutes =
       @user.user_option&.new_topic_duration_minutes ||
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index a61e343e5b89a..b619ad5b17975 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -1066,15 +1066,15 @@
       expect(post_revisor.raw_changed?).to eq(false)
 
       post_revisor.revise!(admin, tags: %w[new-tag new-tag-2])
-      expect(post.post_revisions.last.modifications).to eq(
-        "tags" => [["new-tag"], %w[new-tag new-tag-2]],
-      )
+      before, after = post.post_revisions.last.modifications["tags"]
+      expect(before).to contain_exactly("new-tag")
+      expect(after).to contain_exactly("new-tag", "new-tag-2")
       expect(post_revisor.raw_changed?).to eq(false)
 
       post_revisor.revise!(admin, tags: ["new-tag-3"])
-      expect(post.post_revisions.last.modifications).to eq(
-        "tags" => [%w[new-tag new-tag-2], ["new-tag-3"]],
-      )
+      before, after = post.post_revisions.last.modifications["tags"]
+      expect(before).to contain_exactly("new-tag", "new-tag-2")
+      expect(after).to contain_exactly("new-tag-3")
       expect(post_revisor.raw_changed?).to eq(false)
     end
 
diff --git a/spec/lib/topics_bulk_action_spec.rb b/spec/lib/topics_bulk_action_spec.rb
index 43d91464372c3..43ea3e418e5c0 100644
--- a/spec/lib/topics_bulk_action_spec.rb
+++ b/spec/lib/topics_bulk_action_spec.rb
@@ -504,6 +504,7 @@
   end
 
   describe "change_tags" do
+    fab!(:first_post) { Fabricate(:post, topic:) }
     fab!(:tag1, :tag)
     fab!(:tag2, :tag)
 
@@ -577,9 +578,30 @@
         expect(topic.reload.tags).to contain_exactly(tag1, tag2)
       end
     end
+
+    it "does not send notifications" do
+      fab_tag3 = Fabricate(:tag)
+      topic_watcher = Fabricate(:user)
+      Jobs.run_immediately!
+      TopicUser.change(
+        topic_watcher,
+        topic.id,
+        notification_level: TopicUser.notification_levels[:watching],
+      )
+
+      expect do
+        TopicsBulkAction.new(
+          Fabricate(:admin),
+          [topic.id],
+          type: "change_tags",
+          tag_ids: [fab_tag3.id],
+        ).perform!
+      end.to not_change { Notification.where(user: topic_watcher).count }
+    end
   end
 
   describe "append_tags" do
+    fab!(:first_post) { Fabricate(:post, topic:) }
     fab!(:tag1, :tag)
     fab!(:tag2, :tag)
     fab!(:tag3, :tag)
@@ -604,11 +626,11 @@
         expect(topic.reload.tags).to contain_exactly(tag1, tag2, tag3)
       end
 
-      it "keeps existing tags when appending empty array" do
+      it "is a no-op when appending empty array" do
         topic_ids =
           TopicsBulkAction.new(topic.user, [topic.id], type: "append_tags", tag_ids: []).perform!
 
-        expect(topic_ids).to eq([topic.id])
+        expect(topic_ids).to eq([])
         expect(topic.reload.tags).to contain_exactly(tag1, tag2)
       end
     end
@@ -651,17 +673,36 @@
         expect(topic.reload.tags).to contain_exactly(tag1, tag2)
       end
     end
+
+    it "does not send notifications" do
+      topic_watcher = Fabricate(:user)
+      Jobs.run_immediately!
+      TopicUser.change(
+        topic_watcher,
+        topic.id,
+        notification_level: TopicUser.notification_levels[:watching],
+      )
+
+      expect do
+        TopicsBulkAction.new(
+          Fabricate(:admin),
+          [topic.id],
+          type: "append_tags",
+          tag_ids: [tag3.id],
+        ).perform!
+      end.to not_change { Notification.where(user: topic_watcher).count }
+    end
   end
 
   describe "remove_tags" do
+    fab!(:first_post) { Fabricate(:post, topic:) }
     fab!(:tag1, :tag)
     fab!(:tag2, :tag)
 
     before do
       SiteSetting.tagging_enabled = true
       SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
-      TopicTag.create!(topic: topic, tag: tag1)
-      TopicTag.create!(topic: topic, tag: tag2)
+      topic.tags = [tag1, tag2]
     end
 
     context "when the user can edit the topic" do
@@ -683,8 +724,22 @@
         topic_ids = TopicsBulkAction.new(topic.user, [topic.id], type: "remove_tags").perform!
 
         expect(topic_ids).to eq([])
-        expect(topic.reload.tags.map(&:name)).to contain_exactly(tag1.name, tag2.name)
+        expect(topic.reload.tags).to contain_exactly(tag1, tag2)
       end
     end
+
+    it "does not send notifications" do
+      topic_watcher = Fabricate(:user)
+      Jobs.run_immediately!
+      TopicUser.change(
+        topic_watcher,
+        topic.id,
+        notification_level: TopicUser.notification_levels[:watching],
+      )
+
+      expect do
+        TopicsBulkAction.new(Fabricate(:admin), [topic.id], type: "remove_tags").perform!
+      end.to not_change { Notification.where(user: topic_watcher).count }
+    end
   end
 end
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 1da6ab3a158b0..350f0e1e0f4e2 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -4206,6 +4206,7 @@ def extract_post_stream
         SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
         tag1 = Fabricate(:tag)
         topic.update!(user:)
+        _first_post = Fabricate(:post, topic:, user:)
 
         put "/topics/bulk.json",
             params: {
@@ -4225,6 +4226,7 @@ def extract_post_stream
         SiteSetting.tag_topic_allowed_groups = Group::AUTO_GROUPS[:trust_level_0]
         tag1 = Fabricate(:tag)
         topic.update!(user:)
+        _first_post = Fabricate(:post, topic:, user:)
 
         put "/topics/bulk.json",
             params: {

From e590778a144c01290b25c5716604eedae6042804 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@gmail.com>
Date: Tue, 24 Feb 2026 22:38:51 +0800
Subject: [PATCH 047/168] FIX: Show the tag's name in the composer when
 previewing templated form (#38018)

Reported here:
https://meta.discourse.org/t/tag-chooser-tags-are-not-allowed/396679/6

We want to make sure that the value shown in the composer's preview is
not the tag's ID, but the tag's name.
---
 .../form-template-field/tag-chooser.gjs       | 20 ++++----
 .../form_template_tag_chooser_spec.rb         | 49 +++++++++++++++++++
 .../page_objects/pages/form_template.rb       |  2 +-
 3 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 spec/system/composer/form_template_tag_chooser_spec.rb

diff --git a/frontend/discourse/app/components/form-template-field/tag-chooser.gjs b/frontend/discourse/app/components/form-template-field/tag-chooser.gjs
index 79f6e68350e52..8b9dcf82cf5d7 100644
--- a/frontend/discourse/app/components/form-template-field/tag-chooser.gjs
+++ b/frontend/discourse/app/components/form-template-field/tag-chooser.gjs
@@ -89,23 +89,23 @@ export default class TagChooserField extends Component {
   }
 
   @action
-  handleSelectedTagIds(event) {
+  handleSelectedTagNames(event) {
     return Array.from(event.target.selectedOptions)
-      .map((option) => parseInt(option.value, 10))
-      .filter((id) => !isNaN(id));
+      .map((option) => option.value)
+      .filter((name) => name !== "");
   }
 
   @action
   handleInput(event) {
-    const selectedTagIds = this.handleSelectedTagIds(event);
-    const validTagIds = this.formattedChoices.map((choice) => choice.id);
-    const filteredTagIds = selectedTagIds.filter((tagId) =>
-      validTagIds.includes(tagId)
+    const selectedTagNames = this.handleSelectedTagNames(event);
+    const validTagNames = this.formattedChoices.map((choice) => choice.name);
+    const filteredTagNames = selectedTagNames.filter((name) =>
+      validTagNames.includes(name)
     );
     const existingSelectedTagIds = this.selectedTags.map((t) => this._tagId(t));
 
-    const selectedTags = filteredTagIds.map((tagId) =>
-      this.formattedChoices.find((choice) => choice.id === tagId)
+    const selectedTags = filteredTagNames.map((name) =>
+      this.formattedChoices.find((choice) => choice.name === name)
     );
 
     set(
@@ -167,7 +167,7 @@ export default class TagChooserField extends Component {
         {{/if}}
         {{#each this.formattedChoices as |choice|}}
           <option
-            value={{choice.id}}
+            value={{choice.name}}
             selected={{this.isSelected choice.id}}
           >{{choice.display}}</option>
         {{/each}}
diff --git a/spec/system/composer/form_template_tag_chooser_spec.rb b/spec/system/composer/form_template_tag_chooser_spec.rb
new file mode 100644
index 0000000000000..0bd692305670f
--- /dev/null
+++ b/spec/system/composer/form_template_tag_chooser_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+describe "Composer Form Template", type: :system do
+  fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
+  fab!(:tag1) { Fabricate(:tag, name: "persian") }
+  fab!(:tag2) { Fabricate(:tag, name: "siamese") }
+  fab!(:tag_group) { Fabricate(:tag_group, name: "Cat Breeds", tags: [tag1, tag2]) }
+  fab!(:form_template) do
+    Fabricate(
+      :form_template,
+      name: "Cat Template",
+      template:
+        "- type: tag-chooser\n  id: cat-breed\n  tag_group: \"Cat Breeds\"\n  attributes:\n    label: \"Cat Breed\"\n    none_label: \"Select a breed\"\n    multiple: false\n  validations:\n    required: true\n- type: input\n  id: notes\n  attributes:\n    label: \"Notes\"\n",
+    )
+  end
+  fab!(:category) do
+    Fabricate(
+      :category,
+      name: "Cats",
+      slug: "cats",
+      topic_count: 2,
+      form_template_ids: [form_template.id],
+    )
+  end
+
+  let(:composer) { PageObjects::Components::Composer.new }
+
+  before do
+    SiteSetting.enable_form_templates = true
+    SiteSetting.show_preview_for_form_templates = true
+    SiteSetting.tagging_enabled = true
+    sign_in(user)
+  end
+
+  it "uses tag name instead of tag ID in form template preview" do
+    visit("/")
+    find("#create-topic").click
+    find(".category-chooser").click
+    find(".category-row[data-value='#{category.id}']").click
+
+    expect(page).to have_css(".form-template-field__multi-select[name='cat-breed']")
+
+    find(".form-template-field__multi-select[name='cat-breed']").select("PERSIAN")
+
+    preview = find(".d-editor-preview")
+    expect(preview).to have_content("persian")
+    expect(preview).to have_no_content(tag1.id.to_s)
+  end
+end
diff --git a/spec/system/page_objects/pages/form_template.rb b/spec/system/page_objects/pages/form_template.rb
index f371bab2a1536..248f2b7eb5cfe 100644
--- a/spec/system/page_objects/pages/form_template.rb
+++ b/spec/system/page_objects/pages/form_template.rb
@@ -84,7 +84,7 @@ def has_input_field_with_name?(type, name)
       end
 
       def has_tag_chooser_tag?(tag)
-        find("option[value='#{tag.id}']", visible: :all).present?
+        find("option[value='#{tag.name}']", visible: :all).present?
       end
 
       def has_preview_modal?

From f546a3a403b2da82ac512adc28ea196d11240103 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@gmail.com>
Date: Tue, 24 Feb 2026 22:54:36 +0800
Subject: [PATCH 048/168] FIX: Make truncation of -- consistent across tag
 creations (#38013)

Described here -
https://meta.discourse.org/t/bulk-tag-creation-rejects-tags-with-uppercase-letters/393744/8

There are various ways to create tags, one new method being "bulk
create" from `/tags` page and also the composer. However, not everywhere
goes through the same cleanup

This commit centralises cleanup (squashing, squeezing, etc) and covers the
`a--b` case.
---
 app/services/tags/bulk_create.rb              | 21 +++-------
 .../select-kit/services/tag-utils.js          |  1 +
 .../tests/unit/services/tag-utils-test.js     | 41 ++++++++++++++++++
 lib/discourse_tagging.rb                      |  4 +-
 spec/services/tags/bulk_create_spec.rb        | 42 ++++++++++++++++---
 5 files changed, 87 insertions(+), 22 deletions(-)
 create mode 100644 frontend/discourse/tests/unit/services/tag-utils-test.js

diff --git a/app/services/tags/bulk_create.rb b/app/services/tags/bulk_create.rb
index d600c79be6add..2de71e367ce91 100644
--- a/app/services/tags/bulk_create.rb
+++ b/app/services/tags/bulk_create.rb
@@ -67,27 +67,18 @@ def normalize_tags(raw_tag_names:)
     raw_tag_names.each do |raw_name|
       next if raw_name.blank?
 
-      normalized_input = raw_name.strip
-      normalized_input = normalized_input.downcase if SiteSetting.force_lowercase_tags
-      normalized_input = normalized_input.gsub(/[[:space:]]+/, "-")
-
-      if normalized_input.length > SiteSetting.max_tag_length
-        results[:failed][raw_name] = I18n.t(
-          "tags.bulk_create.tag_too_long",
-          count: SiteSetting.max_tag_length,
-        )
-        next
-      end
-
-      tag_name = DiscourseTagging.clean_tag(raw_name)
+      tag_name = DiscourseTagging.clean_tag(raw_name, truncate: false)
 
       if tag_name.blank?
         results[:failed][raw_name] = I18n.t("tags.bulk_create.invalid_name")
         next
       end
 
-      if tag_name != normalized_input
-        results[:failed][raw_name] = I18n.t("tags.bulk_create.invalid_name")
+      if tag_name.length > SiteSetting.max_tag_length
+        results[:failed][raw_name] = I18n.t(
+          "tags.bulk_create.tag_too_long",
+          count: SiteSetting.max_tag_length,
+        )
         next
       end
 
diff --git a/frontend/discourse/select-kit/services/tag-utils.js b/frontend/discourse/select-kit/services/tag-utils.js
index d132d9ff2fc86..8ce746709b817 100644
--- a/frontend/discourse/select-kit/services/tag-utils.js
+++ b/frontend/discourse/select-kit/services/tag-utils.js
@@ -74,6 +74,7 @@ export default class TagUtils extends Service {
       .trim()
       .replace(/\s+/g, "-")
       .replace(/[\/\?#\[\]@!\$&'\(\)\*\+,;=\.%\\`^\s|\{\}"<>]+/g, "")
+      .replace(/-{2,}/g, "-")
       .substring(0, this.siteSettings.max_tag_length);
 
     if (this.siteSettings.force_lowercase_tags) {
diff --git a/frontend/discourse/tests/unit/services/tag-utils-test.js b/frontend/discourse/tests/unit/services/tag-utils-test.js
new file mode 100644
index 0000000000000..8eeca77ca03c2
--- /dev/null
+++ b/frontend/discourse/tests/unit/services/tag-utils-test.js
@@ -0,0 +1,41 @@
+import { getOwner } from "@ember/owner";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+
+module("Unit | Service | tag-utils", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.tagUtils = getOwner(this).lookup("service:tag-utils");
+  });
+
+  test("createContentFromInput squeezes consecutive dashes", function (assert) {
+    assert.strictEqual(
+      this.tagUtils.createContentFromInput("test--tag"),
+      "test-tag"
+    );
+    assert.strictEqual(
+      this.tagUtils.createContentFromInput("multi---dash"),
+      "multi-dash"
+    );
+    assert.strictEqual(
+      this.tagUtils.createContentFromInput("a--b--c"),
+      "a-b-c"
+    );
+  });
+
+  test("createContentFromInput handles basic normalization", function (assert) {
+    assert.strictEqual(
+      this.tagUtils.createContentFromInput("  spaced  "),
+      "spaced"
+    );
+    assert.strictEqual(
+      this.tagUtils.createContentFromInput("has spaces"),
+      "has-spaces"
+    );
+    assert.strictEqual(
+      this.tagUtils.createContentFromInput("special!@#chars"),
+      "specialchars"
+    );
+  });
+});
diff --git a/lib/discourse_tagging.rb b/lib/discourse_tagging.rb
index 21a24d40fb5a8..3f9b1ba1de396 100644
--- a/lib/discourse_tagging.rb
+++ b/lib/discourse_tagging.rb
@@ -804,7 +804,7 @@ def self.clear_cache!
     Discourse.cache.delete(TAGS_STAFF_CACHE_KEY)
   end
 
-  def self.clean_tag(tag)
+  def self.clean_tag(tag, truncate: true)
     tag = tag.dup
     tag.downcase! if SiteSetting.force_lowercase_tags
     tag.strip!
@@ -812,7 +812,7 @@ def self.clean_tag(tag)
     tag.gsub!(/[^[:word:][:punct:]]+/, "")
     tag.gsub!(TAGS_FILTER_REGEXP, "")
     tag.squeeze!("-")
-    tag[0...SiteSetting.max_tag_length]
+    truncate ? tag[0...SiteSetting.max_tag_length] : tag
   end
 
   def self.tags_for_saving(tags_arg, guardian, opts = {})
diff --git a/spec/services/tags/bulk_create_spec.rb b/spec/services/tags/bulk_create_spec.rb
index b113cda3a9f3a..2a19bbdf9148d 100644
--- a/spec/services/tags/bulk_create_spec.rb
+++ b/spec/services/tags/bulk_create_spec.rb
@@ -155,8 +155,40 @@
       end
     end
 
-    context "when some tags are invalid" do
-      let(:tag_names) { ["", "valid-tag", "   ", "%^&ui^&*", "!!!test"] }
+    context "when tags contain consecutive dashes" do
+      let(:tag_names) { %w[test--tag multi---dash a--b--c] }
+
+      it { is_expected.to run_successfully }
+
+      it "normalizes consecutive dashes and creates tags" do
+        expect { result }.to change { Tag.count }.by(3)
+        expect(Tag.where(name: %w[test-tag multi-dash a-b-c]).count).to eq(3)
+      end
+
+      it "returns normalized names" do
+        expect(result.results[:created]).to contain_exactly("test-tag", "multi-dash", "a-b-c")
+        expect(result.results[:failed]).to be_empty
+      end
+    end
+
+    context "when tags contain characters that get stripped by clean_tag" do
+      let(:tag_names) { %w[valid-tag %^&ui^&* !!!test] }
+
+      it { is_expected.to run_successfully }
+
+      it "cleans and creates tags" do
+        expect { result }.to change { Tag.count }.by(3)
+        expect(Tag.where(name: %w[valid-tag ui test]).count).to eq(3)
+      end
+
+      it "returns cleaned names" do
+        expect(result.results[:created]).to contain_exactly("valid-tag", "ui", "test")
+        expect(result.results[:failed]).to be_empty
+      end
+    end
+
+    context "when tags are entirely invalid" do
+      let(:tag_names) { ["", "valid-tag", "   ", "@!#$%^&*"] }
 
       it { is_expected.to run_successfully }
 
@@ -166,7 +198,7 @@
 
       it "reports failed tags" do
         expect(result.results[:created]).to contain_exactly("valid-tag")
-        expect(result.results[:failed].keys).to contain_exactly("%^&ui^&*", "!!!test")
+        expect(result.results[:failed].keys).to contain_exactly("@!#$%^&*")
       end
     end
 
@@ -202,7 +234,7 @@
     context "when mixing valid, existing, and invalid tags" do
       fab!(:existing_tag) { Fabricate(:tag, name: "existing") }
 
-      let(:tag_names) { ["new-tag", "existing", "", "invalid@@@", "another-new"] }
+      let(:tag_names) { ["new-tag", "existing", "", "@!#$%", "another-new"] }
 
       it { is_expected.to run_successfully }
 
@@ -210,7 +242,7 @@
         expect { result }.to change { Tag.count }.by(2)
         expect(result.results[:created]).to contain_exactly("new-tag", "another-new")
         expect(result.results[:existing]).to contain_exactly("existing")
-        expect(result.results[:failed].keys).to contain_exactly("invalid@@@")
+        expect(result.results[:failed].keys).to contain_exactly("@!#$%")
       end
     end
   end

From c74bdd6d3a6dfcf8441817f3b76afde55466ea6c Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Tue, 24 Feb 2026 17:22:22 +0100
Subject: [PATCH 049/168] DEV: Add admin notices for pre-2.7 deprecations
 (#38030)

A redo of #37830
---
 frontend/discourse/app/deprecation-workflow.js         | 10 ++++++++++
 .../discourse/public/assets/scripts/module-shims.js    |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/frontend/discourse/app/deprecation-workflow.js b/frontend/discourse/app/deprecation-workflow.js
index ef1ebec29841d..6ae8e8cf7da46 100644
--- a/frontend/discourse/app/deprecation-workflow.js
+++ b/frontend/discourse/app/deprecation-workflow.js
@@ -352,8 +352,17 @@ const workflows = [
     matchId: "discourse.component-template-resolving",
   },
   { handler: "notify-admin", matchId: "discourse.decorate-plugin-outlet" },
+  { handler: "notify-admin", matchId: "discourse.ember-computed-decorators" },
+  { handler: "notify-admin", matchId: "discourse.globals.site" },
+  { handler: "notify-admin", matchId: "discourse.globals.user" },
   { handler: "notify-admin", matchId: "discourse.header-widget-overrides" },
+  { handler: "notify-admin", matchId: "discourse.jquery-cookie" },
+  { handler: "notify-admin", matchId: "discourse.markdown-it.whitelist" },
   { handler: "notify-admin", matchId: "discourse.modal-controllers" },
+  {
+    handler: "notify-admin",
+    matchId: "discourse.nav-item.built-list-site-settings",
+  },
   {
     handler: "notify-admin",
     matchId: "discourse.plugin-outlet-classic-args-clash",
@@ -368,6 +377,7 @@ const workflows = [
   },
   { handler: "notify-admin", matchId: "discourse.qunit.acceptance-function" },
   { handler: "notify-admin", matchId: "discourse.qunit.global-exists" },
+  { handler: "notify-admin", matchId: "discourse.resolver-resolutions" },
   { handler: "notify-admin", matchId: "discourse.script-tag-discourse-plugin" },
   { handler: "notify-admin", matchId: "discourse.script-tag-hbs" },
   { handler: "notify-admin", matchId: "discourse.widgets-decommissioned" },
diff --git a/frontend/discourse/public/assets/scripts/module-shims.js b/frontend/discourse/public/assets/scripts/module-shims.js
index b59bcad9bfd99..5223693a943c8 100644
--- a/frontend/discourse/public/assets/scripts/module-shims.js
+++ b/frontend/discourse/public/assets/scripts/module-shims.js
@@ -22,7 +22,7 @@ define("ember-addons/ember-computed-decorators", [
 ], function (decorators, deprecated) {
   deprecated.default(
     "ember-addons/ember-computed-decorators is deprecated. Use discourse/lib/decorators instead.",
-    { since: "2.4", dropFrom: "3.0" }
+    { since: "2.4", dropFrom: "3.0", id: "discourse.ember-computed-decorators" }
   );
   return decorators;
 });

From 60a20ccdebbc9afd47461014213941ebd9c836fa Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 24 Feb 2026 16:36:10 +0000
Subject: [PATCH 050/168] DEV: Bump mini_racer to 0.19.2 (#38031)

---
 Gemfile.lock | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9ad6e8887f387..7e40c6ced7aaf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -252,12 +252,13 @@ GEM
       base64
     kgio (2.11.4)
     language_server-protocol (3.17.0.5)
-    libv8-node (24.1.0.0)
-    libv8-node (24.1.0.0-aarch64-linux)
-    libv8-node (24.1.0.0-arm64-darwin)
-    libv8-node (24.1.0.0-x86_64-darwin)
-    libv8-node (24.1.0.0-x86_64-linux)
-    libv8-node (24.1.0.0-x86_64-linux-musl)
+    libv8-node (24.12.0.1)
+    libv8-node (24.12.0.1-aarch64-linux)
+    libv8-node (24.12.0.1-aarch64-linux-musl)
+    libv8-node (24.12.0.1-arm64-darwin)
+    libv8-node (24.12.0.1-x86_64-darwin)
+    libv8-node (24.12.0.1-x86_64-linux)
+    libv8-node (24.12.0.1-x86_64-linux-musl)
     lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -295,8 +296,8 @@ GEM
       mime-types-data (~> 3.2025, >= 3.2025.0507)
     mime-types-data (3.2025.0924)
     mini_mime (1.1.5)
-    mini_racer (0.19.1)
-      libv8-node (~> 24.1.0.0)
+    mini_racer (0.19.2)
+      libv8-node (~> 24.12.0.1)
     mini_scheduler (0.18.0)
       sidekiq (>= 6.5, < 8.0)
     mini_sql (1.6.0)
@@ -1039,12 +1040,13 @@ CHECKSUMS
   jwt (2.10.1) sha256=e6424ae1d813f63e761a04d6284e10e7ec531d6f701917fadcd0d9b2deaf1cc5
   kgio (2.11.4) sha256=bda7a2146115998a5b07154e708e0ac02c38dcee7e793c33e2e14f600fdfffc6
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
-  libv8-node (24.1.0.0) sha256=2f0e9ac629c4c5753eaf7001952bb6dce4eb596f3dc0df3049ee7d9cfb9471cd
-  libv8-node (24.1.0.0-aarch64-linux) sha256=fe7787bdb082d1101f65d8f42572ec6c634776a334d82b9fedded152e1d4f358
-  libv8-node (24.1.0.0-arm64-darwin) sha256=f34bdd85787a32a16db137ffbe83feb1cd09f4d69ff3c43cd2f0a675656ee16b
-  libv8-node (24.1.0.0-x86_64-darwin) sha256=243cfae376d7d54b02fb9e8cfd2a2a08e791d066fb78252925a825f05805083b
-  libv8-node (24.1.0.0-x86_64-linux) sha256=0857486e64f7bd4133d4aa607c42d0abade1ab53dffcbfd30f12e0b7dba8f157
-  libv8-node (24.1.0.0-x86_64-linux-musl) sha256=080a243ac014054780cc0d0be2c18b93642a139d09622c0cfd1ebc8614d24437
+  libv8-node (24.12.0.1) sha256=d93d23b861bfe5de3ba829e34a142402fb83b4c3592dd58d9ac4e027588d739a
+  libv8-node (24.12.0.1-aarch64-linux) sha256=22bd0246cde85d70c88cf772727ac3677a20ac1d169105f82efe5f1f7c39f755
+  libv8-node (24.12.0.1-aarch64-linux-musl) sha256=791b5960f79525e87d1bd1e5f2bf3715ef2a38bac6c97f297853e98a8411ba89
+  libv8-node (24.12.0.1-arm64-darwin) sha256=124904a46b4a15c01ac024b4cf537dcf199cfb49a309cc59f66315e156e48339
+  libv8-node (24.12.0.1-x86_64-darwin) sha256=5eee594393e7a27dc230a7fca5f9f72fc11ed58bce655624a683f4d027bf2d16
+  libv8-node (24.12.0.1-x86_64-linux) sha256=e1236be4765edc109bd6ecef2989cf781bdcbac6f6e2cb3236ec9568540a9cfa
+  libv8-node (24.12.0.1-x86_64-linux-musl) sha256=7563175534c40893815bfd28e8fe27e12ff1656700c7208f53de06d14001712b
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
   listen (3.9.0) sha256=db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67
   literate_randomizer (0.4.0) sha256=05073c9b383983b1ed7e26c40b963468e91bc86e663b3eeff3a4af91b84217b1
@@ -1065,7 +1067,7 @@ CHECKSUMS
   mime-types (3.7.0) sha256=dcebf61c246f08e15a4de34e386ebe8233791e868564a470c3fe77c00eed5e56
   mime-types-data (3.2025.0924) sha256=f276bca15e59f35767cbcf2bc10e023e9200b30bd6a572c1daf7f4cc24994728
   mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
-  mini_racer (0.19.1) sha256=3e4ec1bfbb3ebb39c23d8fc4b6e641b5dc6767a173a8938356c271895e5d6de3
+  mini_racer (0.19.2) sha256=ef3328e7e164d5ef2d38bb25d0da0fde3a9199a6f467461dd5f5e0b6443dd7ef
   mini_scheduler (0.18.0) sha256=d2f084f38da8d76c5844a92f0d6bd01fc9982a8b5e6c7679b6cf44c82da33503
   mini_sql (1.6.0) sha256=5296637f6a4af5bb43e06788037e9a2968ff9c8eb65928befcba8cb41f42d6ee
   mini_suffix (0.3.3) sha256=8d1d33f92f69a2247c9b7d27173235da90479d955cdb863b63a7f53843b722e7

From 5472f8fc05f6f9a3cd93775e2d4da8b2d932977a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Tue, 24 Feb 2026 17:44:27 +0100
Subject: [PATCH 051/168] DEV: Add support for d-compat branches in
 plugins/themes (#37984)

---
 lib/version_compatibility.rb           | 26 ++++++++-
 spec/lib/version_compatibility_spec.rb | 78 ++++++++++++++++++++------
 spec/support/helpers.rb                | 28 ++++++---
 3 files changed, 105 insertions(+), 27 deletions(-)

diff --git a/lib/version_compatibility.rb b/lib/version_compatibility.rb
index 412648252ba58..a0710470bda0f 100644
--- a/lib/version_compatibility.rb
+++ b/lib/version_compatibility.rb
@@ -75,10 +75,33 @@ def self.find_compatible_resource(version_list, target_version = ::Discourse::VE
     checkout_version
   end
 
+  def self.find_compatible_git_branch(path)
+    current_branch =
+      Discourse::Utils.execute_command("git", "-C", path, "branch", "--show-current").strip
+
+    default_branch =
+      Discourse::Utils
+        .execute_command("git", "-C", path, "symbolic-ref", "--short", "refs/remotes/origin/HEAD")
+        .strip
+        .sub(%r{\Aorigin/}, "")
+
+    return if current_branch != default_branch
+
+    compat_branch = "d-compat/#{Discourse::VERSION::MAJOR}.#{Discourse::VERSION::MINOR}"
+    remote_branch_ref = "refs/remotes/origin/#{compat_branch}"
+
+    Discourse::Utils.execute_command("git", "-C", path, "rev-parse", remote_branch_ref).strip
+  rescue Discourse::Utils::CommandError
+  end
+
   # Find a compatible resource from a git repo
   def self.find_compatible_git_resource(path)
     return unless File.directory?("#{path}/.git")
 
+    if compat_branch_sha = find_compatible_git_branch(path)
+      return compat_branch_sha
+    end
+
     tree_info =
       Discourse::Utils.execute_command(
         "git",
@@ -108,7 +131,6 @@ def self.find_compatible_git_resource(path)
     Discourse.find_compatible_resource(compat_resource)
   rescue InvalidVersionListError => e
     $stderr.puts "Invalid version list in #{path}"
-  rescue Discourse::Utils::CommandError => e
-    nil
+  rescue Discourse::Utils::CommandError
   end
 end
diff --git a/spec/lib/version_compatibility_spec.rb b/spec/lib/version_compatibility_spec.rb
index 45c64041a2f8b..a05107d8cd583 100644
--- a/spec/lib/version_compatibility_spec.rb
+++ b/spec/lib/version_compatibility_spec.rb
@@ -154,36 +154,80 @@
   end
 
   describe ".find_compatible_git_resource" do
-    let!(:git_directory) do
-      path = nil
+    let(:compat_branch_name) do
+      "d-compat/#{Discourse::VERSION::MAJOR}.#{Discourse::VERSION::MINOR}"
+    end
 
-      capture_stdout do
-        # Note the lack of colon between version and hash
-        path = setup_git_repo(".discourse-compatibility" => "1.0.0.beta1 12f82d5")
+    context "when there is a matching d-compat branch" do
+      let!(:git_directory) do
+        path = setup_git_repo(".discourse-compatibility" => "<= 9999.0: fallback-ref")
+
+        system("git -C #{path} checkout -q -b #{compat_branch_name}", exception: true)
+        add_to_git_repo(path, "compat.txt" => "from branch")
+        system("git -C #{path} checkout -q -", exception: true)
 
-        # Simulate a remote upstream
-        `cd #{path} && git remote add origin #{path}/.git && git fetch -q`
-        `cd #{path} && git branch -u origin/$(git rev-parse --abbrev-ref HEAD)`
+        setup_remote_upstream(path)
+        path
       end
 
-      path
+      after { FileUtils.remove_entry(git_directory) }
+
+      it "returns the branch commit and ignores .discourse-compatibility" do
+        compat_branch_sha = `cd #{git_directory} && git rev-parse #{compat_branch_name}`.strip
+
+        expect(Discourse.find_compatible_git_resource(git_directory)).to eq(compat_branch_sha)
+      end
     end
 
-    after { FileUtils.remove_entry(git_directory) }
+    context "when there is no matching d-compat branch" do
+      let!(:git_directory) do
+        path = setup_git_repo(".discourse-compatibility" => "<= 9999.0: fallback-ref")
+        setup_remote_upstream(path)
+        path
+      end
 
-    it "gracefully handles invalid input" do
-      output =
-        capture_stderr { expect(Discourse.find_compatible_git_resource(git_directory)).to be_nil }
+      after { FileUtils.remove_entry(git_directory) }
 
-      expect(output).to include("Invalid version list")
+      it "falls back to .discourse-compatibility" do
+        expect(Discourse.find_compatible_git_resource(git_directory)).to eq("fallback-ref")
+      end
     end
 
-    it "gracefully handles large .discourse-compatibility files" do
-      stub_const(Discourse, "MAX_METADATA_FILE_SIZE", 1) do
+    context "with an invalid .discourse-compatibility file" do
+      let!(:git_directory) do
+        path = setup_git_repo(".discourse-compatibility" => "1.0.0.beta1 12f82d5")
+        setup_remote_upstream(path)
+        path
+      end
+
+      after { FileUtils.remove_entry(git_directory) }
+
+      it "gracefully handles invalid input" do
         output =
           capture_stderr { expect(Discourse.find_compatible_git_resource(git_directory)).to be_nil }
 
-        expect(output).to include(Discourse::VERSION_COMPATIBILITY_FILENAME)
+        expect(output).to include("Invalid version list")
+      end
+    end
+
+    context "with a large .discourse-compatibility file" do
+      let!(:git_directory) do
+        path = setup_git_repo(".discourse-compatibility" => "<= 9999.0: fallback-ref")
+        setup_remote_upstream(path)
+        path
+      end
+
+      after { FileUtils.remove_entry(git_directory) }
+
+      it "gracefully handles large .discourse-compatibility files" do
+        stub_const(Discourse, "MAX_METADATA_FILE_SIZE", 1) do
+          output =
+            capture_stderr do
+              expect(Discourse.find_compatible_git_resource(git_directory)).to be_nil
+            end
+
+          expect(output).to include(Discourse::VERSION_COMPATIBILITY_FILENAME)
+        end
       end
     end
   end
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 8ac8beb9e1acc..83de1aa9cbca0 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -179,26 +179,38 @@ def set_subfolder(new_root)
 
   def setup_git_repo(files)
     repo_dir = Dir.mktmpdir
-    `cd #{repo_dir} && git init . #{"--initial-branch=main" if GIT_INITIAL_BRANCH_SUPPORTED}`
-    `cd #{repo_dir} && git config user.email 'someone@cool.com'`
-    `cd #{repo_dir} && git config user.name 'The Cool One'`
-    `cd #{repo_dir} && git config commit.gpgsign 'false'`
+    system(
+      "git -C #{repo_dir} init -q . #{"--initial-branch=main" if GIT_INITIAL_BRANCH_SUPPORTED}",
+      exception: true,
+    )
+    system("git -C #{repo_dir} config user.email 'someone@cool.com'", exception: true)
+    system("git -C #{repo_dir} config user.name 'The Cool One'", exception: true)
+    system("git -C #{repo_dir} config commit.gpgsign 'false'", exception: true)
     files.each do |name, data|
       FileUtils.mkdir_p(Pathname.new("#{repo_dir}/#{name}").dirname)
       File.write("#{repo_dir}/#{name}", data)
-      `cd #{repo_dir} && git add #{name}`
+      system("git -C #{repo_dir} add #{name}", exception: true)
     end
-    `cd #{repo_dir} && git commit -am 'first commit'`
+    system("git -C #{repo_dir} commit -q -am 'first commit'", exception: false)
     repo_dir
   end
 
+  def setup_remote_upstream(path)
+    system("git -C #{path} remote add origin #{path}/.git", exception: true)
+    system("git -C #{path} fetch -q", exception: true)
+    branch = `git -C #{path} rev-parse --abbrev-ref HEAD`.strip
+    raise "no branch in setup_remote_upstream" if branch.blank?
+    system("git -C #{path} branch -u origin/#{branch}", exception: true)
+    system("git -C #{path} remote set-head origin #{branch}", exception: true)
+  end
+
   def add_to_git_repo(repo_dir, files)
     files.each do |name, data|
       FileUtils.mkdir_p(Pathname.new("#{repo_dir}/#{name}").dirname)
       File.write("#{repo_dir}/#{name}", data)
-      `cd #{repo_dir} && git add #{name}`
+      system("git -C #{repo_dir} add #{name}", exception: true)
     end
-    `cd #{repo_dir} && git commit -am 'add #{files.size} files'`
+    system("git -C #{repo_dir} commit -q -am 'add #{files.size} files'", exception: true)
     repo_dir
   end
 

From 9f7d0d34c6dc3892eade6b2619f82935a67e324e Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 24 Feb 2026 12:25:01 -0500
Subject: [PATCH 052/168] UX: when SMTP is not configured, show email disabled
 banner selectively (#38002)

This is a follow-up to
https://github.com/discourse/discourse/commit/2a6fd61af3189c5d7601bdc042944441e7529139

Since it's now possible to run a Discourse site without configuring
SMTP, we can handle warnings about email a little differently.

When SMTP is not configured, we can show a more specific banner in areas
where email is relevant:
<img width="2190" height="218" alt="image"
src="https://github.com/user-attachments/assets/7e379fb0-32e0-4c52-8b2b-83bddc4573a1"
/>

When SMTP is not configured, this will appear on relevant routes:

* admin
* review
* login (covers forgotten email)
* signup confirmation after account creation
* user preferences: email, notifications, security
* invite pages (both generating and accepting invites)

The SMTP warning will not appear in development mode.

When email is explicitly disabled using the `Disable emails` site
setting, this banner will still appear globally:

<img width="2212" height="232" alt="image"
src="https://github.com/user-attachments/assets/4e088534-0989-4f8a-811d-8ebcbefb99d4"
/>
---
 app/serializers/site_serializer.rb            |  5 ++
 config/locales/client.en.yml                  |  1 +
 .../app/components/global-notice.gjs          | 23 ++++--
 .../tests/acceptance/email-notice-test.js     | 72 +++++++++++--------
 .../api/schemas/json/site_response.json       |  6 +-
 spec/serializers/site_serializer_spec.rb      | 16 +++++
 6 files changed, 86 insertions(+), 37 deletions(-)

diff --git a/app/serializers/site_serializer.rb b/app/serializers/site_serializer.rb
index 59edfa3149aaa..0dbffed075d7d 100644
--- a/app/serializers/site_serializer.rb
+++ b/app/serializers/site_serializer.rb
@@ -52,6 +52,7 @@ class SiteSerializer < ApplicationSerializer
     :full_name_required_for_signup,
     :full_name_visible_in_signup,
     :admin_config_login_routes,
+    :email_configured,
   )
 
   has_many :archetypes, embed: :objects, serializer: ArchetypeSerializer
@@ -416,6 +417,10 @@ def include_admin_config_routes?
     scope.is_admin?
   end
 
+  def email_configured
+    GlobalSetting.smtp_address.present?
+  end
+
   def full_name_required_for_signup
     Site.full_name_required_for_signup
   end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 968dccf86fcc5..f87065f0aed57 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -318,6 +318,7 @@ en:
     skip_user_nav: "Skip to profile content"
 
     emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent."
+    emails_are_disabled_no_smtp: "All outgoing email is disabled because no SMTP server has been configured. No emails of any kind can be sent."
     emails_are_disabled_non_staff: "Outgoing email has been disabled for non-staff users."
 
     software_update_prompt:
diff --git a/frontend/discourse/app/components/global-notice.gjs b/frontend/discourse/app/components/global-notice.gjs
index 599e483457ac3..878b97d934ebb 100644
--- a/frontend/discourse/app/components/global-notice.gjs
+++ b/frontend/discourse/app/components/global-notice.gjs
@@ -8,6 +8,7 @@ import { tagName } from "@ember-decorators/component";
 import DButton from "discourse/components/d-button";
 import cookie, { removeCookie } from "discourse/lib/cookie";
 import { bind } from "discourse/lib/decorators";
+import { isDevelopment } from "discourse/lib/environment";
 import { currentThemeId } from "discourse/lib/theme-selector";
 import { DeferredTrackedSet } from "discourse/lib/tracked-tools";
 import { i18n } from "discourse-i18n";
@@ -81,13 +82,19 @@ export default class GlobalNotice extends Component {
     return !this.router.currentRouteName.startsWith("wizard.");
   }
 
-  get #showEmailsDisabledNotice() {
+  get #isEmailRelatedRoute() {
     const routeName = this.router.currentRouteName;
     return (
       routeName?.startsWith("admin") ||
       routeName?.startsWith("review") ||
+      routeName?.startsWith("account-created") ||
+      routeName?.startsWith("invites") ||
+      routeName?.startsWith("userInvited") ||
+      routeName === "login" ||
+      routeName === "preferences.email" ||
       routeName === "preferences.emails" ||
-      routeName === "preferences.notifications"
+      routeName === "preferences.notifications" ||
+      routeName === "preferences.security"
     );
   }
 
@@ -156,9 +163,6 @@ export default class GlobalNotice extends Component {
         Notice.create({
           text: i18n("emails_are_disabled"),
           id: "alert-emails-disabled",
-          options: {
-            visibility: () => this.#showEmailsDisabledNotice,
-          },
         })
       );
     } else if (this.siteSettings.disable_emails === "non-staff") {
@@ -166,8 +170,15 @@ export default class GlobalNotice extends Component {
         Notice.create({
           text: i18n("emails_are_disabled_non_staff"),
           id: "alert-emails-disabled",
+        })
+      );
+    } else if (!this.site.email_configured && !isDevelopment()) {
+      notices.push(
+        Notice.create({
+          text: i18n("emails_are_disabled_no_smtp"),
+          id: "alert-emails-disabled",
           options: {
-            visibility: () => this.#showEmailsDisabledNotice,
+            visibility: () => this.#isEmailRelatedRoute,
           },
         })
       );
diff --git a/frontend/discourse/tests/acceptance/email-notice-test.js b/frontend/discourse/tests/acceptance/email-notice-test.js
index 8400de56ce61d..f469042109a40 100644
--- a/frontend/discourse/tests/acceptance/email-notice-test.js
+++ b/frontend/discourse/tests/acceptance/email-notice-test.js
@@ -6,55 +6,67 @@ import {
 } from "discourse/tests/helpers/qunit-helpers";
 import { i18n } from "discourse-i18n";
 
-acceptance("Email Disabled Banner", function (needs) {
+acceptance("Email Disabled Banner - disable_emails setting", function (needs) {
   needs.user();
+  needs.site({ email_configured: true });
 
-  test("when disabled", async function (assert) {
+  test("no banner when emails are enabled", async function (assert) {
     this.siteSettings.disable_emails = "no";
     await visit("/");
-    assert
-      .dom(".alert-emails-disabled")
-      .doesNotExist("alert is not displayed when email enabled");
+    assert.dom(".alert-emails-disabled").doesNotExist();
   });
 
-  test("when enabled", async function (assert) {
+  test("shows globally when disable_emails is yes", async function (assert) {
     this.siteSettings.disable_emails = "yes";
-
     await visit("/latest");
+    assert.dom(".alert-emails-disabled").exists();
     assert
-      .dom(".alert-emails-disabled")
-      .doesNotExist("alert is not displayed on non-admin routes");
+      .dom(".alert-emails-disabled .text")
+      .hasText(i18n("emails_are_disabled"));
+  });
 
-    updateCurrentUser({ admin: true });
-    await visit("/admin");
-    assert
-      .dom(".alert-emails-disabled")
-      .exists("alert is displayed on admin routes when email disabled");
+  test("shows globally when disable_emails is non-staff", async function (assert) {
+    this.siteSettings.disable_emails = "non-staff";
+    await visit("/latest");
+    assert.dom(".alert-emails-disabled").exists();
     assert
       .dom(".alert-emails-disabled .text")
-      .hasText(i18n("emails_are_disabled"), "alert uses the correct text");
+      .hasText(i18n("emails_are_disabled_non_staff"));
   });
+});
 
-  test("when non-staff", async function (assert) {
-    this.siteSettings.disable_emails = "non-staff";
+acceptance("Email Disabled Banner - no SMTP configured", function (needs) {
+  needs.user();
+  needs.site({ email_configured: false });
 
+  test("no banner on regular routes", async function (assert) {
+    this.siteSettings.disable_emails = "no";
     await visit("/latest");
-    assert
-      .dom(".alert-emails-disabled")
-      .doesNotExist("alert is not displayed on non-admin routes");
+    assert.dom(".alert-emails-disabled").doesNotExist();
+  });
 
-    updateCurrentUser({ admin: true });
-    await visit("/admin");
+  test("shows on email-related routes when no SMTP", async function (assert) {
+    this.siteSettings.disable_emails = "no";
+    await visit("/login");
+    assert.dom(".alert-emails-disabled").exists();
     assert
-      .dom(".alert-emails-disabled")
-      .exists(
-        "alert is displayed on admin routes when email disabled for non-staff"
-      );
+      .dom(".alert-emails-disabled .text")
+      .hasText(i18n("emails_are_disabled_no_smtp"));
+  });
+
+  test("disable_emails setting takes precedence and shows globally", async function (assert) {
+    this.siteSettings.disable_emails = "yes";
+    await visit("/latest");
+    assert.dom(".alert-emails-disabled").exists();
     assert
       .dom(".alert-emails-disabled .text")
-      .hasText(
-        i18n("emails_are_disabled_non_staff"),
-        "alert uses the correct text"
-      );
+      .hasText(i18n("emails_are_disabled"));
+  });
+
+  test("shows on admin routes when no SMTP", async function (assert) {
+    this.siteSettings.disable_emails = "no";
+    updateCurrentUser({ admin: true });
+    await visit("/admin");
+    assert.dom(".alert-emails-disabled").exists();
   });
 });
diff --git a/spec/requests/api/schemas/json/site_response.json b/spec/requests/api/schemas/json/site_response.json
index 2406de6e04e76..863ecf6a9a903 100644
--- a/spec/requests/api/schemas/json/site_response.json
+++ b/spec/requests/api/schemas/json/site_response.json
@@ -501,6 +501,9 @@
     "can_associate_groups": {
       "type": "boolean"
     },
+    "email_configured": {
+      "type": "boolean"
+    },
     "topic_featured_link_allowed_category_ids": {
       "type": "array",
       "items": {
@@ -969,6 +972,7 @@
     "user_fields",
     "auth_providers",
     "full_name_required_for_signup",
-    "full_name_visible_in_signup"
+    "full_name_visible_in_signup",
+    "email_configured"
   ]
 }
diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb
index fc5aac17c01f9..bc6e825380d42 100644
--- a/spec/serializers/site_serializer_spec.rb
+++ b/spec/serializers/site_serializer_spec.rb
@@ -515,6 +515,22 @@
     end
   end
 
+  describe "#email_configured" do
+    it "returns true when smtp_address is set" do
+      global_setting :smtp_address, "smtp.example.com"
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:email_configured]).to eq(true)
+    end
+
+    it "returns false when smtp_address is blank" do
+      global_setting :smtp_address, ""
+
+      serialized = described_class.new(Site.new(guardian), scope: guardian, root: false).as_json
+      expect(serialized[:email_configured]).to eq(false)
+    end
+  end
+
   describe "#groups" do
     fab!(:group)
     fab!(:admin)

From bab10337580ace7cd6de7a89e4bb7e6f4b43ce28 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 24 Feb 2026 15:29:00 -0300
Subject: [PATCH 053/168] FIX: Switch Reddit onebox from OG scraping to JSON
 API (#38035)

Reddit removed OpenGraph meta tags from their HTML responses, so
oneboxing fails silently. This switches to fetching from Reddit's
`.json` API endpoint instead.

- Fetches post data from `.json` endpoint (appended to post URL)
- Supports image, video, and self/text posts
- Adds `matches_path` to restrict to actual post URLs
- Adds `old.reddit.com`, `np.reddit.com`, `new.reddit.com` support
- Flex-based layout for video post thumbnails (avoids legacy float
issues)


<img width="949" height="1434" alt="image"
src="https://github.com/user-attachments/assets/40b3f4fa-ace5-4dd1-97a9-45d9497037e4"
/>
---
 .../stylesheets/common/base/onebox.scss       |  43 +-
 lib/onebox/engine/reddit_media_onebox.rb      | 132 ++++-
 spec/fixtures/onebox/reddit_image.response    | 459 ++----------------
 .../fixtures/onebox/reddit_self_post.response |  31 ++
 spec/fixtures/onebox/reddit_video.response    |  43 ++
 .../engine/allowlisted_generic_onebox_spec.rb |  16 +-
 .../onebox/engine/reddit_media_onebox_spec.rb | 113 ++++-
 7 files changed, 369 insertions(+), 468 deletions(-)
 create mode 100644 spec/fixtures/onebox/reddit_self_post.response
 create mode 100644 spec/fixtures/onebox/reddit_video.response

diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss
index 735a537750083..0bd69c6e5798c 100644
--- a/app/assets/stylesheets/common/base/onebox.scss
+++ b/app/assets/stylesheets/common/base/onebox.scss
@@ -950,13 +950,48 @@ aside.onebox.xkcd .onebox-body img {
 }
 
 .onebox.reddit {
-  div.aspect-image-full-size {
-    position: relative;
-  }
-
   div.description {
     color: var(--primary-med-or-secondary-med);
   }
+
+  .onebox-body.reddit-preview-onebox {
+    display: flex;
+    gap: 0.75em;
+
+    .reddit-preview-thumbnail {
+      flex-shrink: 0;
+      max-width: 150px;
+
+      // neutralize the legacy float/absolute-position system
+      .aspect-image {
+        position: relative;
+        width: auto;
+        height: auto;
+        max-width: 100%;
+        max-height: none;
+        float: none;
+        margin: 0;
+      }
+
+      .aspect-image img,
+      > img {
+        position: static;
+        width: auto;
+        height: auto;
+        max-width: 100%;
+        max-height: 170px;
+        float: none;
+      }
+    }
+
+    .reddit-preview-details {
+      flex: 1;
+      min-width: 0;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+    }
+  }
 }
 
 .onebox.githubfolder {
diff --git a/lib/onebox/engine/reddit_media_onebox.rb b/lib/onebox/engine/reddit_media_onebox.rb
index ffc51b6669fd0..81ab71317a2df 100644
--- a/lib/onebox/engine/reddit_media_onebox.rb
+++ b/lib/onebox/engine/reddit_media_onebox.rb
@@ -4,51 +4,137 @@ module Onebox
   module Engine
     class RedditMediaOnebox
       include Engine
-      include StandardEmbed
 
       always_https
-      matches_domain("reddit.com", "www.reddit.com")
+      matches_domain(
+        "reddit.com",
+        "www.reddit.com",
+        "old.reddit.com",
+        "np.reddit.com",
+        "new.reddit.com",
+      )
+
+      def self.matches_path(path)
+        path.match?(%r{^/r/[^/]+/comments/[^/]+})
+      end
 
       def to_html
-        if raw[:type] == "image"
-          <<-HTML
+        post = reddit_post
+        return nil unless post
+
+        url = Onebox::Helpers.normalize_url_for_output("https://www.reddit.com#{post["permalink"]}")
+        subreddit_url =
+          Onebox::Helpers.normalize_url_for_output(
+            "https://www.reddit.com/#{post["subreddit_name_prefixed"]}",
+          )
+        title = CGI.escapeHTML(Onebox::Helpers.truncate(post["title"].to_s, 80))
+        subreddit = CGI.escapeHTML(post["subreddit_name_prefixed"].to_s)
+        author = CGI.escapeHTML(post["author"].to_s)
+        score = post["score"].to_i
+        num_comments = post["num_comments"].to_i
+        nsfw_label = post["over_18"] ? " <span class='nsfw'>NSFW</span>" : ""
+        meta = "#{score} points | #{num_comments} comments — u/#{author}"
+
+        if image_post?(post)
+          image_url = extract_image_url(post)
+          return nil unless image_url
+
+          image_url = Onebox::Helpers.normalize_url_for_output(image_url)
+
+          <<~HTML
             <aside class="onebox reddit">
               <header class="source">
-                <img src="#{raw[:favicon]}" class="site-icon" width="16" height="16">
-                <a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">#{raw[:site_name]}</a>
+                <img src="https://www.reddit.com/favicon.ico" class="site-icon" width="16" height="16">
+                <a href="#{subreddit_url}" target="_blank" rel="nofollow ugc noopener">#{subreddit}</a>
               </header>
               <article class="onebox-body">
-                <h3><a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">#{raw[:title]}</a></h3>
+                <h3><a href="#{url}" target="_blank" rel="nofollow ugc noopener">#{title}#{nsfw_label}</a></h3>
                 <div class="scale-images">
-                  <img src="#{raw[:image]}" class="scale-image"/>
+                  <img src="#{image_url}" class="scale-image"/>
                 </div>
-                <div class="description"><p>#{raw[:description]}</p></div>
+                <div class="description"><p>#{meta}</p></div>
               </article>
             </aside>
           HTML
-        elsif raw[:type] =~ %r{^video[/\.]}
-          <<-HTML
+        elsif video_post?(post)
+          preview_url = extract_image_url(post)
+          preview_html =
+            if preview_url
+              preview_url = Onebox::Helpers.normalize_url_for_output(preview_url)
+              "<div class=\"reddit-preview-thumbnail\"><img src=\"#{preview_url}\" class=\"thumbnail\"/></div>"
+            else
+              ""
+            end
+
+          <<~HTML
             <aside class="onebox reddit">
               <header class="source">
-                <img src="#{raw[:favicon]}" class="site-icon" width="16" height="16">
-                <a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">#{raw[:site_name]}</a>
+                <img src="https://www.reddit.com/favicon.ico" class="site-icon" width="16" height="16">
+                <a href="#{subreddit_url}" target="_blank" rel="nofollow ugc noopener">#{subreddit}</a>
               </header>
-              <article class="onebox-body">
-                <h3><a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">#{raw[:title]}</a></h3>
-                <div class="aspect-image-full-size">
-                  <a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener" class="image-wrapper">
-                    <img src="#{raw[:image]}" class="scale-image"/>
-                    <span class="video-icon"></span>
-                  </a>
+              <article class="onebox-body reddit-preview-onebox">
+                #{preview_html}
+                <div class="reddit-preview-details">
+                  <h3><a href="#{url}" target="_blank" rel="nofollow ugc noopener">#{title}#{nsfw_label}</a></h3>
+                  <div class="description"><p>#{meta}</p></div>
                 </div>
-                <div class="description"><p>#{raw[:description]}</p></div>
               </article>
             </aside>
           HTML
         else
-          html = Onebox::Engine::AllowlistedGenericOnebox.new(@url, @timeout).to_html
-          html.presence
+          description_html =
+            if post["is_self"] && post["selftext"].present?
+              desc = CGI.escapeHTML(Onebox::Helpers.truncate(post["selftext"], 250))
+              "<div class=\"description\"><p>#{desc}</p></div>"
+            else
+              ""
+            end
+
+          <<~HTML
+            <aside class="onebox reddit">
+              <header class="source">
+                <img src="https://www.reddit.com/favicon.ico" class="site-icon" width="16" height="16">
+                <a href="#{subreddit_url}" target="_blank" rel="nofollow ugc noopener">#{subreddit}</a>
+              </header>
+              <article class="onebox-body">
+                <h3><a href="#{url}" target="_blank" rel="nofollow ugc noopener">#{title}#{nsfw_label}</a></h3>
+                #{description_html}
+                <div class="description"><p>#{meta}</p></div>
+              </article>
+            </aside>
+          HTML
+        end
+      end
+
+      private
+
+      def reddit_post
+        return @reddit_post if defined?(@reddit_post)
+
+        json_url = @url.sub(%r{/?(\?.*)?$}, ".json")
+        response = Onebox::Helpers.fetch_response(json_url)
+        parsed = ::MultiJson.load(response)
+        @reddit_post = parsed[0]["data"]["children"][0]["data"]
+      rescue StandardError
+        @reddit_post = nil
+      end
+
+      def image_post?(post)
+        post["post_hint"] == "image" ||
+          post["url"].to_s.match?(/\.(jpg|jpeg|png|gif|webp)(\?.*)?$/i)
+      end
+
+      def video_post?(post)
+        post["is_video"] || post["post_hint"].to_s.include?("video")
+      end
+
+      def extract_image_url(post)
+        if post["url"].to_s.match?(/\.(jpg|jpeg|png|gif|webp)(\?.*)?$/i)
+          return CGI.unescapeHTML(post["url"])
         end
+
+        preview_url = post.dig("preview", "images", 0, "source", "url")
+        CGI.unescapeHTML(preview_url) if preview_url
       end
     end
   end
diff --git a/spec/fixtures/onebox/reddit_image.response b/spec/fixtures/onebox/reddit_image.response
index b8158ea47681a..5b02b92235dcc 100644
--- a/spec/fixtures/onebox/reddit_image.response
+++ b/spec/fixtures/onebox/reddit_image.response
@@ -1,416 +1,43 @@
-<html lang="en" data-ember-extension="1">
-<head>
-    <link href="//c.aaxads.com/aax.js?pub=AAX763KC6&amp;hst=www.reddit.com&amp;ver=1.2" rel="preload" as="script">
-    <link href="//c.amazon-adsystem.com/aax2/apstag.js" rel="preload" as="script">
-    <link href="//www.googletagservices.com/tag/js/gpt.js" rel="preload" as="script">
-    <title>Literally nothing black edition : colors</title>
-    <meta charset="utf8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="r/colors: “Mere color, unspoiled by meaning, and unallied with definite form, can speak to the soul in a thousand different ways. ”
-― Oscar Wilde">
-    <link rel="canonical" href="https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/">
-    <meta property="og:ttl" content="600">
-    <meta property="og:site_name" content="reddit">
-    <meta property="twitter:site" content="@reddit">
-    <meta property="twitter:card" content="summary">
-    <meta property="og:title" content="r/colors - Literally nothing black edition">
-    <meta property="twitter:title" content="r/colors - Literally nothing black edition">
-    <meta property="og:type" content="image">
-    <meta property="og:url" content="https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/">
-    <meta property="og:description" content="4 votes and 1 comment so far on Reddit">
-    <meta property="og:image" content="https://preview.redd.it/vsg59iw0srn21.jpg?auto=webp&amp;s=e19452b85c0aa8e3563cb1006a36eb914abfdec7">
-    <meta property="og:image:width" content="3024">
-    <meta property="og:image:height" content="4032">
-    <meta property="twitter:image" content="https://preview.redd.it/vsg59iw0srn21.jpg?auto=webp&amp;s=e19452b85c0aa8e3563cb1006a36eb914abfdec7">
-    <link rel="apple-touch-icon" sizes="57x57" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://www.redditstatic.com/desktop2x/img/favicon/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="https://www.redditstatic.com/desktop2x/img/favicon/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://www.redditstatic.com/desktop2x/img/favicon/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="https://www.redditstatic.com/desktop2x/img/favicon/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://www.redditstatic.com/desktop2x/img/favicon/favicon-16x16.png">
-    <link rel="manifest" href="https://www.redditstatic.com/desktop2x/img/favicon/manifest.json">
-    <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="https://www.redditstatic.com/desktop2x/img/favicon/ms-icon-144x144.png">
-    <meta name="theme-color" content="#ffffff">
-    <meta name="jsapi">
-<body>
-    <iframe marginwidth="0" marginheight="0" scrolling="no" frameborder="0" height="0" width="0" id="aax_prefetch_frame" sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-pointer-lock allow-popups-to-escape-sandbox" src="https://redditad.com/display.html?&amp;_otarOg=https%3A%2F%2Fwww.reddit.com&amp;_cpub=AAX763KC6&amp;_csvr=2019032812_578&amp;_cgdpr=1&amp;_cgdprconsent=0" name="{&quot;fid&quot;:1,&quot;type&quot;:&quot;prefetch_frame&quot;}" style="display: none !important;"></iframe>
-    <iframe marginwidth="0" marginheight="0" scrolling="no" frameborder="0" height="0" width="0" id="cok_aax" src="https://c.aaxads.com/aacxs.php?&amp;yvVbqf=1&amp;fv=1&amp;ke=1&amp;fy=37&amp;qghf=1&amp;flg=AAX763KC6&amp;suylg=33%2C38%2C41%2C51%2C55%2C80%2C82%2C89%2C90%2C97%2C109%2C113%2C114%2C117%2C122%2C141%2C145%2C155%2C157%2C161%2C167%2C172%2C3004&amp;uwlph=75&amp;kwwsv=1&amp;gdpr=1&amp;gdprconsent=0" style="display: none !important;"></iframe>
-    <iframe marginwidth="0" marginheight="0" scrolling="no" frameborder="0" height="0" width="0" id="aax_if_detect" src="https://aaxdetect.com/detect.html?&amp;pub=AAX763KC6&amp;svr=2019032812_578&amp;gdpr=1&amp;gdprconsent=0&amp;dn=https%3A%2F%2Fwww.reddit.com" style="display: none !important;"></iframe>
-    <script>
-        __perfMark('app_html_start');
-    </script>
-    <div id="2x-container">
-        <div class="xvmxia-0 PrKco">
-            <div tabindex="-1">
-                <div class="_1gsAk1ihQliBnDybgyjghy" id="SHORTCUT_FOCUSABLE_DIV" tabindex="-1">
-                    <div class="SubredditVars-r-colors">
-                        <header class="_2GyPfdsi-MbQFyHRECo9GO cx1ohrUAq6ARaXTX2u8YN  s4rdgu3-0 eAICLF s1ipn2bl-0 dPRCBc" data-redditstyle="true">
-                            <div class="_2vkeRJojnV7cb9pMlPHy7d">
-                                <div class="_3dnbqz69WJTFCss8wl7Wlk"><span class="s1dqr9jy-0 imyGpC">Press J to jump to the feed. Press question mark to learn the rest of the keyboard shortcuts</span>
-                                    <a aria-label="Home" class="_30BbATRhFv3V83DHNDjJAO" href="/">
-                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="_1O4jTk-dZ-VIxsCuYB6OR8">
-                                            <g>
-                                                <circle fill="#FF4500" cx="10" cy="10" r="10"></circle>
-                                                <path fill="#FFF" d="M16.67,10A1.46,1.46,0,0,0,14.2,9a7.12,7.12,0,0,0-3.85-1.23L11,4.65,13.14,5.1a1,1,0,1,0,.13-0.61L10.82,4a0.31,0.31,0,0,0-.37.24L9.71,7.71a7.14,7.14,0,0,0-3.9,1.23A1.46,1.46,0,1,0,4.2,11.33a2.87,2.87,0,0,0,0,.44c0,2.24,2.61,4.06,5.83,4.06s5.83-1.82,5.83-4.06a2.87,2.87,0,0,0,0-.44A1.46,1.46,0,0,0,16.67,10Zm-10,1a1,1,0,1,1,1,1A1,1,0,0,1,6.67,11Zm5.81,2.75a3.84,3.84,0,0,1-2.47.77,3.84,3.84,0,0,1-2.47-.77,0.27,0.27,0,0,1,.38-0.38A3.27,3.27,0,0,0,10,14a3.28,3.28,0,0,0,2.09-.61A0.27,0.27,0,1,1,12.48,13.79Zm-0.18-1.71a1,1,0,1,1,1-1A1,1,0,0,1,12.29,12.08Z"></path>
-                                            </g>
-                                        </svg>
-                                        <svg class="_1bWuGs_1sq4Pqy099x_yy-" viewBox="0 0 55 17.44">
-                                            <g fill="#1c1c1c">
-                                                <circle fill="#FF4500" cx="45.77" cy="3.33" r="2.05"></circle>
-                                                <path fill="inherit" d="M16.73,12.05a1.44,1.44,0,0,0,1.54-1.48,4.91,4.91,0,0,0-.1-0.83,5.66,5.66,0,0,0-5.34-4.61c-3,0-5.51,2.76-5.51,6.15s2.47,6.15,5.51,6.15a5.47,5.47,0,0,0,4.26-1.78,1.19,1.19,0,0,0-.19-1.77,1.25,1.25,0,0,0-1.53.16,3.78,3.78,0,0,1-2.54,1.09,3.42,3.42,0,0,1-3.14-3.08h7ZM12.82,7.44a3.3,3.3,0,0,1,3,2.56h-6A3.3,3.3,0,0,1,12.82,7.44Z"></path>
-                                                <path fill="inherit" d="M7.44,6.32a1.15,1.15,0,0,0-1-1.14A4.46,4.46,0,0,0,2.31,6.69V6.54A1.15,1.15,0,1,0,0,6.54V16a1.18,1.18,0,0,0,1.08,1.2A1.15,1.15,0,0,0,2.31,16V11.15A3.51,3.51,0,0,1,6.15,7.47H6.38A1.15,1.15,0,0,0,7.44,6.32Z"></path>
-                                                <path fill="inherit" d="M46.92,7.56a1.15,1.15,0,0,0-2.31,0V16a1.15,1.15,0,1,0,2.31,0V7.56Z"></path>
-                                                <path fill="inherit" d="M29.87,1.15A1.15,1.15,0,0,0,28.72,0h0a1.15,1.15,0,0,0-1.15,1.15V6.31a4,4,0,0,0-2.95-1.18c-3,0-5.51,2.76-5.51,6.15s2.47,6.15,5.51,6.15a4.08,4.08,0,0,0,3-1.19A1.15,1.15,0,0,0,29.87,16V1.15Zm-5.26,14c-1.77,0-3.21-1.72-3.21-3.85s1.43-3.85,3.21-3.85,3.21,1.72,3.21,3.85S26.39,15.13,24.62,15.13Z"></path>
-                                                <path fill="inherit" d="M41.92,1.15A1.15,1.15,0,0,0,40.77,0h0a1.15,1.15,0,0,0-1.15,1.15V6.31a4,4,0,0,0-2.95-1.18c-3,0-5.51,2.76-5.51,6.15s2.47,6.15,5.51,6.15a4.08,4.08,0,0,0,3-1.19A1.15,1.15,0,0,0,41.92,16V1.15Zm-5.26,14c-1.77,0-3.21-1.72-3.21-3.85s1.43-3.85,3.21-3.85,3.21,1.72,3.21,3.85S38.44,15.13,36.67,15.13Z"></path>
-                                                <path fill="inherit" d="M52.91,16V7.44h1a1,1,0,0,0,1.06-1,1,1,0,0,0-1-1.09H52.91V3.76a1.18,1.18,0,0,0-1.08-1.19,1.15,1.15,0,0,0-1.23,1.15V5.38h-1a1,1,0,0,0-1.06,1,1,1,0,0,0,1,1.09h1V16a1.15,1.15,0,0,0,1.15,1.15h0A1.15,1.15,0,0,0,52.91,16Z"></path>
-                                            </g>
-                                        </svg>
-                                    </a>
-                                    <div class="_3jiriKeNer8y0-1r6oWIFM m-not-pinned">
-                                        <button aria-label="Start typing to filter your subscriptions or use up and down to select." class="h-jI8r2f9ozTNqu_2TBeY" role="navigation"><span class="_1GieMuLljOrqnVpRAwz7VP">r/colors</span>
-                                            <svg class="_3fvJBCH6c6P0NvMwoqK9MJ s1745pas-1 NuwdV" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" role="presentation">
-                                                <path d="M15.8286,15.8998 C15.3466,16.3788 12.6326,15.5598 8.5516,11.4798 C4.4706,7.3968 3.6486,4.6858 4.1316,4.2038 C4.3566,3.9788 4.9286,3.9208 5.9126,4.3518 C5.6166,4.5678 5.3306,4.8008 5.0666,5.0658 C5.0536,5.0798 5.0416,5.0948 5.0266,5.1098 C5.5756,6.4268 6.8946,8.4088 9.2596,10.7728 C11.6206,13.1338 13.6046,14.4538 14.9246,15.0028 C14.9376,14.9898 14.9526,14.9778 14.9666,14.9638 C15.2316,14.6988 15.4646,14.4128 15.6786,14.1178 C16.1096,15.1028 16.0526,15.6748 15.8286,15.8998 M16.7526,11.8998 C17.4066,9.5458 16.8136,6.9138 14.9666,5.0658 C13.6436,3.7438 11.8866,3.0148 10.0166,3.0148 C9.3686,3.0148 8.7356,3.1078 8.1286,3.2768 C5.7306,1.7598 3.9176,1.5898 2.7176,2.7898 C1.4036,4.1028 2.0736,6.1918 3.2866,8.1688 C2.6446,10.5128 3.2276,13.1258 5.0666,14.9638 C6.3886,16.2868 8.1456,17.0148 10.0166,17.0148 C10.6536,17.0148 11.2746,16.9178 11.8736,16.7518 C13.0856,17.4938 14.3406,18.0318 15.4316,18.0318 C16.1156,18.0318 16.7366,17.8198 17.2426,17.3138 C18.4416,16.1138 18.2706,14.2988 16.7526,11.8998"></path>
-                                            </svg>
-                                            <svg class="_3CG2U_hX3HI-ibl5v2RCq1 r2jmej-0 gEeUEF" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                                <g>
-                                                    <path fill="inherit" d="M14.1711599,9.3535 L9.99925636,13.529 L5.82735283,9.3535 C5.51262415,9.0385 5.73543207,8.5 6.18054835,8.5 L13.8179644,8.5 C14.2630807,8.5 14.4858886,9.0385 14.1711599,9.3535"></path>
-                                                </g>
-                                            </svg>
-                                        </button>
-                                    </div>
-                                    <div class="_3jiriKeNer8y0-1r6oWIFM _2dlTXDaX9JuL0bekTwhV18  s1vm61o8-3 lcwViv" id="SearchDropdown">
-                                        <label class="s1vm61o8-1 hLCjnv" for="header-search-bar">
-                                            <svg class="s1vm61o8-2 clhxOb" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
-                                                <g>
-                                                    <path d="M12.4743167,11.1299698 L14.6957506,13.2817166 C15.0924476,13.665969 15.1025359,14.2990536 14.7182834,14.6957506 C14.334031,15.0924476 13.7009464,15.1025359 13.3042494,14.7182834 L11.0486163,12.5334103 C10.0079655,13.2768564 8.73367013,13.7142857 7.35714286,13.7142857 C3.84600096,13.7142857 1,10.8682847 1,7.35714286 C1,3.84600096 3.84600096,1 7.35714286,1 C10.8682847,1 13.7142857,3.84600096 13.7142857,7.35714286 C13.7142857,8.76975383 13.2536226,10.0747029 12.4743167,11.1299698 Z M11.7142857,7.35714286 C11.7142857,4.95057046 9.76371525,3 7.35714286,3 C4.95057046,3 3,4.95057046 3,7.35714286 C3,9.76371525 4.95057046,11.7142857 7.35714286,11.7142857 C9.76371525,11.7142857 11.7142857,9.76371525 11.7142857,7.35714286 Z"></path>
-                                                </g>
-                                            </svg>
-                                        </label>
-                                        <form action="/search" autocomplete="off" method="get">
-                                            <input type="search" class="s1vm61o8-0 iWGgAu" id="header-search-bar" name="q" placeholder="Search r/colors" role="search" value="">
-                                        </form>
-                                    </div>
-                                </div>
-                                <div class="_2u8LqkbMtzd0lpblMFbJq5">
-                                    <div class="x0hiXHicn7r3BG9m1FJH4 _23q1waDr4n_2fR5A7zcZzb">
-                                        <div class="_1vXXD2qKLnHetdKvisFzBD">
-                                            <a class="_3dZnYgFFpifT-M_Vs2FAq6" id="header-quicklinks-popular" href="/">
-                                                <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                                    <g>
-                                                        <polygon fill="none" points="0 20 20 20 20 0 0 0"></polygon>
-                                                        <polygon fill="inherit" points="12.5 3.5 20 3.5 20 11 17.5 8.5 11.25 14.75 7.5 11 2.5 16 0 13.5 7.5 6 11.25 9.75 15 6"></polygon>
-                                                    </g>
-                                                </svg>
-                                            </a>
-                                            <a class="_3dZnYgFFpifT-M_Vs2FAq6" id="header-quicklinks-all" href="/r/all">
-                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-                                                    <g fill-rule="evenodd">
-                                                        <polygon fill="none" points="0 20 20 20 20 .001 0 .001"></polygon>
-                                                        <path fill="inherit" d="M1.25,17.5 L1.25,7.5 L6.25,7.5 L6.25,17.5 L1.25,17.5 Z M12.49995,17.5001 L7.49995,17.5001 L7.49995,5.0001 L4.99995,5.0001 L9.99995,0.0006 L14.99995,5.0001 L12.49995,5.0001 L12.49995,17.5001 Z M13.75,17.5 L13.75,12.5 L18.75,12.5 L18.75,17.5 L13.75,17.5 Z"></path>
-                                                    </g>
-                                                </svg>
-                                            </a>
-                                            <a class="_3dZnYgFFpifT-M_Vs2FAq6" id="header-quicklinks-oc" href="/original">
-                                                <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                                    <path fill="inherit" d="M16.9998,2.9995 C18.1028,2.9995 18.9998,3.8975 18.9998,4.9995 L18.9998,14.9995 C18.9998,16.1025 18.1028,16.9995 16.9998,16.9995 L2.9998,16.9995 C1.8978,16.9995 0.9998,16.1025 0.9998,14.9995 L0.9998,4.9995 C0.9998,3.8975 1.8978,2.9995 2.9998,2.9995 L16.9998,2.9995 Z M13.9648,13.3525 C15.2718,13.3525 16.3188,12.6745 16.8278,11.5665 L15.1818,10.9775 C14.9318,11.4765 14.4528,11.8165 13.8338,11.8165 C13.0158,11.8165 12.3478,11.0575 12.3478,9.9995 C12.3478,8.9525 13.0058,8.1735 13.8438,8.1735 C14.4528,8.1735 14.9218,8.5025 15.1308,8.9615 L16.6968,8.2435 C16.1988,7.2755 15.2108,6.6365 13.9648,6.6365 C12.0588,6.6365 10.5118,8.1335 10.5118,9.9995 C10.5118,11.8755 12.0588,13.3525 13.9648,13.3525 Z M6.6248,13.3635 C8.5408,13.3635 10.0878,11.8755 10.0878,9.9995 C10.0878,8.1335 8.5408,6.6365 6.6248,6.6365 C4.7188,6.6365 3.1718,8.1335 3.1718,9.9995 C3.1718,11.8755 4.7188,13.3635 6.6248,13.3635 Z M6.625,8.1641 C7.562,8.1641 8.262,8.9421 8.262,10.0001 C8.262,11.0481 7.562,11.8361 6.625,11.8361 C5.697,11.8361 4.998,11.0481 4.998,10.0001 C4.998,8.9421 5.697,8.1641 6.625,8.1641 Z"></path>
-                                                </svg>
-                                            </a>
-                                        </div>
-                                    </div>
-                                    <div class="_19oWd7e3z7-ztUGzdIoCR7">
-                                        <div class="_1JBkpB_FOZMZ7IPr3FyNfH"><a class="_3Wg53T10KuuPmyWOMWsY2F s1di1u0z-5 eiJrJP" href="https://www.reddit.com/login?dest=https%3A%2F%2Fwww.reddit.com%2Fr%2Fcolors%2Fcomments%2Fb4d5xm%2Fliterally_nothing_black_edition%2F">log in</a><a class="Z_HUY3BUsGOBOtdmH94ZS _3Wg53T10KuuPmyWOMWsY2F s1di1u0z-1 iynWOK" href="https://www.reddit.com/register?dest=https%3A%2F%2Fwww.reddit.com%2Fr%2Fcolors%2Fcomments%2Fb4d5xm%2Fliterally_nothing_black_edition%2F">sign up</a></div>
-                                        <div class="U3FRqDA_Qhr4icbaNXSuf s1cu8rnh-0 kCxZdn" id="email-verification-tooltip-id">
-                                            <div class="s1dxm5k4-5 exNEfa"></div>
-                                            <div class="header-user-dropdown">
-                                                <button class="s1dxm5k4-6 cXRnFU  o914k-12 hEWURs" aria-expanded="false" aria-haspopup="true" id="USER_DROPDOWN_ID">
-                                                    <div class="o914k-1 hcePqI">
-                                                        <div class="o914k-5 fHiJFY">
-                                                            <svg class="o914k-13 cuvTDF" viewBox="0 0 250 250" xmlns="http://www.w3.org/2000/svg">
-                                                                <g fill="inherit">
-                                                                    <path d="M146.8 142.6h-37.6c-31.1 0-56.5 25.3-56.5 56.5 0 5.2 4.2 9.4 9.4 9.4h131.8c5.2 0 9.4-4.2 9.4-9.4 0-31.2-25.3-56.5-56.5-56.5zM128 130.7c20.1 0 36.4-16.3 36.4-36.4v-9.4c0-20.1-16.3-36.4-36.4-36.4S91.6 64.8 91.6 84.9v9.4c0 20.1 16.3 36.4 36.4 36.4z"></path>
-                                                                </g>
-                                                            </svg>
-                                                        </div>
-                                                        <svg class="o914k-10 dPjfRs" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                                            <g>
-                                                                <path fill="inherit" d="M14.1711599,9.3535 L9.99925636,13.529 L5.82735283,9.3535 C5.51262415,9.0385 5.73543207,8.5 6.18054835,8.5 L13.8179644,8.5 C14.2630807,8.5 14.4858886,9.0385 14.1711599,9.3535"></path>
-                                                            </g>
-                                                        </svg>
-                                                    </div><span class="s1dqr9jy-0 imyGpC">User account menu</span></button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </header>
-                    </div>
-                    <div class="SubredditVars-r-colors">
-                        <div class="_1nxEQl5D2Bx2jxDILRHemb  s4rdgu3-1 lbeKQg" aria-hidden="false">
-                            <div>
-                                <div class="th5f56-0 dHUYIZ">
-                                    <div class="th5f56-4 YygLa th5f56-3 jFtZBV"></div>
-                                    <div class="th5f56-1 fJQRaL">
-                                        <div class="th5f56-2 bGwsrC">
-                                            <a class="ssdjlj-8 clTCiy ssdjlj-7 jDJmGa" href="/r/colors/">
-                                                <div class="ssdjlj-4 elhfNK" style="max-width:1600px">
-                                                    <div class="ssdjlj-3 hLkSVI">
-                                                        <svg class="ssdjlj-0 zSeAY" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-                                                            <path d="M15.8286,15.8998 C15.3466,16.3788 12.6326,15.5598 8.5516,11.4798 C4.4706,7.3968 3.6486,4.6858 4.1316,4.2038 C4.3566,3.9788 4.9286,3.9208 5.9126,4.3518 C5.6166,4.5678 5.3306,4.8008 5.0666,5.0658 C5.0536,5.0798 5.0416,5.0948 5.0266,5.1098 C5.5756,6.4268 6.8946,8.4088 9.2596,10.7728 C11.6206,13.1338 13.6046,14.4538 14.9246,15.0028 C14.9376,14.9898 14.9526,14.9778 14.9666,14.9638 C15.2316,14.6988 15.4646,14.4128 15.6786,14.1178 C16.1096,15.1028 16.0526,15.6748 15.8286,15.8998 M16.7526,11.8998 C17.4066,9.5458 16.8136,6.9138 14.9666,5.0658 C13.6436,3.7438 11.8866,3.0148 10.0166,3.0148 C9.3686,3.0148 8.7356,3.1078 8.1286,3.2768 C5.7306,1.7598 3.9176,1.5898 2.7176,2.7898 C1.4036,4.1028 2.0736,6.1918 3.2866,8.1688 C2.6446,10.5128 3.2276,13.1258 5.0666,14.9638 C6.3886,16.2868 8.1456,17.0148 10.0166,17.0148 C10.6536,17.0148 11.2746,16.9178 11.8736,16.7518 C13.0856,17.4938 14.3406,18.0318 15.4316,18.0318 C16.1156,18.0318 16.7366,17.8198 17.2426,17.3138 C18.4416,16.1138 18.2706,14.2988 16.7526,11.8998"></path>
-                                                        </svg><span class="ssdjlj-6 lbhgpA">r/<h1 class="ssdjlj-5 evVwId">colors</h1></span></div>
-                                                    <div class="ssdjlj-2 haiyiH"></div>
-                                                </div>
-                                            </a>
-                                            <div class="s1s4hmd1-0 enEuTf">
-                                                <div class="s1s4hmd1-1 ixOlPy" style="max-width:1600px">
-                                                    <div><a class="s8ofjbx-2 ekBJsF" href="/r/colors/">Posts</a></div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div style="max-width:1600px"></div>
-                                        <div class="th5f56-5 ftjuQd" style="max-width:1600px">
-                                            <div class="sdccme-0 kIpPAE">
-                                                <div class="uI_hDmU5GSiudtABRz_37  ugs5wq-3 inaZFZ">
-                                                    <div class="ct93lh-9 gdWvqQ _2rszc84L136gWQrkwH6IaM  Post t3_b4d5xm  s1ukwo15-0 RqhAo" id="t3_b4d5xm" tabindex="-1">
-                                                        <div data-test-id="post-content">
-                                                            <div class="_23h0-EcaBUorIHC-JZyh6J" style="width:40px;border-left:4px solid transparent">
-                                                                <div class="s1b4xnj8-0 dNbgrk">
-                                                                    <button class="cYUyoUM3wmgRXEHv1LlZv " aria-label="upvote" aria-pressed="false" data-click-id="upvote" id="upvote-button-t3_b4d5xm">
-                                                                        <div class="_2q7IQ0BUOWeEZoeAxN555e dplx91-0 hmUUsU"><i class="icon icon-upvote _2Jxk822qXs4DaXwsN7yyHA"></i></div>
-                                                                    </button>
-                                                                    <div class="_1rZYMD_4xY3gRcSS3p8ODO" style="color:#1A1A1B">4</div>
-                                                                    <button class="cYUyoUM3wmgRXEHv1LlZv " aria-label="downvote" aria-pressed="false" data-click-id="downvote">
-                                                                        <div class="_1iKd82bq_nqObFvSH1iC_Q s1y8gf4b-0 keMdrU"><i class="icon icon-downvote ZyxIIl4FP5gHGrJDzNpUC"></i></div>
-                                                                    </button>
-                                                                </div>
-                                                            </div>
-                                                            <div class="s8w20h0-0 zHadr">
-                                                                <div class="cZPZhMe-UCZ8htPodMyJ5">
-                                                                    <div class="_3AStxql1mQsrZuUIFP9xSg nU4Je7n-eSXStTBAPMYt8"><span class="_2fCzxBE1dlMh4OFc7B3Dun">Posted by</span>
-                                                                        <div class="xvda30-0 camSYk"><a class="_2tbHP6ZydRpjI44J3syuqC k9omvt-1 eTLhLs" href="/user/thatrandomretard">u/thatrandomretard</a>
-                                                                            <div id="UserInfoTooltip--t3_b4d5xm"></div>
-                                                                        </div><a class="_3jOxDPIQ0KaOWpzvSQo-1s" data-click-id="timestamp" href="https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/" id="PostTopMeta--Created--false--t3_b4d5xm" target="_blank" rel="nofollow noopener">11 days ago</a></div>
-                                                                    <div class="_2wFk1qX4e1cxk8Pkw1rAHk"></div>
-                                                                    <div class="s1himhqu-0 mVLQc _2LeW9tc_6Fs1n7Ou8uD-70 "></div>
-                                                                </div>
-                                                            </div>
-                                                            <div class="ct93lh-0 cjqnLg"><span class="y8HYJ-y_lTUHkQIc1mdCq"><h2 class="s1okktje-0 eYgaub" data-redditstyle="true">Literally nothing black edition</h2></span>
-                                                                <div class="_1hLrLjnE1G_RBCNcN9MVQf">
-                                                                    <img src="https://www.redditstatic.com/desktop2x/img/renderTimingPixel.png" style="width: 1px; height: 1px;" onload="(__markFirstPostVisible || function(){})();">
-                                                                </div>
-                                                            </div>
-                                                            <div class="_3Oa0THmZ3f5iZXAQ0hBJ0k " style="margin:0 auto">
-                                                                <a href="https://i.redd.it/vsg59iw0srn21.jpg" target="_blank"><img class="_2_tDEnGMLxpM6uOa2kaDB3 media-element" style="background-color:#FFFFFF;max-height:700px;margin:0 auto" src="https://preview.redd.it/vsg59iw0srn21.jpg?width=640&amp;crop=smart&amp;auto=webp&amp;s=20aac863eaf45bc3022e50942e979c4026410e49"></a>
-                                                            </div>
-                                                            <div class="_1hwEKkB_38tIoal6fcdrt9">
-                                                                <div class="_3-miAEojrCvx_4FQ8x3P-s erkui2-3 jVMRBO">
-                                                                    <div class="_1UoeAeSRhOKSNdY_h3iS1O _3m17ICJgx45k_z-t82iVuO _2qww3J5KKzsD7e5DO0BvvU erkui2-0 jlzGbU"><i class="icon icon-comment _3ch9jJ0painNf41PmU4F9i _3DVrpDrMM9NLT6TlsTUMxC" role="presentation"></i><span class="FHCV02u6Cp2zYL0fhQPsO">1 comment</span></div>
-                                                                    <div class="erkui2-2 lcDJEC" id="t3_b4d5xm-share-menu">
-                                                                        <button class="erkui2-1 kjRcny" data-click-id="share"><i class="icon icon-share xwmljjCrovDE5C9MasZja _1GQDWqbF-wkYWbrpmOvjqJ"></i><span class="_6_44iTtZoeY6_XChKt5b0">share</span></button>
-                                                                    </div>
-                                                                    <button class="s1afabjy-1 hyEpNP b1zwxr-0 hxpTao" role="menuitem">
-                                                                        <div class="s1nordvo-0 iRFTnd"><i class="icon icon-save vlzsw3-2 IyvWL"></i></div><span class="s1nordvo-1 bVDUJS">save</span></button>
-                                                                    <button class="s1afabjy-1 kVpXsu b1zwxr-0 hxpTao" role="menuitem">
-                                                                        <div class="s1nordvo-0 iRFTnd"><i class="icon icon-hide vlzsw3-0 giMEpI"></i></div><span class="s1nordvo-1 bVDUJS">hide</span></button>
-                                                                    <button class="s1afabjy-1 kVpXsu b1zwxr-0 hxpTao" role="menuitem">
-                                                                        <div class="s1nordvo-0 iRFTnd"><i class="icon icon-report _1MDjRAzxk1RSTB12748O1v vlzsw3-1 junIdA"><span class="i729lw-0 ebGXPK"></span></i></div><span class="s1nordvo-1 bVDUJS">report</span></button>
-                                                                    <div class="s1o43ulv-1 fGjVuX"></div>
-                                                                    <div>
-                                                                        <button class="vlzsw3-17 cYeNXF s18u2fuq-1 gwVOpf" aria-expanded="false" aria-haspopup="true" aria-label="more options" id="t3_b4d5xm-overflow-menu"><i class="icon icon-menu s18u2fuq-2 demKfm"></i></button>
-                                                                    </div>
-                                                                    <div class="_21pmAV9gWG6F_UKVe7YIE0"></div>
-                                                                </div>
-                                                                <div class="t4Hq30BDzTeJ85vREX7_M"><span>84% Upvoted</span></div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="s6wlmco-0 jecSt"><span class="s6wlmco-1 fGrGUl">What are your thoughts? Log in or Sign up</span><a class="s6wlmco-3 bsaIpo" href="https://www.reddit.com/login?dest=https%3A%2F%2Fwww.reddit.com%2Fr%2Fcolors%2Fcomments%2Fb4d5xm%2Fliterally_nothing_black_edition%2F">log in</a><a class="s6wlmco-2 eykXoL" href="https://www.reddit.com/register?dest=https%3A%2F%2Fwww.reddit.com%2Fr%2Fcolors%2Fcomments%2Fb4d5xm%2Fliterally_nothing_black_edition%2F">sign up</a></div>
-                                                    <div class="s121jps0-1 cyghBJ">
-                                                        <div class="qcxaFzxDBtnkGs5hS18OZ">Sort by</div>
-                                                        <button class="_9hEKbWSdCV7reKexfA9A9 s1nordvo-2 bhJqeZ b1zwxr-0 hxpTao" id="CommentSort--SortPicker" role="menuitem"><span class="s1nordvo-1 bVDUJS">best</span></button>
-                                                        <svg class="_2SygZtDzf_C4qIcNZSp9Da r2jmej-0 gEeUEF" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                                            <g>
-                                                                <path fill="inherit" d="M14.1711599,9.3535 L9.99925636,13.529 L5.82735283,9.3535 C5.51262415,9.0385 5.73543207,8.5 6.18054835,8.5 L13.8179644,8.5 C14.2630807,8.5 14.4858886,9.0385 14.1711599,9.3535"></path>
-                                                            </g>
-                                                        </svg>
-                                                        <div class="s1ksf9tn-0 hbcgEe">
-                                                            <a tabindex="-1" href="/r/colors/comments/b4d5xm/literally_nothing_black_edition/?sort=confidence">
-                                                                <button class="s1nordvo-2 jKLnd b1zwxr-0 hxpTao" role="menuitem"><span class="s1nordvo-1 bVDUJS">best</span></button>
-                                                            </a>
-                                                            <a tabindex="-1" href="/r/colors/comments/b4d5xm/literally_nothing_black_edition/?sort=top">
-                                                                <button class="s1nordvo-2 dVvmOF b1zwxr-0 hxpTao" role="menuitem"><span class="s1nordvo-1 bVDUJS">top</span></button>
-                                                            </a>
-                                                            <a tabindex="-1" href="/r/colors/comments/b4d5xm/literally_nothing_black_edition/?sort=new">
-                                                                <button class="s1nordvo-2 dVvmOF b1zwxr-0 hxpTao" role="menuitem"><span class="s1nordvo-1 bVDUJS">new</span></button>
-                                                            </a>
-                                                            <a tabindex="-1" href="/r/colors/comments/b4d5xm/literally_nothing_black_edition/?sort=controversial">
-                                                                <button class="s1nordvo-2 dVvmOF b1zwxr-0 hxpTao" role="menuitem"><span class="s1nordvo-1 bVDUJS">controversial</span></button>
-                                                            </a>
-                                                            <a tabindex="-1" href="/r/colors/comments/b4d5xm/literally_nothing_black_edition/?sort=old">
-                                                                <button class="s1nordvo-2 dVvmOF b1zwxr-0 hxpTao" role="menuitem"><span class="s1nordvo-1 bVDUJS">old</span></button>
-                                                            </a>
-                                                            <a tabindex="-1" href="/r/colors/comments/b4d5xm/literally_nothing_black_edition/?sort=qa">
-                                                                <button class="s1nordvo-2 dVvmOF b1zwxr-0 hxpTao" role="menuitem"><span class="s1nordvo-1 bVDUJS">q&amp;a</span></button>
-                                                            </a>
-                                                        </div>
-                                                    </div>
-                                                    <div class="p0SYO8TbZVqJIWEeFcNZx ugs5wq-2 iwyQYP">
-                                                        <div class="_2tRg7ajbEnfStKCizLgiOL">
-                                                            <div class="ugs5wq-1 iPeDWx">
-                                                                <div class="s1s03i76-0 gZtOW">
-                                                                    <div>
-                                                                        <div>
-                                                                            <div class="s136il31-0 cMWqxb" id="t1_ej75j43" tabindex="-1">
-                                                                                <div class="fxv3b9-1 jDSCcP">
-                                                                                    <div class="fxv3b9-2 czhQfm">
-                                                                                        <div class="t1_ej75j43 fxv3b9-0 efNcNS"><i class="threadline"></i></div>
-                                                                                    </div>
-                                                                                </div>
-                                                                                <div class="Comment t1_ej75j43 top-level s1m8d0lr-3 jzfRiQ">
-                                                                                    <div class="s1m8d0lr-0 iJHidl">
-                                                                                        <button class="cYUyoUM3wmgRXEHv1LlZv " aria-label="upvote" aria-pressed="false" data-click-id="upvote">
-                                                                                            <div class="_3wVayy5JvIMI67DheMYra2 dplx91-0 hmUUsU"><i class="icon icon-upvote _2Jxk822qXs4DaXwsN7yyHA _39UOLMgvssWenwbRxz_iEn"></i></div>
-                                                                                        </button>
-                                                                                        <button class="cYUyoUM3wmgRXEHv1LlZv " aria-label="downvote" aria-pressed="false" data-click-id="downvote">
-                                                                                            <div class="jR747Vd1NbfaLusf5bHre s1y8gf4b-0 keMdrU"><i class="icon icon-downvote ZyxIIl4FP5gHGrJDzNpUC _2GCoZTwJW7199HSwNZwlHk"></i></div>
-                                                                                        </button>
-                                                                                    </div>
-                                                                                    <div class="s1m8d0lr-2 iDQVFl"><span class="s1dqr9jy-0 imyGpC">level 1</span>
-                                                                                        <div class="s1m8d0lr-1 hTYgIw s1scqi3h-15 iFVGWf">
-                                                                                            <div class="xvda30-0 camSYk"><a class="k9omvt-1 elIMnE" href="/user/MTF_BETA_4">MTF_BETA_4</a>
-                                                                                                <div class="_16AAktgl_rVbXAeiWU9CQd" id="UserInfoTooltip--t1_ej75j43"></div>
-                                                                                            </div><span class="h5svje-0 cFQOcm">2 points</span><span class="h5svje-0 cFQOcm"> · </span><a class="s1scqi3h-11 iCjbNx" href="/r/colors/comments/b4d5xm/literally_nothing_black_edition/ej75j43/" id="CommentTopMeta--Created--t1_ej75j43" rel="nofollow" target="_blank"><span>11 days ago</span></a>
-                                                                                            <div class="s1himhqu-0 mVLQc _2LeW9tc_6Fs1n7Ou8uD-70 "></div>
-                                                                                        </div>
-                                                                                        <div data-test-id="comment" class="_3cjCphgls6DH-irkVaA0GM">
-                                                                                            <div class="fo16tt-0 bJBAtI">
-                                                                                                <p class="s14dydj4-10 kiAEUp">Hell yeah</p>
-                                                                                            </div>
-                                                                                        </div>
-                                                                                        <div class="qpz9zt-7 bFqcHi">
-                                                                                            <button class="qpz9zt-8 hNcpjb"><i class="icon icon-comment _3ch9jJ0painNf41PmU4F9i qpz9zt-0 dCntJB"></i>Reply</button>
-                                                                                            <div id="t1_ej75j43-comment-share-menu">
-                                                                                                <button class="qpz9zt-8 hNcpjb">share</button>
-                                                                                            </div>
-                                                                                            <button class="qpz9zt-8 hNcpjb">report</button>
-                                                                                            <button class="qpz9zt-8 hNcpjb">Save</button>
-                                                                                        </div>
-                                                                                    </div>
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="th5f56-6 iQdHyy" style="margin-left:24px">
-                                                <div class="RffBqG1xCvuy1r49wYhLr ex0irb-2 clOGyg">
-                                                    <div class="s17ivpdx-0 bpjjeT" data-redditstyle="false">
-                                                        <div class="_ZhON3a3vplThB8NFwuJn">
-                                                            <div class="_2sggAEfRQLyoAl4J__5twU">Community Details</div>
-                                                        </div>
-                                                        <div class="TmgZY6tDcdErbE5d7E0HJ">
-                                                            <div class="fa9nbo-1 dGiaKs">
-                                                                <svg class="_2Vkdik1Q8k0lBEhhA_lRKE s1745pas-1 NuwdV" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" role="presentation">
-                                                                    <path d="M15.8286,15.8998 C15.3466,16.3788 12.6326,15.5598 8.5516,11.4798 C4.4706,7.3968 3.6486,4.6858 4.1316,4.2038 C4.3566,3.9788 4.9286,3.9208 5.9126,4.3518 C5.6166,4.5678 5.3306,4.8008 5.0666,5.0658 C5.0536,5.0798 5.0416,5.0948 5.0266,5.1098 C5.5756,6.4268 6.8946,8.4088 9.2596,10.7728 C11.6206,13.1338 13.6046,14.4538 14.9246,15.0028 C14.9376,14.9898 14.9526,14.9778 14.9666,14.9638 C15.2316,14.6988 15.4646,14.4128 15.6786,14.1178 C16.1096,15.1028 16.0526,15.6748 15.8286,15.8998 M16.7526,11.8998 C17.4066,9.5458 16.8136,6.9138 14.9666,5.0658 C13.6436,3.7438 11.8866,3.0148 10.0166,3.0148 C9.3686,3.0148 8.7356,3.1078 8.1286,3.2768 C5.7306,1.7598 3.9176,1.5898 2.7176,2.7898 C1.4036,4.1028 2.0736,6.1918 3.2866,8.1688 C2.6446,10.5128 3.2276,13.1258 5.0666,14.9638 C6.3886,16.2868 8.1456,17.0148 10.0166,17.0148 C10.6536,17.0148 11.2746,16.9178 11.8736,16.7518 C13.0856,17.4938 14.3406,18.0318 15.4316,18.0318 C16.1156,18.0318 16.7366,17.8198 17.2426,17.3138 C18.4416,16.1138 18.2706,14.2988 16.7526,11.8998"></path>
-                                                                </svg><a class="fa9nbo-4 eDxOau" href="/r/colors/"><span class="fa9nbo-5 ljlNSY" title="r/colors">r/colors</span></a></div>
-                                                            <div class="fa9nbo-8 bsqcZX">
-                                                                <div>
-                                                                    <p class="fa9nbo-10 iHHoqD">485</p>
-                                                                    <p class="fa9nbo-11 kBVNef" id="IdCard--Subscribers--undefined--t5_2qlwz">Subscribers</p>
-                                                                </div>
-                                                                <div class="fa9nbo-9 filgwm">
-                                                                    <p class="fa9nbo-10 iHHoqD">0</p>
-                                                                    <p class="fa9nbo-11 kBVNef" id="IdCard--CurrentlyViewing--undefined--t5_2qlwz">Online</p>
-                                                                </div>
-                                                            </div>
-                                                            <p class="fa9nbo-13 iYBMzr">“Mere color, unspoiled by meaning, and unallied with definite form, can speak to the soul in a thousand different ways. ” ― Oscar Wilde</p>
-                                                            <div class="fa9nbo-14 iooGMG">
-                                                                <button class="fa9nbo-16 gmOtef s2ckgxg-4 cSzoLk s1di1u0z-3 dOwrvp" id="subscribe-button-t5_2qlwz">Subscribe</button><a class="fa9nbo-18 RdprA s1di1u0z-2 boHcOD" href="/r/colors/submit">Create post</a></div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="ii4q9d-0 fePAzF">
-                                                        <div class="s17ivpdx-0 bpjjeT" data-redditstyle="false">
-                                                            <div class="_ZhON3a3vplThB8NFwuJn">
-                                                                <div class="_2sggAEfRQLyoAl4J__5twU">Moderators</div><a class="s1mvqe4r-2 ykJHm" href="https://reddit.com/message/compose?to=/r/colors" target="_blank"><i class="icon icon-envelope i2kq3x-0 ideQEv"></i></a></div>
-                                                            <div class="TmgZY6tDcdErbE5d7E0HJ">
-                                                                <div class="s1mvqe4r-0 caXkXK">
-                                                                    <a href="/user/HattoriHanzo">
-                                                                        <div class="s1mvqe4r-1 selJt">u/HattoriHanzo</div>
-                                                                    </a>
-                                                                </div>
-                                                                <div class="s1mvqe4r-0 caXkXK">
-                                                                    <a href="/user/chromakode">
-                                                                        <div class="s1mvqe4r-1 selJt">u/chromakode</div>
-                                                                    </a>
-                                                                </div>
-                                                                <div class="s1mvqe4r-0 caXkXK">
-                                                                    <a href="/user/konayashi">
-                                                                        <div class="s1mvqe4r-1 selJt">u/konayashi</div>
-                                                                    </a>
-                                                                </div>
-                                                                <div class="s1mvqe4r-5 kSUcya"><a class="s1mvqe4r-4 fjkzOx" href="/r/colors/about/moderators/">View All Moderators</a></div>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="nowfa1-0 eLfEZO">
-                                                        <div class="nowfa1-5 WraxO">
-                                                            <div class="s1168hkq-4 hjxxdC s17ivpdx-0 bpjjeT" data-redditstyle="false">
-                                                                <div class="_3RPJ8hHnfFohktLZca18J6">
-                                                                    <div class="s1168hkq-0 jpZMnH">
-                                                                        <div class="s21l9wz-0 bmnsEB">
-                                                                            <div><a class="s1168hkq-1 hSAKYw" href="https://about.reddit.com">about</a><a class="s1168hkq-1 hSAKYw" href="https://about.reddit.com/careers/">careers</a><a class="s1168hkq-1 hSAKYw" href="https://about.reddit.com/press/">press</a></div>
-                                                                        </div>
-                                                                        <div class="s21l9wz-0 bmnsEB">
-                                                                            <div><a class="s1168hkq-1 hSAKYw" href="https://about.reddit.com/advertise/">advertise</a><a class="s1168hkq-1 hSAKYw" href="http://www.redditblog.com/">blog</a><a class="s1168hkq-1 hSAKYw" href="https://www.reddithelp.com">help</a></div>
-                                                                        </div>
-                                                                        <div class="s21l9wz-0 bmnsEB">
-                                                                            <div><a class="s1168hkq-1 hSAKYw" href="https://www.reddit.com/mobile/download">the reddit app</a><a class="s1168hkq-1 hSAKYw" href="https://www.reddit.com/coins">reddit coins</a><a class="s1168hkq-1 hSAKYw" href="https://www.reddit.com/premium">reddit premium</a><a class="s1168hkq-1 hSAKYw" href="http://redditgifts.com/">reddit gifts</a></div>
-                                                                        </div>
-                                                                    </div>
-                                                                    <div class="s1168hkq-2 kddyLv">
-                                                                        <div>
-                                                                            <a class="s1168hkq-3 dikVDQ" href="https://www.reddit.com/help/contentpolicy">
-                                                                                <!-- -->content policy</a><span>|</span>
-                                                                            <a class="s1168hkq-3 dikVDQ" href="https://www.reddit.com/help/privacypolicy">
-                                                                                <!-- -->privacy policy</a>
-                                                                        </div>
-                                                                        <div>
-                                                                            <a class="s1168hkq-3 dikVDQ" href="https://www.reddit.com/help/useragreement">
-                                                                                <!-- -->user agreement</a><span>|</span>
-                                                                            <a class="s1168hkq-3 dikVDQ" href="https://www.reddit.com/help/healthycommunities/">
-                                                                                <!-- -->mod policy</a>
-                                                                        </div>
-                                                                        <div>© 2019 Reddit, Inc. All rights reserved</div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                        <div class="nowfa1-1 bcFbiE s1ayxy26-0 hYctxm">
-                                                            <button class="s1ayxy26-1 cPZUMx">back to top</button>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-</html>
+[
+  {
+    "kind": "Listing",
+    "data": {
+      "children": [
+        {
+          "kind": "t3",
+          "data": {
+            "title": "Literally nothing black edition",
+            "author": "colorlover99",
+            "subreddit_name_prefixed": "r/colors",
+            "score": 4,
+            "num_comments": 1,
+            "selftext": "",
+            "is_self": false,
+            "post_hint": "image",
+            "is_video": false,
+            "over_18": false,
+            "url": "https://i.redd.it/vsg59iw0srn21.jpg",
+            "permalink": "/r/colors/comments/b4d5xm/literally_nothing_black_edition/",
+            "preview": {
+              "images": [
+                {
+                  "source": {
+                    "url": "https://preview.redd.it/vsg59iw0srn21.jpg?auto=webp&amp;s=e19452b85c0aa8e3563cb1006a36eb914abfdec7",
+                    "width": 3024,
+                    "height": 4032
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ]
+    }
+  },
+  {
+    "kind": "Listing",
+    "data": {
+      "children": []
+    }
+  }
+]
diff --git a/spec/fixtures/onebox/reddit_self_post.response b/spec/fixtures/onebox/reddit_self_post.response
new file mode 100644
index 0000000000000..4f1ac12d878f2
--- /dev/null
+++ b/spec/fixtures/onebox/reddit_self_post.response
@@ -0,0 +1,31 @@
+[
+  {
+    "kind": "Listing",
+    "data": {
+      "children": [
+        {
+          "kind": "t3",
+          "data": {
+            "title": "What are some underrated local LLMs?",
+            "author": "llm_enthusiast",
+            "subreddit_name_prefixed": "r/LocalLLaMA",
+            "score": 256,
+            "num_comments": 89,
+            "selftext": "I've been experimenting with various local models and wanted to hear what hidden gems people have found. Specifically looking for models under 13B parameters that punch above their weight.",
+            "is_self": true,
+            "is_video": false,
+            "over_18": false,
+            "url": "https://www.reddit.com/r/LocalLLaMA/comments/xyz789/what_are_some_underrated_local_llms/",
+            "permalink": "/r/LocalLLaMA/comments/xyz789/what_are_some_underrated_local_llms/"
+          }
+        }
+      ]
+    }
+  },
+  {
+    "kind": "Listing",
+    "data": {
+      "children": []
+    }
+  }
+]
diff --git a/spec/fixtures/onebox/reddit_video.response b/spec/fixtures/onebox/reddit_video.response
new file mode 100644
index 0000000000000..873c69e403991
--- /dev/null
+++ b/spec/fixtures/onebox/reddit_video.response
@@ -0,0 +1,43 @@
+[
+  {
+    "kind": "Listing",
+    "data": {
+      "children": [
+        {
+          "kind": "t3",
+          "data": {
+            "title": "My cat doing a backflip",
+            "author": "cat_person_42",
+            "subreddit_name_prefixed": "r/cats",
+            "score": 12500,
+            "num_comments": 432,
+            "selftext": "",
+            "is_self": false,
+            "post_hint": "hosted:video",
+            "is_video": true,
+            "over_18": false,
+            "url": "https://v.redd.it/abc123def456",
+            "permalink": "/r/cats/comments/abc123/my_cat_doing_a_backflip/",
+            "preview": {
+              "images": [
+                {
+                  "source": {
+                    "url": "https://preview.redd.it/abc123def456.png?auto=webp&amp;s=deadbeef",
+                    "width": 1920,
+                    "height": 1080
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ]
+    }
+  },
+  {
+    "kind": "Listing",
+    "data": {
+      "children": []
+    }
+  }
+]
diff --git a/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb b/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb
index 95bd5d039e768..bb9eedcee9e36 100644
--- a/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb
+++ b/spec/lib/onebox/engine/allowlisted_generic_onebox_spec.rb
@@ -251,10 +251,11 @@ def generic_html
 
     context "when using basic meta description when necessary" do
       before do
-        stub_request(
-          :get,
-          "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/",
-        ).to_return(status: 200, body: onebox_response("reddit_image"))
+        stub_request(:get, "https://www.example.com/og-content").to_return(
+          status: 200,
+          body:
+            '<html><head><meta property="og:title" content="OG Title"/><meta property="og:description" content="OG description for testing"/></head><body></body></html>',
+        )
         stub_request(:get, "https://www.example.com/content").to_return(
           status: 200,
           body: onebox_response("basic_description"),
@@ -262,11 +263,8 @@ def generic_html
       end
 
       it "uses opengraph tags when present" do
-        onebox =
-          described_class.new(
-            "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/",
-          )
-        expect(onebox.to_html).to include("4 votes and 1 comment so far on Reddit")
+        onebox = described_class.new("https://www.example.com/og-content")
+        expect(onebox.to_html).to include("OG description for testing")
       end
 
       it "fallback to basic meta description if other description tags are missing" do
diff --git a/spec/lib/onebox/engine/reddit_media_onebox_spec.rb b/spec/lib/onebox/engine/reddit_media_onebox_spec.rb
index c5d09bc46fc69..970f3a1073dcd 100644
--- a/spec/lib/onebox/engine/reddit_media_onebox_spec.rb
+++ b/spec/lib/onebox/engine/reddit_media_onebox_spec.rb
@@ -1,35 +1,116 @@
 # frozen_string_literal: true
 
 RSpec.describe Onebox::Engine::RedditMediaOnebox do
-  let(:link) { "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition" }
-  let(:html) { described_class.new(link).to_html }
-
-  before do
-    stub_request(:head, "#{link}/").to_return(status: 200)
-    stub_request(:get, link).to_return(status: 200, body: onebox_response("reddit_image"))
-    stub_request(:get, "#{link}/").to_return(status: 200, body: onebox_response("reddit_image"))
+  let(:image_link) do
+    "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition"
+  end
+  let(:self_post_link) do
+    "https://www.reddit.com/r/LocalLLaMA/comments/xyz789/what_are_some_underrated_local_llms"
   end
+  let(:video_link) { "https://www.reddit.com/r/cats/comments/abc123/my_cat_doing_a_backflip" }
+
+  describe "image post" do
+    let(:html) { described_class.new(image_link).to_html }
+
+    before do
+      stub_request(:get, "#{image_link}.json").to_return(
+        status: 200,
+        body: onebox_response("reddit_image"),
+      )
+    end
+
+    it "includes image" do
+      expect(html).to include("https://i.redd.it/vsg59iw0srn21.jpg")
+    end
+
+    it "includes title" do
+      expect(html).to include("Literally nothing black edition")
+    end
 
-  it "includes title" do
-    expect(html).to include(
-      '<a href="https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition/" target="_blank" rel="nofollow ugc noopener">reddit</a>',
-    )
+    it "includes subreddit" do
+      expect(html).to include("r/colors")
+    end
+
+    it "includes score and comments" do
+      expect(html).to include("4 points")
+      expect(html).to include("1 comments")
+    end
   end
 
-  it "includes image" do
-    expect(html).to include("https://preview.redd.it/vsg59iw0srn21.jpg")
+  describe "self/text post" do
+    let(:html) { described_class.new(self_post_link).to_html }
+
+    before do
+      stub_request(:get, "#{self_post_link}.json").to_return(
+        status: 200,
+        body: onebox_response("reddit_self_post"),
+      )
+    end
+
+    it "includes title" do
+      expect(html).to include("What are some underrated local LLMs?")
+    end
+
+    it "includes selftext" do
+      expect(html).to include("experimenting with various local models")
+    end
+
+    it "includes author" do
+      expect(html).to include("u/llm_enthusiast")
+    end
+
+    it "does not include image markup" do
+      expect(html).not_to include("scale-image")
+    end
   end
 
-  it "includes description" do
-    expect(html).to include("Literally nothing black edition")
+  describe "video post" do
+    let(:html) { described_class.new(video_link).to_html }
+
+    before do
+      stub_request(:get, "#{video_link}.json").to_return(
+        status: 200,
+        body: onebox_response("reddit_video"),
+      )
+    end
+
+    it "includes title" do
+      expect(html).to include("My cat doing a backflip")
+    end
+
+    it "includes preview thumbnail" do
+      expect(html).to include("thumbnail")
+    end
+
+    it "includes preview image" do
+      expect(html).to include("https://preview.redd.it/abc123def456.png")
+    end
   end
 
   describe ".===" do
     it "matches valid Reddit URL" do
-      valid_url = URI(link)
+      valid_url = URI(image_link)
       expect(described_class === valid_url).to eq(true)
     end
 
+    it "matches old.reddit.com URL" do
+      expect(described_class === URI("https://old.reddit.com/r/cats/comments/abc123/post/")).to eq(
+        true,
+      )
+    end
+
+    it "matches np.reddit.com URL" do
+      expect(described_class === URI("https://np.reddit.com/r/cats/comments/abc123/post/")).to eq(
+        true,
+      )
+    end
+
+    it "matches new.reddit.com URL" do
+      expect(described_class === URI("https://new.reddit.com/r/cats/comments/abc123/post/")).to eq(
+        true,
+      )
+    end
+
     it "does not match invalid Reddit URL" do
       invalid_url = URI("https://www.reddit.com.somedomain.com/r/colors/comments/b4d5xm/")
       expect(described_class === invalid_url).to eq(false)

From e1d4b1637cff07d4a26e6101ff37aea124fc00f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Tue, 24 Feb 2026 19:30:46 +0100
Subject: [PATCH 054/168] DEV: Replace MissingMailgunApiKey check with
 comprehensive EmailBounceHandling (#38028)

The `MissingMailgunApiKey` problem check had inverted logic: it warned
admins when `reply_by_email_enabled` was true (meaning the mail receiver
handles bounces via VERP, so no webhook API key is needed), but stayed
silent when it was false (meaning bounces aren't being tracked at all).
This caused false warnings on sites using the mail-receiver container.

This commit replaces the Mailgun-only check with a general
`EmailBounceHandling` check that covers all supported email providers
(Mailgun, SendGrid, Mailjet, Mandrill, Postmark, SparkPost, Mailpace,
AWS SES). The check now correctly returns `no_problem` when both
`reply_by_email_enabled` is true **AND** a VERP-capable reply address is
configured, since bounces are handled by the mail receiver in that case.

For providers that previously accepted unauthenticated webhooks with
only a log warning (SendGrid, Mailjet, Mandrill, Postmark, SparkPost),
the behavior is preserved but upgraded to a Discourse.deprecate call
(since 2026.2, drop 2026.5) to signal that authentication will be
enforced in a future release.

Additionally:
- Adds Mailpace webhook signature verification (was previously missing)
- Adds the mailpace_verification_key site setting
- Includes a migration to clean up orphaned `problem_check_trackers`
rows from the old `missing_mailgun_api_key` check

https://meta.discourse.org/t/305909
---
 app/controllers/webhooks_controller.rb        |  81 +-
 app/models/problem_check.rb                   |   2 +-
 .../problem_check/email_bounce_handling.rb    |  39 +
 .../problem_check/missing_mailgun_api_key.rb  |  13 -
 config/locales/server.en.yml                  |   5 +-
 config/site_settings.yml                      |   3 +
 ...g_mailgun_api_key_problem_check_tracker.rb |  11 +
 spec/requests/webhooks_controller_spec.rb     | 808 ++++++++----------
 .../email_bounce_handling_spec.rb             | 150 ++++
 .../missing_mailgun_api_key_spec.rb           |  41 -
 10 files changed, 625 insertions(+), 528 deletions(-)
 create mode 100644 app/services/problem_check/email_bounce_handling.rb
 delete mode 100644 app/services/problem_check/missing_mailgun_api_key.rb
 create mode 100644 db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb
 create mode 100644 spec/services/problem_check/email_bounce_handling_spec.rb
 delete mode 100644 spec/services/problem_check/missing_mailgun_api_key_spec.rb

diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 763c31d07aa22..60ba6178dfdcb 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -22,9 +22,7 @@ def sendgrid
     if SiteSetting.sendgrid_verification_key.present?
       return signature_failure if !valid_sendgrid_signature?
     else
-      Rails.logger.warn(
-        "Received a Sendgrid webhook, but no verification key has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      warn_unauthenticated_webhook("SendGrid", "sendgrid_verification_key")
     end
 
     events = params["_json"] || [params]
@@ -55,9 +53,7 @@ def mailjet
     if SiteSetting.mailjet_webhook_token.present?
       return signature_failure if !valid_mailjet_token?
     else
-      Rails.logger.warn(
-        "Received a Mailjet webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      warn_unauthenticated_webhook("Mailjet", "mailjet_webhook_token")
     end
 
     events = params["_json"] || [params]
@@ -77,7 +73,11 @@ def mailjet
   end
 
   def mailpace
-    # see https://docs.mailpace.com/guide/webhooks#email-events
+    if SiteSetting.mailpace_verification_key.present?
+      return signature_failure if !valid_mailpace_signature?
+    else
+      warn_unauthenticated_webhook("Mailpace", "mailpace_verification_key")
+    end
 
     message_id = Email::MessageIdService.message_id_clean(params["payload"]["message_id"])
     to_address = params["payload"]["to"]
@@ -97,9 +97,7 @@ def mandrill
     if SiteSetting.mandrill_authentication_key.present?
       return signature_failure if !valid_mandrill_signature?
     else
-      Rails.logger.warn(
-        "Received a Mandrill webhook, but no authentication key has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      warn_unauthenticated_webhook("Mandrill", "mandrill_authentication_key")
     end
 
     JSON
@@ -130,18 +128,13 @@ def postmark
     if SiteSetting.postmark_webhook_token.present?
       return signature_failure if !valid_postmark_token?
     else
-      Rails.logger.warn(
-        "Received a Postmark webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      warn_unauthenticated_webhook("Postmark", "postmark_webhook_token")
     end
 
-    # see https://postmarkapp.com/developer/webhooks/bounce-webhook#bounce-webhook-data
-    # and https://postmarkapp.com/developer/api/bounce-api#bounce-types
-
     message_id = params["MessageID"]
     to_address = params["Email"]
-    type = params["Type"]
-    case type
+
+    case params["Type"]
     when "HardBounce", "SpamNotification", "SpamComplaint"
       process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
     when "SoftBounce"
@@ -155,9 +148,7 @@ def sparkpost
     if SiteSetting.sparkpost_webhook_token.present?
       return signature_failure if !valid_sparkpost_token?
     else
-      Rails.logger.warn(
-        "Received a Sparkpost webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      warn_unauthenticated_webhook("SparkPost", "sparkpost_webhook_token")
     end
 
     events = params["_json"] || [params]
@@ -172,7 +163,6 @@ def sparkpost
 
       bounce_class = bounce_class.to_i
 
-      # bounce class definitions: https://support.sparkpost.com/customer/portal/articles/1929896
       if bounce_class < 80
         if bounce_class == 10 || bounce_class == 25 || bounce_class == 30
           process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
@@ -201,6 +191,14 @@ def aws
 
   private
 
+  def warn_unauthenticated_webhook(provider, setting)
+    Discourse.deprecate(
+      "Received a #{provider} webhook, but the `#{setting}` setting is not configured. Unauthenticated webhooks is unsafe behavior and will be rejected in a future version.",
+      since: "2026.2",
+      drop_from: "2026.5",
+    )
+  end
+
   def signature_failure
     render body: nil, status: :not_acceptable
   end
@@ -210,22 +208,16 @@ def success
   end
 
   def valid_mailgun_signature?(token, timestamp, signature)
-    # token is a random 50 characters string
     return false if token.blank? || token.size != 50
 
-    # prevent replay attacks
     key = "mailgun_token_#{token}"
     return false unless Discourse.redis.setnx(key, 1)
     Discourse.redis.expire(key, 10.minutes)
 
-    # ensure timestamp isn't too far from current time
     return false if (Time.at(timestamp.to_i) - Time.now).abs > 12.hours.to_i
 
-    # check the signature
-    ActiveSupport::SecurityUtils.secure_compare(
-      signature,
-      OpenSSL::HMAC.hexdigest("SHA256", SiteSetting.mailgun_api_key, "#{timestamp}#{token}"),
-    )
+    digest = OpenSSL::HMAC.hexdigest("SHA256", SiteSetting.mailgun_api_key, "#{timestamp}#{token}")
+    ActiveSupport::SecurityUtils.secure_compare(signature, digest)
   end
 
   def handle_mailgun_legacy(params)
@@ -317,12 +309,8 @@ def valid_mandrill_signature?
         payload += value
       end
 
-    payload_signature =
-      OpenSSL::HMAC.digest("sha1", SiteSetting.mandrill_authentication_key, payload)
-    ActiveSupport::SecurityUtils.secure_compare(
-      signature,
-      Base64.strict_encode64(payload_signature),
-    )
+    digest = OpenSSL::HMAC.digest("sha1", SiteSetting.mandrill_authentication_key, payload)
+    ActiveSupport::SecurityUtils.secure_compare(signature, Base64.strict_encode64(digest))
   end
 
   def valid_postmark_token?
@@ -330,6 +318,27 @@ def valid_postmark_token?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.postmark_webhook_token)
   end
 
+  def valid_mailpace_signature?
+    signature = request.headers["X-MailPace-Signature"]
+    return false if signature.blank?
+
+    request.body.rewind
+    payload = request.body.read
+
+    begin
+      decoded_key = Base64.strict_decode64(SiteSetting.mailpace_verification_key)
+      public_key = OpenSSL::PKey.read(decoded_key)
+    rescue StandardError
+      Rails.logger.error("Invalid Mailpace webhook verification key")
+      return false
+    end
+
+    decoded_signature = Base64.strict_decode64(signature)
+    public_key.verify(nil, decoded_signature, payload)
+  rescue StandardError
+    false
+  end
+
   def valid_sparkpost_token?
     return false if params[:t].blank?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.sparkpost_webhook_token)
diff --git a/app/models/problem_check.rb b/app/models/problem_check.rb
index 4e9c42908bdb4..dd2e4633ad98f 100644
--- a/app/models/problem_check.rb
+++ b/app/models/problem_check.rb
@@ -77,7 +77,7 @@ def run_all
     ProblemCheck::GroupEmailCredentials,
     ProblemCheck::HostNames,
     ProblemCheck::ImageMagick,
-    ProblemCheck::MissingMailgunApiKey,
+    ProblemCheck::EmailBounceHandling,
     ProblemCheck::OutOfDateThemes,
     ProblemCheck::PollPop3Timeout,
     ProblemCheck::PollPop3AuthError,
diff --git a/app/services/problem_check/email_bounce_handling.rb b/app/services/problem_check/email_bounce_handling.rb
new file mode 100644
index 0000000000000..14cf68ca9f335
--- /dev/null
+++ b/app/services/problem_check/email_bounce_handling.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class ProblemCheck::EmailBounceHandling < ProblemCheck
+  self.priority = "low"
+
+  PROVIDERS = [
+    { address: "smtp.mailgun.org", setting: :mailgun_api_key, name: "Mailgun" },
+    { address: "smtp.sendgrid.net", setting: :sendgrid_verification_key, name: "SendGrid" },
+    { address: /\.mailjet\.com\z/, setting: :mailjet_webhook_token, name: "Mailjet" },
+    { address: "smtp.mandrillapp.com", setting: :mandrill_authentication_key, name: "Mandrill" },
+    { address: "smtp.postmarkapp.com", setting: :postmark_webhook_token, name: "Postmark" },
+    { address: "smtp.sparkpostmail.com", setting: :sparkpost_webhook_token, name: "SparkPost" },
+    { address: "smtp.mailpace.com", setting: :mailpace_verification_key, name: "Mailpace" },
+    { address: /email-smtp\..+\.amazonaws\.com\z/, name: "AWS SES" },
+  ].freeze
+
+  def call
+    if SiteSetting.reply_by_email_enabled && Email::Sender.bounceable_reply_address?
+      return no_problem
+    end
+
+    smtp_address = ActionMailer::Base.smtp_settings[:address].to_s
+
+    if provider = PROVIDERS.find { |p| p[:address] === smtp_address }
+      return no_problem if provider[:setting].blank?
+      return no_problem if SiteSetting.public_send(provider[:setting]).present?
+
+      problem(
+        override_key: "dashboard.problem.email_bounce_handling.webhook_key_missing",
+        override_data: {
+          provider: provider[:name],
+          setting: provider[:setting],
+        },
+      )
+    else
+      problem(override_key: "dashboard.problem.email_bounce_handling.no_bounce_handling")
+    end
+  end
+end
diff --git a/app/services/problem_check/missing_mailgun_api_key.rb b/app/services/problem_check/missing_mailgun_api_key.rb
deleted file mode 100644
index 4e399faefb141..0000000000000
--- a/app/services/problem_check/missing_mailgun_api_key.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class ProblemCheck::MissingMailgunApiKey < ProblemCheck
-  self.priority = "low"
-
-  def call
-    return no_problem if !SiteSetting.reply_by_email_enabled
-    return no_problem if ActionMailer::Base.smtp_settings[:address] != "smtp.mailgun.org"
-    return no_problem if SiteSetting.mailgun_api_key.present?
-
-    problem
-  end
-end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 15bf5e6c880c9..f463722136135 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1710,7 +1710,9 @@ en:
       email_polling_errored_recently:
         one: "Email polling has generated an error in the past 24 hours. Look at <a href='%{base_path}/logs' target='_blank'>the logs</a> for more details."
         other: "Email polling has generated %{count} errors in the past 24 hours. Look at <a href='%{base_path}/logs' target='_blank'>the logs</a> for more details."
-      missing_mailgun_api_key: "The server is configured to send emails via Mailgun but you haven't provided an API key used to verify the webhook messages."
+      email_bounce_handling:
+        webhook_key_missing: "The server sends emails via %{provider} but the <code>%{setting}</code> setting is not configured. Without it, bounce webhooks will be rejected and bounced emails won't be tracked. Configure it in <a href='%{base_path}/admin/site_settings'>Site Settings</a>."
+        no_bounce_handling: "No bounce handling detected. Configure reply by email with VERP support, or set up bounce webhooks with a supported email provider. Without bounce handling, you won't be notified of email delivery failures."
       qq_mail_smtp: "Your SMTP server (%{smtp_address}) is known to cause duplicate emails with Discourse. QQ Mail does not return proper acknowledgments, causing Discourse to retry sends that already succeeded. <a href='https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md' target='_blank'>See recommended alternatives</a>."
       bad_favicon_url: "The favicon is failing to load. Check your favicon setting in <a href='%{base_path}/admin/site_settings'>Site Settings</a>."
       poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your <a href='%{base_path}/admin/site_settings/category/email'>POP3 settings</a> and service provider."
@@ -2343,6 +2345,7 @@ en:
     mandrill_authentication_key: "Mandrill authentication key used to verify webhook messages."
     postmark_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/sparkpost?t=supersecret"
+    mailpace_verification_key: "Verification key used to verify MailPace webhook messages."
 
     soft_bounce_score: "Bounce score added to the user when a temporary bounce happens."
     hard_bounce_score: "Bounce score added to the user when a permanent bounce happens."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 25f0ac0594e8d..c210b0058ccc6 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2019,6 +2019,9 @@ email:
   sparkpost_webhook_token:
     default: ""
     secret: true
+  mailpace_verification_key:
+    default: ""
+    secret: true
   bounce_score_threshold:
     client: true
     default: 4
diff --git a/db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb b/db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb
new file mode 100644
index 0000000000000..5e988a26dd7d2
--- /dev/null
+++ b/db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveStaleMissingMailgunApiKeyProblemCheckTracker < ActiveRecord::Migration[8.0]
+  def up
+    execute "DELETE FROM problem_check_trackers WHERE identifier = 'missing_mailgun_api_key'"
+  end
+
+  def down
+    # no-op: can't restore deleted tracker rows
+  end
+end
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index bd4a52ec0eee0..f03b606f9a494 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -5,6 +5,19 @@
 
   fab!(:email) { "em@il.com" }
   fab!(:message_id) { "12345@il.com" }
+  fab!(:user) { Fabricate(:user, email:) }
+  fab!(:email_log) { Fabricate(:email_log, user:, message_id:, to_address: email) }
+
+  def expect_bounce(score:, error_code: nil)
+    email_log.reload
+    expect(email_log.bounced).to eq(true)
+    expect(email_log.bounce_error_code).to eq(error_code)
+    expect(email_log.user.user_stat.bounce_score).to eq(score)
+  end
+
+  def expect_no_bounce
+    expect(email_log.reload.bounced).to eq(false)
+  end
 
   describe "#mailgun" do
     let(:token) { "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de" }
@@ -14,15 +27,28 @@
 
     before do
       SiteSetting.mailgun_api_key = "key-8221462f0c915af3f6f2e2df7aa5a493"
-      ActionController::Base.allow_forgery_protection = true # Ensure the endpoint works, even with CSRF protection generally enabled
+      ActionController::Base.allow_forgery_protection = true
     end
 
     after { ActionController::Base.allow_forgery_protection = false }
 
-    it "works (deprecated)" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    it "returns 406 when API key is missing" do
+      SiteSetting.mailgun_api_key = ""
+
+      post "/webhooks/mailgun.json",
+           params: {
+             "token" => token,
+             "timestamp" => timestamp,
+             "event" => "dropped",
+             "recipient" => email,
+             "Message-Id" => "<#{message_id}>",
+             "signature" => signature,
+           }
+
+      expect(response.status).to eq(406)
+    end
 
+    it "processes legacy dropped events as hard bounces" do
       post "/webhooks/mailgun.json",
            params: {
              "token" => token,
@@ -36,17 +62,27 @@
            }
 
       expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq("5.1.1")
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
     end
 
-    it "works (new)" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    it "processes legacy transient bounces as soft bounces" do
+      post "/webhooks/mailgun.json",
+           params: {
+             "token" => token,
+             "timestamp" => timestamp,
+             "event" => "bounced",
+             "recipient" => email,
+             "Message-Id" => "<#{message_id}>",
+             "signature" => signature,
+             "error" => "smtp; 4.7.1 Temporary failure",
+             "code" => "4.7.1",
+           }
 
+      expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.7.1")
+    end
+
+    it "processes new format temporary failures as soft bounces" do
       post "/webhooks/mailgun.json",
            params: {
              "signature" => {
@@ -65,58 +101,75 @@
                },
              },
              "delivery-status" => {
-               "message" =>
-                 "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
-               "code" => "5.1.1",
-               "description" => "",
+               "code" => "4.7.1",
              },
            }
 
       expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq("5.1.1")
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
+      expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.7.1")
     end
 
-    context "when readonly mode is enabled" do
-      before { Discourse.enable_readonly_mode }
-
-      it "returns 503" do
-        user = Fabricate(:user, email:)
-        email_log = Fabricate(:email_log, user:, message_id:, to_address: email)
-
-        post "/webhooks/mailgun.json",
-             params: {
+    it "processes new format permanent failures as hard bounces" do
+      post "/webhooks/mailgun.json",
+           params: {
+             "signature" => {
                "token" => token,
                "timestamp" => timestamp,
-               "event" => "dropped",
-               "recipient" => email,
-               "Message-Id" => "<#{message_id}>",
                "signature" => signature,
-               "error" =>
-                 "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
+             },
+             "event-data" => {
+               "event" => "failed",
+               "severity" => "permanent",
+               "recipient" => email,
+               "message" => {
+                 "headers" => {
+                   "message-id" => message_id,
+                 },
+               },
+             },
+             "delivery-status" => {
                "code" => "5.1.1",
-             }
+             },
+           }
 
-        expect(response.status).to eq(503)
-        expect(email_log.reload.bounced).to eq(false)
-      end
+      expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
+    end
+
+    it "returns 503 in readonly mode" do
+      Discourse.enable_readonly_mode
+
+      post "/webhooks/mailgun.json",
+           params: {
+             "token" => token,
+             "timestamp" => timestamp,
+             "event" => "dropped",
+             "recipient" => email,
+             "Message-Id" => "<#{message_id}>",
+             "signature" => signature,
+             "code" => "5.1.1",
+           }
+
+      expect(response.status).to eq(503)
+      expect_no_bounce
     end
   end
 
   describe "#sendgrid" do
-    fab!(:user) { Fabricate(:user, email:) }
-    fab!(:email_log) { Fabricate(:email_log, user:, message_id: message_id, to_address: email) }
+    before do
+      SiteSetting.sendgrid_verification_key = "key"
+      WebhooksController.any_instance.stubs(:valid_sendgrid_signature?).returns(true)
+    end
+
+    it "processes webhooks with a deprecation warning when verification key is missing" do
+      SiteSetting.sendgrid_verification_key = ""
 
-    it "works" do
       post "/webhooks/sendgrid.json",
            params: {
              "_json" => [
                {
                  "email" => email,
-                 "smtp-id" => "<12345@il.com>",
+                 "smtp-id" => "<#{message_id}>",
                  "event" => "bounce",
                  "status" => "5.0.0",
                },
@@ -124,508 +177,396 @@
            }
 
       expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq("5.0.0")
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.0.0")
     end
 
-    it "sets the bounce error code to 5.1.2 when payload's `event` is `bounce`, `type` is `blocked` and `status` is blank" do
+    it "returns 406 when signature is invalid" do
+      WebhooksController.any_instance.stubs(:valid_sendgrid_signature?).returns(false)
+
       post "/webhooks/sendgrid.json",
            params: {
              "_json" => [
                {
                  "email" => email,
-                 "smtp-id" => "<12345@il.com>",
+                 "smtp-id" => "<#{message_id}>",
                  "event" => "bounce",
-                 "type" => "blocked",
+                 "status" => "5.0.0",
                },
              ],
            }
 
-      expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq("5.1.2")
+      expect(response.status).to eq(406)
     end
 
-    it "verifies signatures" do
-      SiteSetting.sendgrid_verification_key =
-        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
-
+    it "processes hard bounces" do
       post "/webhooks/sendgrid.json",
-           headers: {
-             "X-Twilio-Email-Event-Webhook-Signature" =>
-               "MEUCIGHQVtGj+Y3LkG9fLcxf3qfI10QysgDWmMOVmxG0u6ZUAiEAyBiXDWzM+uOe5W0JuG+luQAbPIqHh89M15TluLtEZtM=",
-             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
-           },
-           params:
-             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+           params: {
+             "_json" => [
+               {
+                 "email" => email,
+                 "smtp-id" => "<#{message_id}>",
+                 "event" => "bounce",
+                 "status" => "5.0.0",
+               },
+             ],
+           }
 
       expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.0.0")
     end
 
-    it "returns error if signature verification fails" do
-      SiteSetting.sendgrid_verification_key =
-        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
-
+    it "processes soft bounces with transient failure status" do
       post "/webhooks/sendgrid.json",
-           headers: {
-             "X-Twilio-Email-Event-Webhook-Signature" =>
-               "MEUCIQCtIHJeH93Y+qpYeWrySphQgpNGNr/U+UyUlBkU6n7RAwIgJTz2C+8a8xonZGi6BpSzoQsbVRamr2nlxFDWYNH3j/0=",
-             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
-           },
-           params:
-             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
-
-      expect(response.status).to eq(406)
-    end
-
-    it "returns error if signature is invalid" do
-      SiteSetting.sendgrid_verification_key = "foo"
-
-      post "/webhooks/sendgrid.json",
-           headers: {
-             "X-Twilio-Email-Event-Webhook-Signature" =>
-               "MEUCIQCtIHJeH93Y+qpYeWrySphQgpNGNr/U+UyUlBkU6n7RAwIgJTz2C+8a8xonZGi6BpSzoQsbVRamr2nlxFDWYNH3j/0=",
-             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
-           },
-           params:
-             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+           params: {
+             "_json" => [
+               {
+                 "email" => email,
+                 "smtp-id" => "<#{message_id}>",
+                 "event" => "bounce",
+                 "status" => "4.0.0",
+               },
+             ],
+           }
 
-      expect(response.status).to eq(406)
+      expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.0.0")
     end
 
-    it "returns error if signature header is missing" do
-      SiteSetting.sendgrid_verification_key =
-        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
-
+    it "processes dropped events as hard bounces" do
       post "/webhooks/sendgrid.json",
-           headers: {
-             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112492",
-           },
-           params:
-             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+           params: {
+             "_json" => [
+               {
+                 "email" => email,
+                 "smtp-id" => "<#{message_id}>",
+                 "event" => "dropped",
+                 "status" => "5.0.0",
+               },
+             ],
+           }
 
-      expect(response.status).to eq(406)
+      expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.0.0")
     end
 
-    it "returns error if timestamp header is missing" do
-      SiteSetting.sendgrid_verification_key =
-        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
-
+    it "defaults to error code 5.1.2 for blocked bounces without status" do
       post "/webhooks/sendgrid.json",
-           headers: {
-             "X-Twilio-Email-Event-Webhook-Signature" =>
-               "MEUCIGHQVtGj+Y3LkG9fLcxf3qfI10QysgDWmMOVmxG0u6ZUAiEAyBiXDWzM+uOe5W0JuG+luQAbPIqHh89M15TluLtEZtM=",
-           },
-           params:
-             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+           params: {
+             "_json" => [
+               {
+                 "email" => email,
+                 "smtp-id" => "<#{message_id}>",
+                 "event" => "bounce",
+                 "type" => "blocked",
+               },
+             ],
+           }
 
-      expect(response.status).to eq(406)
+      expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.2")
     end
   end
 
   describe "#mailjet" do
-    it "works" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    let(:bounce_params) do
+      { "event" => "bounce", "email" => email, "hard_bounce" => true, "CustomID" => message_id }
+    end
 
-      post "/webhooks/mailjet.json",
-           params: {
-             "event" => "bounce",
-             "email" => email,
-             "hard_bounce" => true,
-             "CustomID" => message_id,
-           }
+    it "processes webhooks with a deprecation warning when webhook token is missing" do
+      post "/webhooks/mailjet.json", params: bounce_params
 
       expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq(nil) # mailjet doesn't give us this
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+      expect_bounce(score: SiteSetting.hard_bounce_score)
     end
 
-    it "verifies signatures" do
-      SiteSetting.mailjet_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    context "with a valid webhook token" do
+      before { SiteSetting.mailjet_webhook_token = "foo" }
 
-      post "/webhooks/mailjet.json?t=foo",
-           params: {
-             "event" => "bounce",
-             "email" => email,
-             "hard_bounce" => true,
-             "CustomID" => message_id,
-           }
+      it "processes hard bounces" do
+        post "/webhooks/mailjet.json?t=foo", params: bounce_params
 
-      expect(response.status).to eq(200)
-      expect(email_log.reload.bounced).to eq(true)
-    end
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.hard_bounce_score)
+      end
 
-    it "returns error if signature verification fails" do
-      SiteSetting.mailjet_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+      it "processes soft bounces" do
+        post "/webhooks/mailjet.json?t=foo",
+             params: [
+               {
+                 "event" => "bounce",
+                 "email" => email,
+                 "hard_bounce" => false,
+                 "CustomID" => message_id,
+               },
+             ].to_json,
+             headers: {
+               "CONTENT_TYPE" => "application/json",
+             }
 
-      post "/webhooks/mailjet.json?t=bar",
-           params: {
-             "event" => "bounce",
-             "email" => email,
-             "hard_bounce" => true,
-             "CustomID" => message_id,
-           }
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.soft_bounce_score)
+      end
 
-      expect(response.status).to eq(406)
-      expect(email_log.reload.bounced).to eq(false)
-    end
+      it "rejects wrong token" do
+        post "/webhooks/mailjet.json?t=bar", params: bounce_params
 
-    it "returns error if token param is missing" do
-      SiteSetting.mailjet_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+        expect(response.status).to eq(406)
+        expect_no_bounce
+      end
 
-      post "/webhooks/mailjet.json",
-           params: {
-             "event" => "bounce",
-             "email" => email,
-             "hard_bounce" => true,
-             "CustomID" => message_id,
-           }
+      it "rejects missing token param" do
+        post "/webhooks/mailjet.json", params: bounce_params
 
-      expect(response.status).to eq(406)
-      expect(email_log.reload.bounced).to eq(false)
+        expect(response.status).to eq(406)
+        expect_no_bounce
+      end
     end
   end
 
   describe "#mailpace" do
-    it "works" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    let(:bounce_params) do
+      {
+        event: "email.bounced",
+        payload: {
+          status: "bounced",
+          to: email,
+          message_id: "<#{message_id}>",
+        },
+      }
+    end
 
-      post "/webhooks/mailpace.json",
-           params: {
-             event: "email.bounced",
-             payload: {
-               status: "bounced",
-               to: email,
-               message_id: "<#{message_id}>",
-             },
-           }
+    it "processes webhooks with a deprecation warning when verification key is missing" do
+      post "/webhooks/mailpace.json", params: bounce_params
 
       expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq(nil) # mailpace doesn't give us this
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+      expect_bounce(score: SiteSetting.hard_bounce_score)
     end
 
-    it "soft bounces" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    it "returns 406 when signature is invalid" do
+      SiteSetting.mailpace_verification_key = "key"
+      WebhooksController.any_instance.stubs(:valid_mailpace_signature?).returns(false)
 
-      post "/webhooks/mailpace.json",
-           params: {
-             event: "email.deferred",
-             payload: {
-               status: "deferred",
-               to: email,
-               message_id: "<#{message_id}>",
-             },
-           }
-
-      expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq(nil) # mailpace doesn't give us this
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
+      post "/webhooks/mailpace.json", params: bounce_params
+      expect(response.status).to eq(406)
     end
-  end
 
-  describe "#mandrill" do
-    let(:payload) do
-      "mandrill_events=%5B%7B%22event%22%3A%22hard_bounce%22%2C%22msg%22%3A%7B%22email%22%3A%22em%40il.com%22%2C%22diag%22%3A%225.1.1%22%2C%22bounce_description%22%3A%22smtp%3B+550-5.1.1+The+email+account+that+you+tried+to+reach+does+not+exist.%22%2C%22metadata%22%3A%7B%22message_id%22%3A%2212345%40il.com%22%7D%7D%7D%5D"
-    end
+    context "with a valid verification key" do
+      before do
+        SiteSetting.mailpace_verification_key = "key"
+        WebhooksController.any_instance.stubs(:valid_mailpace_signature?).returns(true)
+      end
 
-    it "works" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+      it "processes hard bounces" do
+        post "/webhooks/mailpace.json", params: bounce_params
 
-      post "/webhooks/mandrill.json",
-           params: {
-             mandrill_events: [
-               {
-                 "event" => "hard_bounce",
-                 "msg" => {
-                   "email" => email,
-                   "diag" => "5.1.1",
-                   :"bounce_description" =>
-                     "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
-                   "metadata" => {
-                     "message_id" => message_id,
-                   },
-                 },
-               },
-             ].to_json,
-           }
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.hard_bounce_score)
+      end
 
-      expect(response.status).to eq(200)
+      it "processes soft bounces" do
+        post "/webhooks/mailpace.json",
+             params: {
+               event: "email.deferred",
+               payload: {
+                 status: "deferred",
+                 to: email,
+                 message_id: "<#{message_id}>",
+               },
+             }
 
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq("5.1.1")
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.soft_bounce_score)
+      end
     end
+  end
 
-    it "verifies signatures" do
-      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
+  describe "#mandrill" do
+    def mandrill_events_json(event: "hard_bounce", diag: "5.1.1")
+      [
+        {
+          "event" => event,
+          "msg" => {
+            "email" => email,
+            "diag" => diag,
+            "bounce_description" =>
+              "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
+            "metadata" => {
+              "message_id" => message_id,
+            },
+          },
+        },
+      ].to_json
+    end
 
-      post "/webhooks/mandrill.json",
-           headers: {
-             "X-Mandrill-Signature" => "Q5pCb903EjEqRZ99gZrlYKOfvIU=",
-           },
-           params: payload
+    it "processes webhooks with a deprecation warning when authentication key is missing" do
+      post "/webhooks/mandrill.json", params: { mandrill_events: mandrill_events_json }
 
       expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
     end
 
-    it "returns error if signature verification fails" do
-      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
+    it "returns 406 when signature is invalid" do
+      SiteSetting.mandrill_authentication_key = "key"
+      WebhooksController.any_instance.stubs(:valid_mandrill_signature?).returns(false)
 
-      post "/webhooks/mandrill.json", headers: { "X-Mandrill-Signature" => "foo" }, params: payload
+      post "/webhooks/mandrill.json", params: { mandrill_events: mandrill_events_json }
 
       expect(response.status).to eq(406)
     end
 
-    it "returns error if signature is invalid" do
-      SiteSetting.mandrill_authentication_key = "foo"
-
-      post "/webhooks/mandrill.json",
-           headers: {
-             "X-Mandrill-Signature" => "Q5pCb903EjEqRZ99gZrlYKOfvIU=",
-           },
-           params: payload
+    context "with a valid authentication key" do
+      before do
+        SiteSetting.mandrill_authentication_key = "key"
+        WebhooksController.any_instance.stubs(:valid_mandrill_signature?).returns(true)
+      end
 
-      expect(response.status).to eq(406)
-    end
+      it "processes hard bounces" do
+        post "/webhooks/mandrill.json", params: { mandrill_events: mandrill_events_json }
 
-    it "returns error if signature header is missing" do
-      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
+      end
 
-      post "/webhooks/mandrill.json", params: payload
+      it "processes soft bounces" do
+        post "/webhooks/mandrill.json",
+             params: {
+               mandrill_events: mandrill_events_json(event: "soft_bounce", diag: "4.7.1"),
+             }
 
-      expect(response.status).to eq(406)
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.7.1")
+      end
     end
   end
 
   describe "#mandrill_head" do
-    it "works" do
+    it "returns 200" do
       head "/webhooks/mandrill.json"
-
       expect(response.status).to eq(200)
     end
   end
 
   describe "#postmark" do
-    it "works" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    let(:bounce_params) { { "Type" => "HardBounce", "MessageID" => message_id, "Email" => email } }
 
-      post "/webhooks/postmark.json",
-           params: {
-             "Type" => "HardBounce",
-             "MessageID" => message_id,
-             "Email" => email,
-           }
-      expect(response.status).to eq(200)
+    it "processes webhooks with a deprecation warning when webhook token is missing" do
+      post "/webhooks/postmark.json", params: bounce_params
 
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq(nil) # postmark doesn't give us this
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
-    end
-
-    it "soft bounces" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
-
-      post "/webhooks/postmark.json",
-           params: {
-             "Type" => "SoftBounce",
-             "MessageID" => message_id,
-             "Email" => email,
-           }
       expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.bounce_error_code).to eq(nil) # postmark doesn't give us this
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
+      expect_bounce(score: SiteSetting.hard_bounce_score)
     end
 
-    it "verifies signatures" do
-      SiteSetting.postmark_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    context "with a valid webhook token" do
+      before { SiteSetting.postmark_webhook_token = "foo" }
 
-      post "/webhooks/postmark.json?t=foo",
-           params: {
-             "Type" => "HardBounce",
-             "MessageID" => message_id,
-             "Email" => email,
-           }
+      it "processes hard bounces" do
+        post "/webhooks/postmark.json?t=foo", params: bounce_params
 
-      expect(response.status).to eq(200)
-      expect(email_log.reload.bounced).to eq(true)
-    end
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.hard_bounce_score)
+      end
 
-    it "returns error if signature verification fails" do
-      SiteSetting.postmark_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+      it "processes soft bounces" do
+        post "/webhooks/postmark.json?t=foo",
+             params: {
+               "Type" => "SoftBounce",
+               "MessageID" => message_id,
+               "Email" => email,
+             }
 
-      post "/webhooks/postmark.json?t=bar",
-           params: {
-             "Type" => "HardBounce",
-             "MessageID" => message_id,
-             "Email" => email,
-           }
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.soft_bounce_score)
+      end
 
-      expect(response.status).to eq(406)
-      expect(email_log.reload.bounced).to eq(false)
-    end
+      it "rejects wrong token" do
+        post "/webhooks/postmark.json?t=bar", params: bounce_params
 
-    it "returns error if token param is missing" do
-      SiteSetting.postmark_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+        expect(response.status).to eq(406)
+        expect_no_bounce
+      end
 
-      post "/webhooks/postmark.json",
-           params: {
-             "Type" => "HardBounce",
-             "MessageID" => message_id,
-             "Email" => email,
-           }
+      it "rejects missing token param" do
+        post "/webhooks/postmark.json", params: bounce_params
 
-      expect(response.status).to eq(406)
-      expect(email_log.reload.bounced).to eq(false)
+        expect(response.status).to eq(406)
+        expect_no_bounce
+      end
     end
   end
 
   describe "#sparkpost" do
-    it "works" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    let(:bounce_params) do
+      {
+        "_json" => [
+          {
+            "msys" => {
+              "message_event" => {
+                "bounce_class" => 10,
+                "error_code" => "554",
+                "rcpt_to" => email,
+                "rcpt_meta" => {
+                  "message_id" => message_id,
+                },
+              },
+            },
+          },
+        ],
+      }
+    end
 
-      post "/webhooks/sparkpost.json",
-           params: {
-             "_json" => [
-               {
-                 "msys" => {
-                   "message_event" => {
-                     "bounce_class" => 10,
-                     "error_code" => "554",
-                     "rcpt_to" => email,
-                     "rcpt_meta" => {
-                       "message_id" => message_id,
-                     },
-                   },
-                 },
-               },
-             ],
-           }
+    it "processes webhooks with a deprecation warning when webhook token is missing" do
+      post "/webhooks/sparkpost.json", params: bounce_params
 
       expect(response.status).to eq(200)
-
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+      expect_bounce(score: SiteSetting.hard_bounce_score)
     end
 
-    it "verifies signatures" do
-      SiteSetting.sparkpost_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+    context "with a valid webhook token" do
+      before { SiteSetting.sparkpost_webhook_token = "foo" }
 
-      post "/webhooks/sparkpost.json?t=foo",
-           params: {
-             "_json" => [
-               {
-                 "msys" => {
-                   "message_event" => {
-                     "bounce_class" => 10,
-                     "error_code" => "554",
-                     "rcpt_to" => email,
-                     "rcpt_meta" => {
-                       "message_id" => message_id,
-                     },
-                   },
-                 },
-               },
-             ],
-           }
+      it "processes hard bounces" do
+        post "/webhooks/sparkpost.json?t=foo", params: bounce_params
 
-      expect(response.status).to eq(200)
-      expect(email_log.reload.bounced).to eq(true)
-    end
-
-    it "returns error if signature verification fails" do
-      SiteSetting.sparkpost_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.hard_bounce_score)
+      end
 
-      post "/webhooks/sparkpost.json?t=bar",
-           params: {
-             "_json" => [
-               {
-                 "msys" => {
-                   "message_event" => {
-                     "bounce_class" => 10,
-                     "error_code" => "554",
-                     "rcpt_to" => email,
-                     "rcpt_meta" => {
-                       "message_id" => message_id,
+      it "processes soft bounces" do
+        post "/webhooks/sparkpost.json?t=foo",
+             params: {
+               "_json" => [
+                 {
+                   "msys" => {
+                     "message_event" => {
+                       "bounce_class" => 20,
+                       "error_code" => "450",
+                       "rcpt_to" => email,
+                       "rcpt_meta" => {
+                         "message_id" => message_id,
+                       },
                      },
                    },
                  },
-               },
-             ],
-           }
+               ],
+             }
 
-      expect(response.status).to eq(406)
-      expect(email_log.reload.bounced).to eq(false)
-    end
+        expect(response.status).to eq(200)
+        expect_bounce(score: SiteSetting.soft_bounce_score)
+      end
 
-    it "returns error if token param is missing" do
-      SiteSetting.sparkpost_webhook_token = "foo"
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+      it "rejects wrong token" do
+        post "/webhooks/sparkpost.json?t=bar", params: bounce_params
 
-      post "/webhooks/sparkpost.json",
-           params: {
-             "_json" => [
-               {
-                 "msys" => {
-                   "message_event" => {
-                     "bounce_class" => 10,
-                     "error_code" => "554",
-                     "rcpt_to" => email,
-                     "rcpt_meta" => {
-                       "message_id" => message_id,
-                     },
-                   },
-                 },
-               },
-             ],
-           }
+        expect(response.status).to eq(406)
+        expect_no_bounce
+      end
 
-      expect(response.status).to eq(406)
-      expect(email_log.reload.bounced).to eq(false)
+      it "rejects missing token param" do
+        post "/webhooks/sparkpost.json", params: bounce_params
+
+        expect(response.status).to eq(406)
+        expect_no_bounce
+      end
     end
   end
 
@@ -635,10 +576,10 @@
         "Type" => "Notification",
         "Message" => {
           "notificationType" => "Bounce",
-          :"bounce" => {
+          "bounce" => {
             "bounceType" => "Permanent",
             "reportingMTA" => "dns; email.example.com",
-            :"bouncedRecipients" => [
+            "bouncedRecipients" => [
               {
                 "emailAddress" => email,
                 "status" => "5.1.1",
@@ -651,7 +592,7 @@
             "feedbackId" => "00000138111222aa-33322211-cccc-cccc-cccc-ddddaaaa068a-000000",
             "remoteMtaIp" => "127.0.2.0",
           },
-          :"mail" => {
+          "mail" => {
             "timestamp" => "2016-01-27T14:59:38.237Z",
             "source" => "john@example.com",
             "sourceArn" => "arn:aws:ses:us-east-1:888888888888:identity/example.com",
@@ -690,19 +631,14 @@
 
     before { Jobs.run_immediately! }
 
-    it "works" do
-      user = Fabricate(:user, email: email)
-      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
-
+    it "processes bounce notifications" do
       require "aws-sdk-sns"
       Aws::SNS::MessageVerifier.any_instance.stubs(:authentic?).with(payload).returns(true)
 
       post "/webhooks/aws.json", headers: { "RAW_POST_DATA" => payload }
-      expect(response.status).to eq(200)
 
-      email_log.reload
-      expect(email_log.bounced).to eq(true)
-      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+      expect(response.status).to eq(200)
+      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
     end
   end
 end
diff --git a/spec/services/problem_check/email_bounce_handling_spec.rb b/spec/services/problem_check/email_bounce_handling_spec.rb
new file mode 100644
index 0000000000000..4d99fad3bb40c
--- /dev/null
+++ b/spec/services/problem_check/email_bounce_handling_spec.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+RSpec.describe ProblemCheck::EmailBounceHandling do
+  subject(:check) { described_class.new }
+
+  before do
+    SiteSetting.stubs(reply_by_email_enabled: reply_by_email_enabled)
+    Email::Sender.stubs(:bounceable_reply_address?).returns(bounceable_reply_address)
+    ActionMailer::Base.stubs(smtp_settings: { address: smtp_address })
+  end
+
+  context "when reply by email is enabled with VERP" do
+    let(:reply_by_email_enabled) { true }
+    let(:bounceable_reply_address) { true }
+    let(:smtp_address) { "smtp.mailgun.org" }
+
+    it { expect(check).to be_chill_about_it }
+  end
+
+  context "when reply by email is enabled without VERP" do
+    let(:reply_by_email_enabled) { true }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.mailgun.org" }
+
+    before { SiteSetting.stubs(mailgun_api_key: "") }
+
+    it { expect(check).to have_a_problem }
+  end
+
+  context "when reply by email is disabled with VERP address configured" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { true }
+    let(:smtp_address) { "smtp.mailgun.org" }
+
+    before { SiteSetting.stubs(mailgun_api_key: "") }
+
+    it { expect(check).to have_a_problem }
+  end
+
+  context "when using Mailgun without an API key" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.mailgun.org" }
+
+    before { SiteSetting.stubs(mailgun_api_key: "") }
+
+    it do
+      expect(check).to have_a_problem.with_priority("low").with_message(
+        I18n.t(
+          "dashboard.problem.email_bounce_handling.webhook_key_missing",
+          provider: "Mailgun",
+          setting: "mailgun_api_key",
+          base_path: Discourse.base_path,
+        ),
+      )
+    end
+  end
+
+  context "when using Mailgun with an API key" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.mailgun.org" }
+
+    before { SiteSetting.stubs(mailgun_api_key: "key-123") }
+
+    it { expect(check).to be_chill_about_it }
+  end
+
+  context "when using SendGrid without a verification key" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.sendgrid.net" }
+
+    before { SiteSetting.stubs(sendgrid_verification_key: "") }
+
+    it do
+      expect(check).to have_a_problem.with_priority("low").with_message(
+        I18n.t(
+          "dashboard.problem.email_bounce_handling.webhook_key_missing",
+          provider: "SendGrid",
+          setting: "sendgrid_verification_key",
+          base_path: Discourse.base_path,
+        ),
+      )
+    end
+  end
+
+  context "when using SendGrid with a verification key" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.sendgrid.net" }
+
+    before { SiteSetting.stubs(sendgrid_verification_key: "key-123") }
+
+    it { expect(check).to be_chill_about_it }
+  end
+
+  context "when using Mailjet without a webhook token" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "in-v3.mailjet.com" }
+
+    before { SiteSetting.stubs(mailjet_webhook_token: "") }
+
+    it { expect(check).to have_a_problem.with_priority("low") }
+  end
+
+  context "when using Mailpace without a verification key" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.mailpace.com" }
+
+    before { SiteSetting.stubs(mailpace_verification_key: "") }
+
+    it { expect(check).to have_a_problem.with_priority("low") }
+  end
+
+  context "when using Mailpace with a verification key" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.mailpace.com" }
+
+    before { SiteSetting.stubs(mailpace_verification_key: "key-123") }
+
+    it { expect(check).to be_chill_about_it }
+  end
+
+  context "when using AWS SES" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "email-smtp.us-east-1.amazonaws.com" }
+
+    it { expect(check).to be_chill_about_it }
+  end
+
+  context "when using an unknown provider" do
+    let(:reply_by_email_enabled) { false }
+    let(:bounceable_reply_address) { false }
+    let(:smtp_address) { "smtp.unknown-provider.com" }
+
+    it do
+      expect(check).to have_a_problem.with_priority("low").with_message(
+        I18n.t(
+          "dashboard.problem.email_bounce_handling.no_bounce_handling",
+          base_path: Discourse.base_path,
+        ),
+      )
+    end
+  end
+end
diff --git a/spec/services/problem_check/missing_mailgun_api_key_spec.rb b/spec/services/problem_check/missing_mailgun_api_key_spec.rb
deleted file mode 100644
index e52625fc323df..0000000000000
--- a/spec/services/problem_check/missing_mailgun_api_key_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ProblemCheck::MissingMailgunApiKey do
-  subject(:check) { described_class.new }
-
-  describe ".call" do
-    before do
-      SiteSetting.stubs(reply_by_email_enabled: replies_enabled)
-      ActionMailer::Base.stubs(smtp_settings: { address: mailgun_address })
-      SiteSetting.stubs(mailgun_api_key: api_key)
-    end
-
-    context "when replies are disabled" do
-      let(:replies_enabled) { false }
-      let(:mailgun_address) { anything }
-      let(:api_key) { anything }
-
-      it { expect(check).to be_chill_about_it }
-    end
-
-    context "when not using Mailgun for replies" do
-      let(:replies_enabled) { false }
-      let(:mailgun_address) { nil }
-      let(:api_key) { anything }
-
-      it { expect(check).to be_chill_about_it }
-    end
-
-    context "when using Mailgun without an API key" do
-      let(:replies_enabled) { true }
-      let(:mailgun_address) { "smtp.mailgun.org" }
-      let(:api_key) { nil }
-
-      it do
-        expect(check).to have_a_problem.with_priority("low").with_message(
-          "The server is configured to send emails via Mailgun but you haven't provided an API key used to verify the webhook messages.",
-        )
-      end
-    end
-  end
-end

From fd54f2f493f3c5b63e82955822df6ce8d28ae79a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 24 Feb 2026 19:38:30 +0000
Subject: [PATCH 055/168] =?UTF-8?q?Revert=20"DEV:=20Replace=20MissingMailg?=
 =?UTF-8?q?unApiKey=20check=20with=20comprehensive=20Em=E2=80=A6=20(#38038?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…ailBounceHandling (#38028)"

This reverts commit e1d4b1637cff07d4a26e6101ff37aea124fc00f1.

This caused unexpected CI issues. Reverting while we investigate.
---
 app/controllers/webhooks_controller.rb        |  81 +-
 app/models/problem_check.rb                   |   2 +-
 .../problem_check/email_bounce_handling.rb    |  39 -
 .../problem_check/missing_mailgun_api_key.rb  |  13 +
 config/locales/server.en.yml                  |   5 +-
 config/site_settings.yml                      |   3 -
 ...g_mailgun_api_key_problem_check_tracker.rb |  11 -
 spec/requests/webhooks_controller_spec.rb     | 808 ++++++++++--------
 .../email_bounce_handling_spec.rb             | 150 ----
 .../missing_mailgun_api_key_spec.rb           |  41 +
 10 files changed, 528 insertions(+), 625 deletions(-)
 delete mode 100644 app/services/problem_check/email_bounce_handling.rb
 create mode 100644 app/services/problem_check/missing_mailgun_api_key.rb
 delete mode 100644 db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb
 delete mode 100644 spec/services/problem_check/email_bounce_handling_spec.rb
 create mode 100644 spec/services/problem_check/missing_mailgun_api_key_spec.rb

diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 60ba6178dfdcb..763c31d07aa22 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -22,7 +22,9 @@ def sendgrid
     if SiteSetting.sendgrid_verification_key.present?
       return signature_failure if !valid_sendgrid_signature?
     else
-      warn_unauthenticated_webhook("SendGrid", "sendgrid_verification_key")
+      Rails.logger.warn(
+        "Received a Sendgrid webhook, but no verification key has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
     end
 
     events = params["_json"] || [params]
@@ -53,7 +55,9 @@ def mailjet
     if SiteSetting.mailjet_webhook_token.present?
       return signature_failure if !valid_mailjet_token?
     else
-      warn_unauthenticated_webhook("Mailjet", "mailjet_webhook_token")
+      Rails.logger.warn(
+        "Received a Mailjet webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
     end
 
     events = params["_json"] || [params]
@@ -73,11 +77,7 @@ def mailjet
   end
 
   def mailpace
-    if SiteSetting.mailpace_verification_key.present?
-      return signature_failure if !valid_mailpace_signature?
-    else
-      warn_unauthenticated_webhook("Mailpace", "mailpace_verification_key")
-    end
+    # see https://docs.mailpace.com/guide/webhooks#email-events
 
     message_id = Email::MessageIdService.message_id_clean(params["payload"]["message_id"])
     to_address = params["payload"]["to"]
@@ -97,7 +97,9 @@ def mandrill
     if SiteSetting.mandrill_authentication_key.present?
       return signature_failure if !valid_mandrill_signature?
     else
-      warn_unauthenticated_webhook("Mandrill", "mandrill_authentication_key")
+      Rails.logger.warn(
+        "Received a Mandrill webhook, but no authentication key has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
     end
 
     JSON
@@ -128,13 +130,18 @@ def postmark
     if SiteSetting.postmark_webhook_token.present?
       return signature_failure if !valid_postmark_token?
     else
-      warn_unauthenticated_webhook("Postmark", "postmark_webhook_token")
+      Rails.logger.warn(
+        "Received a Postmark webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
     end
 
+    # see https://postmarkapp.com/developer/webhooks/bounce-webhook#bounce-webhook-data
+    # and https://postmarkapp.com/developer/api/bounce-api#bounce-types
+
     message_id = params["MessageID"]
     to_address = params["Email"]
-
-    case params["Type"]
+    type = params["Type"]
+    case type
     when "HardBounce", "SpamNotification", "SpamComplaint"
       process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
     when "SoftBounce"
@@ -148,7 +155,9 @@ def sparkpost
     if SiteSetting.sparkpost_webhook_token.present?
       return signature_failure if !valid_sparkpost_token?
     else
-      warn_unauthenticated_webhook("SparkPost", "sparkpost_webhook_token")
+      Rails.logger.warn(
+        "Received a Sparkpost webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
+      )
     end
 
     events = params["_json"] || [params]
@@ -163,6 +172,7 @@ def sparkpost
 
       bounce_class = bounce_class.to_i
 
+      # bounce class definitions: https://support.sparkpost.com/customer/portal/articles/1929896
       if bounce_class < 80
         if bounce_class == 10 || bounce_class == 25 || bounce_class == 30
           process_bounce(message_id, to_address, SiteSetting.hard_bounce_score)
@@ -191,14 +201,6 @@ def aws
 
   private
 
-  def warn_unauthenticated_webhook(provider, setting)
-    Discourse.deprecate(
-      "Received a #{provider} webhook, but the `#{setting}` setting is not configured. Unauthenticated webhooks is unsafe behavior and will be rejected in a future version.",
-      since: "2026.2",
-      drop_from: "2026.5",
-    )
-  end
-
   def signature_failure
     render body: nil, status: :not_acceptable
   end
@@ -208,16 +210,22 @@ def success
   end
 
   def valid_mailgun_signature?(token, timestamp, signature)
+    # token is a random 50 characters string
     return false if token.blank? || token.size != 50
 
+    # prevent replay attacks
     key = "mailgun_token_#{token}"
     return false unless Discourse.redis.setnx(key, 1)
     Discourse.redis.expire(key, 10.minutes)
 
+    # ensure timestamp isn't too far from current time
     return false if (Time.at(timestamp.to_i) - Time.now).abs > 12.hours.to_i
 
-    digest = OpenSSL::HMAC.hexdigest("SHA256", SiteSetting.mailgun_api_key, "#{timestamp}#{token}")
-    ActiveSupport::SecurityUtils.secure_compare(signature, digest)
+    # check the signature
+    ActiveSupport::SecurityUtils.secure_compare(
+      signature,
+      OpenSSL::HMAC.hexdigest("SHA256", SiteSetting.mailgun_api_key, "#{timestamp}#{token}"),
+    )
   end
 
   def handle_mailgun_legacy(params)
@@ -309,8 +317,12 @@ def valid_mandrill_signature?
         payload += value
       end
 
-    digest = OpenSSL::HMAC.digest("sha1", SiteSetting.mandrill_authentication_key, payload)
-    ActiveSupport::SecurityUtils.secure_compare(signature, Base64.strict_encode64(digest))
+    payload_signature =
+      OpenSSL::HMAC.digest("sha1", SiteSetting.mandrill_authentication_key, payload)
+    ActiveSupport::SecurityUtils.secure_compare(
+      signature,
+      Base64.strict_encode64(payload_signature),
+    )
   end
 
   def valid_postmark_token?
@@ -318,27 +330,6 @@ def valid_postmark_token?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.postmark_webhook_token)
   end
 
-  def valid_mailpace_signature?
-    signature = request.headers["X-MailPace-Signature"]
-    return false if signature.blank?
-
-    request.body.rewind
-    payload = request.body.read
-
-    begin
-      decoded_key = Base64.strict_decode64(SiteSetting.mailpace_verification_key)
-      public_key = OpenSSL::PKey.read(decoded_key)
-    rescue StandardError
-      Rails.logger.error("Invalid Mailpace webhook verification key")
-      return false
-    end
-
-    decoded_signature = Base64.strict_decode64(signature)
-    public_key.verify(nil, decoded_signature, payload)
-  rescue StandardError
-    false
-  end
-
   def valid_sparkpost_token?
     return false if params[:t].blank?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.sparkpost_webhook_token)
diff --git a/app/models/problem_check.rb b/app/models/problem_check.rb
index dd2e4633ad98f..4e9c42908bdb4 100644
--- a/app/models/problem_check.rb
+++ b/app/models/problem_check.rb
@@ -77,7 +77,7 @@ def run_all
     ProblemCheck::GroupEmailCredentials,
     ProblemCheck::HostNames,
     ProblemCheck::ImageMagick,
-    ProblemCheck::EmailBounceHandling,
+    ProblemCheck::MissingMailgunApiKey,
     ProblemCheck::OutOfDateThemes,
     ProblemCheck::PollPop3Timeout,
     ProblemCheck::PollPop3AuthError,
diff --git a/app/services/problem_check/email_bounce_handling.rb b/app/services/problem_check/email_bounce_handling.rb
deleted file mode 100644
index 14cf68ca9f335..0000000000000
--- a/app/services/problem_check/email_bounce_handling.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-class ProblemCheck::EmailBounceHandling < ProblemCheck
-  self.priority = "low"
-
-  PROVIDERS = [
-    { address: "smtp.mailgun.org", setting: :mailgun_api_key, name: "Mailgun" },
-    { address: "smtp.sendgrid.net", setting: :sendgrid_verification_key, name: "SendGrid" },
-    { address: /\.mailjet\.com\z/, setting: :mailjet_webhook_token, name: "Mailjet" },
-    { address: "smtp.mandrillapp.com", setting: :mandrill_authentication_key, name: "Mandrill" },
-    { address: "smtp.postmarkapp.com", setting: :postmark_webhook_token, name: "Postmark" },
-    { address: "smtp.sparkpostmail.com", setting: :sparkpost_webhook_token, name: "SparkPost" },
-    { address: "smtp.mailpace.com", setting: :mailpace_verification_key, name: "Mailpace" },
-    { address: /email-smtp\..+\.amazonaws\.com\z/, name: "AWS SES" },
-  ].freeze
-
-  def call
-    if SiteSetting.reply_by_email_enabled && Email::Sender.bounceable_reply_address?
-      return no_problem
-    end
-
-    smtp_address = ActionMailer::Base.smtp_settings[:address].to_s
-
-    if provider = PROVIDERS.find { |p| p[:address] === smtp_address }
-      return no_problem if provider[:setting].blank?
-      return no_problem if SiteSetting.public_send(provider[:setting]).present?
-
-      problem(
-        override_key: "dashboard.problem.email_bounce_handling.webhook_key_missing",
-        override_data: {
-          provider: provider[:name],
-          setting: provider[:setting],
-        },
-      )
-    else
-      problem(override_key: "dashboard.problem.email_bounce_handling.no_bounce_handling")
-    end
-  end
-end
diff --git a/app/services/problem_check/missing_mailgun_api_key.rb b/app/services/problem_check/missing_mailgun_api_key.rb
new file mode 100644
index 0000000000000..4e399faefb141
--- /dev/null
+++ b/app/services/problem_check/missing_mailgun_api_key.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ProblemCheck::MissingMailgunApiKey < ProblemCheck
+  self.priority = "low"
+
+  def call
+    return no_problem if !SiteSetting.reply_by_email_enabled
+    return no_problem if ActionMailer::Base.smtp_settings[:address] != "smtp.mailgun.org"
+    return no_problem if SiteSetting.mailgun_api_key.present?
+
+    problem
+  end
+end
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f463722136135..15bf5e6c880c9 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1710,9 +1710,7 @@ en:
       email_polling_errored_recently:
         one: "Email polling has generated an error in the past 24 hours. Look at <a href='%{base_path}/logs' target='_blank'>the logs</a> for more details."
         other: "Email polling has generated %{count} errors in the past 24 hours. Look at <a href='%{base_path}/logs' target='_blank'>the logs</a> for more details."
-      email_bounce_handling:
-        webhook_key_missing: "The server sends emails via %{provider} but the <code>%{setting}</code> setting is not configured. Without it, bounce webhooks will be rejected and bounced emails won't be tracked. Configure it in <a href='%{base_path}/admin/site_settings'>Site Settings</a>."
-        no_bounce_handling: "No bounce handling detected. Configure reply by email with VERP support, or set up bounce webhooks with a supported email provider. Without bounce handling, you won't be notified of email delivery failures."
+      missing_mailgun_api_key: "The server is configured to send emails via Mailgun but you haven't provided an API key used to verify the webhook messages."
       qq_mail_smtp: "Your SMTP server (%{smtp_address}) is known to cause duplicate emails with Discourse. QQ Mail does not return proper acknowledgments, causing Discourse to retry sends that already succeeded. <a href='https://github.com/discourse/discourse/blob/main/docs/INSTALL-email.md' target='_blank'>See recommended alternatives</a>."
       bad_favicon_url: "The favicon is failing to load. Check your favicon setting in <a href='%{base_path}/admin/site_settings'>Site Settings</a>."
       poll_pop3_timeout: "Connection to the POP3 server is timing out. Incoming email could not be retrieved. Please check your <a href='%{base_path}/admin/site_settings/category/email'>POP3 settings</a> and service provider."
@@ -2345,7 +2343,6 @@ en:
     mandrill_authentication_key: "Mandrill authentication key used to verify webhook messages."
     postmark_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/sparkpost?t=supersecret"
-    mailpace_verification_key: "Verification key used to verify MailPace webhook messages."
 
     soft_bounce_score: "Bounce score added to the user when a temporary bounce happens."
     hard_bounce_score: "Bounce score added to the user when a permanent bounce happens."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c210b0058ccc6..25f0ac0594e8d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2019,9 +2019,6 @@ email:
   sparkpost_webhook_token:
     default: ""
     secret: true
-  mailpace_verification_key:
-    default: ""
-    secret: true
   bounce_score_threshold:
     client: true
     default: 4
diff --git a/db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb b/db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb
deleted file mode 100644
index 5e988a26dd7d2..0000000000000
--- a/db/migrate/20260224152846_remove_stale_missing_mailgun_api_key_problem_check_tracker.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class RemoveStaleMissingMailgunApiKeyProblemCheckTracker < ActiveRecord::Migration[8.0]
-  def up
-    execute "DELETE FROM problem_check_trackers WHERE identifier = 'missing_mailgun_api_key'"
-  end
-
-  def down
-    # no-op: can't restore deleted tracker rows
-  end
-end
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index f03b606f9a494..bd4a52ec0eee0 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -5,19 +5,6 @@
 
   fab!(:email) { "em@il.com" }
   fab!(:message_id) { "12345@il.com" }
-  fab!(:user) { Fabricate(:user, email:) }
-  fab!(:email_log) { Fabricate(:email_log, user:, message_id:, to_address: email) }
-
-  def expect_bounce(score:, error_code: nil)
-    email_log.reload
-    expect(email_log.bounced).to eq(true)
-    expect(email_log.bounce_error_code).to eq(error_code)
-    expect(email_log.user.user_stat.bounce_score).to eq(score)
-  end
-
-  def expect_no_bounce
-    expect(email_log.reload.bounced).to eq(false)
-  end
 
   describe "#mailgun" do
     let(:token) { "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de" }
@@ -27,28 +14,15 @@ def expect_no_bounce
 
     before do
       SiteSetting.mailgun_api_key = "key-8221462f0c915af3f6f2e2df7aa5a493"
-      ActionController::Base.allow_forgery_protection = true
+      ActionController::Base.allow_forgery_protection = true # Ensure the endpoint works, even with CSRF protection generally enabled
     end
 
     after { ActionController::Base.allow_forgery_protection = false }
 
-    it "returns 406 when API key is missing" do
-      SiteSetting.mailgun_api_key = ""
-
-      post "/webhooks/mailgun.json",
-           params: {
-             "token" => token,
-             "timestamp" => timestamp,
-             "event" => "dropped",
-             "recipient" => email,
-             "Message-Id" => "<#{message_id}>",
-             "signature" => signature,
-           }
-
-      expect(response.status).to eq(406)
-    end
+    it "works (deprecated)" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-    it "processes legacy dropped events as hard bounces" do
       post "/webhooks/mailgun.json",
            params: {
              "token" => token,
@@ -62,27 +36,17 @@ def expect_no_bounce
            }
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
-    end
 
-    it "processes legacy transient bounces as soft bounces" do
-      post "/webhooks/mailgun.json",
-           params: {
-             "token" => token,
-             "timestamp" => timestamp,
-             "event" => "bounced",
-             "recipient" => email,
-             "Message-Id" => "<#{message_id}>",
-             "signature" => signature,
-             "error" => "smtp; 4.7.1 Temporary failure",
-             "code" => "4.7.1",
-           }
-
-      expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.7.1")
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq("5.1.1")
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
 
-    it "processes new format temporary failures as soft bounces" do
+    it "works (new)" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
       post "/webhooks/mailgun.json",
            params: {
              "signature" => {
@@ -101,75 +65,58 @@ def expect_no_bounce
                },
              },
              "delivery-status" => {
-               "code" => "4.7.1",
+               "message" =>
+                 "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
+               "code" => "5.1.1",
+               "description" => "",
              },
            }
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.7.1")
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq("5.1.1")
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
     end
 
-    it "processes new format permanent failures as hard bounces" do
-      post "/webhooks/mailgun.json",
-           params: {
-             "signature" => {
+    context "when readonly mode is enabled" do
+      before { Discourse.enable_readonly_mode }
+
+      it "returns 503" do
+        user = Fabricate(:user, email:)
+        email_log = Fabricate(:email_log, user:, message_id:, to_address: email)
+
+        post "/webhooks/mailgun.json",
+             params: {
                "token" => token,
                "timestamp" => timestamp,
-               "signature" => signature,
-             },
-             "event-data" => {
-               "event" => "failed",
-               "severity" => "permanent",
+               "event" => "dropped",
                "recipient" => email,
-               "message" => {
-                 "headers" => {
-                   "message-id" => message_id,
-                 },
-               },
-             },
-             "delivery-status" => {
+               "Message-Id" => "<#{message_id}>",
+               "signature" => signature,
+               "error" =>
+                 "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
                "code" => "5.1.1",
-             },
-           }
-
-      expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
-    end
-
-    it "returns 503 in readonly mode" do
-      Discourse.enable_readonly_mode
-
-      post "/webhooks/mailgun.json",
-           params: {
-             "token" => token,
-             "timestamp" => timestamp,
-             "event" => "dropped",
-             "recipient" => email,
-             "Message-Id" => "<#{message_id}>",
-             "signature" => signature,
-             "code" => "5.1.1",
-           }
+             }
 
-      expect(response.status).to eq(503)
-      expect_no_bounce
+        expect(response.status).to eq(503)
+        expect(email_log.reload.bounced).to eq(false)
+      end
     end
   end
 
   describe "#sendgrid" do
-    before do
-      SiteSetting.sendgrid_verification_key = "key"
-      WebhooksController.any_instance.stubs(:valid_sendgrid_signature?).returns(true)
-    end
-
-    it "processes webhooks with a deprecation warning when verification key is missing" do
-      SiteSetting.sendgrid_verification_key = ""
+    fab!(:user) { Fabricate(:user, email:) }
+    fab!(:email_log) { Fabricate(:email_log, user:, message_id: message_id, to_address: email) }
 
+    it "works" do
       post "/webhooks/sendgrid.json",
            params: {
              "_json" => [
                {
                  "email" => email,
-                 "smtp-id" => "<#{message_id}>",
+                 "smtp-id" => "<12345@il.com>",
                  "event" => "bounce",
                  "status" => "5.0.0",
                },
@@ -177,396 +124,508 @@ def expect_no_bounce
            }
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.0.0")
-    end
 
-    it "returns 406 when signature is invalid" do
-      WebhooksController.any_instance.stubs(:valid_sendgrid_signature?).returns(false)
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq("5.0.0")
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+    end
 
+    it "sets the bounce error code to 5.1.2 when payload's `event` is `bounce`, `type` is `blocked` and `status` is blank" do
       post "/webhooks/sendgrid.json",
            params: {
              "_json" => [
                {
                  "email" => email,
-                 "smtp-id" => "<#{message_id}>",
+                 "smtp-id" => "<12345@il.com>",
                  "event" => "bounce",
-                 "status" => "5.0.0",
+                 "type" => "blocked",
                },
              ],
            }
 
-      expect(response.status).to eq(406)
+      expect(response.status).to eq(200)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq("5.1.2")
     end
 
-    it "processes hard bounces" do
+    it "verifies signatures" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
       post "/webhooks/sendgrid.json",
-           params: {
-             "_json" => [
-               {
-                 "email" => email,
-                 "smtp-id" => "<#{message_id}>",
-                 "event" => "bounce",
-                 "status" => "5.0.0",
-               },
-             ],
-           }
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIGHQVtGj+Y3LkG9fLcxf3qfI10QysgDWmMOVmxG0u6ZUAiEAyBiXDWzM+uOe5W0JuG+luQAbPIqHh89M15TluLtEZtM=",
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.0.0")
     end
 
-    it "processes soft bounces with transient failure status" do
+    it "returns error if signature verification fails" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
       post "/webhooks/sendgrid.json",
-           params: {
-             "_json" => [
-               {
-                 "email" => email,
-                 "smtp-id" => "<#{message_id}>",
-                 "event" => "bounce",
-                 "status" => "4.0.0",
-               },
-             ],
-           }
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIQCtIHJeH93Y+qpYeWrySphQgpNGNr/U+UyUlBkU6n7RAwIgJTz2C+8a8xonZGi6BpSzoQsbVRamr2nlxFDWYNH3j/0=",
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
 
-      expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.0.0")
+      expect(response.status).to eq(406)
     end
 
-    it "processes dropped events as hard bounces" do
+    it "returns error if signature is invalid" do
+      SiteSetting.sendgrid_verification_key = "foo"
+
       post "/webhooks/sendgrid.json",
-           params: {
-             "_json" => [
-               {
-                 "email" => email,
-                 "smtp-id" => "<#{message_id}>",
-                 "event" => "dropped",
-                 "status" => "5.0.0",
-               },
-             ],
-           }
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIQCtIHJeH93Y+qpYeWrySphQgpNGNr/U+UyUlBkU6n7RAwIgJTz2C+8a8xonZGi6BpSzoQsbVRamr2nlxFDWYNH3j/0=",
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112502",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
 
-      expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.0.0")
+      expect(response.status).to eq(406)
     end
 
-    it "defaults to error code 5.1.2 for blocked bounces without status" do
+    it "returns error if signature header is missing" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
       post "/webhooks/sendgrid.json",
-           params: {
-             "_json" => [
-               {
-                 "email" => email,
-                 "smtp-id" => "<#{message_id}>",
-                 "event" => "bounce",
-                 "type" => "blocked",
-               },
-             ],
-           }
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Timestamp" => "1600112492",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
 
-      expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.2")
+      expect(response.status).to eq(406)
+    end
+
+    it "returns error if timestamp header is missing" do
+      SiteSetting.sendgrid_verification_key =
+        "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g=="
+
+      post "/webhooks/sendgrid.json",
+           headers: {
+             "X-Twilio-Email-Event-Webhook-Signature" =>
+               "MEUCIGHQVtGj+Y3LkG9fLcxf3qfI10QysgDWmMOVmxG0u6ZUAiEAyBiXDWzM+uOe5W0JuG+luQAbPIqHh89M15TluLtEZtM=",
+           },
+           params:
+             "[{\"email\":\"hello@world.com\",\"event\":\"dropped\",\"reason\":\"Bounced Address\",\"sg_event_id\":\"ZHJvcC0xMDk5NDkxOS1MUnpYbF9OSFN0T0doUTRrb2ZTbV9BLTA\",\"sg_message_id\":\"LRzXl_NHStOGhQ4kofSm_A.filterdrecv-p3mdw1-756b745b58-kmzbl-18-5F5FC76C-9.0\",\"smtp-id\":\"<LRzXl_NHStOGhQ4kofSm_A@ismtpd0039p1iad1.sendgrid.net>\",\"timestamp\":1600112492}]\r\n"
+
+      expect(response.status).to eq(406)
     end
   end
 
   describe "#mailjet" do
-    let(:bounce_params) do
-      { "event" => "bounce", "email" => email, "hard_bounce" => true, "CustomID" => message_id }
-    end
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-    it "processes webhooks with a deprecation warning when webhook token is missing" do
-      post "/webhooks/mailjet.json", params: bounce_params
+      post "/webhooks/mailjet.json",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq(nil) # mailjet doesn't give us this
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
 
-    context "with a valid webhook token" do
-      before { SiteSetting.mailjet_webhook_token = "foo" }
+    it "verifies signatures" do
+      SiteSetting.mailjet_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      it "processes hard bounces" do
-        post "/webhooks/mailjet.json?t=foo", params: bounce_params
+      post "/webhooks/mailjet.json?t=foo",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.hard_bounce_score)
-      end
+      expect(response.status).to eq(200)
+      expect(email_log.reload.bounced).to eq(true)
+    end
 
-      it "processes soft bounces" do
-        post "/webhooks/mailjet.json?t=foo",
-             params: [
-               {
-                 "event" => "bounce",
-                 "email" => email,
-                 "hard_bounce" => false,
-                 "CustomID" => message_id,
-               },
-             ].to_json,
-             headers: {
-               "CONTENT_TYPE" => "application/json",
-             }
+    it "returns error if signature verification fails" do
+      SiteSetting.mailjet_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.soft_bounce_score)
-      end
+      post "/webhooks/mailjet.json?t=bar",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
 
-      it "rejects wrong token" do
-        post "/webhooks/mailjet.json?t=bar", params: bounce_params
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
 
-        expect(response.status).to eq(406)
-        expect_no_bounce
-      end
+    it "returns error if token param is missing" do
+      SiteSetting.mailjet_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      it "rejects missing token param" do
-        post "/webhooks/mailjet.json", params: bounce_params
+      post "/webhooks/mailjet.json",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
 
-        expect(response.status).to eq(406)
-        expect_no_bounce
-      end
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
     end
   end
 
   describe "#mailpace" do
-    let(:bounce_params) do
-      {
-        event: "email.bounced",
-        payload: {
-          status: "bounced",
-          to: email,
-          message_id: "<#{message_id}>",
-        },
-      }
-    end
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-    it "processes webhooks with a deprecation warning when verification key is missing" do
-      post "/webhooks/mailpace.json", params: bounce_params
+      post "/webhooks/mailpace.json",
+           params: {
+             event: "email.bounced",
+             payload: {
+               status: "bounced",
+               to: email,
+               message_id: "<#{message_id}>",
+             },
+           }
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score)
-    end
 
-    it "returns 406 when signature is invalid" do
-      SiteSetting.mailpace_verification_key = "key"
-      WebhooksController.any_instance.stubs(:valid_mailpace_signature?).returns(false)
-
-      post "/webhooks/mailpace.json", params: bounce_params
-      expect(response.status).to eq(406)
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq(nil) # mailpace doesn't give us this
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
 
-    context "with a valid verification key" do
-      before do
-        SiteSetting.mailpace_verification_key = "key"
-        WebhooksController.any_instance.stubs(:valid_mailpace_signature?).returns(true)
-      end
+    it "soft bounces" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      it "processes hard bounces" do
-        post "/webhooks/mailpace.json", params: bounce_params
-
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.hard_bounce_score)
-      end
+      post "/webhooks/mailpace.json",
+           params: {
+             event: "email.deferred",
+             payload: {
+               status: "deferred",
+               to: email,
+               message_id: "<#{message_id}>",
+             },
+           }
 
-      it "processes soft bounces" do
-        post "/webhooks/mailpace.json",
-             params: {
-               event: "email.deferred",
-               payload: {
-                 status: "deferred",
-                 to: email,
-                 message_id: "<#{message_id}>",
-               },
-             }
+      expect(response.status).to eq(200)
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.soft_bounce_score)
-      end
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq(nil) # mailpace doesn't give us this
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
     end
   end
 
   describe "#mandrill" do
-    def mandrill_events_json(event: "hard_bounce", diag: "5.1.1")
-      [
-        {
-          "event" => event,
-          "msg" => {
-            "email" => email,
-            "diag" => diag,
-            "bounce_description" =>
-              "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
-            "metadata" => {
-              "message_id" => message_id,
-            },
-          },
-        },
-      ].to_json
+    let(:payload) do
+      "mandrill_events=%5B%7B%22event%22%3A%22hard_bounce%22%2C%22msg%22%3A%7B%22email%22%3A%22em%40il.com%22%2C%22diag%22%3A%225.1.1%22%2C%22bounce_description%22%3A%22smtp%3B+550-5.1.1+The+email+account+that+you+tried+to+reach+does+not+exist.%22%2C%22metadata%22%3A%7B%22message_id%22%3A%2212345%40il.com%22%7D%7D%7D%5D"
+    end
+
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mandrill.json",
+           params: {
+             mandrill_events: [
+               {
+                 "event" => "hard_bounce",
+                 "msg" => {
+                   "email" => email,
+                   "diag" => "5.1.1",
+                   :"bounce_description" =>
+                     "smtp; 550-5.1.1 The email account that you tried to reach does not exist.",
+                   "metadata" => {
+                     "message_id" => message_id,
+                   },
+                 },
+               },
+             ].to_json,
+           }
+
+      expect(response.status).to eq(200)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq("5.1.1")
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
 
-    it "processes webhooks with a deprecation warning when authentication key is missing" do
-      post "/webhooks/mandrill.json", params: { mandrill_events: mandrill_events_json }
+    it "verifies signatures" do
+      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
+
+      post "/webhooks/mandrill.json",
+           headers: {
+             "X-Mandrill-Signature" => "Q5pCb903EjEqRZ99gZrlYKOfvIU=",
+           },
+           params: payload
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
     end
 
-    it "returns 406 when signature is invalid" do
-      SiteSetting.mandrill_authentication_key = "key"
-      WebhooksController.any_instance.stubs(:valid_mandrill_signature?).returns(false)
+    it "returns error if signature verification fails" do
+      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
 
-      post "/webhooks/mandrill.json", params: { mandrill_events: mandrill_events_json }
+      post "/webhooks/mandrill.json", headers: { "X-Mandrill-Signature" => "foo" }, params: payload
 
       expect(response.status).to eq(406)
     end
 
-    context "with a valid authentication key" do
-      before do
-        SiteSetting.mandrill_authentication_key = "key"
-        WebhooksController.any_instance.stubs(:valid_mandrill_signature?).returns(true)
-      end
+    it "returns error if signature is invalid" do
+      SiteSetting.mandrill_authentication_key = "foo"
 
-      it "processes hard bounces" do
-        post "/webhooks/mandrill.json", params: { mandrill_events: mandrill_events_json }
+      post "/webhooks/mandrill.json",
+           headers: {
+             "X-Mandrill-Signature" => "Q5pCb903EjEqRZ99gZrlYKOfvIU=",
+           },
+           params: payload
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
-      end
+      expect(response.status).to eq(406)
+    end
 
-      it "processes soft bounces" do
-        post "/webhooks/mandrill.json",
-             params: {
-               mandrill_events: mandrill_events_json(event: "soft_bounce", diag: "4.7.1"),
-             }
+    it "returns error if signature header is missing" do
+      SiteSetting.mandrill_authentication_key = "wr_JeJNO9OI65RFDrvk3Zw"
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.soft_bounce_score, error_code: "4.7.1")
-      end
+      post "/webhooks/mandrill.json", params: payload
+
+      expect(response.status).to eq(406)
     end
   end
 
   describe "#mandrill_head" do
-    it "returns 200" do
+    it "works" do
       head "/webhooks/mandrill.json"
+
       expect(response.status).to eq(200)
     end
   end
 
   describe "#postmark" do
-    let(:bounce_params) { { "Type" => "HardBounce", "MessageID" => message_id, "Email" => email } }
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-    it "processes webhooks with a deprecation warning when webhook token is missing" do
-      post "/webhooks/postmark.json", params: bounce_params
+      post "/webhooks/postmark.json",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
+      expect(response.status).to eq(200)
 
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq(nil) # postmark doesn't give us this
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
+    end
+
+    it "soft bounces" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/postmark.json",
+           params: {
+             "Type" => "SoftBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.bounce_error_code).to eq(nil) # postmark doesn't give us this
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
     end
 
-    context "with a valid webhook token" do
-      before { SiteSetting.postmark_webhook_token = "foo" }
+    it "verifies signatures" do
+      SiteSetting.postmark_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      it "processes hard bounces" do
-        post "/webhooks/postmark.json?t=foo", params: bounce_params
+      post "/webhooks/postmark.json?t=foo",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.hard_bounce_score)
-      end
+      expect(response.status).to eq(200)
+      expect(email_log.reload.bounced).to eq(true)
+    end
 
-      it "processes soft bounces" do
-        post "/webhooks/postmark.json?t=foo",
-             params: {
-               "Type" => "SoftBounce",
-               "MessageID" => message_id,
-               "Email" => email,
-             }
+    it "returns error if signature verification fails" do
+      SiteSetting.postmark_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.soft_bounce_score)
-      end
+      post "/webhooks/postmark.json?t=bar",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
 
-      it "rejects wrong token" do
-        post "/webhooks/postmark.json?t=bar", params: bounce_params
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
 
-        expect(response.status).to eq(406)
-        expect_no_bounce
-      end
+    it "returns error if token param is missing" do
+      SiteSetting.postmark_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      it "rejects missing token param" do
-        post "/webhooks/postmark.json", params: bounce_params
+      post "/webhooks/postmark.json",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
 
-        expect(response.status).to eq(406)
-        expect_no_bounce
-      end
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
     end
   end
 
   describe "#sparkpost" do
-    let(:bounce_params) do
-      {
-        "_json" => [
-          {
-            "msys" => {
-              "message_event" => {
-                "bounce_class" => 10,
-                "error_code" => "554",
-                "rcpt_to" => email,
-                "rcpt_meta" => {
-                  "message_id" => message_id,
-                },
-              },
-            },
-          },
-        ],
-      }
-    end
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-    it "processes webhooks with a deprecation warning when webhook token is missing" do
-      post "/webhooks/sparkpost.json", params: bounce_params
+      post "/webhooks/sparkpost.json",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
+                     },
+                   },
+                 },
+               },
+             ],
+           }
 
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score)
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
 
-    context "with a valid webhook token" do
-      before { SiteSetting.sparkpost_webhook_token = "foo" }
+    it "verifies signatures" do
+      SiteSetting.sparkpost_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      it "processes hard bounces" do
-        post "/webhooks/sparkpost.json?t=foo", params: bounce_params
+      post "/webhooks/sparkpost.json?t=foo",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
+                     },
+                   },
+                 },
+               },
+             ],
+           }
 
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.hard_bounce_score)
-      end
+      expect(response.status).to eq(200)
+      expect(email_log.reload.bounced).to eq(true)
+    end
 
-      it "processes soft bounces" do
-        post "/webhooks/sparkpost.json?t=foo",
-             params: {
-               "_json" => [
-                 {
-                   "msys" => {
-                     "message_event" => {
-                       "bounce_class" => 20,
-                       "error_code" => "450",
-                       "rcpt_to" => email,
-                       "rcpt_meta" => {
-                         "message_id" => message_id,
-                       },
+    it "returns error if signature verification fails" do
+      SiteSetting.sparkpost_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/sparkpost.json?t=bar",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
                      },
                    },
                  },
-               ],
-             }
-
-        expect(response.status).to eq(200)
-        expect_bounce(score: SiteSetting.soft_bounce_score)
-      end
+               },
+             ],
+           }
 
-      it "rejects wrong token" do
-        post "/webhooks/sparkpost.json?t=bar", params: bounce_params
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
 
-        expect(response.status).to eq(406)
-        expect_no_bounce
-      end
+    it "returns error if token param is missing" do
+      SiteSetting.sparkpost_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      it "rejects missing token param" do
-        post "/webhooks/sparkpost.json", params: bounce_params
+      post "/webhooks/sparkpost.json",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
+                     },
+                   },
+                 },
+               },
+             ],
+           }
 
-        expect(response.status).to eq(406)
-        expect_no_bounce
-      end
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
     end
   end
 
@@ -576,10 +635,10 @@ def mandrill_events_json(event: "hard_bounce", diag: "5.1.1")
         "Type" => "Notification",
         "Message" => {
           "notificationType" => "Bounce",
-          "bounce" => {
+          :"bounce" => {
             "bounceType" => "Permanent",
             "reportingMTA" => "dns; email.example.com",
-            "bouncedRecipients" => [
+            :"bouncedRecipients" => [
               {
                 "emailAddress" => email,
                 "status" => "5.1.1",
@@ -592,7 +651,7 @@ def mandrill_events_json(event: "hard_bounce", diag: "5.1.1")
             "feedbackId" => "00000138111222aa-33322211-cccc-cccc-cccc-ddddaaaa068a-000000",
             "remoteMtaIp" => "127.0.2.0",
           },
-          "mail" => {
+          :"mail" => {
             "timestamp" => "2016-01-27T14:59:38.237Z",
             "source" => "john@example.com",
             "sourceArn" => "arn:aws:ses:us-east-1:888888888888:identity/example.com",
@@ -631,14 +690,19 @@ def mandrill_events_json(event: "hard_bounce", diag: "5.1.1")
 
     before { Jobs.run_immediately! }
 
-    it "processes bounce notifications" do
+    it "works" do
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
       require "aws-sdk-sns"
       Aws::SNS::MessageVerifier.any_instance.stubs(:authentic?).with(payload).returns(true)
 
       post "/webhooks/aws.json", headers: { "RAW_POST_DATA" => payload }
-
       expect(response.status).to eq(200)
-      expect_bounce(score: SiteSetting.hard_bounce_score, error_code: "5.1.1")
+
+      email_log.reload
+      expect(email_log.bounced).to eq(true)
+      expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score)
     end
   end
 end
diff --git a/spec/services/problem_check/email_bounce_handling_spec.rb b/spec/services/problem_check/email_bounce_handling_spec.rb
deleted file mode 100644
index 4d99fad3bb40c..0000000000000
--- a/spec/services/problem_check/email_bounce_handling_spec.rb
+++ /dev/null
@@ -1,150 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ProblemCheck::EmailBounceHandling do
-  subject(:check) { described_class.new }
-
-  before do
-    SiteSetting.stubs(reply_by_email_enabled: reply_by_email_enabled)
-    Email::Sender.stubs(:bounceable_reply_address?).returns(bounceable_reply_address)
-    ActionMailer::Base.stubs(smtp_settings: { address: smtp_address })
-  end
-
-  context "when reply by email is enabled with VERP" do
-    let(:reply_by_email_enabled) { true }
-    let(:bounceable_reply_address) { true }
-    let(:smtp_address) { "smtp.mailgun.org" }
-
-    it { expect(check).to be_chill_about_it }
-  end
-
-  context "when reply by email is enabled without VERP" do
-    let(:reply_by_email_enabled) { true }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.mailgun.org" }
-
-    before { SiteSetting.stubs(mailgun_api_key: "") }
-
-    it { expect(check).to have_a_problem }
-  end
-
-  context "when reply by email is disabled with VERP address configured" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { true }
-    let(:smtp_address) { "smtp.mailgun.org" }
-
-    before { SiteSetting.stubs(mailgun_api_key: "") }
-
-    it { expect(check).to have_a_problem }
-  end
-
-  context "when using Mailgun without an API key" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.mailgun.org" }
-
-    before { SiteSetting.stubs(mailgun_api_key: "") }
-
-    it do
-      expect(check).to have_a_problem.with_priority("low").with_message(
-        I18n.t(
-          "dashboard.problem.email_bounce_handling.webhook_key_missing",
-          provider: "Mailgun",
-          setting: "mailgun_api_key",
-          base_path: Discourse.base_path,
-        ),
-      )
-    end
-  end
-
-  context "when using Mailgun with an API key" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.mailgun.org" }
-
-    before { SiteSetting.stubs(mailgun_api_key: "key-123") }
-
-    it { expect(check).to be_chill_about_it }
-  end
-
-  context "when using SendGrid without a verification key" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.sendgrid.net" }
-
-    before { SiteSetting.stubs(sendgrid_verification_key: "") }
-
-    it do
-      expect(check).to have_a_problem.with_priority("low").with_message(
-        I18n.t(
-          "dashboard.problem.email_bounce_handling.webhook_key_missing",
-          provider: "SendGrid",
-          setting: "sendgrid_verification_key",
-          base_path: Discourse.base_path,
-        ),
-      )
-    end
-  end
-
-  context "when using SendGrid with a verification key" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.sendgrid.net" }
-
-    before { SiteSetting.stubs(sendgrid_verification_key: "key-123") }
-
-    it { expect(check).to be_chill_about_it }
-  end
-
-  context "when using Mailjet without a webhook token" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "in-v3.mailjet.com" }
-
-    before { SiteSetting.stubs(mailjet_webhook_token: "") }
-
-    it { expect(check).to have_a_problem.with_priority("low") }
-  end
-
-  context "when using Mailpace without a verification key" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.mailpace.com" }
-
-    before { SiteSetting.stubs(mailpace_verification_key: "") }
-
-    it { expect(check).to have_a_problem.with_priority("low") }
-  end
-
-  context "when using Mailpace with a verification key" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.mailpace.com" }
-
-    before { SiteSetting.stubs(mailpace_verification_key: "key-123") }
-
-    it { expect(check).to be_chill_about_it }
-  end
-
-  context "when using AWS SES" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "email-smtp.us-east-1.amazonaws.com" }
-
-    it { expect(check).to be_chill_about_it }
-  end
-
-  context "when using an unknown provider" do
-    let(:reply_by_email_enabled) { false }
-    let(:bounceable_reply_address) { false }
-    let(:smtp_address) { "smtp.unknown-provider.com" }
-
-    it do
-      expect(check).to have_a_problem.with_priority("low").with_message(
-        I18n.t(
-          "dashboard.problem.email_bounce_handling.no_bounce_handling",
-          base_path: Discourse.base_path,
-        ),
-      )
-    end
-  end
-end
diff --git a/spec/services/problem_check/missing_mailgun_api_key_spec.rb b/spec/services/problem_check/missing_mailgun_api_key_spec.rb
new file mode 100644
index 0000000000000..e52625fc323df
--- /dev/null
+++ b/spec/services/problem_check/missing_mailgun_api_key_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+RSpec.describe ProblemCheck::MissingMailgunApiKey do
+  subject(:check) { described_class.new }
+
+  describe ".call" do
+    before do
+      SiteSetting.stubs(reply_by_email_enabled: replies_enabled)
+      ActionMailer::Base.stubs(smtp_settings: { address: mailgun_address })
+      SiteSetting.stubs(mailgun_api_key: api_key)
+    end
+
+    context "when replies are disabled" do
+      let(:replies_enabled) { false }
+      let(:mailgun_address) { anything }
+      let(:api_key) { anything }
+
+      it { expect(check).to be_chill_about_it }
+    end
+
+    context "when not using Mailgun for replies" do
+      let(:replies_enabled) { false }
+      let(:mailgun_address) { nil }
+      let(:api_key) { anything }
+
+      it { expect(check).to be_chill_about_it }
+    end
+
+    context "when using Mailgun without an API key" do
+      let(:replies_enabled) { true }
+      let(:mailgun_address) { "smtp.mailgun.org" }
+      let(:api_key) { nil }
+
+      it do
+        expect(check).to have_a_problem.with_priority("low").with_message(
+          "The server is configured to send emails via Mailgun but you haven't provided an API key used to verify the webhook messages.",
+        )
+      end
+    end
+  end
+end

From 9ae86743427af6ea698ca5df8d47aef46bcc20b0 Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 24 Feb 2026 15:11:28 -0500
Subject: [PATCH 056/168] FIX: Improve mobile card cloak interaction (#38025)

Two fixes in one:

- when clicking outside the card, now the click event won't bubble
- the background cloak element is now faded in and out, similar to what
we do for modals and lightboxes

Followup to 61fac8a6a8a088dc27257a90d5c19ede7feb5d1e
---
 .../mobile/components/user-card.scss          | 19 ++++++++++++++++---
 .../app/components/card-container.gjs         |  2 +-
 .../app/components/card-contents-base.js      |  4 ++--
 spec/system/group_card_spec.rb                | 13 +++++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/mobile/components/user-card.scss b/app/assets/stylesheets/mobile/components/user-card.scss
index 5b134941567cc..d6784a35d8595 100644
--- a/app/assets/stylesheets/mobile/components/user-card.scss
+++ b/app/assets/stylesheets/mobile/components/user-card.scss
@@ -118,10 +118,23 @@
   z-index: z("mobile-composer") + 1; // 1101
   height: 100vh;
   width: 100vw;
-  background-color: rgb(black, 0.5);
-  animation: fadein 0.2s;
+  background-color: #000;
+  opacity: 0;
+  visibility: hidden;
+  transition:
+    opacity 0.3s,
+    visibility 0s 0.3s;
+
+  &.--visible {
+    pointer-events: all;
+    opacity: 0.6;
+    visibility: visible;
+    transition:
+      opacity 0.3s,
+      visibility 0s;
+  }
 
   @media (prefers-reduced-motion) {
-    animation-duration: 0s;
+    transition-duration: 0s;
   }
 }
diff --git a/frontend/discourse/app/components/card-container.gjs b/frontend/discourse/app/components/card-container.gjs
index cf904448d4e1e..51e7577a7a543 100644
--- a/frontend/discourse/app/components/card-container.gjs
+++ b/frontend/discourse/app/components/card-container.gjs
@@ -29,7 +29,7 @@ export default class CardContainer extends Component {
 
   <template>
     {{#if this.site.mobileView}}
-      <div class="card-cloak hidden"></div>
+      <div class="card-cloak"></div>
     {{/if}}
 
     <PluginOutlet @name="user-card-content-container">
diff --git a/frontend/discourse/app/components/card-contents-base.js b/frontend/discourse/app/components/card-contents-base.js
index 44c55479a6479..3f9f4fe08d212 100644
--- a/frontend/discourse/app/components/card-contents-base.js
+++ b/frontend/discourse/app/components/card-contents-base.js
@@ -84,7 +84,7 @@ export default class CardContentsBase extends Component {
       post,
     });
 
-    document.querySelector(".card-cloak")?.classList.remove("hidden");
+    document.querySelector(".card-cloak")?.classList.add("--visible");
 
     this.appEvents.trigger("user-card:show", { username });
     // Using `next()` to optimise INP
@@ -245,7 +245,7 @@ export default class CardContentsBase extends Component {
   @bind
   _hide() {
     if (!this.visible && this.site.mobileView) {
-      document.querySelector(".card-cloak")?.classList.add("hidden");
+      document.querySelector(".card-cloak")?.classList.remove("--visible");
     }
 
     this._menuInstance?.destroy();
diff --git a/spec/system/group_card_spec.rb b/spec/system/group_card_spec.rb
index 31849cae52682..419a4a4ff4a89 100644
--- a/spec/system/group_card_spec.rb
+++ b/spec/system/group_card_spec.rb
@@ -49,4 +49,17 @@
       )
     end
   end
+
+  context "when on mobile", mobile: true do
+    it "shows and hides the card cloak when opening and closing the group card" do
+      topic_page.visit_topic(topic, post_number: post_with_mention.post_number)
+      topic_page.click_mention(post_with_mention, mention)
+
+      expect(page).to have_css(".card-cloak.--visible")
+
+      find(".card-cloak").click
+
+      expect(page).to have_no_css(".card-cloak.--visible")
+    end
+  end
 end

From 85ff130c80eae0bd44075e81818bd90006c85a15 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Tue, 24 Feb 2026 21:40:46 +0100
Subject: [PATCH 057/168] DEV: Remove unnecessary `@tracked` from some
 properties (#37528)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…and remove completely unused props/arguments
---
 .../admin/components/admin-area-settings.gjs  |   5 +-
 .../components/admin-filter-controls.gjs      |   2 +-
 .../admin/components/admin-logo-form.gjs      |   3 +-
 .../admin/components/admin-report.gjs         | 442 +++++++++---------
 .../admin/components/admin-search.gjs         |   1 -
 .../admin/components/admin-theme-editor.gjs   |  10 +-
 .../bulk-user-delete-confirmation.gjs         |   2 +-
 .../admin/templates/admin-config/flags.gjs    |   5 +-
 .../app/components/avatar-uploader.gjs        |   4 +-
 .../discourse/app/components/badge-card.gjs   |   9 +-
 .../app/components/create-topic-button.gjs    |   9 +-
 .../discourse/app/components/d-navigation.gjs |   3 -
 .../app/components/discovery/topics.gjs       |   3 -
 .../app/components/emoji-picker/content.gjs   |   2 -
 .../components/form-template-field/upload.gjs |   5 +-
 frontend/discourse/app/components/header.gjs  |   5 +-
 .../app/components/modal/avatar-selector.gjs  |   4 +-
 .../app/components/modal/bookmark.gjs         |   5 +-
 .../modal/edit-user-directory-columns.gjs     |   2 -
 .../discourse/app/components/modal/flag.gjs   |   3 -
 .../modal/second-factor-backup-edit.gjs       |   2 -
 .../app/components/navigation-item.gjs        |   4 +-
 .../app/components/post-list/index.gjs        |   5 +-
 frontend/discourse/app/components/post.gjs    |   6 +-
 .../post/menu/buttons/add-translation.gjs     |   3 -
 .../sidebar/common/custom-section.gjs         |   3 +-
 .../app/components/software-update-prompt.gjs |  23 +-
 .../app/components/tag-groups-form.gjs        |   4 +-
 .../app/form-kit/components/fk/field-data.gjs |   7 -
 .../helpers/directory-table-header-title.js   |   6 +-
 .../discourse/components/chat-channel-row.gjs |   1 -
 .../discourse/components/chat-channel.gjs     |   3 -
 .../discourse/components/chat-composer.gjs    |   1 -
 .../chat/drawer-routes/channel-threads.gjs    |   5 +-
 .../chat/message-creator/search.gjs           |   5 -
 .../components/chat/routes/channel-thread.gjs |   1 -
 .../chat/routes/channel-threads.gjs           |   2 +-
 .../discourse/components/ai-spam.gjs          |   3 +-
 .../discourse/components/doughnut-chart.gjs   |   3 -
 .../components/ai-composer-helper-menu.gjs    |  11 +-
 .../components/ai-post-helper-menu.gjs        |   1 -
 .../components/ai-search-discoveries.gjs      |   5 +-
 .../components/ai-split-topic-suggester.gjs   |   1 -
 .../components/modal/ai-summary-modal.gjs     |   1 -
 .../discourse/components/modal/diff-modal.gjs |   5 +-
 .../discourse/components/rag-uploader.gjs     |   2 +-
 .../ai-post-helper-trigger.gjs                |   4 +-
 .../modal/edit-topic-assignments.gjs          |   3 +-
 .../components/admin-create-leaderboard.gjs   |   4 -
 .../modal/recalculate-scores-form.gjs         |  14 +-
 .../discourse/components/h-captcha.gjs        |   1 -
 .../components/post-voting-comment.gjs        |   1 -
 .../discourse/components/vote-box.gjs         |   1 -
 .../components/sections/molecules/dialog.gjs  |  11 +-
 .../styleguide/calendar-date-time-input.gjs   |   4 +-
 55 files changed, 288 insertions(+), 392 deletions(-)

diff --git a/frontend/discourse/admin/components/admin-area-settings.gjs b/frontend/discourse/admin/components/admin-area-settings.gjs
index a1bdd1244c4ad..0cc496de63cfa 100644
--- a/frontend/discourse/admin/components/admin-area-settings.gjs
+++ b/frontend/discourse/admin/components/admin-area-settings.gjs
@@ -15,13 +15,16 @@ import { i18n } from "discourse-i18n";
 export default class AdminAreaSettings extends Component {
   @tracked settings = [];
   @tracked loading = false;
-  @tracked showBreadcrumb = this.args.showBreadcrumb ?? true;
 
   constructor() {
     super(...arguments);
     this.#loadSettings();
   }
 
+  get showBreadcrumb() {
+    return this.args.showBreadcrumb ?? true;
+  }
+
   get showSettings() {
     return !this.loading && this.settings.length > 0;
   }
diff --git a/frontend/discourse/admin/components/admin-filter-controls.gjs b/frontend/discourse/admin/components/admin-filter-controls.gjs
index dbc5bf17c7025..e9ee29bbe5639 100644
--- a/frontend/discourse/admin/components/admin-filter-controls.gjs
+++ b/frontend/discourse/admin/components/admin-filter-controls.gjs
@@ -39,9 +39,9 @@ import { and, not } from "discourse/truth-helpers";
 export default class AdminFilterControls extends Component {
   @tracked textFilter = "";
   @tracked dropdownFilter = "all";
-  @tracked dropdownFilters = new TrackedObject();
   @tracked
   showFilterDropdowns = this.args.filterDropdownsExpanded ?? isTesting();
+  dropdownFilters = new TrackedObject();
 
   constructor() {
     super(...arguments);
diff --git a/frontend/discourse/admin/components/admin-logo-form.gjs b/frontend/discourse/admin/components/admin-logo-form.gjs
index 395bf7b7920c3..cb76c15e90df2 100644
--- a/frontend/discourse/admin/components/admin-logo-form.gjs
+++ b/frontend/discourse/admin/components/admin-logo-form.gjs
@@ -3,6 +3,7 @@ import { cached, tracked } from "@glimmer/tracking";
 import { fn } from "@ember/helper";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
+import { TrackedObject } from "@ember-compat/tracked-built-ins";
 import AdminConfigAreaCardSection from "discourse/admin/components/admin-config-area-card-section";
 import SimpleList from "discourse/admin/components/simple-list";
 import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
@@ -17,8 +18,8 @@ export default class AdminLogoForm extends Component {
   @service siteSettingChangeTracker;
   @service toasts;
 
-  @tracked placeholders = {};
   @tracked loading = false;
+  placeholders = new TrackedObject();
 
   constructor() {
     super(...arguments);
diff --git a/frontend/discourse/admin/components/admin-report.gjs b/frontend/discourse/admin/components/admin-report.gjs
index eb78c426f3d58..20da814fc2bbe 100644
--- a/frontend/discourse/admin/components/admin-report.gjs
+++ b/frontend/discourse/admin/components/admin-report.gjs
@@ -5,7 +5,6 @@ import EmberObject, { action } from "@ember/object";
 import didUpdate from "@ember/render-modifiers/modifiers/did-update";
 import { next } from "@ember/runloop";
 import { service } from "@ember/service";
-import { htmlSafe } from "@ember/template";
 import { isPresent } from "@ember/utils";
 import AdminReportChart from "discourse/admin/components/admin-report-chart";
 import AdminReportCounters from "discourse/admin/components/admin-report-counters";
@@ -55,12 +54,9 @@ const CHART_OPTIONS = {};
 export default class AdminReport extends Component {
   @service siteSettings;
 
-  @tracked isEnabled = true;
   @tracked isLoading = false;
   @tracked rateLimitationString = null;
-  @tracked report = null;
   @tracked model = null;
-  @tracked showTitle = true;
   @tracked currentMode = this.args.filters?.mode;
   @tracked options = null;
   @tracked dateRangeFrom = null;
@@ -103,7 +99,7 @@ export default class AdminReport extends Component {
   }
 
   get reportClasses() {
-    const builtReportClasses = [];
+    const builtReportClasses = ["is-enabled"];
 
     if (this.isHidden) {
       builtReportClasses.push("hidden");
@@ -113,10 +109,6 @@ export default class AdminReport extends Component {
       builtReportClasses.push("is-visible");
     }
 
-    if (this.isEnabled) {
-      builtReportClasses.push("is-enabled");
-    }
-
     if (this.isLoading) {
       builtReportClasses.push("is-loading");
     }
@@ -369,9 +361,7 @@ export default class AdminReport extends Component {
 
   @bind
   fetchOrRender() {
-    if (this.report) {
-      this._renderReport(this.report);
-    } else if (this.args.dataSourceName) {
+    if (this.args.dataSourceName) {
       this._fetchReport();
     }
   }
@@ -543,254 +533,242 @@ export default class AdminReport extends Component {
       {{didUpdate this.fetchOrRender @filters.startDate @filters.endDate}}
     >
       {{#unless this.isHidden}}
-        {{#if this.isEnabled}}
-          <ConditionalLoadingSection @isLoading={{this.isLoading}}>
-            {{#if
-              (and this.siteSettings.reporting_improvements this.model.legacy)
-            }}
-              <div class="alert alert-info">
-                {{icon "triangle-exclamation"}}
-                <span>{{i18n "admin.reports.legacy_warning"}}</span>
-              </div>
-            {{/if}}
-            {{#if this.showHeader}}
-              <div class="header">
-                {{#if this.showTitle}}
-                  {{#unless this.showNotFoundError}}
-                    <DPageSubheader
-                      @titleLabel={{this.model.title}}
-                      @titleUrl={{this.model.reportUrl}}
-                      @descriptionLabel={{unless
-                        this.showDescriptionInTooltip
-                        this.model.description
-                      }}
-                      @learnMoreUrl={{this.model.description_link}}
-                    />
+        <ConditionalLoadingSection @isLoading={{this.isLoading}}>
+          {{#if
+            (and this.siteSettings.reporting_improvements this.model.legacy)
+          }}
+            <div class="alert alert-info">
+              {{icon "triangle-exclamation"}}
+              <span>{{i18n "admin.reports.legacy_warning"}}</span>
+            </div>
+          {{/if}}
+          {{#if this.showHeader}}
+            <div class="header">
+              {{#unless this.showNotFoundError}}
+                <DPageSubheader
+                  @titleLabel={{this.model.title}}
+                  @titleUrl={{this.model.reportUrl}}
+                  @descriptionLabel={{unless
+                    this.showDescriptionInTooltip
+                    this.model.description
+                  }}
+                  @learnMoreUrl={{this.model.description_link}}
+                />
+
+                {{#if this.showDescriptionInTooltip}}
+                  {{#if this.model.description}}
+                    <DTooltip
+                      @interactive={{this.model.description_link.length}}
+                    >
+                      <:trigger>
+                        {{icon "circle-question"}}
+                      </:trigger>
+                      <:content>
+                        {{#if this.model.description_link}}
+                          <a
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            href={{this.model.description_link}}
+                            class="info"
+                          >
+                            {{this.model.description}}
+                          </a>
+                        {{else}}
+                          <span>{{this.model.description}}</span>
+                        {{/if}}
+                      </:content>
+                    </DTooltip>
+                  {{/if}}
+                {{/if}}
+              {{/unless}}
 
-                    {{#if this.showDescriptionInTooltip}}
-                      {{#if this.model.description}}
-                        <DTooltip
-                          @interactive={{this.model.description_link.length}}
-                        >
-                          <:trigger>
-                            {{icon "circle-question"}}
-                          </:trigger>
-                          <:content>
-                            {{#if this.model.description_link}}
-                              <a
-                                target="_blank"
-                                rel="noopener noreferrer"
-                                href={{this.model.description_link}}
-                                class="info"
-                              >
-                                {{this.model.description}}
-                              </a>
-                            {{else}}
-                              <span>{{this.model.description}}</span>
-                            {{/if}}
-                          </:content>
-                        </DTooltip>
-                      {{/if}}
+              {{#if this.shouldDisplayTrend}}
+                <div class="trend {{this.model.trend}}">
+                  <span class="value" title={{this.model.trendTitle}}>
+                    {{#if this.model.average}}
+                      {{number this.model.currentAverage}}{{#if
+                        this.model.percent
+                      }}%{{/if}}
+                    {{else}}
+                      {{number this.model.currentTotal noTitle="true"}}{{#if
+                        this.model.percent
+                      }}%{{/if}}
                     {{/if}}
-                  {{/unless}}
-                {{/if}}
 
-                {{#if this.shouldDisplayTrend}}
-                  <div class="trend {{this.model.trend}}">
-                    <span class="value" title={{this.model.trendTitle}}>
-                      {{#if this.model.average}}
-                        {{number this.model.currentAverage}}{{#if
-                          this.model.percent
-                        }}%{{/if}}
-                      {{else}}
-                        {{number this.model.currentTotal noTitle="true"}}{{#if
-                          this.model.percent
-                        }}%{{/if}}
-                      {{/if}}
+                    {{#if this.model.trendIcon}}
+                      {{icon this.model.trendIcon class="icon"}}
+                    {{/if}}
+                  </span>
+                </div>
+              {{/if}}
+            </div>
+          {{/if}}
+
+          <div class="body">
+            <div class="main">
+              {{#if this.showError}}
+                {{#if this.showTimeoutError}}
+                  <div class="alert alert-error report-alert timeout">
+                    {{icon "triangle-exclamation"}}
+                    <span>{{i18n "admin.dashboard.timeout_error"}}</span>
+                  </div>
+                {{/if}}
 
-                      {{#if this.model.trendIcon}}
-                        {{icon this.model.trendIcon class="icon"}}
-                      {{/if}}
-                    </span>
+                {{#if this.showExceptionError}}
+                  <div class="alert alert-error report-alert exception">
+                    {{icon "triangle-exclamation"}}
+                    <span>{{i18n "admin.dashboard.exception_error"}}</span>
                   </div>
                 {{/if}}
-              </div>
-            {{/if}}
 
-            <div class="body">
-              <div class="main">
-                {{#if this.showError}}
-                  {{#if this.showTimeoutError}}
-                    <div class="alert alert-error report-alert timeout">
-                      {{icon "triangle-exclamation"}}
-                      <span>{{i18n "admin.dashboard.timeout_error"}}</span>
-                    </div>
+                {{#if this.showNotFoundError}}
+                  <div class="alert alert-error report-alert not-found">
+                    {{icon "triangle-exclamation"}}
+                    <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+                  </div>
+                {{/if}}
+              {{else}}
+                {{#if this.hasData}}
+                  {{#if this.currentMode}}
+                    {{component
+                      this.modeComponent
+                      model=this.model
+                      options=this.options
+                    }}
+
+                    {{#if this.model.relatedReport}}
+                      <AdminReport
+                        @showFilteringUI={{false}}
+                        @dataSourceName={{this.model.relatedReport.type}}
+                      />
+                    {{/if}}
                   {{/if}}
-
-                  {{#if this.showExceptionError}}
-                    <div class="alert alert-error report-alert exception">
-                      {{icon "triangle-exclamation"}}
-                      <span>{{i18n "admin.dashboard.exception_error"}}</span>
+                {{else}}
+                  {{#if this.rateLimitationString}}
+                    <div class="alert alert-error report-alert rate-limited">
+                      {{icon "temperature-three-quarters"}}
+                      <span>{{this.rateLimitationString}}</span>
                     </div>
-                  {{/if}}
-
-                  {{#if this.showNotFoundError}}
-                    <div class="alert alert-error report-alert not-found">
-                      {{icon "triangle-exclamation"}}
-                      <span>{{i18n "admin.dashboard.not_found_error"}}</span>
+                  {{else}}
+                    <div class="alert alert-info report-alert no-data">
+                      {{icon "chart-pie"}}
+                      {{#if this.model.reportUrl}}
+                        <a href={{this.model.reportUrl}} class="report-url">
+                          <span>
+                            {{#if this.model.title}}
+                              {{this.model.title}}
+                              —
+                            {{/if}}
+                            {{i18n "admin.dashboard.reports.no_data"}}
+                          </span>
+                        </a>
+                      {{else}}
+                        <span>{{i18n "admin.dashboard.reports.no_data"}}</span>
+                      {{/if}}
                     </div>
                   {{/if}}
-                {{else}}
-                  {{#if this.hasData}}
-                    {{#if this.currentMode}}
-                      {{component
-                        this.modeComponent
-                        model=this.model
-                        options=this.options
-                      }}
+                {{/if}}
+              {{/if}}
+            </div>
 
-                      {{#if this.model.relatedReport}}
-                        <AdminReport
-                          @showFilteringUI={{false}}
-                          @dataSourceName={{this.model.relatedReport.type}}
-                        />
-                      {{/if}}
-                    {{/if}}
-                  {{else}}
-                    {{#if this.rateLimitationString}}
-                      <div class="alert alert-error report-alert rate-limited">
-                        {{icon "temperature-three-quarters"}}
-                        <span>{{this.rateLimitationString}}</span>
-                      </div>
-                    {{else}}
-                      <div class="alert alert-info report-alert no-data">
-                        {{icon "chart-pie"}}
-                        {{#if this.model.reportUrl}}
-                          <a href={{this.model.reportUrl}} class="report-url">
-                            <span>
-                              {{#if this.model.title}}
-                                {{this.model.title}}
-                                —
-                              {{/if}}
-                              {{i18n "admin.dashboard.reports.no_data"}}
-                            </span>
-                          </a>
-                        {{else}}
-                          <span>{{i18n
-                              "admin.dashboard.reports.no_data"
-                            }}</span>
-                        {{/if}}
-                      </div>
-                    {{/if}}
-                  {{/if}}
+            {{#if this.showFilteringUI}}
+              <div class="filters">
+                {{#if this.showModes}}
+                  <div class="modes">
+                    {{#each this.displayedModes as |displayedMode|}}
+                      <DButton
+                        @action={{fn this.onChangeMode displayedMode.mode}}
+                        @icon={{displayedMode.icon}}
+                        class={{displayedMode.cssClass}}
+                      />
+                    {{/each}}
+                  </div>
                 {{/if}}
-              </div>
 
-              {{#if this.showFilteringUI}}
-                <div class="filters">
-                  {{#if this.showModes}}
-                    <div class="modes">
-                      {{#each this.displayedModes as |displayedMode|}}
-                        <DButton
-                          @action={{fn this.onChangeMode displayedMode.mode}}
-                          @icon={{displayedMode.icon}}
-                          class={{displayedMode.cssClass}}
-                        />
-                      {{/each}}
-                    </div>
+                {{#if this.isChartMode}}
+                  {{#if this.model.average}}
+                    <span class="average-chart">
+                      {{i18n "admin.dashboard.reports.average_chart_label"}}
+                    </span>
                   {{/if}}
+                  <div class="chart-groupings">
+                    {{#each this.chartGroupings as |chartGrouping|}}
+                      <DButton
+                        @label={{chartGrouping.label}}
+                        @action={{fn this.changeGrouping chartGrouping.id}}
+                        @disabled={{chartGrouping.disabled}}
+                        class={{chartGrouping.class}}
+                      />
+                    {{/each}}
+                  </div>
+                {{/if}}
 
-                  {{#if this.isChartMode}}
-                    {{#if this.model.average}}
-                      <span class="average-chart">
-                        {{i18n "admin.dashboard.reports.average_chart_label"}}
-                      </span>
-                    {{/if}}
-                    <div class="chart-groupings">
-                      {{#each this.chartGroupings as |chartGrouping|}}
-                        <DButton
-                          @label={{chartGrouping.label}}
-                          @action={{fn this.changeGrouping chartGrouping.id}}
-                          @disabled={{chartGrouping.disabled}}
-                          class={{chartGrouping.class}}
-                        />
-                      {{/each}}
-                    </div>
-                  {{/if}}
+                {{#if this.showDatesOptions}}
+                  <div class="control">
+                    <span class="label">
+                      {{i18n "admin.dashboard.reports.dates"}}
+                    </span>
 
-                  {{#if this.showDatesOptions}}
-                    <div class="control">
-                      <span class="label">
-                        {{i18n "admin.dashboard.reports.dates"}}
-                      </span>
-
-                      <div class="input">
-                        <DateTimeInputRange
-                          @from={{this.startDate}}
-                          @to={{this.endDate}}
-                          @onChange={{this.onChangeDateRange}}
-                          @showFromTime={{false}}
-                          @showToTime={{false}}
-                        />
-                      </div>
+                    <div class="input">
+                      <DateTimeInputRange
+                        @from={{this.startDate}}
+                        @to={{this.endDate}}
+                        @onChange={{this.onChangeDateRange}}
+                        @showFromTime={{false}}
+                        @showToTime={{false}}
+                      />
                     </div>
-                  {{/if}}
+                  </div>
+                {{/if}}
 
-                  {{#each this.model.available_filters as |filter|}}
-                    <div class="control">
-                      <span class="label">
-                        {{i18n
-                          (concat
-                            "admin.dashboard.reports.filters."
-                            filter.id
-                            ".label"
-                          )
-                        }}
-                      </span>
-
-                      <div class="input">
-                        {{component
-                          (this.reportFilterComponent filter)
-                          model=this.model
-                          filter=filter
-                          applyFilter=this.applyFilter
-                        }}
-                      </div>
+                {{#each this.model.available_filters as |filter|}}
+                  <div class="control">
+                    <span class="label">
+                      {{i18n
+                        (concat
+                          "admin.dashboard.reports.filters." filter.id ".label"
+                        )
+                      }}
+                    </span>
+
+                    <div class="input">
+                      {{component
+                        (this.reportFilterComponent filter)
+                        model=this.model
+                        filter=filter
+                        applyFilter=this.applyFilter
+                      }}
                     </div>
-                  {{/each}}
+                  </div>
+                {{/each}}
+
+                <div class="control">
+                  <div class="input">
+                    <DButton
+                      @action={{this.exportCsv}}
+                      @label="admin.export_csv.button_text"
+                      @icon="download"
+                      class="btn-default export-csv-btn"
+                    />
+                  </div>
+                </div>
 
+                {{#if this.showRefresh}}
                   <div class="control">
                     <div class="input">
                       <DButton
-                        @action={{this.exportCsv}}
-                        @label="admin.export_csv.button_text"
-                        @icon="download"
-                        class="btn-default export-csv-btn"
+                        @action={{this.refreshReport}}
+                        @label="admin.dashboard.reports.refresh_report"
+                        @icon="arrows-rotate"
+                        class="refresh-report-btn btn-primary"
                       />
                     </div>
                   </div>
-
-                  {{#if this.showRefresh}}
-                    <div class="control">
-                      <div class="input">
-                        <DButton
-                          @action={{this.refreshReport}}
-                          @label="admin.dashboard.reports.refresh_report"
-                          @icon="arrows-rotate"
-                          class="refresh-report-btn btn-primary"
-                        />
-                      </div>
-                    </div>
-                  {{/if}}
-                </div>
-              {{/if}}
-            </div>
-          </ConditionalLoadingSection>
-        {{else}}
-          <div class="alert alert-info">
-            {{htmlSafe this.disabledLabel}}
+                {{/if}}
+              </div>
+            {{/if}}
           </div>
-        {{/if}}
+        </ConditionalLoadingSection>
       {{/unless}}
     </div>
   </template>
diff --git a/frontend/discourse/admin/components/admin-search.gjs b/frontend/discourse/admin/components/admin-search.gjs
index 7dab18e8f059b..c14f1c61eb15b 100644
--- a/frontend/discourse/admin/components/admin-search.gjs
+++ b/frontend/discourse/admin/components/admin-search.gjs
@@ -20,7 +20,6 @@ export default class AdminSearch extends Component {
 
   @tracked filter = this.args.initialFilter ?? "";
   @tracked searchResults = [];
-  @tracked showFilters = true;
   @tracked loading = false;
   @tracked dataReady = false;
 
diff --git a/frontend/discourse/admin/components/admin-theme-editor.gjs b/frontend/discourse/admin/components/admin-theme-editor.gjs
index c9f94b07f72f7..6d14ac9f13ac5 100644
--- a/frontend/discourse/admin/components/admin-theme-editor.gjs
+++ b/frontend/discourse/admin/components/admin-theme-editor.gjs
@@ -38,8 +38,7 @@ export default class AdminThemeEditor extends Component {
   @service router;
 
   @tracked showAdvanced;
-  @tracked onlyOverridden;
-  @tracked currentTargetName;
+  currentTargetName;
 
   warning = null;
 
@@ -53,17 +52,12 @@ export default class AdminThemeEditor extends Component {
       if (!this.showAdvanced && ADVANCED_TARGETS.includes(target.name)) {
         return false;
       }
-      if (!this.onlyOverridden) {
-        return true;
-      }
+      return true;
     });
   }
 
   get visibleFields() {
     let fields = this.theme.fields[this.currentTargetName];
-    if (this.onlyOverridden) {
-      fields = fields.filter((field) => field.edited);
-    }
     if (!this.showAdvanced) {
       fields = fields.filter(
         (field) => field.edited || !ADVANCED_FIELDS.includes(field.name)
diff --git a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs
index 2a1741f567f87..82df59876deaf 100644
--- a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs
+++ b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs
@@ -19,7 +19,7 @@ export default class BulkUserDeleteConfirmation extends Component {
 
   @tracked confirmButtonDisabled = true;
   @tracked deleteStarted = false;
-  @tracked logs = new TrackedArray();
+  logs = new TrackedArray();
   failedUsernames = [];
 
   callAfterBulkDelete = false;
diff --git a/frontend/discourse/admin/templates/admin-config/flags.gjs b/frontend/discourse/admin/templates/admin-config/flags.gjs
index 5ed0d9656e9b9..2ba08589d4ed5 100644
--- a/frontend/discourse/admin/templates/admin-config/flags.gjs
+++ b/frontend/discourse/admin/templates/admin-config/flags.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { service } from "@ember/service";
 import { SYSTEM_FLAG_IDS } from "discourse/admin/lib/constants";
 import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";
@@ -11,11 +10,9 @@ class FlagsTemplate extends Component {
   @service site;
   @service siteSettings;
 
-  @tracked flags = this.site.flagTypes;
-
   get addFlagButtonDisabled() {
     return (
-      this.flags.filter(
+      this.site.flagTypes.filter(
         (flag) => !Object.values(SYSTEM_FLAG_IDS).includes(flag.id)
       ).length >= this.siteSettings.custom_flags_limit
     );
diff --git a/frontend/discourse/app/components/avatar-uploader.gjs b/frontend/discourse/app/components/avatar-uploader.gjs
index d7fddf546ef94..5598082638b4e 100644
--- a/frontend/discourse/app/components/avatar-uploader.gjs
+++ b/frontend/discourse/app/components/avatar-uploader.gjs
@@ -57,7 +57,7 @@ export default class AvatarUploader extends Component {
         id="custom-profile-upload"
         {{didInsert this.uppyUpload.setup}}
         class="hidden-upload-field"
-        disabled={{this.uploading}}
+        disabled={{this.uppyUpload.uploading}}
         type="file"
         accept="image/*"
         aria-hidden="true"
@@ -65,7 +65,7 @@ export default class AvatarUploader extends Component {
       <DButton
         @translatedLabel={{this.uploadLabel}}
         @icon="far-image"
-        @disabled={{this.uploading}}
+        @disabled={{this.uppyUpload.uploading}}
         @action={{this.chooseImage}}
         @title="user.change_avatar.upload_title"
         class="btn-default avatar-uploader__button"
diff --git a/frontend/discourse/app/components/badge-card.gjs b/frontend/discourse/app/components/badge-card.gjs
index a59ef61c9d42d..c47405cc01b9d 100644
--- a/frontend/discourse/app/components/badge-card.gjs
+++ b/frontend/discourse/app/components/badge-card.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { htmlSafe } from "@ember/template";
 import { isEmpty } from "@ember/utils";
 import DButton from "discourse/components/d-button";
@@ -13,7 +12,9 @@ import { i18n } from "discourse-i18n";
 import PluginOutlet from "./plugin-outlet";
 
 export default class BadgeCard extends Component {
-  @tracked size = this.args.size || "medium";
+  get size() {
+    return this.args.size || "medium";
+  }
 
   get url() {
     const { badge, filterUser, username } = this.args;
@@ -31,9 +32,9 @@ export default class BadgeCard extends Component {
   }
 
   get summary() {
-    const { size, badge } = this.args;
+    const { badge } = this.args;
 
-    if (size === "large" && !isEmpty(badge.long_description)) {
+    if (this.size === "large" && !isEmpty(badge.long_description)) {
       return emojiUnescape(sanitize(badge.long_description));
     }
     return sanitize(badge.description);
diff --git a/frontend/discourse/app/components/create-topic-button.gjs b/frontend/discourse/app/components/create-topic-button.gjs
index 11ba111adaf14..5919a7a868df5 100644
--- a/frontend/discourse/app/components/create-topic-button.gjs
+++ b/frontend/discourse/app/components/create-topic-button.gjs
@@ -7,8 +7,13 @@ import { applyValueTransformer } from "discourse/lib/transformer";
 export default class CreateTopicButton extends Component {
   @service router;
 
-  label = this.args.label ?? "topic.create";
-  btnId = this.args.btnId ?? "create-topic";
+  get label() {
+    return this.args.label ?? "topic.create";
+  }
+
+  get btnId() {
+    return this.args.btnId ?? "create-topic";
+  }
 
   get btnTypeClass() {
     return this.args.btnTypeClass || "btn-default";
diff --git a/frontend/discourse/app/components/d-navigation.gjs b/frontend/discourse/app/components/d-navigation.gjs
index d8ea1913152f9..d8fb52a6d4777 100644
--- a/frontend/discourse/app/components/d-navigation.gjs
+++ b/frontend/discourse/app/components/d-navigation.gjs
@@ -1,5 +1,4 @@
 /* eslint-disable ember/no-classic-components */
-import { tracked } from "@glimmer/tracking";
 import Component from "@ember/component";
 import { hash } from "@ember/helper";
 import { action } from "@ember/object";
@@ -33,8 +32,6 @@ export default class DNavigation extends Component {
   @service siteSettings;
   @service currentUser;
 
-  @tracked filterMode;
-
   @setting("fixed_category_positions") fixedCategoryPositions;
 
   get canEditTags() {
diff --git a/frontend/discourse/app/components/discovery/topics.gjs b/frontend/discourse/app/components/discovery/topics.gjs
index 672ff83f7b95e..1a28807a14779 100644
--- a/frontend/discourse/app/components/discovery/topics.gjs
+++ b/frontend/discourse/app/components/discovery/topics.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
@@ -27,8 +26,6 @@ export default class DiscoveryTopics extends Component {
   @service currentUser;
   @service topicTrackingState;
 
-  @tracked loadingNew;
-
   get redirectedReason() {
     return this.currentUser?.user_option.redirected_to_top?.reason;
   }
diff --git a/frontend/discourse/app/components/emoji-picker/content.gjs b/frontend/discourse/app/components/emoji-picker/content.gjs
index 45fc0741f82ea..7f6c00b0dcf21 100644
--- a/frontend/discourse/app/components/emoji-picker/content.gjs
+++ b/frontend/discourse/app/components/emoji-picker/content.gjs
@@ -61,13 +61,11 @@ export default class EmojiPicker extends Component {
   @tracked filteredEmojis = null;
   @tracked scrollObserverEnabled = true;
   @tracked scrollDirection = "up";
-  @tracked emojis = null;
   @tracked visibleSections = DEFAULT_VISIBLE_SECTIONS;
   @tracked lastVisibleSection = DEFAULT_LAST_SECTION;
   @tracked term = this.args.term;
 
   prevYPosition = 0;
-
   scrollableNode;
 
   setupSectionsNavScroll = modifierFn((element) => {
diff --git a/frontend/discourse/app/components/form-template-field/upload.gjs b/frontend/discourse/app/components/form-template-field/upload.gjs
index de86926232a4c..6a9d70300b43b 100644
--- a/frontend/discourse/app/components/form-template-field/upload.gjs
+++ b/frontend/discourse/app/components/form-template-field/upload.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { getOwner } from "@ember/owner";
 import { next, schedule } from "@ember/runloop";
@@ -16,11 +15,9 @@ import UppyUpload from "discourse/lib/uppy/uppy-upload";
 export default class FormTemplateFieldUpload extends Component {
   @service appEvents;
 
-  @tracked fileInputSelector = `#${this.fileUploadElementId}`;
-  @tracked
-  fileUploadElementId = `${dasherize(this.args.id.toString())}-uploader`;
   @resettableTracked uploadValue = this.args.value || "";
   @trackedArray uploadedFiles = [];
+  fileUploadElementId = `${dasherize(this.args.id.toString())}-uploader`;
 
   uppyUpload = new UppyUpload(getOwner(this), {
     id: this.args.id,
diff --git a/frontend/discourse/app/components/header.gjs b/frontend/discourse/app/components/header.gjs
index ce05e01fb52ea..6cb5072c73a80 100644
--- a/frontend/discourse/app/components/header.gjs
+++ b/frontend/discourse/app/components/header.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { hash } from "@ember/helper";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
@@ -49,8 +48,6 @@ export default class GlimmerHeader extends Component {
   @service appEvents;
   @service header;
 
-  @tracked skipSearchContext = this.site.mobileView;
-
   appEventsListeners = modifierFn(() => {
     this.appEvents.on(
       "header:keyboard-trigger",
@@ -163,7 +160,7 @@ export default class GlimmerHeader extends Component {
       const context = this.search.searchContext;
       let params = "";
       if (context) {
-        params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.skipSearchContext}`;
+        params = `?context=${context.type}&context_id=${context.id}&skip_context=${this.site.mobileView}`;
       }
 
       if (this.router.currentRouteName === "full-page-search") {
diff --git a/frontend/discourse/app/components/modal/avatar-selector.gjs b/frontend/discourse/app/components/modal/avatar-selector.gjs
index 1c6f66d19f592..365cc825a4022 100644
--- a/frontend/discourse/app/components/modal/avatar-selector.gjs
+++ b/frontend/discourse/app/components/modal/avatar-selector.gjs
@@ -23,7 +23,6 @@ export default class AvatarSelectorModal extends Component {
 
   @tracked gravatarRefreshDisabled = false;
   @tracked gravatarFailed = false;
-  @tracked uploading = false;
   @tracked _selected = null;
 
   get user() {
@@ -39,7 +38,7 @@ export default class AvatarSelectorModal extends Component {
   }
 
   get submitDisabled() {
-    return this.selected === "logo" || this.uploading;
+    return this.selected === "logo";
   }
 
   get selectableAvatars() {
@@ -299,7 +298,6 @@ export default class AvatarSelectorModal extends Component {
                 @user_id={{this.user.id}}
                 @uploadedAvatarTemplate={{this.user.custom_avatar_template}}
                 @uploadedAvatarId={{this.user.custom_avatar_upload_id}}
-                @uploading={{this.uploading}}
                 @id="avatar-uploader"
                 @done={{this.uploadComplete}}
                 class="avatar-uploader"
diff --git a/frontend/discourse/app/components/modal/bookmark.gjs b/frontend/discourse/app/components/modal/bookmark.gjs
index 7e0f914cf9a81..47f5d4dbcb9eb 100644
--- a/frontend/discourse/app/components/modal/bookmark.gjs
+++ b/frontend/discourse/app/components/modal/bookmark.gjs
@@ -48,7 +48,6 @@ export default class BookmarkModal extends Component {
   @tracked postDetectedLocalTimezone = null;
   @tracked prefilledDatetime = null;
   @tracked flash = null;
-  @tracked userTimezone = this.currentUser.user_option.timezone;
   @tracked showOptions = this.args.model.bookmark.id ? true : false;
 
   @notEmpty("userTimezone") userHasTimezoneSet;
@@ -73,6 +72,10 @@ export default class BookmarkModal extends Component {
     this.keyboardShortcuts.unpause();
   }
 
+  get userTimezone() {
+    return this.currentUser.user_option.timezone;
+  }
+
   get bookmark() {
     return this.args.model.bookmark;
   }
diff --git a/frontend/discourse/app/components/modal/edit-user-directory-columns.gjs b/frontend/discourse/app/components/modal/edit-user-directory-columns.gjs
index 77f41bdb5b0ec..7a39d77929c24 100644
--- a/frontend/discourse/app/components/modal/edit-user-directory-columns.gjs
+++ b/frontend/discourse/app/components/modal/edit-user-directory-columns.gjs
@@ -20,7 +20,6 @@ const DOWN = "down";
 export default class EditUserDirectoryColumns extends Component {
   @tracked loading = true;
   @tracked columns;
-  @tracked labelKey;
   @tracked flash;
 
   constructor() {
@@ -133,7 +132,6 @@ export default class EditUserDirectoryColumns extends Component {
                     {{#if (directoryColumnIsAutomatic column=column)}}
                       {{directoryTableHeaderTitle
                         field=column.name
-                        labelKey=this.labelKey
                         icon=column.icon
                       }}
                     {{else if (directoryColumnIsUserField column=column)}}
diff --git a/frontend/discourse/app/components/modal/flag.gjs b/frontend/discourse/app/components/modal/flag.gjs
index aa477e11788c2..4b8d6188ef789 100644
--- a/frontend/discourse/app/components/modal/flag.gjs
+++ b/frontend/discourse/app/components/modal/flag.gjs
@@ -27,11 +27,9 @@ export default class Flag extends Component {
   // eslint-disable-next-line discourse/no-unused-services
   @service site; // FIXME: used by flag-target objects
 
-  @tracked userDetails;
   @tracked selected;
   @tracked message;
   @tracked isConfirmed = false;
-  @tracked isWarning = false;
   @tracked spammerDetails;
 
   constructor() {
@@ -255,7 +253,6 @@ export default class Flag extends Component {
               @flag={{f}}
               @message={{this.message}}
               @isConfirmed={{this.isConfirmed}}
-              @isWarning={{this.isWarning}}
               @selectedFlag={{this.selected}}
               @username={{@model.flagModel.username}}
               @staffFlagsAvailable={{this.staffFlagsAvailable}}
diff --git a/frontend/discourse/app/components/modal/second-factor-backup-edit.gjs b/frontend/discourse/app/components/modal/second-factor-backup-edit.gjs
index a5854d13c524e..61ec88a263184 100644
--- a/frontend/discourse/app/components/modal/second-factor-backup-edit.gjs
+++ b/frontend/discourse/app/components/modal/second-factor-backup-edit.gjs
@@ -8,7 +8,6 @@ import ConditionalLoadingSection from "discourse/components/conditional-loading-
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
 import { debounce } from "discourse/lib/decorators";
-import { SECOND_FACTOR_METHODS } from "discourse/models/user";
 import { i18n } from "discourse-i18n";
 
 export default class SecondFactorBackupEdit extends Component {
@@ -21,7 +20,6 @@ export default class SecondFactorBackupEdit extends Component {
   remainingCodes =
     this.args.model.secondFactor.second_factor_remaining_backup_codes;
   @tracked backupCodes;
-  @tracked secondFactorMethod = SECOND_FACTOR_METHODS.TOTP;
 
   @action
   copyBackupCode(successful) {
diff --git a/frontend/discourse/app/components/navigation-item.gjs b/frontend/discourse/app/components/navigation-item.gjs
index 2e3b0d56d400e..ed87706c14c50 100644
--- a/frontend/discourse/app/components/navigation-item.gjs
+++ b/frontend/discourse/app/components/navigation-item.gjs
@@ -1,5 +1,4 @@
 /* eslint-disable ember/no-classic-components */
-import { tracked } from "@glimmer/tracking";
 import Component from "@ember/component";
 import { dependentKeyCompat } from "@ember/object/compat";
 import { tagName } from "@ember-decorators/component";
@@ -9,8 +8,7 @@ import { filterTypeForMode } from "discourse/lib/filter-mode";
 
 @tagName("")
 export default class NavigationItem extends Component {
-  @tracked filterMode;
-
+  filterMode;
   hidden = false;
   activeClass = "";
   hrefLink = null;
diff --git a/frontend/discourse/app/components/post-list/index.gjs b/frontend/discourse/app/components/post-list/index.gjs
index 35f43e84c0a94..c514081f24a30 100644
--- a/frontend/discourse/app/components/post-list/index.gjs
+++ b/frontend/discourse/app/components/post-list/index.gjs
@@ -48,7 +48,10 @@ import { addUniqueValuesToArray } from "../../lib/array-tools";
 export default class PostList extends Component {
   @tracked loading = false;
   @tracked canLoadMore = true;
-  @tracked emptyText = this.args.emptyText || i18n("post_list.empty");
+
+  get emptyText() {
+    return this.args.emptyText || i18n("post_list.empty");
+  }
 
   get isLoadingContent() {
     return this.loading || this.args.isLoading;
diff --git a/frontend/discourse/app/components/post.gjs b/frontend/discourse/app/components/post.gjs
index 2ebbeb6313b06..e928dbab44a55 100644
--- a/frontend/discourse/app/components/post.gjs
+++ b/frontend/discourse/app/components/post.gjs
@@ -52,14 +52,10 @@ export default class Post extends Component {
 
   @tracked expandedFirstPost;
   @tracked repliesAbove;
-  @tracked repliesBelow = new TrackedArray();
-
-  /**
-   * @type {boolean}
-   */
   @tracked isTogglingReplies = false;
   @tracked isLoadingMoreReplies = false;
 
+  repliesBelow = new TrackedArray();
   decoratorState = new TrackedMap();
 
   addEventListeners = modifier((element, [listeners]) => {
diff --git a/frontend/discourse/app/components/post/menu/buttons/add-translation.gjs b/frontend/discourse/app/components/post/menu/buttons/add-translation.gjs
index e08e58f99b5d2..e354f7fac051a 100644
--- a/frontend/discourse/app/components/post/menu/buttons/add-translation.gjs
+++ b/frontend/discourse/app/components/post/menu/buttons/add-translation.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
@@ -17,8 +16,6 @@ export default class PostMenuAddTranslationButton extends Component {
   @service composer;
   @service modal;
 
-  @tracked showComposer = false;
-
   get showTranslationButton() {
     return this.args.post.can_localize_post;
   }
diff --git a/frontend/discourse/app/components/sidebar/common/custom-section.gjs b/frontend/discourse/app/components/sidebar/common/custom-section.gjs
index 7814252fbabf7..95621f1be7d01 100644
--- a/frontend/discourse/app/components/sidebar/common/custom-section.gjs
+++ b/frontend/discourse/app/components/sidebar/common/custom-section.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { getOwner } from "@ember/owner";
 import { service } from "@ember/service";
 import replaceEmoji from "discourse/helpers/replace-emoji";
@@ -18,7 +17,7 @@ export default class SidebarCustomSection extends Component {
   @service navigationMenu;
   @service router;
 
-  @tracked section = this.initialSection;
+  section = this.initialSection;
 
   willDestroy() {
     super.willDestroy();
diff --git a/frontend/discourse/app/components/software-update-prompt.gjs b/frontend/discourse/app/components/software-update-prompt.gjs
index cc7e49f2e1c8e..c873c71e444e8 100644
--- a/frontend/discourse/app/components/software-update-prompt.gjs
+++ b/frontend/discourse/app/components/software-update-prompt.gjs
@@ -47,31 +47,21 @@ export default class SoftwareUpdatePrompt extends Component {
 
     if (!this.timeoutHandler && this.session.requiresRefresh) {
       if (isTesting()) {
-        this.updatePromptState(true);
+        this.addMessage();
       } else {
         // Since we can do this transparently for people browsing the forum
         // hold back the message 24 hours.
         this.timeoutHandler = discourseLater(
-          () => this.updatePromptState(true),
+          () => this.addMessage(),
           1000 * 60 * 24 * 60
         );
       }
     }
   }
 
-  updatePromptState(value) {
-    // when adding the message, we inject the HTML then add the animation
-    // when dismissing, things need to happen in the opposite order
-    const firstProp = value ? "showPrompt" : "animatePrompt";
-    const secondProp = value ? "animatePrompt" : "showPrompt";
-
-    this[firstProp] = value;
-
-    if (isTesting()) {
-      this[secondProp] = value;
-    } else {
-      discourseLater(() => (this[secondProp] = value), 500);
-    }
+  addMessage() {
+    this.showPrompt = true;
+    discourseLater(() => (this.animatePrompt = true), 500);
   }
 
   @action
@@ -81,7 +71,8 @@ export default class SoftwareUpdatePrompt extends Component {
 
   @action
   dismiss() {
-    this.updatePromptState(false);
+    this.animatePrompt = false;
+    discourseLater(() => (this.showPrompt = false), 500);
   }
 
   <template>
diff --git a/frontend/discourse/app/components/tag-groups-form.gjs b/frontend/discourse/app/components/tag-groups-form.gjs
index 0b5799fdcba5f..fc1dda40935c1 100644
--- a/frontend/discourse/app/components/tag-groups-form.gjs
+++ b/frontend/discourse/app/components/tag-groups-form.gjs
@@ -1,5 +1,5 @@
 /* eslint-disable ember/no-classic-components */
-import { cached, tracked } from "@glimmer/tracking";
+import { cached } from "@glimmer/tracking";
 import Component, { Input } from "@ember/component";
 import { hash } from "@ember/helper";
 import { action } from "@ember/object";
@@ -23,8 +23,6 @@ export default class TagGroupsForm extends Component {
   @service dialog;
   @service site;
 
-  @tracked model;
-
   // All but the "everyone" group
   allGroups = this.site.groups.filter(
     ({ id }) => id !== AUTO_GROUPS.everyone.id
diff --git a/frontend/discourse/app/form-kit/components/fk/field-data.gjs b/frontend/discourse/app/form-kit/components/fk/field-data.gjs
index 5b4543e630403..e42c4dd70525a 100644
--- a/frontend/discourse/app/form-kit/components/fk/field-data.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/field-data.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import ValidationParser from "discourse/form-kit/lib/validation-parser";
 import Validator from "discourse/form-kit/lib/validator";
@@ -9,12 +8,6 @@ import uniqueId from "discourse/helpers/unique-id";
  * Represents a field in a form with validation, registration, and field data management capabilities.
  */
 export default class FKFieldData extends Component {
-  /**
-   * Type of the field.
-   * @type {string}
-   */
-  @tracked type;
-
   /**
    * Unique identifier for the field.
    * @type {string}
diff --git a/frontend/discourse/app/helpers/directory-table-header-title.js b/frontend/discourse/app/helpers/directory-table-header-title.js
index 60bb984f75db0..6eaf86fa3ab62 100644
--- a/frontend/discourse/app/helpers/directory-table-header-title.js
+++ b/frontend/discourse/app/helpers/directory-table-header-title.js
@@ -3,16 +3,16 @@ import { iconHTML } from "discourse/lib/icon-library";
 import { i18n } from "discourse-i18n";
 
 export default function directoryTableHeaderTitle(args) {
-  // Args should include key/values { field, labelKey, icon, translated }
+  // Args should include key/values { field, icon, translated }
 
   let html = "";
   if (args.icon) {
     html += iconHTML(args.icon);
   }
-  let labelKey = args.labelKey || `directory.${args.field}`;
+  const labelKey = `directory.${args.field}`;
 
   html += args.translated
     ? args.field
-    : i18n(labelKey + "_long", { defaultValue: i18n(labelKey) });
+    : i18n(`${labelKey}_long`, { defaultValue: i18n(labelKey) });
   return htmlSafe(html);
 }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
index d3bff0a302a38..8ca9953e6ea8c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs
@@ -34,7 +34,6 @@ export default class ChatChannelRow extends Component {
   @tracked shouldReset = false;
   @tracked diff = 0;
   @tracked rowStyle = null;
-  @tracked canSwipe = true;
 
   registerSwipableRow = modifierFn((element) => {
     this.swipableRow = element;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs
index a130fc7bded21..878d958ec981a 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs
@@ -59,9 +59,6 @@ export default class ChatChannel extends Component {
   @service dialog;
   @service siteSettings;
 
-  @tracked sending = false;
-  @tracked showChatQuoteSuccess = false;
-  @tracked includeHeader = true;
   @tracked atBottom = true;
   @tracked uploadDropZone;
   @tracked isScrolling = false;
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjs
index 79578b78d1a74..1414ed33dc056 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjs
@@ -75,7 +75,6 @@ export default class ChatComposer extends Component {
 
   @tracked isFocused = false;
   @tracked inProgressUploadsCount = 0;
-  @tracked presenceChannelName;
 
   get shouldRenderMessageDetails() {
     return (
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs
index d265037eb54a9..440fe73dbb859 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs
@@ -39,10 +39,7 @@ export default class ChatDrawerRoutesChannelThreads extends Component {
 
         {{#if this.chatStateManager.isDrawerExpanded}}
           <div class="chat-drawer-content">
-            <ChatThreadList
-              @channel={{@model.channel}}
-              @includeHeader={{false}}
-            />
+            <ChatThreadList @channel={{@model.channel}} />
           </div>
         {{/if}}
       {{/if}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs
index 68c82a593f42e..b872e00343678 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs
@@ -23,15 +23,10 @@ export default class ChatMessageCreatorSearch extends Component {
   @tracked chatables = [];
   @tracked highlightedChatable;
   @tracked term;
-  @tracked loading = false;
 
   get items() {
     const items = [];
 
-    if (this.loading) {
-      return items;
-    }
-
     if (!this.term?.length && this.chatGuardian.canUseGroupChat()) {
       items.push({
         identifier: "new-group",
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-thread.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-thread.gjs
index c24548937baf8..fc5b940a8236c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-thread.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-thread.gjs
@@ -24,7 +24,6 @@ export default class ChatRoutesChannelThread extends Component {
         <Thread
           @thread={{thread}}
           @targetMessageId={{@targetMessageId}}
-          @includeHeader={{true}}
           @setFullTitle={{this.setFullTitle}}
         />
       {{/each}}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-threads.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-threads.gjs
index 2ab2671645adb..969692035e84c 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-threads.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-threads.gjs
@@ -4,7 +4,7 @@ import ChatThreadList from "discourse/plugins/chat/discourse/components/chat-thr
 const ChatRoutesChannelThreads = <template>
   <div class="c-routes --channel-threads">
     <ChatThreadListHeader @channel={{@channel}} />
-    <ChatThreadList @channel={{@channel}} @includeHeader={{true}} />
+    <ChatThreadList @channel={{@channel}} />
   </div>
 </template>;
 
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjs
index bd112bfd9e956..c4ca4dc37ca51 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjs
@@ -16,6 +16,7 @@ import withEventValue from "discourse/helpers/with-event-value";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import getURL from "discourse/lib/get-url";
+import { trackedArray } from "discourse/lib/tracked-tools";
 import ComboBox from "discourse/select-kit/components/combo-box";
 import { i18n } from "discourse-i18n";
 import SpamTestModal from "./modal/spam-test-modal";
@@ -36,7 +37,7 @@ export default class AiSpam extends Component {
   @tracked selectedLLM = null;
   @tracked selectedPersonaId = null;
   @tracked customInstructions = "";
-  @tracked errors = [];
+  @trackedArray errors;
 
   constructor() {
     super(...arguments);
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/doughnut-chart.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/doughnut-chart.gjs
index 7ae620c554e23..a3dd9138f20a5 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/doughnut-chart.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/doughnut-chart.gjs
@@ -1,10 +1,7 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import Chart from "discourse/admin/components/chart";
 
 export default class DoughnutChart extends Component {
-  @tracked canvasSize = null;
-
   get config() {
     const totalScore = this.args.totalScore || "";
 
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-composer-helper-menu.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-composer-helper-menu.gjs
index ed1f36307fefd..e98bc830d5e87 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-composer-helper-menu.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-composer-helper-menu.gjs
@@ -17,19 +17,12 @@ export default class AiComposerHelperMenu extends Component {
   @service currentUser;
   @service site;
 
-  @tracked newSelectedText;
-  @tracked diff;
   @tracked customPromptValue = "";
-  @tracked noContentError = false;
   prompts = [];
   promptTypes = {};
 
-  constructor() {
-    super(...arguments);
-
-    if (this.args.data.toolbarEvent.getText().length === 0) {
-      this.noContentError = true;
-    }
+  get noContentError() {
+    return this.args.data.toolbarEvent.getText().length === 0;
   }
 
   get helperOptions() {
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjs
index 5c9b46564c215..7d3754727fd99 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjs
@@ -44,7 +44,6 @@ export default class AiPostHelperMenu extends Component {
   @tracked streaming = false;
   @tracked lastSelectedOption = null;
   @tracked isSavingFootnote = false;
-  @tracked
   smoothStreamer = new SmoothStreamer(
     () => this.suggestion,
     (newValue) => (this.suggestion = newValue)
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjs
index 227e2c798062e..31a6fc06e7587 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjs
@@ -30,7 +30,6 @@ export default class AiSearchDiscoveries extends Component {
 
   @tracked loadingConversationTopic = false;
   @tracked fullDiscoveryToggled = false;
-  @tracked discoveryPreviewLength = this.args.discoveryPreviewLength || 150;
 
   constructor() {
     super(...arguments);
@@ -73,6 +72,10 @@ export default class AiSearchDiscoveries extends Component {
     );
   }
 
+  get discoveryPreviewLength() {
+    return this.args.discoveryPreviewLength || 150;
+  }
+
   get query() {
     return this.args?.searchTerm || this.search.activeGlobalSearchTerm;
   }
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjs
index 184d0c85eef40..ab86e91f6da3f 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjs
@@ -17,7 +17,6 @@ export default class AiSplitTopicSuggester extends Component {
 
   @tracked suggestions = [];
   @tracked loading = false;
-  @tracked icon = "discourse-sparkles";
 
   SUGGESTION_TYPES = {
     title: "suggest_title",
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjs
index 2f8beee80df17..cb9aaec9e85f6 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjs
@@ -38,7 +38,6 @@ export default class AiSummaryModal extends Component {
   @tracked canRegenerate = false;
   @tracked loading = false;
   @tracked currentIndex = 0;
-  @tracked
   smoothStreamer = new SmoothStreamer(
     () => this.text,
     (newValue) => (this.text = newValue)
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjs
index 70e4a2ae51d2a..3baa91f0e8493 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjs
@@ -28,10 +28,9 @@ export default class ModalDiffModal extends Component {
 
   @tracked loading = false;
   @tracked finalResult = "";
-  @tracked escapedSelectedText = escapeExpression(this.args.model.selectedText);
-  @tracked diffStreamer = new DiffStreamer(this.args.model.selectedText);
   @tracked suggestion = "";
-  @tracked
+  escapedSelectedText = escapeExpression(this.args.model.selectedText);
+  diffStreamer = new DiffStreamer(this.args.model.selectedText);
   smoothStreamer = new SmoothStreamer(
     () => this.suggestion,
     (newValue) => (this.suggestion = newValue)
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjs
index 0aae2368e7297..06819ff2549d0 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjs
@@ -67,7 +67,7 @@ export default class RagUploader extends Component {
       ajax(
         `/admin/plugins/discourse-ai/rag-document-fragments/files/status.json?target_type=${targetName}&target_id=${this.target.id}`
       ).then((statuses) => {
-        this.set("ragIndexingStatuses", statuses);
+        this.ragIndexingStatuses = statuses;
       });
     }
 
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
index 54d2c0d35779b..2aa689a816fb1 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
@@ -15,9 +15,7 @@ export default class AiPostHelperTrigger extends Component {
   @service menu;
 
   @tracked postHighlighted = false;
-  @tracked currentMenu = this.menu.getByIdentifier(
-    "post-text-selection-toolbar"
-  );
+  currentMenu = this.menu.getByIdentifier("post-text-selection-toolbar");
 
   // capture the state at the moment the toolbar is rendered
   // so we ensure change of state (selection change for example)
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs
index fe9302690e9be..086500953213e 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
@@ -12,7 +11,7 @@ import TopicAssignments from "../topic-assignments";
 export default class EditTopicAssignments extends Component {
   @service taskActions;
 
-  @tracked assignments = this.topic.assignments();
+  assignments = this.topic.assignments();
 
   get title() {
     if (this.topic.isAssigned() || this.topic.hasAssignedPosts()) {
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs
index 8c7206a179cb1..db307065615b7 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs
+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs
@@ -1,7 +1,6 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { readOnly } from "@ember/object/computed";
 import { service } from "@ember/service";
 import Form from "discourse/components/form";
 import { ajax } from "discourse/lib/ajax";
@@ -13,11 +12,8 @@ export default class AdminCreateLeaderboard extends Component {
   @service router;
   @service toasts;
 
-  @tracked newLeaderboardName = "";
   @tracked loading = false;
 
-  @readOnly("newLeaderboardName") nameValid;
-
   get formData() {
     return { name: "", created_by_id: this.currentUser.id };
   }
diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjs b/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjs
index 6c21b210d3e42..a4b4d70a4cd9c 100644
--- a/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjs
+++ b/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjs
@@ -20,7 +20,6 @@ export default class RecalculateScoresForm extends Component {
 
   @tracked updateRangeValue = 0;
   @tracked recalculateFromDate = "";
-  @tracked haveAvailability = this.args.model.recalculate_scores_remaining > 0;
   @tracked remaining = this.args.model.recalculate_scores_remaining;
   @tracked status = "initial";
 
@@ -75,16 +74,15 @@ export default class RecalculateScoresForm extends Component {
   }
 
   get applyDisabled() {
-    if (!this.haveAvailability || this.status !== "initial") {
+    const haveAvailability = this.args.model.recalculate_scores_remaining > 0;
+    if (!haveAvailability || this.status !== "initial") {
       return true;
-    } else if (
+    }
+
+    return (
       this.updateRangeValue === 5 &&
       this.recalculateFromDate <= moment().locale("en").utc().endOf("day")
-    ) {
-      return true;
-    } else {
-      return false;
-    }
+    );
   }
 
   get dateRange() {
diff --git a/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjs b/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjs
index 5498434b43a5a..f3a72531e1e0f 100644
--- a/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjs
+++ b/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjs
@@ -12,7 +12,6 @@ export default class HCaptcha extends Component {
   @service hCaptchaService;
 
   @tracked widgetId;
-  @tracked invalid = true;
   @tracked hCaptchaConfigError = "";
   hCaptcha;
 
diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjs
index 7efc3614dca2d..059f4be4b3327 100644
--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjs
+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjs
@@ -23,7 +23,6 @@ export default class PostVotingComment extends Component {
 
   @tracked isEditing = false;
   @tracked isVoting = false;
-  @tracked hidden = false;
 
   get anchorId() {
     return buildAnchorId(this.args.comment.id);
diff --git a/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-box.gjs b/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-box.gjs
index 71d1b1123f5fd..475b7f05f9dcf 100644
--- a/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-box.gjs
+++ b/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-box.gjs
@@ -15,7 +15,6 @@ export default class VoteBox extends Component {
 
   @tracked votesAlert;
   @tracked allowClick = true;
-  @tracked initialVote = false;
 
   @action
   addVote() {
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjs
index 51e3dbbefffdb..58b6b634b58dd 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { fn, hash } from "@ember/helper";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
@@ -10,11 +9,11 @@ import StyleguideExample from "discourse/plugins/styleguide/discourse/components
 export default class Dialogs extends Component {
   @service dialog;
 
-  @tracked alertOutput = "";
-  @tracked deleteConfirmOutput = "";
-  @tracked noticeOutput = "";
-  @tracked confirmOutput = "";
-  @tracked yesNoConfirmOutput = "";
+  alertOutput = "";
+  deleteConfirmOutput = "";
+  noticeOutput = "";
+  confirmOutput = "";
+  yesNoConfirmOutput = "";
 
   @action
   async openDialog(dialog = {}) {
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjs
index 06dad9849200a..def9617826b5b 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjs
@@ -10,11 +10,11 @@ import Row from "discourse/plugins/styleguide/discourse/components/styleguide/co
 import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";
 
 export default class StyleguideCalendarDateTimeInput extends Component {
-  @tracked dateFormat = "YYYY-MM-DD";
-  @tracked timeFormat = "HH:mm:ss";
   @tracked date = null;
   @tracked time = null;
   @tracked minDate = null;
+  dateFormat = "YYYY-MM-DD";
+  timeFormat = "HH:mm:ss";
 
   @action
   changeDate(date) {

From 267db265b3c8446988a695c2d0809a2ae3e8c142 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 24 Feb 2026 22:14:36 +0100
Subject: [PATCH 058/168] FIX: Limit visibility on accepted/not_accepted
 endpoints (#38026)

The accepted and not_accepted endpoints were exposing user lists for
private policies to any logged-in user who could see group members. This
extracts authorization into a shared `ensure_can_see_policy_users`
before_action that enforces private policy restrictions consistent with
the serializer behavior.
---
 .../discourse_policy/policy_controller.rb     | 28 ++++-----
 .../spec/requests/policy_controller_spec.rb   | 58 ++++++++++++++++++-
 2 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb b/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
index 41140c8f47c63..08c83588c8f5c 100644
--- a/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
+++ b/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
@@ -5,6 +5,7 @@ class DiscoursePolicy::PolicyController < ::ApplicationController
 
   before_action :ensure_logged_in, :set_post
   before_action :ensure_can_accept, only: %i[accept unaccept]
+  before_action :ensure_can_see_policy_users, only: %i[accepted not_accepted]
 
   def accept
     PolicyUser.add!(current_user, @post.post_policy)
@@ -29,15 +30,6 @@ def unaccept
   end
 
   def accepted
-    # Check if user has permission to see group members
-    groups = @post.post_policy.groups
-    return render_json_error(I18n.t("discourse_policy.errors.group_not_found")) if groups.blank?
-
-    guardian = Guardian.new(current_user)
-    unless guardian.can_see_groups_members?(groups)
-      return render_json_error(I18n.t("discourse_policy.error.no_permission"))
-    end
-
     users =
       @post
         .post_policy
@@ -49,15 +41,6 @@ def accepted
   end
 
   def not_accepted
-    # Check if user has permission to see group members
-    groups = @post.post_policy.groups
-    return render_json_error(I18n.t("discourse_policy.errors.group_not_found")) if groups.blank?
-
-    guardian = Guardian.new(current_user)
-    unless guardian.can_see_groups_members?(groups)
-      return render_json_error(I18n.t("discourse_policy.error.no_permission"))
-    end
-
     users =
       @post
         .post_policy
@@ -70,6 +53,15 @@ def not_accepted
 
   private
 
+  def ensure_can_see_policy_users
+    post_policy = @post.post_policy
+    raise Discourse::InvalidAccess if post_policy.private? && !guardian.is_admin?
+
+    unless guardian.can_see_groups_members?(post_policy.groups)
+      render_json_error(I18n.t("discourse_policy.error.no_permission"))
+    end
+  end
+
   def ensure_can_accept
     if !GroupUser.where(
          "group_id in (:group_ids) and user_id = :user_id",
diff --git a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
index 559f962d21f37..143fe99860d38 100644
--- a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
+++ b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
@@ -112,6 +112,60 @@ def raw
     end
   end
 
+  describe "private policy restrictions" do
+    fab!(:admin)
+
+    def private_raw
+      <<~MD
+        [policy group=#{group.name} private=true]
+        I always open **doors**!
+        [/policy]
+      MD
+    end
+
+    it "denies non-admin access to accepted users for a private policy" do
+      post = create_post(raw: private_raw, user: moderator)
+      PolicyUser.add!(user1, post.post_policy)
+
+      sign_in(user1)
+      get "/policy/accepted.json", params: { post_id: post.id, offset: 0 }
+      expect(response.status).to eq(403)
+    end
+
+    it "denies non-admin access to not_accepted users for a private policy" do
+      post = create_post(raw: private_raw, user: moderator)
+
+      sign_in(user1)
+      get "/policy/not-accepted.json", params: { post_id: post.id, offset: 0 }
+      expect(response.status).to eq(403)
+    end
+
+    it "allows admin access to accepted users for a private policy" do
+      group.add(admin)
+      post = create_post(raw: private_raw, user: moderator)
+      PolicyUser.add!(user1, post.post_policy)
+
+      sign_in(admin)
+      get "/policy/accepted.json", params: { post_id: post.id, offset: 0 }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["users"].map { |x| x["id"] }).to include(user1.id)
+    end
+
+    it "allows admin access to not_accepted users for a private policy" do
+      group.add(admin)
+      post = create_post(raw: private_raw, user: moderator)
+
+      sign_in(admin)
+      get "/policy/not-accepted.json", params: { post_id: post.id, offset: 0 }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["users"].map { |x| x["id"] }).to contain_exactly(
+        user1.id,
+        user2.id,
+        admin.id,
+      )
+    end
+  end
+
   describe "group member visibility restrictions" do
     fab!(:owner, :user)
     let!(:post) do
@@ -147,10 +201,12 @@ def raw
     end
 
     it "allows owner to see group members" do
+      PolicyUser.add!(user1, post.post_policy)
+
       sign_in(owner)
       get "/policy/accepted.json", params: { post_id: post.id, offset: 0 }
       expect(response.status).to eq(200)
-      expect(response.parsed_body["users"]).to be_an(Array)
+      expect(response.parsed_body["users"].map { |x| x["id"] }).to contain_exactly(user1.id)
     end
   end
 end

From 4724ca4203dd7465ab02de25a632e706fcfb873b Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 24 Feb 2026 17:12:57 -0500
Subject: [PATCH 059/168] UX: add "saved!" toast when editing category (#38041)

This shows our standard "saved!" toast when creating or editing a
category, it was mentioned that we don't have any explicit feedback on
save here:
https://meta.discourse.org/t/more-friendly-category-creation/390841/14

<img width="2002" height="1644" alt="image"
src="https://github.com/user-attachments/assets/c8250dc6-4c93-4730-a708-60947c87963e"
/>
---
 frontend/discourse/admin/controllers/edit-category/tabs.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.js
index fde913c1f14b6..a88a6617ae4a6 100644
--- a/frontend/discourse/admin/controllers/edit-category/tabs.js
+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js
@@ -58,6 +58,7 @@ export default class EditCategoryTabsController extends Controller {
   @service site;
   @service router;
   @service keyValueStore;
+  @service toasts;
 
   @tracked breadcrumbCategories = this.site.get("categoriesList");
   @tracked
@@ -225,6 +226,11 @@ export default class EditCategoryTabsController extends Controller {
 
       this.set("saving", false);
 
+      this.toasts.success({
+        duration: "short",
+        data: { message: i18n("saved") },
+      });
+
       if (!this.model.id) {
         this.router.transitionTo(
           "editCategory",

From b637339b478650f958d6b8e3e8a512929d1ff5c3 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 24 Feb 2026 22:59:52 +0000
Subject: [PATCH 060/168] =?UTF-8?q?Revert=20"FIX:=20Limit=20visibility=20o?=
 =?UTF-8?q?n=20accepted/not=5Faccepted=20endpoints=20(#38=E2=80=A6=20(#380?=
 =?UTF-8?q?43)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…026)"

This reverts commit 267db265b3c8446988a695c2d0809a2ae3e8c142.

Causing CI failure. To be investigated.
---
 .../discourse_policy/policy_controller.rb     | 28 +++++----
 .../spec/requests/policy_controller_spec.rb   | 58 +------------------
 2 files changed, 19 insertions(+), 67 deletions(-)

diff --git a/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb b/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
index 08c83588c8f5c..41140c8f47c63 100644
--- a/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
+++ b/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
@@ -5,7 +5,6 @@ class DiscoursePolicy::PolicyController < ::ApplicationController
 
   before_action :ensure_logged_in, :set_post
   before_action :ensure_can_accept, only: %i[accept unaccept]
-  before_action :ensure_can_see_policy_users, only: %i[accepted not_accepted]
 
   def accept
     PolicyUser.add!(current_user, @post.post_policy)
@@ -30,6 +29,15 @@ def unaccept
   end
 
   def accepted
+    # Check if user has permission to see group members
+    groups = @post.post_policy.groups
+    return render_json_error(I18n.t("discourse_policy.errors.group_not_found")) if groups.blank?
+
+    guardian = Guardian.new(current_user)
+    unless guardian.can_see_groups_members?(groups)
+      return render_json_error(I18n.t("discourse_policy.error.no_permission"))
+    end
+
     users =
       @post
         .post_policy
@@ -41,6 +49,15 @@ def accepted
   end
 
   def not_accepted
+    # Check if user has permission to see group members
+    groups = @post.post_policy.groups
+    return render_json_error(I18n.t("discourse_policy.errors.group_not_found")) if groups.blank?
+
+    guardian = Guardian.new(current_user)
+    unless guardian.can_see_groups_members?(groups)
+      return render_json_error(I18n.t("discourse_policy.error.no_permission"))
+    end
+
     users =
       @post
         .post_policy
@@ -53,15 +70,6 @@ def not_accepted
 
   private
 
-  def ensure_can_see_policy_users
-    post_policy = @post.post_policy
-    raise Discourse::InvalidAccess if post_policy.private? && !guardian.is_admin?
-
-    unless guardian.can_see_groups_members?(post_policy.groups)
-      render_json_error(I18n.t("discourse_policy.error.no_permission"))
-    end
-  end
-
   def ensure_can_accept
     if !GroupUser.where(
          "group_id in (:group_ids) and user_id = :user_id",
diff --git a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
index 143fe99860d38..559f962d21f37 100644
--- a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
+++ b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
@@ -112,60 +112,6 @@ def raw
     end
   end
 
-  describe "private policy restrictions" do
-    fab!(:admin)
-
-    def private_raw
-      <<~MD
-        [policy group=#{group.name} private=true]
-        I always open **doors**!
-        [/policy]
-      MD
-    end
-
-    it "denies non-admin access to accepted users for a private policy" do
-      post = create_post(raw: private_raw, user: moderator)
-      PolicyUser.add!(user1, post.post_policy)
-
-      sign_in(user1)
-      get "/policy/accepted.json", params: { post_id: post.id, offset: 0 }
-      expect(response.status).to eq(403)
-    end
-
-    it "denies non-admin access to not_accepted users for a private policy" do
-      post = create_post(raw: private_raw, user: moderator)
-
-      sign_in(user1)
-      get "/policy/not-accepted.json", params: { post_id: post.id, offset: 0 }
-      expect(response.status).to eq(403)
-    end
-
-    it "allows admin access to accepted users for a private policy" do
-      group.add(admin)
-      post = create_post(raw: private_raw, user: moderator)
-      PolicyUser.add!(user1, post.post_policy)
-
-      sign_in(admin)
-      get "/policy/accepted.json", params: { post_id: post.id, offset: 0 }
-      expect(response.status).to eq(200)
-      expect(response.parsed_body["users"].map { |x| x["id"] }).to include(user1.id)
-    end
-
-    it "allows admin access to not_accepted users for a private policy" do
-      group.add(admin)
-      post = create_post(raw: private_raw, user: moderator)
-
-      sign_in(admin)
-      get "/policy/not-accepted.json", params: { post_id: post.id, offset: 0 }
-      expect(response.status).to eq(200)
-      expect(response.parsed_body["users"].map { |x| x["id"] }).to contain_exactly(
-        user1.id,
-        user2.id,
-        admin.id,
-      )
-    end
-  end
-
   describe "group member visibility restrictions" do
     fab!(:owner, :user)
     let!(:post) do
@@ -201,12 +147,10 @@ def private_raw
     end
 
     it "allows owner to see group members" do
-      PolicyUser.add!(user1, post.post_policy)
-
       sign_in(owner)
       get "/policy/accepted.json", params: { post_id: post.id, offset: 0 }
       expect(response.status).to eq(200)
-      expect(response.parsed_body["users"].map { |x| x["id"] }).to contain_exactly(user1.id)
+      expect(response.parsed_body["users"]).to be_an(Array)
     end
   end
 end

From 401f49c5fc30f947759e43e4d4d260c2af435071 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 25 Feb 2026 09:07:40 +1000
Subject: [PATCH 061/168] FIX: Staff group causing errors in upcoming changes
 from localization (#37797)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have a "Staff" option for upcoming change items that was sending
the `staff` group name to the server. I had assumed that our automatic
groups could not be renamed, but this is not the case. If your
`default_locale` for your site is changed, the automatic group names
change via `Group.refresh_automatic_groups!` in a background job.

This means that if you change your `default_locale` to `de` (German),
the `staff` group becomes `Team`, and the upcoming changes that are set
to "Staff" will now be looking for the `staff` group, which no longer
exists, causing errors.

This commit fixes the issue by always using the localized staff
automatic group name, both for the value of the dropdown, and in
successs messsages etc.

c.f.

https://meta.discourse.org/t/issue-with-enabling-upcoming-changes/395881/16

---------

Co-authored-by: Régis Hanol <regis@hanol.fr>
---
 config/locales/client.de.yml                  |  2 +-
 config/locales/client.en.yml                  |  4 +--
 .../upcoming-change-item.gjs                  | 18 ++++++----
 frontend/discourse/app/lib/constants.js       |  2 ++
 lib/tasks/javascript.rake                     |  2 ++
 spec/system/admin_upcoming_changes_spec.rb    | 33 ++++++++++++++++++-
 .../pages/admin_upcoming_changes.rb           | 21 ++++++++----
 7 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 40e6e90f8356a..e73ffc029378e 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -5518,7 +5518,7 @@ de:
         enabled_for_options:
           no_one: "Keinen"
           everyone: "Jeden"
-          staff: "Nur Team-Mitglieder"
+          staff: "Nur %{staffGroupName}"
           specific_groups: "Bestimmte Gruppe(n)"
           specific_groups_with_group_names:
             one: "die Gruppe %{groupNames}"
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index f87065f0aed57..65f23daaed19b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5961,7 +5961,7 @@ en:
         enabled_for_options:
           no_one: "No one"
           everyone: "Everyone"
-          staff: "Staff only"
+          staff: "%{staffGroupName} only"
           specific_groups: "Specific group(s)"
           specific_groups_with_group_names:
             one: "the group %{groupNames}"
@@ -5984,7 +5984,7 @@ en:
           all: "All"
           enabled_all: "All enabled states"
           enabled: "Enabled"
-          enabled_for_staff: "Enabled for staff"
+          enabled_for_staff: "Enabled for %{staffGroupName}"
           enabled_for_specific_groups: "Enabled for specific groups"
           disabled: "Disabled"
           impact_type_all: "All impact types"
diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs
index 706ce03092810..6352f284aa625 100644
--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs
@@ -7,6 +7,7 @@ import { action } from "@ember/object";
 import { LinkTo } from "@ember/routing";
 import { cancel } from "@ember/runloop";
 import { service } from "@ember/service";
+import { capitalize } from "@ember/string";
 import { htmlSafe } from "@ember/template";
 import { modifier } from "ember-modifier";
 import DButton from "discourse/components/d-button";
@@ -73,8 +74,8 @@ export default class UpcomingChangeItem extends Component {
     if (!this.args.change.upcoming_change.disallow_enabled_for_groups) {
       options.push(
         {
-          label: i18n("admin.upcoming_changes.enabled_for_options.staff"),
-          value: "staff",
+          label: capitalize(this.staffGroupName),
+          value: this.staffGroupName,
         },
         {
           label: i18n(
@@ -88,6 +89,10 @@ export default class UpcomingChangeItem extends Component {
     return options;
   }
 
+  get staffGroupName() {
+    return this.site.groupsById[AUTO_GROUPS.staff.id].name;
+  }
+
   get enabledForDisabled() {
     return (
       this.args.change.upcoming_change.status === "permanent" ||
@@ -190,9 +195,10 @@ export default class UpcomingChangeItem extends Component {
       enabledForLabel = i18n(
         "admin.upcoming_changes.enabled_for_options.everyone"
       );
-    } else if (enabledFor === "staff") {
+    } else if (enabledFor === this.staffGroupName) {
       enabledForLabel = i18n(
-        "admin.upcoming_changes.enabled_for_options.staff"
+        "admin.upcoming_changes.enabled_for_options.staff",
+        { staffGroupName: capitalize(this.staffGroupName) }
       );
     } else if (enabledFor === "groups") {
       const groupNames = this.bufferedGroups.split(",");
@@ -246,8 +252,8 @@ export default class UpcomingChangeItem extends Component {
     try {
       await this.toggleChange(isEnabled, newValue);
 
-      if (newValue === "staff") {
-        this.groupsChanged(this.site.groupsById[AUTO_GROUPS.staff.id].name);
+      if (newValue === this.staffGroupName) {
+        this.groupsChanged(this.staffGroupName);
       } else if (newValue === "everyone" || newValue === "no_one") {
         this.groupsChanged("");
       }
diff --git a/frontend/discourse/app/lib/constants.js b/frontend/discourse/app/lib/constants.js
index b67441d0794fd..15e39627662f1 100644
--- a/frontend/discourse/app/lib/constants.js
+++ b/frontend/discourse/app/lib/constants.js
@@ -26,6 +26,8 @@ export const CATEGORY_STYLE_TYPES = { square: 0, icon: 1, emoji: 2 };
 
 export const CATEGORY_TEXT_COLORS = ["FFFFFF", "000000"];
 
+// NOTE: Group names are changed based on the site's locale, see
+// Group.refresh_automatic_group! for more details
 export const AUTO_GROUPS = {
   everyone: { id: 0, automatic: true, name: "everyone" },
   admins: { id: 1, automatic: true, name: "admins" },
diff --git a/lib/tasks/javascript.rake b/lib/tasks/javascript.rake
index b18a948b4b535..39c67c9c37ee1 100644
--- a/lib/tasks/javascript.rake
+++ b/lib/tasks/javascript.rake
@@ -66,6 +66,8 @@ task "javascript:update_constants" => :environment do
 
     export const CATEGORY_TEXT_COLORS = #{Category::DEFAULT_TEXT_COLORS};
 
+    // NOTE: Group names are changed based on the site's locale, see
+    // Group.refresh_automatic_group! for more details
     export const AUTO_GROUPS = #{auto_groups.to_json};
 
     export const GROUP_SMTP_SSL_MODES = #{Group.smtp_ssl_modes.to_json};
diff --git a/spec/system/admin_upcoming_changes_spec.rb b/spec/system/admin_upcoming_changes_spec.rb
index ce2d3c917d9ea..d6b44204bec0b 100644
--- a/spec/system/admin_upcoming_changes_spec.rb
+++ b/spec/system/admin_upcoming_changes_spec.rb
@@ -132,7 +132,12 @@
 
     # Test 'staff' option - should enable the change and set staff group
     upcoming_changes_page.change_item(:enable_upload_debug_mode).select_enabled_for("staff")
-    expect(upcoming_changes_page).to have_enabled_for_success_toast("staff")
+    expect(upcoming_changes_page).to have_enabled_for_success_toast(
+      "staff",
+      translation_args: {
+        staffGroupName: I18n.t("groups.default_names.staff").titleize,
+      },
+    )
     expect(upcoming_changes_page.change_item(:enable_upload_debug_mode)).to be_enabled
 
     upcoming_changes_page.visit
@@ -255,4 +260,30 @@
       ".sidebar-section-link-suffix.admin-sidebar-nav-link__dot",
     )
   end
+
+  context "when the staff group name has been localized" do
+    before do
+      SiteSetting.default_locale = "de"
+      Group.refresh_automatic_group!(:staff)
+    end
+
+    it "displays the localized name in the enabled for options and enabling staff works correctly" do
+      upcoming_changes_page.visit
+
+      upcoming_changes_page.change_item(:enable_upload_debug_mode).select_enabled_for(
+        Group.find(Group::AUTO_GROUPS[:staff]).name,
+      )
+      expect(upcoming_changes_page).to have_enabled_for_success_toast(
+        "staff",
+        translation_args: {
+          staffGroupName: I18n.t("groups.default_names.staff", locale: SiteSetting.default_locale),
+        },
+      )
+      expect(upcoming_changes_page.change_item(:enable_upload_debug_mode)).to be_enabled
+      expect(SiteSetting.enable_upload_debug_mode).to be_truthy
+      expect(SiteSettingGroup.find_by(name: "enable_upload_debug_mode").group_ids).to include(
+        Group::AUTO_GROUPS[:staff].to_s,
+      )
+    end
+  end
 end
diff --git a/spec/system/page_objects/pages/admin_upcoming_changes.rb b/spec/system/page_objects/pages/admin_upcoming_changes.rb
index e309eabec37e7..f4468b57e042e 100644
--- a/spec/system/page_objects/pages/admin_upcoming_changes.rb
+++ b/spec/system/page_objects/pages/admin_upcoming_changes.rb
@@ -31,23 +31,32 @@ def filter_controls
         )
       end
 
-      def has_enabled_for_success_toast?(enabled_for, translation_args: {})
+      def has_enabled_for_success_toast?(
+        enabled_for,
+        translation_args: {},
+        locale: SiteSetting.default_locale
+      )
         enabled_for_text =
           if enabled_for == "specific_groups_with_group_names"
             I18n.t(
               "admin_js.admin.upcoming_changes.enabled_for_options.#{enabled_for}",
-              translation_args,
+              translation_args.merge(locale: locale),
             ).downcase
           else
-            I18n.t("admin_js.admin.upcoming_changes.enabled_for_options.#{enabled_for}").downcase
+            I18n.t(
+              "admin_js.admin.upcoming_changes.enabled_for_options.#{enabled_for}",
+              translation_args.merge(locale: locale),
+            ).downcase
           end
 
-        page.has_content?(
+        enabled_for_success_text =
           I18n.t(
             "admin_js.admin.upcoming_changes.change_enabled_for_success",
             enabledFor: enabled_for_text,
-          ),
-        )
+            locale: locale,
+          )
+
+        page.has_content?(enabled_for_success_text)
       end
 
       def has_disabled_success_toast?

From 7bd37b7dbca8c5ec2b60e8d3f2bdb6721edde562 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Tue, 24 Feb 2026 18:26:50 -0500
Subject: [PATCH 062/168] UX: allow anon visitors to search in title on /search
 page (#38042)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When logged out the `matching in title only` option isn't available on
`/search` — this adds it. I don't think there's much reason to not have
it here, logged out visitors can already use `in:title` manually.

Before:
<img width="450" alt="image"
src="https://github.com/user-attachments/assets/1da3d4de-2760-4d4e-82c5-3cb257aa0fa3"
/>


After:
<img width="450" alt="image"
src="https://github.com/user-attachments/assets/53d323b3-dbc4-43a4-8285-8e7c1aa5b262"
/>

Thanks for noticing @moin-Jana!
---
 frontend/discourse/app/components/search-advanced-options.gjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/discourse/app/components/search-advanced-options.gjs b/frontend/discourse/app/components/search-advanced-options.gjs
index d56b058b9bd44..7f2d359eb992d 100644
--- a/frontend/discourse/app/components/search-advanced-options.gjs
+++ b/frontend/discourse/app/components/search-advanced-options.gjs
@@ -70,8 +70,6 @@ function inOptionsForUsers() {
       // Messages
       "all",
       "private",
-      // Search scope
-      "title",
     ],
     "inOptionsForUsers"
   );
@@ -85,6 +83,8 @@ function inOptionsForAll() {
       "pinned",
       "wiki",
       "images",
+      // Search scope
+      "title",
     ],
     "inOptionsForAll"
   );

From d2176ac67b93fed2a877691213a1957982f4e7ea Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 25 Feb 2026 10:36:47 +1000
Subject: [PATCH 063/168] FIX: Hide enable_auto_grid_images site setting
 (#38046)

This is in the upcoming changes list and should not show in site
settings at the same time.
---
 config/site_settings.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 25f0ac0594e8d..bd073f46f7f2f 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4217,6 +4217,7 @@ experimental:
   enable_auto_grid_images:
     default: false
     client: true
+    hidden: true
     area: "experimental"
     upcoming_change:
       status: "experimental"

From 4e2a5a8fc063af0752fd0a1b20b1c69af3a6c2a4 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Wed, 25 Feb 2026 09:27:12 +0800
Subject: [PATCH 064/168] DEV: Remove legacy reviewable component shims and
 unused code (#38010)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

What is the problem?

PR #36752 removed the `reviewable_ui_refresh` feature flag and migrated
the review UI to the refreshed implementation. As part of that
migration, temporary re-export shims were left in `reviewable-refresh/`
and `reviewable-user.js` so plugins could continue importing from the
old paths. Several legacy components (`reviewable-flagged-post`,
`reviewable-queued-post`, `reviewable-score`, `reviewable-scores`, etc.)
and the `Pages::RefreshedReview` page object were also kept around until
plugins were updated. All plugin PRs have now been merged
(discourse-akismet#203, discourse-antivirus#98,
discourse-category-experts#223).

What is the solution?

Delete all transitional artifacts that are no longer referenced:
- Remove the `reviewable-refresh/` re-export shims (7 files) — plugins
now import directly from `reviewable/`
- Remove `reviewable-user.js` shim
- Remove unused legacy components: `reviewable-conversation-post`,
`reviewable-flagged-post`, `reviewable-histories`,
`reviewable-post-header`, `reviewable-queued-post`, `reviewable-score`,
and `reviewable-scores`
- Remove `Pages::RefreshedReview` page object — system tests now use
`Pages::Review`
---
 .../reviewable-conversation-post.gjs          |  28 ---
 .../components/reviewable-flagged-post.gjs    |  93 ---------
 .../app/components/reviewable-histories.gjs   |  44 ----
 .../app/components/reviewable-post-header.gjs |  27 ---
 .../app/components/reviewable-queued-post.gjs | 114 ----------
 .../reviewable-refresh/created-by.gjs         |   3 -
 .../reviewable-refresh/flagged-post.gjs       |   3 -
 .../components/reviewable-refresh/item.gjs    |   4 -
 .../components/reviewable-refresh/post.gjs    |   3 -
 .../reviewable-refresh/queued-post.gjs        |   2 -
 .../reviewable-refresh/topic-link.gjs         |   3 -
 .../components/reviewable-refresh/user.gjs    |   3 -
 .../app/components/reviewable-score.gjs       |  73 -------
 .../app/components/reviewable-scores.gjs      |  59 ------
 .../app/components/reviewable-user.js         |   3 -
 .../page_objects/pages/refreshed_review.rb    | 195 ------------------
 16 files changed, 657 deletions(-)
 delete mode 100644 frontend/discourse/app/components/reviewable-conversation-post.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-flagged-post.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-histories.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-post-header.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-queued-post.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-refresh/created-by.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-refresh/flagged-post.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-refresh/item.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-refresh/post.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-refresh/queued-post.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-refresh/topic-link.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-refresh/user.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-score.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-scores.gjs
 delete mode 100644 frontend/discourse/app/components/reviewable-user.js
 delete mode 100644 spec/system/page_objects/pages/refreshed_review.rb

diff --git a/frontend/discourse/app/components/reviewable-conversation-post.gjs b/frontend/discourse/app/components/reviewable-conversation-post.gjs
deleted file mode 100644
index aef40132ac573..0000000000000
--- a/frontend/discourse/app/components/reviewable-conversation-post.gjs
+++ /dev/null
@@ -1,28 +0,0 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { gte } from "@ember/object/computed";
-import { LinkTo } from "@ember/routing";
-import { htmlSafe } from "@ember/template";
-import { tagName } from "@ember-decorators/component";
-
-@tagName("")
-export default class ReviewableConversationPost extends Component {
-  @gte("index", 1) showUsername;
-
-  <template>
-    <div ...attributes>
-      {{#if this.post}}
-        <div class="reviewable-conversation-post">
-          {{#if this.showUsername}}
-            <LinkTo
-              @route="user"
-              @model={{this.post.user}}
-              class="username"
-            >@{{this.post.user.username}}</LinkTo>
-          {{/if}}
-          {{htmlSafe this.post.excerpt}}
-        </div>
-      {{/if}}
-    </div>
-  </template>
-}
diff --git a/frontend/discourse/app/components/reviewable-flagged-post.gjs b/frontend/discourse/app/components/reviewable-flagged-post.gjs
deleted file mode 100644
index c3edfa1defc62..0000000000000
--- a/frontend/discourse/app/components/reviewable-flagged-post.gjs
+++ /dev/null
@@ -1,93 +0,0 @@
-import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import { action } from "@ember/object";
-import didInsert from "@ember/render-modifiers/modifiers/did-insert";
-import DButton from "discourse/components/d-button";
-import PluginOutlet from "discourse/components/plugin-outlet";
-import ReviewableCreatedBy from "discourse/components/reviewable-created-by";
-import ReviewablePostEdits from "discourse/components/reviewable-post-edits";
-import ReviewablePostHeader from "discourse/components/reviewable-post-header";
-import ReviewableTopicLink from "discourse/components/reviewable-topic-link";
-import lazyHash from "discourse/helpers/lazy-hash";
-import { bind } from "discourse/lib/decorators";
-import highlightWatchedWords from "discourse/lib/highlight-watched-words";
-import { i18n } from "discourse-i18n";
-
-export default class ReviewableFlaggedPost extends Component {
-  @tracked isCollapsed = false;
-  @tracked isLongPost = false;
-  maxPostHeight = 300;
-
-  @action
-  toggleContent() {
-    this.isCollapsed = !this.isCollapsed;
-  }
-
-  @bind
-  calculatePostBodySize(element) {
-    if (element?.offsetHeight > this.maxPostHeight) {
-      this.isCollapsed = true;
-      this.isLongPost = true;
-    } else {
-      this.isCollapsed = false;
-      this.isLongPost = false;
-    }
-  }
-
-  get collapseButtonProps() {
-    if (this.isCollapsed) {
-      return {
-        label: "review.show_more",
-        icon: "chevron-down",
-      };
-    }
-    return {
-      label: "review.show_less",
-      icon: "chevron-up",
-    };
-  }
-
-  <template>
-    <div class="flagged-post-header">
-      <ReviewableTopicLink @reviewable={{@reviewable}} />
-      <ReviewablePostEdits @reviewable={{@reviewable}} />
-    </div>
-
-    <div class="post-contents-wrapper">
-      <ReviewableCreatedBy @user={{@reviewable.target_created_by}} />
-      <div class="post-contents">
-        <ReviewablePostHeader
-          @reviewable={{@reviewable}}
-          @createdBy={{@reviewable.target_created_by}}
-        />
-        <div
-          class="post-body {{if this.isCollapsed 'is-collapsed'}}"
-          {{didInsert this.calculatePostBodySize @reviewable}}
-        >
-          {{#if @reviewable.blank_post}}
-            <p>{{i18n "review.deleted_post"}}</p>
-          {{else}}
-            {{highlightWatchedWords @reviewable.cooked @reviewable}}
-          {{/if}}
-        </div>
-
-        {{#if this.isLongPost}}
-          <DButton
-            @action={{this.toggleContent}}
-            @label={{this.collapseButtonProps.label}}
-            @icon={{this.collapseButtonProps.icon}}
-            class="btn-default btn-icon post-body__toggle-btn"
-          />
-        {{/if}}
-        <span>
-          <PluginOutlet
-            @name="after-reviewable-flagged-post-body"
-            @connectorTagName="div"
-            @outletArgs={{lazyHash model=@reviewable}}
-          />
-        </span>
-        {{yield}}
-      </div>
-    </div>
-  </template>
-}
diff --git a/frontend/discourse/app/components/reviewable-histories.gjs b/frontend/discourse/app/components/reviewable-histories.gjs
deleted file mode 100644
index 90ec34f393348..0000000000000
--- a/frontend/discourse/app/components/reviewable-histories.gjs
+++ /dev/null
@@ -1,44 +0,0 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { filterBy } from "@ember/object/computed";
-import { tagName } from "@ember-decorators/component";
-import UserLink from "discourse/components/user-link";
-import avatar from "discourse/helpers/avatar";
-import formatDate from "discourse/helpers/format-date";
-import reviewableHistoryDescription from "discourse/helpers/reviewable-history-description";
-import { i18n } from "discourse-i18n";
-
-@tagName("")
-export default class ReviewableHistories extends Component {
-  @filterBy("histories", "created", false) filteredHistories;
-
-  <template>
-    {{#if this.filteredHistories}}
-      <table class="reviewable-histories">
-        <thead>
-          <tr>
-            <th colspan="3">{{i18n "review.history.title"}}</th>
-          </tr>
-        </thead>
-        <tbody>
-          {{#each this.filteredHistories as |rh|}}
-            {{#unless rh.created}}
-              <tr>
-                <td>
-                  {{reviewableHistoryDescription rh}}
-                </td>
-                <td>
-                  <UserLink @user={{this.rs.user}}>
-                    {{avatar rh.created_by imageSize="tiny"}}
-                    {{rh.created_by.username}}
-                  </UserLink>
-                </td>
-                <td>{{formatDate rh.created_at format="medium"}}</td>
-              </tr>
-            {{/unless}}
-          {{/each}}
-        </tbody>
-      </table>
-    {{/if}}
-  </template>
-}
diff --git a/frontend/discourse/app/components/reviewable-post-header.gjs b/frontend/discourse/app/components/reviewable-post-header.gjs
deleted file mode 100644
index dee4531ed8d6f..0000000000000
--- a/frontend/discourse/app/components/reviewable-post-header.gjs
+++ /dev/null
@@ -1,27 +0,0 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { concat } from "@ember/helper";
-import { tagName } from "@ember-decorators/component";
-import ReviewableCreatedByName from "discourse/components/reviewable-created-by-name";
-import icon from "discourse/helpers/d-icon";
-import { i18n } from "discourse-i18n";
-
-@tagName("")
-export default class ReviewablePostHeader extends Component {
-  <template>
-    <ReviewableCreatedByName @user={{this.createdBy}} />
-    {{#if this.reviewable.reply_to_post_number}}
-      <a
-        href={{concat
-          this.reviewable.topic_url
-          "/"
-          this.reviewable.reply_to_post_number
-        }}
-        class="reviewable-reply-to"
-      >
-        {{icon "share"}}
-        <span>{{i18n "review.in_reply_to"}}</span>
-      </a>
-    {{/if}}
-  </template>
-}
diff --git a/frontend/discourse/app/components/reviewable-queued-post.gjs b/frontend/discourse/app/components/reviewable-queued-post.gjs
deleted file mode 100644
index 25f75398eb8d4..0000000000000
--- a/frontend/discourse/app/components/reviewable-queued-post.gjs
+++ /dev/null
@@ -1,114 +0,0 @@
-import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import { hash } from "@ember/helper";
-import { on } from "@ember/modifier";
-import { action } from "@ember/object";
-import { service } from "@ember/service";
-import CookText from "discourse/components/cook-text";
-import DButton from "discourse/components/d-button";
-import RawEmailModal from "discourse/components/modal/raw-email";
-import ReviewableCreatedBy from "discourse/components/reviewable-created-by";
-import ReviewablePostHeader from "discourse/components/reviewable-post-header";
-import ReviewableTags from "discourse/components/reviewable-tags";
-import ReviewableTopicLink from "discourse/components/reviewable-topic-link";
-import categoryBadge from "discourse/helpers/category-badge";
-import icon from "discourse/helpers/d-icon";
-import highlightWatchedWords from "discourse/lib/highlight-watched-words";
-
-export default class ReviewableQueuedPost extends Component {
-  @service modal;
-
-  @tracked isCollapsed = false;
-  @tracked isLongPost = false;
-  @tracked postBodyHeight = 0;
-  maxPostHeight = 300;
-
-  @action
-  showRawEmail(event) {
-    event?.preventDefault();
-    this.modal.show(RawEmailModal, {
-      model: {
-        rawEmail: this.args.reviewable.payload.raw_email,
-      },
-    });
-  }
-
-  @action
-  toggleContent() {
-    this.isCollapsed = !this.isCollapsed;
-  }
-
-  get collapseButtonProps() {
-    if (this.isCollapsed) {
-      return {
-        label: "review.show_more",
-        icon: "chevron-down",
-      };
-    }
-    return {
-      label: "review.show_less",
-      icon: "chevron-up",
-    };
-  }
-
-  @action
-  setPostBodyHeight(offsetHeight) {
-    this.postBodyHeight = offsetHeight;
-
-    if (this.postBodyHeight > this.maxPostHeight) {
-      this.isCollapsed = true;
-      this.isLongPost = true;
-    } else {
-      this.isCollapsed = false;
-      this.isLongPost = false;
-    }
-  }
-
-  <template>
-    <ReviewableTopicLink @reviewable={{@reviewable}}>
-      <div class="title-text">
-        {{icon "square-plus" title="review.new_topic"}}
-        {{highlightWatchedWords @reviewable.payload.title @reviewable}}
-      </div>
-      {{categoryBadge @reviewable.category}}
-      <ReviewableTags @tags={{@reviewable.payload.tags}} />
-      {{#if @reviewable.payload.via_email}}
-        <a href {{on "click" this.showRawEmail}} class="show-raw-email">
-          {{icon "envelope" title="post.via_email"}}
-        </a>
-      {{/if}}
-    </ReviewableTopicLink>
-
-    <div class="post-contents-wrapper">
-      <ReviewableCreatedBy @user={{@reviewable.target_created_by}} />
-
-      <div class="post-contents">
-        <ReviewablePostHeader
-          @reviewable={{@reviewable}}
-          @createdBy={{@reviewable.target_created_by}}
-        />
-
-        <CookText
-          class="post-body {{if this.isCollapsed 'is-collapsed'}}"
-          @rawText={{highlightWatchedWords @reviewable.payload.raw @reviewable}}
-          @categoryId={{@reviewable.category_id}}
-          @topicId={{@reviewable.topic_id}}
-          @paintOneboxes={{false}}
-          @opts={{hash removeMissing=true}}
-          @onOffsetHeightCalculated={{this.setPostBodyHeight}}
-        />
-
-        {{#if this.isLongPost}}
-          <DButton
-            @action={{this.toggleContent}}
-            @label={{this.collapseButtonProps.label}}
-            @icon={{this.collapseButtonProps.icon}}
-            class="btn-default btn-icon post-body__toggle-btn"
-          />
-        {{/if}}
-
-        {{yield}}
-      </div>
-    </div>
-  </template>
-}
diff --git a/frontend/discourse/app/components/reviewable-refresh/created-by.gjs b/frontend/discourse/app/components/reviewable-refresh/created-by.gjs
deleted file mode 100644
index 01cd1e654337a..0000000000000
--- a/frontend/discourse/app/components/reviewable-refresh/created-by.gjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import CreatedBy from "discourse/components/reviewable/created-by";
-
-export default CreatedBy;
diff --git a/frontend/discourse/app/components/reviewable-refresh/flagged-post.gjs b/frontend/discourse/app/components/reviewable-refresh/flagged-post.gjs
deleted file mode 100644
index 17543f8c0d2fd..0000000000000
--- a/frontend/discourse/app/components/reviewable-refresh/flagged-post.gjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import FlaggedPost from "discourse/components/reviewable/flagged-post";
-
-export default FlaggedPost;
diff --git a/frontend/discourse/app/components/reviewable-refresh/item.gjs b/frontend/discourse/app/components/reviewable-refresh/item.gjs
deleted file mode 100644
index 1915366d9046d..0000000000000
--- a/frontend/discourse/app/components/reviewable-refresh/item.gjs
+++ /dev/null
@@ -1,4 +0,0 @@
-export { registerReviewableTypeLabel } from "discourse/components/reviewable/item";
-import Item from "discourse/components/reviewable/item";
-
-export default Item;
diff --git a/frontend/discourse/app/components/reviewable-refresh/post.gjs b/frontend/discourse/app/components/reviewable-refresh/post.gjs
deleted file mode 100644
index f682c1e841497..0000000000000
--- a/frontend/discourse/app/components/reviewable-refresh/post.gjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import Post from "discourse/components/reviewable/post";
-
-export default Post;
diff --git a/frontend/discourse/app/components/reviewable-refresh/queued-post.gjs b/frontend/discourse/app/components/reviewable-refresh/queued-post.gjs
deleted file mode 100644
index 34636d5c40062..0000000000000
--- a/frontend/discourse/app/components/reviewable-refresh/queued-post.gjs
+++ /dev/null
@@ -1,2 +0,0 @@
-export default QueuedPost;
-import QueuedPost from "discourse/components/reviewable/queued-post";
diff --git a/frontend/discourse/app/components/reviewable-refresh/topic-link.gjs b/frontend/discourse/app/components/reviewable-refresh/topic-link.gjs
deleted file mode 100644
index 1592ecaa309cd..0000000000000
--- a/frontend/discourse/app/components/reviewable-refresh/topic-link.gjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import TopicLink from "discourse/components/reviewable/topic-link";
-
-export default TopicLink;
diff --git a/frontend/discourse/app/components/reviewable-refresh/user.gjs b/frontend/discourse/app/components/reviewable-refresh/user.gjs
deleted file mode 100644
index 9a30395994365..0000000000000
--- a/frontend/discourse/app/components/reviewable-refresh/user.gjs
+++ /dev/null
@@ -1,3 +0,0 @@
-import User from "discourse/components/reviewable/user";
-
-export default User;
diff --git a/frontend/discourse/app/components/reviewable-score.gjs b/frontend/discourse/app/components/reviewable-score.gjs
deleted file mode 100644
index 0197d4ced5a9a..0000000000000
--- a/frontend/discourse/app/components/reviewable-score.gjs
+++ /dev/null
@@ -1,73 +0,0 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { gt } from "@ember/object/computed";
-import { tagName } from "@ember-decorators/component";
-import UserLink from "discourse/components/user-link";
-import avatar from "discourse/helpers/avatar";
-import icon from "discourse/helpers/d-icon";
-import formatDate from "discourse/helpers/format-date";
-import reviewableStatus from "discourse/helpers/reviewable-status";
-import discourseComputed from "discourse/lib/decorators";
-
-@tagName("")
-export default class ReviewableScore extends Component {
-  @gt("rs.status", 0) showStatus;
-
-  @discourseComputed("rs.score_type.title", "reviewable.target_created_by")
-  title(title, targetCreatedBy) {
-    if (title && targetCreatedBy) {
-      return title.replace(
-        /{{username}}|%{username}/,
-        targetCreatedBy.username
-      );
-    }
-
-    return title;
-  }
-
-  <template>
-    <tr class="reviewable-score">
-      <td class="user">
-        <UserLink @user={{this.rs.user}}>
-          {{avatar this.rs.user imageSize="tiny"}}
-          {{this.rs.user.username}}
-        </UserLink>
-      </td>
-
-      <td>
-        {{formatDate this.rs.created_at format="tiny"}}
-      </td>
-
-      <td>
-        {{icon this.rs.score_type.icon}}
-        {{this.title}}
-      </td>
-
-      {{#if this.showStatus}}
-        <td class="reviewed-by">
-          {{#if this.rs.reviewed_by}}
-            <UserLink @user={{this.rs.reviewed_by}}>
-              {{avatar this.rs.reviewed_by imageSize="tiny"}}
-              {{this.rs.reviewed_by.username}}
-            </UserLink>
-          {{else}}
-            &mdash;
-          {{/if}}
-        </td>
-
-        <td>
-          {{#if this.rs.reviewed_by}}
-            {{formatDate this.rs.reviewed_at format="tiny"}}
-          {{/if}}
-        </td>
-
-        <td>
-          {{reviewableStatus this.rs.status this.reviewable.type}}
-        </td>
-
-      {{else}}
-        <td colspan="4"></td>
-      {{/if}}
-    </tr>
-  </template>
-}
diff --git a/frontend/discourse/app/components/reviewable-scores.gjs b/frontend/discourse/app/components/reviewable-scores.gjs
deleted file mode 100644
index 3259b694cbca6..0000000000000
--- a/frontend/discourse/app/components/reviewable-scores.gjs
+++ /dev/null
@@ -1,59 +0,0 @@
-/* eslint-disable ember/no-classic-components */
-import Component from "@ember/component";
-import { htmlSafe } from "@ember/template";
-import { tagName } from "@ember-decorators/component";
-import ReviewableConversationPost from "discourse/components/reviewable-conversation-post";
-import ReviewableScore from "discourse/components/reviewable-score";
-import { i18n } from "discourse-i18n";
-
-@tagName("")
-export default class ReviewableScores extends Component {
-  <template>
-    {{#if this.reviewable.reviewable_scores}}
-      <div class="reviewable-scores__table-wrapper">
-        <table class="reviewable-scores">
-          <thead>
-            <tr>
-              <th>{{i18n "review.scores.submitted_by"}}</th>
-              <th>{{i18n "review.scores.date"}}</th>
-              <th>{{i18n "review.scores.type"}}</th>
-              <th>{{i18n "review.scores.reviewed_by"}}</th>
-              <th>{{i18n "review.scores.reviewed_timestamp"}}</th>
-              <th>{{i18n "review.scores.status"}}</th>
-            </tr>
-          </thead>
-          <tbody>
-            {{#each this.reviewable.reviewable_scores as |rs|}}
-              <ReviewableScore @rs={{rs}} @reviewable={{this.reviewable}} />
-            {{/each}}
-          </tbody>
-        </table>
-      </div>
-
-      {{#each this.reviewable.reviewable_scores as |rs|}}
-        {{#if rs.reason}}
-          <div class="reviewable-score-reason">{{htmlSafe rs.reason}}</div>
-        {{/if}}
-        {{#if rs.context}}
-          <div class="reviewable-score-context">{{htmlSafe rs.context}}</div>
-        {{/if}}
-
-        {{#if rs.reviewable_conversation}}
-          <div class="reviewable-conversation">
-            {{#each rs.reviewable_conversation.conversation_posts as |p index|}}
-              <ReviewableConversationPost @post={{p}} @index={{index}} />
-            {{/each}}
-            <div class="controls">
-              <a
-                href={{rs.reviewable_conversation.permalink}}
-                class="btn btn-small"
-              >
-                {{i18n "review.conversation.view_full"}}
-              </a>
-            </div>
-          </div>
-        {{/if}}
-      {{/each}}
-    {{/if}}
-  </template>
-}
diff --git a/frontend/discourse/app/components/reviewable-user.js b/frontend/discourse/app/components/reviewable-user.js
deleted file mode 100644
index 9a30395994365..0000000000000
--- a/frontend/discourse/app/components/reviewable-user.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import User from "discourse/components/reviewable/user";
-
-export default User;
diff --git a/spec/system/page_objects/pages/refreshed_review.rb b/spec/system/page_objects/pages/refreshed_review.rb
deleted file mode 100644
index 005e1b040e27b..0000000000000
--- a/spec/system/page_objects/pages/refreshed_review.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-# frozen_string_literal: true
-
-module PageObjects
-  module Pages
-    class RefreshedReview < PageObjects::Pages::Base
-      REVIEWABLE_ACTION_DROPDOWN = ".reviewable-action-dropdown"
-
-      def visit_reviewable(reviewable)
-        page.visit("/review/#{reviewable.id}")
-        self
-      end
-
-      def click_timeline_tab
-        find(".action-list li.timeline").click
-      end
-
-      def click_insights_tab
-        find(".action-list li.insights").click
-      end
-
-      def select_bundled_action(reviewable, value, bundle_id = nil)
-        within(reviewable_by_id(reviewable.id)) do
-          if bundle_id
-            dropdown_selector = "#{REVIEWABLE_ACTION_DROPDOWN}.#{bundle_id.dasherize}"
-            dropdown = PageObjects::Components::SelectKit.new(dropdown_selector)
-            dropdown.expand
-            dropdown.select_row_by_value(value)
-          else
-            dropdown_count = all(REVIEWABLE_ACTION_DROPDOWN).count
-            dropdown_count.times do |index|
-              dropdown_selector = "#{REVIEWABLE_ACTION_DROPDOWN}:nth-of-type(#{index + 1})"
-              dropdown = PageObjects::Components::SelectKit.new(dropdown_selector)
-              dropdown.expand
-              if dropdown.expanded_component.has_css?(
-                   ".select-kit-row[data-value='#{value}']",
-                   wait: 0,
-                 )
-                dropdown.select_row_by_value(value)
-                break
-              else
-                dropdown.collapse
-              end
-            end
-          end
-        end
-      end
-
-      def select_action(reviewable, value)
-        within(reviewable_by_id(reviewable.id)) do
-          find(".reviewable-action.#{value.dasherize}").click
-        end
-      end
-
-      def has_reviewable_with_rejected_status?(reviewable)
-        within(reviewable_by_id(reviewable.id)) { page.has_css?(".review-item__status.--rejected") }
-      end
-
-      def has_rejected_item_in_timeline?(reviewable)
-        within(reviewable_by_id(reviewable.id)) { page.has_text?("Rejected by") }
-      end
-
-      def has_reviewable_with_pending_status?(reviewable)
-        within(reviewable_by_id(reviewable.id)) { page.has_css?(".review-item__status.--pending") }
-      end
-
-      def has_reviewable_with_approved_status?(reviewable)
-        within(reviewable_by_id(reviewable.id)) { page.has_css?(".review-item__status.--approved") }
-      end
-
-      def has_approved_item_in_timeline?(reviewable)
-        within(reviewable_by_id(reviewable.id)) { page.has_text?("Approved by") }
-      end
-
-      def has_reviewable_with_ignored_status?(reviewable)
-        within(reviewable_by_id(reviewable.id)) { page.has_css?(".review-item__status.--ignored") }
-      end
-
-      def has_reviewable_with_scrubbed_by?(reviewable, scrubbed_by)
-        within(reviewable_by_id(reviewable.id)) do
-          page.has_css?(".reviewable-user-details.scrubbed-by .value", text: scrubbed_by)
-        end
-      end
-
-      def has_reviewable_with_scrubbed_reason?(reviewable, scrubbed_reason)
-        within(reviewable_by_id(reviewable.id)) do
-          page.has_css?(".reviewable-user-details.scrubbed-reason .value", text: scrubbed_reason)
-        end
-      end
-
-      def has_reviewable_with_scrubbed_at?(reviewable, scrubbed_at)
-        within(reviewable_by_id(reviewable.id)) do
-          page.has_css?(".reviewable-user-details.scrubbed-at .value", text: scrubbed_at)
-        end
-      end
-
-      def click_edit_post_button
-        find(".reviewable-action.edit").click
-      end
-
-      def click_scrub_user_button
-        find(".user-scrub").click
-      end
-
-      def fill_post_content(content)
-        find(".d-editor-input").fill_in(with: content)
-      end
-
-      def save_post_edit
-        find(".reviewable-action.save-edit").click
-      end
-
-      def has_ip_lookup_info?
-        page.has_css?(".reviewable-ip-lookup")
-      end
-
-      def has_ip_location?(location)
-        page.has_text?(location)
-      end
-
-      def has_ip_hostname?(hostname)
-        page.has_text?(hostname)
-      end
-
-      def has_ip_organization?(organization)
-        page.has_text?(organization)
-      end
-
-      def has_other_accounts_link?(count:)
-        page.has_button?(I18n.t("js.ip_lookup.other_accounts_with_ip", count: count))
-      end
-
-      def click_other_accounts_link
-        find(".ip-lookup-other-accounts-link").click
-      end
-
-      def has_ip_lookup_modal?
-        page.has_css?(".ip-lookup-other-accounts-modal")
-      end
-
-      def has_account_in_modal?(username)
-        within(".ip-lookup-other-accounts-modal") { page.has_text?(username) }
-      end
-
-      def click_claim_reviewable
-        find(".reviewable-claimed-topic .claim").click
-      end
-
-      def click_unclaim_reviewable
-        find(".reviewable-claimed-topic .unclaim").click
-      end
-
-      def has_context_question?(reviewable, text)
-        within(reviewable_by_id(reviewable.id)) do
-          page.has_css?(".review-item__aside-title", text: text)
-        end
-      end
-
-      def has_created_at_history_item?
-        expect(page).to have_css(".timeline-event__icon .d-icon-pen-to-square")
-        expect(page).to have_text("Post created by")
-      end
-
-      def has_claimed_history_item?(user)
-        expect(page).to have_css(".timeline-event__icon .d-icon-user-plus")
-        expect(page).to have_text("Claimed by")
-      end
-
-      def has_unclaimed_history_item?(user)
-        expect(page).to have_css(".timeline-event__icon .d-icon-user-xmark")
-        expect(page).to have_text("Unclaimed by")
-      end
-
-      def has_history_items?(count:)
-        expect(page).to have_css(".timeline-event", count: count)
-      end
-
-      def has_reviewables?(reviewables)
-        reviewable_ids = reviewables.map(&:id)
-        page.has_css?(".review-item", count: reviewables.size) &&
-          reviewable_ids.all? { |id| page.has_css?(".review-item[data-reviewable-id='#{id}']") }
-      end
-
-      private
-
-      def reviewable_by_id(id)
-        find(".review-item[data-reviewable-id=\"#{id}\"]")
-      end
-
-      def reviewable_action_dropdown
-        @reviewable_action_dropdown ||=
-          PageObjects::Components::SelectKit.new(REVIEWABLE_ACTION_DROPDOWN)
-      end
-    end
-  end
-end

From e8287d22b08587fa77dbb72c1c8f2d56304b184d Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 25 Feb 2026 13:31:48 +1000
Subject: [PATCH 065/168] FIX: Links to old DE queries were not redirecting
 (#38047)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup 174ad83901a6641248de133d267dc6ae2364d818

We had the empty route file
`plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries.js`
in the PR for the above commit but removed it before merge....
however it was actually necessary to properly redirect
old DE query links (not a direct URL in the browser address bar)
to the new query page e.g. `/admin/plugins/explorer/queries/:id`
to `/admin/plugins/discourse-data-explorer/queries/:id`

This commit adds the empty route file back to make this work.

The root cause here is that when Ember's resolver looks up a route
handler for `adminPlugins.explorer.queries`, it searches for a module
with
the suffix routes `/admin-plugins/explorer/queries`. Since no file
queries.js exists at that path, the resolver's suffix trie falls back to
`routes/admin-plugins/explorer/queries/index` — finding queries/index.js
and using its class (`AdminPluginsExplorerQueriesIndexRoute`) as the
handler for the parent queries route.

This means when the router transitions to
`adminPlugins.explorer.queries.details` it first enters the parent
queries route, which runs the index handler's `beforeModel` —
redirecting to `/admin/plugins/discourse-data-explorer/queries` and
aborting the transition before the details route is ever reached.
---
 .../discourse/routes/admin-plugins/explorer/queries.js         | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries.js

diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries.js
new file mode 100644
index 0000000000000..7caf0983a29f3
--- /dev/null
+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/routes/admin-plugins/explorer/queries.js
@@ -0,0 +1,3 @@
+import Route from "@ember/routing/route";
+
+export default class AdminPluginsExplorerQueriesRoute extends Route {}

From 26fa64aa536352d5d2c2ce3f084f4f3925601463 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 25 Feb 2026 11:42:47 +0800
Subject: [PATCH 066/168] FIX: Exclude user names from topic search when
 enable_names is disabled (#38011)

The "search within topic" feature in `Search` unconditionally includes
`COALESCE(u.name, '')` in its ILIKE query, making user real names
searchable even when `SiteSetting.enable_names` is disabled. This leaks
name information through search results.

Fix this by conditionally appending the name column to the search fields
only when `SiteSetting.enable_names` is true, matching the behavior of
the global user search path.
---
 lib/search.rb           |  8 +++-----
 spec/lib/search_spec.rb | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/lib/search.rb b/lib/search.rb
index 245b22fcbe037..b9f37f53b4808 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -1270,11 +1270,9 @@ def posts_query(limit, type_filter: nil, aggregate_search: false)
         term_without_quote = $1 if @term =~ /'(.+)'/
 
         posts = posts.joins("JOIN users u ON u.id = posts.user_id")
-        posts =
-          posts.where(
-            "posts.raw || ' ' || post_search_data.raw_data || ' ' || u.username || ' ' || COALESCE(u.name, '') ILIKE ?",
-            "%#{term_without_quote}%",
-          )
+        user_search_fields = +"posts.raw || ' ' || post_search_data.raw_data || ' ' || u.username"
+        user_search_fields << " || ' ' || COALESCE(u.name, '')" if SiteSetting.enable_names
+        posts = posts.where("#{user_search_fields} ILIKE ?", "%#{term_without_quote}%")
       else
         posts = posts.where(post_number: 1) if @in_title
         posts = posts.where("post_search_data.search_data @@ #{ts_query(weight_filter: weights)}")
diff --git a/spec/lib/search_spec.rb b/spec/lib/search_spec.rb
index c862a610452d5..fd51990dd3da0 100644
--- a/spec/lib/search_spec.rb
+++ b/spec/lib/search_spec.rb
@@ -1420,6 +1420,24 @@ def new_post(raw, topic = nil, created_at: nil)
         results = Search.execute("Example Site Title", search_context: post.topic)
         expect(results.posts.map(&:id)).to eq([post.id])
       end
+
+      describe "searching for author's real name" do
+        before { topic.user.update!(name: "Jane Searcher") }
+
+        it "does not find posts when the enable_names site setting is disabled" do
+          SiteSetting.enable_names = false
+
+          results = Search.execute("Jane Searcher", search_context: topic)
+          expect(results.posts).to be_empty
+        end
+
+        it "finds posts when the enable_names site setting is enabled" do
+          SiteSetting.enable_names = true
+
+          results = Search.execute("Jane Searcher", search_context: topic)
+          expect(results.posts.map(&:id)).to include(post.id)
+        end
+      end
     end
 
     context "when searching the OP" do

From b3ded56549596aa92add78ed0a719f60bfdde195 Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Wed, 25 Feb 2026 11:45:42 +0800
Subject: [PATCH 067/168] FIX: Enforce Guardian checks in
 `ComposerMessagesFinder` (#38005)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`ComposerMessagesController#index` accepts `topic_id` and `post_id`
parameters and passes them directly to `ComposerMessagesFinder`, which
loads the topic and post without verifying the current user can see
them. This means any authenticated user can probe arbitrary topic and
post IDs to trigger composer hints that should only appear for
accessible content. In particular,
`ComposerMessagesFinder#check_dont_feed_the_trolls` reveals whether a
post has active flags, leaking moderation state.
`ComposerMessagesFinder#check_dominating_topic` and
`ComposerMessagesFinder#check_get_a_room` can also create `UserHistory`
records referencing topics the user has no access to.

Add a `Guardian#can_see?` check in the `ComposerMessagesFinder`
constructor that nils out the topic when the user cannot see it. This is
safe because the class already handles a nil topic everywhere — it is
the normal state when no `topic_id` is provided. Add a second
`Guardian#can_see?` check in
`ComposerMessagesFinder#check_dont_feed_the_trolls` after the post is
loaded, returning early when the user cannot see the post.
---
 lib/composer_messages_finder.rb           |  4 ++-
 spec/lib/composer_messages_finder_spec.rb | 33 ++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index 39c37bd1ea35b..aa8967cb8cf7a 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -5,6 +5,7 @@ def initialize(user, details)
     @user = user
     @details = details
     @topic = Topic.find_by(id: details[:topic_id]) if details[:topic_id]
+    @topic = nil if @topic && !@user.guardian.can_see?(@topic)
   end
 
   def self.check_methods
@@ -54,7 +55,7 @@ def check_education_message
 
   # New users have a limited number of replies in a topic
   def check_new_user_many_replies
-    return unless replying? && @user.posted_too_much_in_topic?(@details[:topic_id])
+    return unless replying? && @user.posted_too_much_in_topic?(@topic&.id)
 
     {
       id: "too_many_replies",
@@ -156,6 +157,7 @@ def check_dont_feed_the_trolls
       end
 
     return if post.blank?
+    return if !@user.guardian.can_see?(post)
 
     flags = post.flags.active.group(:user_id).count
     flagged_by_replier = flags[@user.id].to_i > 0
diff --git a/spec/lib/composer_messages_finder_spec.rb b/spec/lib/composer_messages_finder_spec.rb
index a0f77e8d7feb4..b65e27f373901 100644
--- a/spec/lib/composer_messages_finder_spec.rb
+++ b/spec/lib/composer_messages_finder_spec.rb
@@ -4,6 +4,10 @@
 require "composer_messages_finder"
 
 RSpec.describe ComposerMessagesFinder do
+  fab!(:group)
+  fab!(:private_category) { Fabricate(:private_category, group: group) }
+  fab!(:private_topic) { Fabricate(:topic, category: private_category) }
+
   describe "delegates work" do
     let(:user) { Fabricate.build(:user) }
     let(:finder) { ComposerMessagesFinder.new(user, composer_action: "createTopic") }
@@ -39,7 +43,7 @@
     end
 
     context "with private message" do
-      fab!(:topic, :private_message_topic)
+      fab!(:topic) { Fabricate(:private_message_topic, user: user) }
 
       context "when starting a new private message" do
         let(:finder) do
@@ -188,6 +192,17 @@
         end
       end
     end
+
+    it "returns no message when the user cannot see the topic" do
+      Fabricate(:post, topic: private_topic, user: user)
+      Fabricate(:post, topic: private_topic, user: user)
+      Fabricate(:post, topic: private_topic)
+
+      finder =
+        ComposerMessagesFinder.new(user, composer_action: "reply", topic_id: private_topic.id)
+
+      expect(finder.check_dominating_topic).to be_blank
+    end
   end
 
   describe "#dont_feed_the_trolls" do
@@ -282,6 +297,22 @@
       finder = ComposerMessagesFinder.new(user, composer_action: "reply", topic_id: nil)
       expect(finder.check_dont_feed_the_trolls).to be_blank
     end
+
+    it "returns no message when the user cannot see the topic" do
+      private_post = Fabricate(:post, topic: private_topic, user: author)
+      _flag = Fabricate(:flag_post_action, post: private_post, user: other_user)
+      SiteSetting.dont_feed_the_trolls_threshold = 1
+
+      finder =
+        ComposerMessagesFinder.new(
+          user,
+          composer_action: "reply",
+          topic_id: private_topic.id,
+          post_id: private_post.id,
+        )
+
+      expect(finder.check_dont_feed_the_trolls).to be_blank
+    end
   end
 
   describe ".check_get_a_room" do

From 9ccafab2ddc998bd37305ae564dc75f989e7cdbc Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Wed, 25 Feb 2026 14:12:05 +1000
Subject: [PATCH 068/168] UX: Add back link to data explorer query name +
 description (#38049)

After feedback was received about this from multiple
sources we are reinstating this behavior and changing
the button text back to Edit. You can now click on the
query name + description again.

We are adding this pattern to our admin UI guidelines,
and a followup PR will add additional CSS classes etc.
here for consistency as needed.

<img width="1177" height="223" alt="image"
src="https://github.com/user-attachments/assets/1ac60818-bb9d-4558-bffd-0d0af522560b"
/>
---
 .../admin-plugins/show/explorer/index.gjs     | 29 +++++++++++++------
 .../assets/stylesheets/explorer.scss          | 10 +++++--
 .../spec/system/query_runner_spec.rb          |  2 +-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
index be9ffb29918a2..0ff27c851894e 100644
--- a/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
+++ b/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
@@ -1,4 +1,4 @@
-import { array, fn } from "@ember/helper";
+import { array, concat, fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { LinkTo } from "@ember/routing";
 import AdminFilterControls from "discourse/admin/components/admin-filter-controls";
@@ -9,6 +9,7 @@ import PickFilesButton from "discourse/components/pick-files-button";
 import TableHeaderToggle from "discourse/components/table-header-toggle";
 import ageWithTooltip from "discourse/helpers/age-with-tooltip";
 import icon from "discourse/helpers/d-icon";
+import getURL from "discourse/lib/get-url";
 import { not } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
 import ShareReport from "discourse/plugins/discourse-data-explorer/discourse/components/share-report";
@@ -150,13 +151,23 @@ export default <template>
                   {{#each filteredQueries as |query|}}
                     <tr class="d-admin-row__content query-row">
                       <td class="d-admin-row__overview">
-                        <strong class="query-name">{{query.name}}</strong>
-                        {{#if query.is_default}}
-                          <span class="query-badge">{{i18n
-                              "explorer.default_query"
-                            }}</span>
-                        {{/if}}
-                        <div class="query-desc">{{query.description}}</div>
+                        <a
+                          class="query-link"
+                          href={{getURL
+                            (concat
+                              "/admin/plugins/discourse-data-explorer/queries/"
+                              query.id
+                            )
+                          }}
+                        >
+                          <strong class="query-name">{{query.name}}</strong>
+                          {{#if query.is_default}}
+                            <span class="query-badge">{{i18n
+                                "explorer.default_query"
+                              }}</span>
+                          {{/if}}
+                          <div class="query-desc">{{query.description}}</div>
+                        </a>
                       </td>
                       <td class="d-admin-row__detail query-created-by">
                         <div class="d-admin-row__mobile-label">
@@ -207,7 +218,7 @@ export default <template>
                             @model={{query.id}}
                             class="btn btn-default btn-small"
                           >
-                            {{i18n "explorer.view"}}
+                            {{i18n "edit"}}
                           </LinkTo>
                         </div>
 
diff --git a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
index 4304ef79609fa..6320fd4916239 100644
--- a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
+++ b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
@@ -437,8 +437,10 @@ table.group-reports {
   }
 
   .query-row {
-    a {
-      width: 100%;
+    a.query-link {
+      @include viewport.until(md) {
+        max-width: 75ch;
+      }
     }
 
     .query-name {
@@ -460,6 +462,10 @@ table.group-reports {
     .query-desc {
       color: var(--primary-high);
       max-width: 20vw;
+
+      @include viewport.until(md) {
+        max-width: 90vw;
+      }
     }
 
     .query-created-by {
diff --git a/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb b/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
index 39ee055c37b92..b3d4ef56f9b34 100644
--- a/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
+++ b/plugins/discourse-data-explorer/spec/system/query_runner_spec.rb
@@ -26,7 +26,7 @@
       expect(page).to have_css(".query-results .result-header")
 
       find(".query-edit .previous").click
-      find("a[href='/admin/plugins/discourse-data-explorer/queries/#{query_b.id}']").click
+      first("a[href='/admin/plugins/discourse-data-explorer/queries/#{query_b.id}']").click
       expect(page).to have_no_css(".query-results .result-header")
     end
   end

From 00c4144de100be8c42a79abde554e16c5b1c56be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 25 Feb 2026 07:36:04 +0100
Subject: [PATCH 069/168] FIX: use i18n for AI tool parameter checkboxes
 (#38045)

The "Required" and "Enum" labels in the AI tool parameter configuration
were hardcoded English strings instead of using the existing translation
keys.

Replace them with `i18n` calls to `parameter_required` and
`parameter_enum` which already exist in the locale files.

https://meta.discourse.org/t/396939
---
 .../discourse/components/ai-tool-editor-form.gjs          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjs
index c0e1b7091aa97..09125947fe529 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-tool-editor-form.gjs
@@ -328,7 +328,11 @@ export default class AiToolEditorForm extends Component {
 
           <form.Row as |row|>
             <row.Col>
-              <collection.Field @name="required" @title="Required" as |field|>
+              <collection.Field
+                @name="required"
+                @title={{i18n "discourse_ai.ai_tool.parameter_required"}}
+                as |field|
+              >
                 <field.Checkbox />
               </collection.Field>
             </row.Col>
@@ -336,7 +340,7 @@ export default class AiToolEditorForm extends Component {
             <row.Col>
               <collection.Field
                 @name="isEnum"
-                @title="Enum"
+                @title={{i18n "discourse_ai.ai_tool.parameter_enum"}}
                 @onSet={{this.toggleIsEnum}}
                 as |field|
               >

From 80791e0980936380fee24ce26c4f7cde9fb55262 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Wed, 25 Feb 2026 13:11:09 +0400
Subject: [PATCH 070/168] DEV: update solved initializers to avoid using
 modifyClass pattern (#37918)

Updates the old `modifyClass` pattern to use
`registerBehaviorTransformer` instead. This change also adds
`addTrackedTopicProperties` to the plugin api, similar to how we do for
posts allowing us to track properties.
---
 frontend/discourse/app/controllers/topic.js   |  45 ++++---
 frontend/discourse/app/lib/plugin-api.gjs     |  19 ++-
 .../discourse/app/lib/transformer/registry.js |   1 +
 frontend/discourse/app/models/topic.js        |  23 +++-
 .../discourse/tests/helpers/qunit-helpers.js  |   2 +
 .../tests/unit/controllers/topic-test.js      |  41 +++++++
 .../discourse/tests/unit/models/topic-test.js |  40 ++++++
 .../solved-accept-answer-button.gjs           |   3 +-
 .../solved-unaccept-answer-button.gjs         |   3 +-
 .../initializers/extend-for-solved-button.gjs |  39 +-----
 .../solved-category-change-confirmation.gjs   | 116 ++++++++----------
 .../discourse/lib/set-accepted-solution.js    |  25 ++++
 12 files changed, 239 insertions(+), 118 deletions(-)
 create mode 100644 plugins/discourse-solved/assets/javascripts/discourse/lib/set-accepted-solution.js

diff --git a/frontend/discourse/app/controllers/topic.js b/frontend/discourse/app/controllers/topic.js
index 844dc0012d45c..cc23eb85b5469 100644
--- a/frontend/discourse/app/controllers/topic.js
+++ b/frontend/discourse/app/controllers/topic.js
@@ -37,6 +37,7 @@ import QuoteState from "discourse/lib/quote-state";
 import { extractLinkMeta } from "discourse/lib/render-topic-featured-link";
 import { fancyTitle } from "discourse/lib/topic-fancy-title";
 import { trackedArray } from "discourse/lib/tracked-tools";
+import { applyBehaviorTransformer } from "discourse/lib/transformer";
 import DiscourseURL, { userPath } from "discourse/lib/url";
 import { escapeExpression } from "discourse/lib/utilities";
 import Bookmark, { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";
@@ -1252,25 +1253,37 @@ export default class TopicController extends Controller {
     if (!this.editingTopic) {
       return;
     }
-    const props = this.get("buffered.buffer");
-    const hasCategoryOrTagChanges =
-      props.category_id !== undefined || props.tags !== undefined;
 
-    try {
-      if (this.editingTopicLocalization) {
-        await this._saveTopicLocalization();
-      }
+    return applyBehaviorTransformer(
+      "topic-controller:finished-editing",
+      async ({ context }) => {
+        const props = context.buffered;
+        const hasCategoryOrTagChanges =
+          props.category_id !== undefined || props.tags !== undefined;
 
-      if (hasCategoryOrTagChanges || !this.editingTopicLocalization) {
-        await Topic.update(this.model, props, { fastEdit: true });
-      }
+        try {
+          if (context.editingTopicLocalization) {
+            await this._saveTopicLocalization();
+          }
 
-      this.buffered.discardChanges();
-      this._resetTranslationState();
-      this.set("editingTopic", false);
-    } catch (error) {
-      popupAjaxError(error);
-    }
+          if (hasCategoryOrTagChanges || !context.editingTopicLocalization) {
+            await Topic.update(context.model, props, { fastEdit: true });
+          }
+
+          this.buffered.discardChanges();
+          this._resetTranslationState();
+          this.set("editingTopic", false);
+        } catch (error) {
+          popupAjaxError(error);
+        }
+      },
+      {
+        editingTopic: this.editingTopic,
+        editingTopicLocalization: this.editingTopicLocalization,
+        buffered: this.get("buffered.buffer"),
+        model: this.model,
+      }
+    );
   }
 
   async _saveTopicLocalization() {
diff --git a/frontend/discourse/app/lib/plugin-api.gjs b/frontend/discourse/app/lib/plugin-api.gjs
index 9e4506cc78ab9..989823c4297b5 100644
--- a/frontend/discourse/app/lib/plugin-api.gjs
+++ b/frontend/discourse/app/lib/plugin-api.gjs
@@ -117,7 +117,10 @@ import Composer, {
 } from "discourse/models/composer";
 import { addNavItem } from "discourse/models/nav-item";
 import { _addTrackedPostProperty } from "discourse/models/post";
-import { registerCustomLastUnreadUrlCallback } from "discourse/models/topic";
+import {
+  _addTrackedTopicProperty,
+  registerCustomLastUnreadUrlCallback,
+} from "discourse/models/topic";
 import {
   addSaveableUserField,
   addSaveableUserOptionField,
@@ -736,6 +739,20 @@ class _PluginApi {
     names.forEach((name) => _addTrackedPostProperty(name));
   }
 
+  /**
+   * Adds tracked properties to the topic model.
+   *
+   * This method is used to mark properties as tracked for topic updates.
+   *
+   * You'll need to do this if you've added properties to a Topic and need them to be
+   * automatically updated in the UI when there are changes in the model.
+   *
+   * @param {...string} names - The names of the properties to be tracked.
+   */
+  addTrackedTopicProperties(...names) {
+    names.forEach((name) => _addTrackedTopicProperty(name));
+  }
+
   /**
    * Decommissioned API
    **/
diff --git a/frontend/discourse/app/lib/transformer/registry.js b/frontend/discourse/app/lib/transformer/registry.js
index a80f8d11efd51..c47ae2f880e7f 100644
--- a/frontend/discourse/app/lib/transformer/registry.js
+++ b/frontend/discourse/app/lib/transformer/registry.js
@@ -6,6 +6,7 @@ export const BEHAVIOR_TRANSFORMERS = Object.freeze([
   "full-page-search-load-more",
   "post-menu-toggle-like-action",
   "post-stream-error-loading",
+  "topic-controller:finished-editing",
   "topic-list-item-click",
 ]);
 
diff --git a/frontend/discourse/app/models/topic.js b/frontend/discourse/app/models/topic.js
index 3cd7bdfc16289..44feb61b39bb4 100644
--- a/frontend/discourse/app/models/topic.js
+++ b/frontend/discourse/app/models/topic.js
@@ -19,7 +19,10 @@ import { deepMerge } from "discourse/lib/object";
 import PreloadStore from "discourse/lib/preload-store";
 import { emojiUnescape } from "discourse/lib/text";
 import { fancyTitle } from "discourse/lib/topic-fancy-title";
-import { trackedArray } from "discourse/lib/tracked-tools";
+import {
+  defineTrackedProperty,
+  trackedArray,
+} from "discourse/lib/tracked-tools";
 import DiscourseURL, { userPath } from "discourse/lib/url";
 import ActionSummary from "discourse/models/action-summary";
 import Bookmark from "discourse/models/bookmark";
@@ -30,6 +33,16 @@ import { flushMap } from "discourse/services/store";
 import { i18n } from "discourse-i18n";
 import Category from "./category";
 
+const pluginTrackedProperties = new Set();
+
+export function _addTrackedTopicProperty(propertyKey) {
+  pluginTrackedProperties.add(propertyKey);
+}
+
+export function clearAddedTrackedTopicProperties() {
+  pluginTrackedProperties.clear();
+}
+
 export function loadTopicView(topic, args) {
   const data = deepMerge({}, args);
   const url = `/t/${topic.id}`;
@@ -347,6 +360,14 @@ export default class Topic extends RestModel {
     topic: this,
   });
 
+  constructor() {
+    super(...arguments);
+
+    pluginTrackedProperties.forEach((propertyKey) => {
+      defineTrackedProperty(this, propertyKey);
+    });
+  }
+
   @discourseComputed("last_read_post_number", "highest_post_number")
   visited(lastReadPostNumber, highestPostNumber) {
     // >= to handle case where there are deleted posts at the end of the topic
diff --git a/frontend/discourse/tests/helpers/qunit-helpers.js b/frontend/discourse/tests/helpers/qunit-helpers.js
index b9c8a595c123b..ec0c473406799 100644
--- a/frontend/discourse/tests/helpers/qunit-helpers.js
+++ b/frontend/discourse/tests/helpers/qunit-helpers.js
@@ -90,6 +90,7 @@ import { clearNavItems } from "discourse/models/nav-item";
 import { clearAddedTrackedPostProperties } from "discourse/models/post";
 import { resetLastEditNotificationClick } from "discourse/models/post-stream";
 import Site from "discourse/models/site";
+import { clearAddedTrackedTopicProperties } from "discourse/models/topic";
 import User from "discourse/models/user";
 import { clearResolverOptions } from "discourse/resolver";
 import { _clearSnapshots } from "discourse/select-kit/components/composer-actions";
@@ -268,6 +269,7 @@ export function testCleanup(container, app) {
   clearRegisteredTabs();
   clearRegisteredEditCategoryTabs();
   clearAddedTrackedPostProperties();
+  clearAddedTrackedTopicProperties();
   resetGroupPostSmallActionCodes();
   enableClearA11yAnnouncementsInTests();
   resetHtmlDecorators();
diff --git a/frontend/discourse/tests/unit/controllers/topic-test.js b/frontend/discourse/tests/unit/controllers/topic-test.js
index 145752ffad7ab..dec99c855b2ac 100644
--- a/frontend/discourse/tests/unit/controllers/topic-test.js
+++ b/frontend/discourse/tests/unit/controllers/topic-test.js
@@ -6,6 +6,7 @@ import { module, test } from "qunit";
 import sinon from "sinon";
 import { removeValueFromArray } from "discourse/lib/array-tools";
 import { forceMobile } from "discourse/lib/mobile";
+import { withPluginApi } from "discourse/lib/plugin-api";
 import { Placeholder } from "discourse/models/post-stream";
 import pretender, { response } from "discourse/tests/helpers/create-pretender";
 
@@ -621,4 +622,44 @@ module("Unit | Controller | topic", function (hooks) {
 
     assert.true(destroyed, "post was destroyed");
   });
+
+  test("topic-controller:finished-editing behavior transformer", async function (assert) {
+    const controller = getOwner(this).lookup("controller:topic");
+    const model = this.store.createRecord("topic", {
+      id: 123,
+      title: "Test",
+    });
+    controller.setProperties({ model });
+    controller.set("editingTopic", true);
+
+    sinon.stub(model.constructor, "update").resolves();
+    sinon.stub(controller, "send");
+
+    withPluginApi((api) => {
+      api.registerBehaviorTransformer(
+        "topic-controller:finished-editing",
+        ({ next }) => {
+          if (controller.blockWithTransformer) {
+            return;
+          }
+          next();
+        }
+      );
+    });
+
+    controller.blockWithTransformer = true;
+    await controller.finishedEditingTopic();
+
+    assert.true(
+      controller.editingTopic,
+      "transformer blocked finishedEditingTopic"
+    );
+
+    controller.blockWithTransformer = false;
+    await controller.finishedEditingTopic();
+    assert.false(
+      controller.editingTopic,
+      "transformer allowed finishedEditingTopic"
+    );
+  });
 });
diff --git a/frontend/discourse/tests/unit/models/topic-test.js b/frontend/discourse/tests/unit/models/topic-test.js
index d13bd425cfc04..dc7cb58fd48d3 100644
--- a/frontend/discourse/tests/unit/models/topic-test.js
+++ b/frontend/discourse/tests/unit/models/topic-test.js
@@ -2,6 +2,7 @@ import { getOwner } from "@ember/owner";
 import { setupTest } from "ember-qunit";
 import { IMAGE_VERSION as v } from "pretty-text/emoji/version";
 import { module, test } from "qunit";
+import { withPluginApi } from "discourse/lib/plugin-api";
 import Category from "discourse/models/category";
 import Topic from "discourse/models/topic";
 import TopicDetails from "discourse/models/topic-details";
@@ -254,4 +255,43 @@ module("Unit | Model | topic", function (hooks) {
     assert.false(invisibleTopic.visible);
     assert.true(invisibleTopic.invisible);
   });
+
+  test("addTrackedTopicProperties", function (assert) {
+    withPluginApi((api) => {
+      api.addTrackedTopicProperties("plugin_property", "other_plugin_property");
+    });
+
+    const topic = this.store.createRecord("topic", { id: 1234 });
+
+    topic.plugin_property = "test value";
+    topic.other_plugin_property = "other value";
+
+    assert.strictEqual(
+      topic.plugin_property,
+      "test value",
+      "plugin tracked property can be set and read via direct assignment"
+    );
+    assert.strictEqual(
+      topic.other_plugin_property,
+      "other value",
+      "other plugin tracked property can be set and read via direct assignment"
+    );
+
+    topic.updateFromJson({
+      details: {},
+      plugin_property: "updated value",
+      other_plugin_property: "other updated value",
+    });
+
+    assert.strictEqual(
+      topic.plugin_property,
+      "updated value",
+      "plugin tracked property is updated via updateFromJson"
+    );
+    assert.strictEqual(
+      topic.other_plugin_property,
+      "other updated value",
+      "other plugin tracked property is updated via updateFromJson"
+    );
+  });
 });
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjs
index 782cd1006dc89..50fd5bf2d37fe 100644
--- a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjs
+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjs
@@ -5,6 +5,7 @@ import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
+import setAcceptedSolution from "../lib/set-accepted-solution";
 
 export default class SolvedAcceptAnswerButton extends Component {
   static hidden(args) {
@@ -62,7 +63,7 @@ async function acceptPost(post) {
       data: { id: post.id },
     });
 
-    topic.setAcceptedSolution(acceptedAnswer);
+    setAcceptedSolution(topic, acceptedAnswer);
   } catch (e) {
     popupAjaxError(e);
   }
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs
index 219bb5af48d1f..44464dacf7c22 100644
--- a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs
+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs
@@ -11,6 +11,7 @@ import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { and } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
+import setAcceptedSolution from "../lib/set-accepted-solution";
 
 export default class SolvedUnacceptAnswerButton extends Component {
   @service appEvents;
@@ -118,7 +119,7 @@ async function unacceptPost(post) {
       data: { id: post.id },
     });
 
-    topic.setAcceptedSolution(undefined);
+    setAcceptedSolution(topic, undefined);
   } catch (e) {
     popupAjaxError(e);
   }
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/initializers/extend-for-solved-button.gjs b/plugins/discourse-solved/assets/javascripts/discourse/initializers/extend-for-solved-button.gjs
index be566b168ed7b..146bdadd70326 100644
--- a/plugins/discourse-solved/assets/javascripts/discourse/initializers/extend-for-solved-button.gjs
+++ b/plugins/discourse-solved/assets/javascripts/discourse/initializers/extend-for-solved-button.gjs
@@ -1,10 +1,10 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import { i18n } from "discourse-i18n";
 import SolvedAcceptAnswerButton from "../components/solved-accept-answer-button";
 import SolvedAcceptedAnswer from "../components/solved-accepted-answer";
 import SolvedUnacceptAnswerButton from "../components/solved-unaccept-answer-button";
+import setAcceptedSolution from "../lib/set-accepted-solution";
 
 function initializeWithApi(api) {
   customizePost(api);
@@ -15,40 +15,7 @@ function initializeWithApi(api) {
     api.addDiscoveryQueryParam("solved", { replace: true, refreshModel: true });
   }
 
-  api.modifyClass(
-    "model:topic",
-    (Superclass) =>
-      class extends Superclass {
-        @tracked accepted_answer;
-        @tracked has_accepted_answer;
-
-        setAcceptedSolution(acceptedAnswer) {
-          this.postStream?.posts?.forEach((post) => {
-            if (!acceptedAnswer) {
-              post.setProperties({
-                accepted_answer: false,
-                topic_accepted_answer: false,
-              });
-            } else if (post.post_number > 1) {
-              post.setProperties(
-                acceptedAnswer.post_number === post.post_number
-                  ? {
-                      accepted_answer: true,
-                      topic_accepted_answer: true,
-                    }
-                  : {
-                      accepted_answer: false,
-                      topic_accepted_answer: true,
-                    }
-              );
-            }
-          });
-
-          this.accepted_answer = acceptedAnswer;
-          this.has_accepted_answer = !!acceptedAnswer;
-        }
-      }
-  );
+  api.addTrackedTopicProperties("accepted_answer", "has_accepted_answer");
 }
 
 function customizePost(api) {
@@ -122,7 +89,7 @@ function handleMessages(api) {
     const topic = controller.model;
 
     if (topic) {
-      topic.setAcceptedSolution(message.accepted_answer);
+      setAcceptedSolution(topic, message.accepted_answer);
     }
   };
 
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-change-confirmation.gjs b/plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-change-confirmation.gjs
index c17e1284ac70a..062e633fbbd9e 100644
--- a/plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-change-confirmation.gjs
+++ b/plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-change-confirmation.gjs
@@ -1,82 +1,74 @@
-import { action } from "@ember/object";
+import { helperContext } from "discourse/lib/helpers";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import Category from "discourse/models/category";
 import SolvedRemovalConfirmationModal from "../components/modal/solved-removal-confirmation";
 
 const STORAGE_KEY = "discourse-solved-hide-category-change-confirmation";
 
-export default {
-  name: "solved-category-change-confirmation",
-
-  initialize() {
-    withPluginApi((api) => {
-      api.modifyClass(
-        "controller:topic",
-        (Superclass) =>
-          class extends Superclass {
-            _solvedEnabled(categoryId, tags) {
-              if (
-                this.siteSettings.allow_solved_on_all_topics ||
-                Category.findById(categoryId)?.custom_fields
-                  ?.enable_accepted_answers === "true"
-              ) {
-                return true;
-              }
-
-              const solvedTags = this.siteSettings.enable_solved_tags
-                .split("|")
-                .filter(Boolean);
-
-              return (tags || []).some((t) => solvedTags.includes(t.name));
-            }
-
-            @action
-            async finishedEditingTopic() {
-              if (!this.editingTopic) {
-                return;
-              }
+function solvedEnabled(categoryId, tags) {
+  const siteSettings = helperContext().siteSettings;
 
-              const props = this.get("buffered.buffer");
-              let solvedStateChanged = false;
+  if (
+    siteSettings.allow_solved_on_all_topics ||
+    Category.findById(categoryId)?.custom_fields?.enable_accepted_answers ===
+      "true"
+  ) {
+    return true;
+  }
 
-              if ("category_id" in props || "tags" in props) {
-                const oldCategoryId = this.model.category_id;
-                const newCategoryId = props.category_id ?? oldCategoryId;
-                const oldTags = this.model.tags;
-                const newTags = props.tags ?? oldTags;
+  const solvedTags = siteSettings.enable_solved_tags.split("|").filter(Boolean);
 
-                const oldAllowed = this._solvedEnabled(oldCategoryId, oldTags);
-                const newAllowed = this._solvedEnabled(newCategoryId, newTags);
+  return (tags || []).some((t) => solvedTags.includes(t.name));
+}
 
-                solvedStateChanged = oldAllowed !== newAllowed;
-
-                if (this.model.accepted_answer && oldAllowed && !newAllowed) {
-                  const showConfirmation =
-                    localStorage.getItem(STORAGE_KEY) !== "true";
-
-                  if (showConfirmation) {
-                    const result = await this.modal.show(
-                      SolvedRemovalConfirmationModal
-                    );
+export default {
+  name: "solved-category-change-confirmation",
 
-                    if (!result?.confirmed) {
-                      return;
-                    }
+  initialize() {
+    withPluginApi((api) => {
+      api.registerBehaviorTransformer(
+        "topic-controller:finished-editing",
+        async ({ next, context }) => {
+          const modal = api.container.lookup("service:modal");
+          const props = context.buffered;
+          const model = context.model;
+          let solvedStateChanged = false;
+
+          if ("category_id" in props || "tags" in props) {
+            const oldCategoryId = model.category_id;
+            const newCategoryId = props.category_id ?? oldCategoryId;
+            const oldTags = model.tags;
+            const newTags = props.tags ?? oldTags;
+
+            const oldAllowed = solvedEnabled(oldCategoryId, oldTags);
+            const newAllowed = solvedEnabled(newCategoryId, newTags);
+
+            solvedStateChanged = oldAllowed !== newAllowed;
+
+            if (model.accepted_answer && oldAllowed && !newAllowed) {
+              const showConfirmation =
+                localStorage.getItem(STORAGE_KEY) !== "true";
+
+              if (showConfirmation) {
+                const result = await modal.show(SolvedRemovalConfirmationModal);
+
+                if (!result?.confirmed) {
+                  return;
+                }
 
-                    if (result.dontShowAgain) {
-                      localStorage.setItem(STORAGE_KEY, "true");
-                    }
-                  }
+                if (result.dontShowAgain) {
+                  localStorage.setItem(STORAGE_KEY, "true");
                 }
               }
+            }
+          }
 
-              await super.finishedEditingTopic();
+          await next();
 
-              if (solvedStateChanged) {
-                this.model.postStream.refresh({ forceLoad: true });
-              }
-            }
+          if (solvedStateChanged) {
+            model.postStream.refresh({ forceLoad: true });
           }
+        }
       );
     });
   },
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/lib/set-accepted-solution.js b/plugins/discourse-solved/assets/javascripts/discourse/lib/set-accepted-solution.js
new file mode 100644
index 0000000000000..6c29998244b89
--- /dev/null
+++ b/plugins/discourse-solved/assets/javascripts/discourse/lib/set-accepted-solution.js
@@ -0,0 +1,25 @@
+export default function setAcceptedSolution(topic, acceptedAnswer) {
+  topic.postStream?.posts?.forEach((post) => {
+    if (!acceptedAnswer) {
+      post.setProperties({
+        accepted_answer: false,
+        topic_accepted_answer: false,
+      });
+    } else if (post.post_number > 1) {
+      post.setProperties(
+        acceptedAnswer.post_number === post.post_number
+          ? {
+              accepted_answer: true,
+              topic_accepted_answer: true,
+            }
+          : {
+              accepted_answer: false,
+              topic_accepted_answer: true,
+            }
+      );
+    }
+  });
+
+  topic.accepted_answer = acceptedAnswer;
+  topic.has_accepted_answer = !!acceptedAnswer;
+}

From 2a52a1bda59b4169e9f78ced41f94005e553b17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 25 Feb 2026 10:37:27 +0100
Subject: [PATCH 071/168] FIX: send RSS polling API credentials as headers
 instead of query params (#38044)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, when polling an RSS feed from a login-required Discourse
site, the `api_key` and `api_username` query parameters were passed
through in the URL. While #37840 fixed the HEAD→GET issue, API key
authentication via query parameters still fails because
`api_parameter_allowed?` rejects the request — the route's
`path_parameters` aren't populated when `current_user` is evaluated in
this context, causing the RouteMatcher to fail the action check.

This extracts API credentials from the feed URL query string and sends
them as `Api-Key` / `Api-Username` headers instead. Header-based API
authentication doesn't go through `api_parameter_allowed?` and works
reliably regardless of route matching state.

Also adds warn-level logging throughout the feed fetching pipeline: HTTP
failures now log the status code, empty/unparseable responses are
surfaced, and RSS parse errors include the exception message. Previously
all of these failed silently, making diagnosis require console access.
---
 .../jobs/discourse_rss_polling/poll_feed.rb   | 53 ++++++++++++++++---
 .../spec/jobs/poll_feed_spec.rb               | 12 +++--
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/plugins/discourse-rss-polling/app/jobs/jobs/discourse_rss_polling/poll_feed.rb b/plugins/discourse-rss-polling/app/jobs/jobs/discourse_rss_polling/poll_feed.rb
index 1a0eed654b3d8..9e84e4325a5b7 100644
--- a/plugins/discourse-rss-polling/app/jobs/jobs/discourse_rss_polling/poll_feed.rb
+++ b/plugins/discourse-rss-polling/app/jobs/jobs/discourse_rss_polling/poll_feed.rb
@@ -122,28 +122,65 @@ def set_image_as_thumbnail(post, image_link)
 
       def topics_polled_from_feed
         raw_feed = fetch_raw_feed
-        return [] if raw_feed.blank?
+
+        if raw_feed.blank?
+          Rails.logger.warn("RSS Polling: Failed to fetch feed from #{feed_url}")
+          return []
+        end
 
         parsed_feed = RSS::Parser.parse(raw_feed, false)
-        return [] if parsed_feed.blank?
+
+        if parsed_feed.blank?
+          Rails.logger.warn("RSS Polling: Unable to parse feed from #{feed_url}")
+          return []
+        end
 
         parsed_feed.items.map { |item| ::DiscourseRssPolling::FeedItem.new(item) }
-      rescue RSS::NotWellFormedError, RSS::InvalidRSSError
+      rescue RSS::NotWellFormedError, RSS::InvalidRSSError => e
+        Discourse.warn_exception(e, message: "RSS Polling: Invalid RSS from #{feed_url}")
         []
       end
 
       def fetch_raw_feed
+        url, headers = extract_api_credentials(@feed_url)
         body = +""
 
-        FinalDestination
-          .new(@feed_url)
-          .get do |response, chunk, uri|
-            throw :done if uri.blank? || !response.is_a?(Net::HTTPSuccess)
-            body << chunk
+        fd = FinalDestination.new(url, headers:)
+        response_status = nil
+
+        fd.get do |response, chunk, uri|
+          if uri.blank? || !response.is_a?(Net::HTTPSuccess)
+            response_status = response&.code
+            throw :done
           end
+          body << chunk
+        end
+
+        if body.blank? && response_status.present?
+          Rails.logger.warn(
+            "RSS Polling: HTTP #{response_status} when fetching #{feed_url} (status: #{fd.status})",
+          )
+        end
 
         body.presence
       end
+
+      def extract_api_credentials(url)
+        uri = URI.parse(url)
+        return url, {} if uri.query.blank?
+
+        params = CGI.parse(uri.query)
+        api_key = params.delete("api_key")&.first
+        api_username = params.delete("api_username")&.first
+
+        return url, {} if api_key.blank?
+
+        headers = { "Api-Key" => api_key }
+        headers["Api-Username"] = api_username if api_username.present?
+
+        uri.query = params.empty? ? nil : URI.encode_www_form(params)
+        [uri.to_s, headers]
+      end
     end
   end
 end
diff --git a/plugins/discourse-rss-polling/spec/jobs/poll_feed_spec.rb b/plugins/discourse-rss-polling/spec/jobs/poll_feed_spec.rb
index 0693e527c247a..89fb79b3a7bc2 100644
--- a/plugins/discourse-rss-polling/spec/jobs/poll_feed_spec.rb
+++ b/plugins/discourse-rss-polling/spec/jobs/poll_feed_spec.rb
@@ -144,15 +144,17 @@
       }.not_to raise_error
     end
 
-    it "works with authentication in query parameters" do
+    it "sends API credentials as headers instead of query parameters" do
       authenticated_url = "#{feed_url}?api_key=test123&api_username=testuser"
 
       Discourse.redis.del("rss-polling-feed-polled:#{Digest::SHA1.hexdigest(authenticated_url)}")
 
-      stub_request(:get, authenticated_url).to_return(
-        status: 200,
-        body: file_from_fixtures("feed.rss", "feed"),
-      )
+      stub_request(:get, feed_url).with(
+        headers: {
+          "Api-Key" => "test123",
+          "Api-Username" => "testuser",
+        },
+      ).to_return(status: 200, body: file_from_fixtures("feed.rss", "feed"))
 
       expect {
         job.execute(feed_url: authenticated_url, author_username: author.username)

From 4e871f46da610ae4cc27735f2a063417d13b0742 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 25 Feb 2026 10:58:16 +0100
Subject: [PATCH 072/168] FIX: Add missing checks to InviteesController and
 convert to services (#38023)

The `update` and `destroy` actions in `InviteesController` were missing
post visibility and event open-state (closed/expired) checks that the
`create` action already enforced. This allowed users to mutate
attendance on events they couldn't see or that were no longer accepting
changes.

This fix has been made as part of refactoring the three actions into
services (`CreateInvitee`, `UpdateInvitee`, `DestroyInvitee`) with
declarative policy steps for consistent authorization.
---
 .../invitees_controller.rb                    |  96 ++--
 .../app/models/discourse_post_event/event.rb  |   2 +-
 .../discourse_post_event/event_serializer.rb  |   2 +-
 .../discourse_post_event/create_invitee.rb    |  56 +++
 .../discourse_post_event/destroy_invitee.rb   |  54 +++
 .../discourse_post_event/update_invitee.rb    |  56 +++
 .../spec/fabricators/event_fabricator.rb      |  12 +
 .../spec/requests/invitees_controller_spec.rb | 435 +++++++-----------
 .../create_invitee_spec.rb                    | 129 ++++++
 .../destroy_invitee_spec.rb                   | 128 ++++++
 .../update_invitee_spec.rb                    | 148 ++++++
 11 files changed, 810 insertions(+), 308 deletions(-)
 create mode 100644 plugins/discourse-calendar/app/services/discourse_post_event/create_invitee.rb
 create mode 100644 plugins/discourse-calendar/app/services/discourse_post_event/destroy_invitee.rb
 create mode 100644 plugins/discourse-calendar/app/services/discourse_post_event/update_invitee.rb
 create mode 100644 plugins/discourse-calendar/spec/services/discourse_post_event/create_invitee_spec.rb
 create mode 100644 plugins/discourse-calendar/spec/services/discourse_post_event/destroy_invitee_spec.rb
 create mode 100644 plugins/discourse-calendar/spec/services/discourse_post_event/update_invitee_spec.rb

diff --git a/plugins/discourse-calendar/app/controllers/discourse_post_event/invitees_controller.rb b/plugins/discourse-calendar/app/controllers/discourse_post_event/invitees_controller.rb
index fe689172c55c0..512ccf748e995 100644
--- a/plugins/discourse-calendar/app/controllers/discourse_post_event/invitees_controller.rb
+++ b/plugins/discourse-calendar/app/controllers/discourse_post_event/invitees_controller.rb
@@ -57,71 +57,73 @@ def index
     end
 
     def update
-      invitee = Invitee.find_by!(id: params[:invitee_id], post_id: params[:event_id])
-      guardian.ensure_can_act_on_invitee!(invitee)
-      begin
-        invitee.update_attendance!(invitee_params[:status])
-        render json: InviteeSerializer.new(invitee)
-      rescue Discourse::InvalidParameters => e
-        if e.message == "max_attendees"
+      DiscoursePostEvent::UpdateInvitee.call(
+        params: {
+          status: params.dig(:invitee, :status),
+          event_id: params[:event_id],
+          invitee_id: params[:invitee_id],
+        },
+        guardian:,
+      ) do
+        on_success { |invitee:| render json: InviteeSerializer.new(invitee) }
+        on_failed_policy(:can_act_on_invitee) { raise Discourse::InvalidAccess }
+        on_failed_policy(:can_see_event) { raise Discourse::InvalidAccess }
+        on_failed_policy(:can_update_attendance) { raise Discourse::InvalidAccess }
+        on_failed_policy(:has_capacity) do
           render_json_error(
             I18n.t("discourse_post_event.errors.models.event.max_attendees_reached"),
             422,
           )
-        else
-          raise
         end
+        on_model_not_found(:invitee) { raise Discourse::NotFound }
+        on_model_not_found(:event) { raise Discourse::NotFound }
+        on_failed_contract { raise Discourse::InvalidParameters }
+        on_failure { render(json: failed_json, status: :unprocessable_entity) }
       end
     end
 
     def create
-      event = Event.find(params[:event_id])
-      guardian.ensure_can_see!(event.post)
-
-      invitee_params = invitee_params(event)
-
-      user = current_user
-      if user_id = invitee_params[:user_id]
-        user = User.find(user_id.to_i)
-      end
-
-      raise Discourse::InvalidAccess if !event.can_user_update_attendance(user)
-
-      if current_user.id != user.id
-        raise Discourse::InvalidAccess if !guardian.can_act_on_discourse_post_event?(event)
-      end
-
-      begin
-        invitee = Invitee.create_attendance!(user.id, params[:event_id], invitee_params[:status])
-        render json: InviteeSerializer.new(invitee)
-      rescue Discourse::InvalidParameters => e
-        if e.message == "max_attendees"
+      DiscoursePostEvent::CreateInvitee.call(
+        params: {
+          status: params[:invitee][:status],
+          user_id: params[:invitee][:user_id],
+          event_id: params[:event_id],
+        },
+        guardian:,
+      ) do
+        on_success { |invitee:| render json: InviteeSerializer.new(invitee) }
+        on_failed_policy(:can_see_event) { raise Discourse::InvalidAccess }
+        on_failed_policy(:can_update_attendance) { raise Discourse::InvalidAccess }
+        on_failed_policy(:can_invite_user) { raise Discourse::InvalidAccess }
+        on_failed_policy(:has_capacity) do
           render_json_error(
             I18n.t("discourse_post_event.errors.models.event.max_attendees_reached"),
             422,
           )
-        else
-          raise
         end
+        on_model_not_found(:event) { raise Discourse::NotFound }
+        on_model_not_found(:user) { raise Discourse::NotFound }
+        on_failed_contract { raise Discourse::InvalidParameters }
+        on_failure { render(json: failed_json, status: :unprocessable_entity) }
       end
     end
 
     def destroy
-      event = Event.find(params[:post_id])
-      invitee = event.invitees.find(params[:id])
-      guardian.ensure_can_act_on_invitee!(invitee)
-      invitee.destroy!
-      event.publish_update!
-      render json: success_json
-    end
-
-    private
-
-    def invitee_params(event = nil)
-      if event && guardian.can_act_on_discourse_post_event?(event)
-        params.require(:invitee).permit(:status, :user_id)
-      else
-        params.require(:invitee).permit(:status)
+      DiscoursePostEvent::DestroyInvitee.call(
+        params: {
+          post_id: params[:post_id],
+          id: params[:id],
+        },
+        guardian:,
+      ) do
+        on_success { render json: success_json }
+        on_failed_policy(:can_act_on_invitee) { raise Discourse::InvalidAccess }
+        on_failed_policy(:can_see_event) { raise Discourse::InvalidAccess }
+        on_failed_policy(:can_update_attendance) { raise Discourse::InvalidAccess }
+        on_model_not_found(:event) { raise Discourse::NotFound }
+        on_model_not_found(:invitee) { raise Discourse::NotFound }
+        on_failed_contract { raise Discourse::InvalidParameters }
+        on_failure { render(json: failed_json, status: :unprocessable_entity) }
       end
     end
   end
diff --git a/plugins/discourse-calendar/app/models/discourse_post_event/event.rb b/plugins/discourse-calendar/app/models/discourse_post_event/event.rb
index ac087acd17942..d9a5efcd85134 100644
--- a/plugins/discourse-calendar/app/models/discourse_post_event/event.rb
+++ b/plugins/discourse-calendar/app/models/discourse_post_event/event.rb
@@ -305,7 +305,7 @@ def enforce_private_invitees!
       self.invitees.where.not(user_id: fetch_users.select(:id)).delete_all
     end
 
-    def can_user_update_attendance(user)
+    def can_user_update_attendance?(user)
       return false if self.closed || self.expired?
       return true if self.public?
 
diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb b/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb
index ee0a603fbbf79..ab0b5d334c5fc 100644
--- a/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb
+++ b/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb
@@ -90,7 +90,7 @@ def status
     end
 
     def can_update_attendance
-      scope.current_user && object.can_user_update_attendance(scope.current_user)
+      scope.current_user && object.can_user_update_attendance?(scope.current_user)
     end
 
     def creator
diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/create_invitee.rb b/plugins/discourse-calendar/app/services/discourse_post_event/create_invitee.rb
new file mode 100644
index 0000000000000..50ee29ca9ecb2
--- /dev/null
+++ b/plugins/discourse-calendar/app/services/discourse_post_event/create_invitee.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module DiscoursePostEvent
+  class CreateInvitee
+    include Service::Base
+
+    params do
+      attribute :event_id, :integer
+      attribute :status, :symbol
+      attribute :user_id, :integer
+
+      validates :event_id, presence: true
+      validates :status, inclusion: { in: Invitee.statuses.keys }
+    end
+
+    model :event
+    policy :can_see_event
+    model :user
+    policy :can_update_attendance
+    policy :can_invite_user
+    policy :has_capacity
+
+    model :invitee, :create_invitee
+
+    private
+
+    def fetch_event(params:)
+      Event.find_by(id: params.event_id)
+    end
+
+    def can_see_event(guardian:, event:)
+      guardian.can_see?(event.post)
+    end
+
+    def fetch_user(params:, guardian:)
+      params.user_id ? User.find_by(id: params.user_id) : guardian.user
+    end
+
+    def can_update_attendance(event:, user:)
+      event.can_user_update_attendance?(user)
+    end
+
+    def can_invite_user(guardian:, event:, user:)
+      return true if guardian.user.id == user.id
+      guardian.can_act_on_discourse_post_event?(event)
+    end
+
+    def has_capacity(event:, params:)
+      params.status != :going || !event.at_capacity?
+    end
+
+    def create_invitee(user:, event:, params:)
+      Invitee.create_attendance!(user.id, event.id, params.status)
+    end
+  end
+end
diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/destroy_invitee.rb b/plugins/discourse-calendar/app/services/discourse_post_event/destroy_invitee.rb
new file mode 100644
index 0000000000000..5b2bd6c8603f0
--- /dev/null
+++ b/plugins/discourse-calendar/app/services/discourse_post_event/destroy_invitee.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module DiscoursePostEvent
+  class DestroyInvitee
+    include Service::Base
+
+    params do
+      attribute :post_id, :integer
+      attribute :id, :integer
+
+      validates :post_id, presence: true
+      validates :id, presence: true
+    end
+
+    model :event
+    model :invitee
+    policy :can_act_on_invitee
+    policy :can_see_event
+    policy :can_update_attendance
+
+    step :destroy
+    step :publish
+
+    private
+
+    def fetch_event(params:)
+      Event.find_by(id: params.post_id)
+    end
+
+    def fetch_invitee(event:, params:)
+      event.invitees.find_by(id: params.id)
+    end
+
+    def can_act_on_invitee(guardian:, invitee:)
+      guardian.can_act_on_invitee?(invitee)
+    end
+
+    def can_see_event(guardian:, event:)
+      guardian.can_see?(event.post)
+    end
+
+    def can_update_attendance(guardian:, event:)
+      event.can_user_update_attendance?(guardian.user)
+    end
+
+    def destroy(invitee:)
+      invitee.destroy!
+    end
+
+    def publish(event:)
+      event.publish_update!
+    end
+  end
+end
diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/update_invitee.rb b/plugins/discourse-calendar/app/services/discourse_post_event/update_invitee.rb
new file mode 100644
index 0000000000000..a62cb7e1dd651
--- /dev/null
+++ b/plugins/discourse-calendar/app/services/discourse_post_event/update_invitee.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module DiscoursePostEvent
+  class UpdateInvitee
+    include Service::Base
+
+    params do
+      attribute :event_id, :integer
+      attribute :invitee_id, :integer
+      attribute :status, :symbol
+
+      validates :event_id, presence: true
+      validates :invitee_id, presence: true
+      validates :status, inclusion: { in: Invitee.statuses.keys }
+    end
+
+    model :invitee
+    policy :can_act_on_invitee
+    model :event
+    policy :can_see_event
+    policy :can_update_attendance
+    policy :has_capacity
+
+    step :update
+
+    private
+
+    def fetch_invitee(params:)
+      Invitee.find_by(id: params.invitee_id, post_id: params.event_id)
+    end
+
+    def can_act_on_invitee(guardian:, invitee:)
+      guardian.can_act_on_invitee?(invitee)
+    end
+
+    def fetch_event(invitee:)
+      invitee.event
+    end
+
+    def can_see_event(guardian:, event:)
+      guardian.can_see?(event.post)
+    end
+
+    def can_update_attendance(guardian:, event:)
+      event.can_user_update_attendance?(guardian.user)
+    end
+
+    def has_capacity(event:, invitee:, params:)
+      params.status != :going || !event.at_capacity? || invitee.status == Invitee.statuses[:going]
+    end
+
+    def update(invitee:, params:)
+      invitee.update_attendance!(params.status)
+    end
+  end
+end
diff --git a/plugins/discourse-calendar/spec/fabricators/event_fabricator.rb b/plugins/discourse-calendar/spec/fabricators/event_fabricator.rb
index 83001893187fa..cbb7fa056feb4 100644
--- a/plugins/discourse-calendar/spec/fabricators/event_fabricator.rb
+++ b/plugins/discourse-calendar/spec/fabricators/event_fabricator.rb
@@ -26,6 +26,18 @@
   original_ends_at { |attrs| attrs[:original_ends_at] }
 end
 
+Fabricator(:private_event, from: :event) do
+  transient :group
+
+  post do |attrs|
+    group = attrs[:group] || Fabricate(:group)
+    category = Fabricate(:private_category, group:)
+    user = attrs[:user] || Fabricate(:user, admin: true, refresh_auto_groups: true)
+    topic = Fabricate(:topic, user:, category:)
+    Fabricate(:post, user:, topic:)
+  end
+end
+
 Fabricator(:event_date, from: "DiscoursePostEvent::EventDate") do
   event
 
diff --git a/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb b/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb
index 84c6e4f345daf..21ad5bc46e906 100644
--- a/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb
+++ b/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb
@@ -119,307 +119,224 @@ module DiscoursePostEvent
       end
     end
 
-    context "when a post event exists" do
-      context "when an invitee exists" do
-        let(:invitee1) { Fabricate(:user) }
-        let(:post_event_2) do
-          pe = Fabricate(:event, post: post_1)
-          pe.create_invitees([{ user_id: invitee1.id, status: Invitee.statuses[:going] }])
-          pe
-        end
+    describe "#create" do
+      let(:event) { Fabricate(:event, post: post_1) }
+
+      it "creates an invitee" do
+        post "/discourse-post-event/events/#{event.id}/invitees.json",
+             params: {
+               invitee: {
+                 status: "going",
+               },
+             }
+
+        expect(response.status).to eq(200)
+        expect(Invitee).to exist(user_id: user.id, status: Invitee.statuses[:going])
+      end
 
-        describe "updating invitee" do
-          it "updates its status" do
-            invitee = post_event_2.invitees.first
+      it "allows staff to invite another user" do
+        other_user = Fabricate(:user)
 
-            expect(invitee.status).to eq(0)
+        post "/discourse-post-event/events/#{event.id}/invitees.json",
+             params: {
+               invitee: {
+                 status: "interested",
+                 user_id: other_user.id,
+               },
+             }
 
-            put "/discourse-post-event/events/#{post_event_2.id}/invitees/#{invitee.id}.json",
-                params: {
-                  invitee: {
-                    status: "interested",
-                  },
-                }
+        expect(response.status).to eq(200)
+        expect(Invitee).to exist(user_id: other_user.id, status: Invitee.statuses[:interested])
+      end
 
-            invitee.reload
+      it "returns 403 when non-staff tries to invite themselves to a private event" do
+        private_event = Fabricate(:event, post: post_1, status: "private")
+        other_user = Fabricate(:user)
+        sign_in(other_user)
 
-            expect(invitee.status).to eq(1)
-            expect(invitee.post_id).to eq(post_1.id)
-          end
+        expect do
+          post "/discourse-post-event/events/#{private_event.id}/invitees.json",
+               params: {
+                 invitee: {
+                   status: "going",
+                 },
+               }
+        end.not_to change { Invitee.count }
 
-          it "returns 404 when invitee does not exist" do
-            put "/discourse-post-event/events/#{post_event_2.id}/invitees/999999.json",
-                params: {
-                  invitee: {
-                    status: "interested",
-                  },
-                }
+        expect(response.status).to eq(403)
+      end
 
-            expect(response.status).to eq(404)
-          end
+      context "when event is at max capacity" do
+        fab!(:post_2) { create_post(user: Fabricate(:admin), category: Fabricate(:category)) }
+        fab!(:user_a, :user)
+        fab!(:user_b, :user)
+        fab!(:full_event) do
+          pe = Fabricate(:event, post: post_2, max_attendees: 1)
+          pe.create_invitees([{ user_id: user_a.id, status: Invitee.statuses[:going] }])
+          pe
         end
 
-        describe "destroying invitee" do
-          context "when acting user can act on discourse event" do
-            it "destroys the invitee" do
-              invitee = post_event_2.invitees.first
-              delete "/discourse-post-event/events/#{post_event_2.id}/invitees/#{invitee.id}.json"
-              expect(Invitee.where(id: invitee.id).length).to eq(0)
-              expect(response.status).to eq(200)
-            end
-          end
-
-          context "when acting user can act on invitee" do
-            before { sign_in(invitee1) }
-
-            it "destroys the invitee" do
-              invitee = post_event_2.invitees.first
-              delete "/discourse-post-event/events/#{post_event_2.id}/invitees/#{invitee.id}.json"
-              expect(Invitee.where(id: invitee.id).length).to eq(0)
-              expect(response.status).to eq(200)
-            end
-          end
+        it "returns 422 when trying to join as going" do
+          sign_in(user_b)
 
-          context "when acting user can't act on invitee" do
-            let(:lurker) { Fabricate(:user) }
+          post "/discourse-post-event/events/#{full_event.id}/invitees.json",
+               params: {
+                 invitee: {
+                   status: "going",
+                 },
+               }
 
-            before { sign_in(lurker) }
+          expect(response.status).to eq(422)
+          expect(response.parsed_body["errors"].join).to include("full")
+        end
 
-            it "doesn't destroy the invitee" do
-              invitee = post_event_2.invitees.first
-              delete "/discourse-post-event/events/#{post_event_2.id}/invitees/#{invitee.id}.json"
-              expect(Invitee.where(id: invitee.id).length).to eq(1)
-              expect(response.status).to eq(403)
-            end
-          end
+        it "allows interested when full" do
+          sign_in(user_b)
 
-          it "returns 404 when invitee does not exist" do
-            delete "/discourse-post-event/events/#{post_event_2.id}/invitees/999999.json"
+          post "/discourse-post-event/events/#{full_event.id}/invitees.json",
+               params: {
+                 invitee: {
+                   status: "interested",
+                 },
+               }
 
-            expect(response.status).to eq(404)
-          end
+          expect(response.status).to eq(200)
         end
+      end
+    end
 
-        context "when changing status" do
-          it "sets tracking of the topic" do
-            invitee = post_event_2.invitees.first
-
-            expect(invitee.status).to eq(0)
+    describe "#update" do
+      let(:invitee_user) { Fabricate(:user) }
+      let(:event) do
+        pe = Fabricate(:event, post: post_1)
+        pe.create_invitees([{ user_id: invitee_user.id, status: Invitee.statuses[:going] }])
+        pe
+      end
+      let(:invitee) { event.invitees.first }
+
+      it "updates the invitee status" do
+        put "/discourse-post-event/events/#{event.id}/invitees/#{invitee.id}.json",
+            params: {
+              invitee: {
+                status: "interested",
+              },
+            }
+
+        expect(response.status).to eq(200)
+        expect(invitee.reload.status).to eq(Invitee.statuses[:interested])
+      end
 
-            put "/discourse-post-event/events/#{post_event_2.id}/invitees/#{invitee.id}.json",
-                params: {
-                  invitee: {
-                    status: "interested",
-                  },
-                }
+      it "returns 404 when invitee does not exist" do
+        put "/discourse-post-event/events/#{event.id}/invitees/999999.json",
+            params: {
+              invitee: {
+                status: "interested",
+              },
+            }
 
-            tu = TopicUser.get(invitee.event.post.topic, invitee.user)
-            expect(tu.notification_level).to eq(TopicUser.notification_levels[:tracking])
+        expect(response.status).to eq(404)
+      end
 
-            put "/discourse-post-event/events/#{post_event_2.id}/invitees/#{invitee.id}.json",
-                params: {
-                  invitee: {
-                    status: "going",
-                  },
-                }
+      it "returns 403 when user cannot act on invitee" do
+        lurker = Fabricate(:user)
+        sign_in(lurker)
 
-            tu = TopicUser.get(invitee.event.post.topic, invitee.user)
-            expect(tu.notification_level).to eq(TopicUser.notification_levels[:watching])
+        put "/discourse-post-event/events/#{event.id}/invitees/#{invitee.id}.json",
+            params: {
+              invitee: {
+                status: "interested",
+              },
+            }
 
-            put "/discourse-post-event/events/#{post_event_2.id}/invitees/#{invitee.id}.json",
-                params: {
-                  invitee: {
-                    status: "not_going",
-                  },
-                }
+        expect(response.status).to eq(403)
+      end
 
-            tu = TopicUser.get(invitee.event.post.topic, invitee.user)
-            expect(tu.notification_level).to eq(TopicUser.notification_levels[:regular])
-          end
+      context "when event is at max capacity" do
+        fab!(:post_2) { create_post(user: Fabricate(:admin), category: Fabricate(:category)) }
+        fab!(:user_a, :user)
+        fab!(:user_b, :user)
+        fab!(:full_event) do
+          pe = Fabricate(:event, post: post_2, max_attendees: 1)
+          pe.create_invitees([{ user_id: user_a.id, status: Invitee.statuses[:going] }])
+          pe
+        end
+        fab!(:interested_invitee) do
+          Fabricate(
+            :invitee,
+            post_id: post_2.id,
+            user_id: user_b.id,
+            status: Invitee.statuses[:interested],
+          )
         end
-      end
 
-      context "when an invitee doesn't exist" do
-        let(:post_event_2) { Fabricate(:event, post: post_1) }
+        it "returns 422 when trying to change to going" do
+          sign_in(user_b)
 
-        it "creates an invitee" do
-          post "/discourse-post-event/events/#{post_event_2.id}/invitees.json",
-               params: {
-                 invitee: {
-                   status: "not_going",
-                 },
-               }
+          put "/discourse-post-event/events/#{full_event.id}/invitees/#{interested_invitee.id}.json",
+              params: {
+                invitee: {
+                  status: "going",
+                },
+              }
 
-          expect(Invitee).to exist(user_id: user.id, status: 2)
+          expect(response.status).to eq(422)
+          expect(response.parsed_body["errors"].join).to include("full")
         end
 
-        it "sets tracking of the topic" do
-          post "/discourse-post-event/events/#{post_event_2.id}/invitees.json",
-               params: {
-                 invitee: {
-                   status: "going",
-                 },
-               }
-
-          invitee = Invitee.find_by(user_id: user.id)
+        it "allows changing to interested" do
+          sign_in(user_b)
 
-          tu = TopicUser.get(invitee.event.post.topic, user)
-          expect(tu.notification_level).to eq(TopicUser.notification_levels[:watching])
-        end
+          put "/discourse-post-event/events/#{full_event.id}/invitees/#{interested_invitee.id}.json",
+              params: {
+                invitee: {
+                  status: "interested",
+                },
+              }
 
-        context "when someone is trying to invite themselves to a private event (creepy)" do
-          let(:post_event_2) { Fabricate(:event, post: post_1, status: "private") }
-          let(:other_user) { Fabricate(:user, username: "creep") }
-
-          before { sign_in(other_user) }
-
-          it "does not create an invitee" do
-            expect do
-              post "/discourse-post-event/events/#{post_event_2.id}/invitees.json",
-                   params: {
-                     invitee: {
-                       status: "going",
-                     },
-                   }
-            end.not_to change { post_event_2.invitees.count }
-          end
+          expect(response.status).to eq(200)
         end
+      end
+    end
 
-        context "when the invitee is the event owner" do
-          let(:post_event_2) { Fabricate(:event, post: post_1) }
-
-          it "allows inviting other users" do
-            user = Fabricate(:user)
+    describe "#destroy" do
+      let(:invitee_user) { Fabricate(:user) }
+      let(:event) do
+        pe = Fabricate(:event, post: post_1)
+        pe.create_invitees([{ user_id: invitee_user.id, status: Invitee.statuses[:going] }])
+        pe
+      end
+      let(:invitee) { event.invitees.first }
 
-            post "/discourse-post-event/events/#{post_event_2.id}/invitees.json",
-                 params: {
-                   invitee: {
-                     status: "interested",
-                     user_id: user.id,
-                   },
-                 }
+      it "destroys the invitee as staff" do
+        delete "/discourse-post-event/events/#{event.id}/invitees/#{invitee.id}.json"
 
-            post_event_2.reload
+        expect(response.status).to eq(200)
+        expect(Invitee.exists?(invitee.id)).to eq(false)
+      end
 
-            expect(post_event_2.invitees.length).to eq(1)
-            invitee = post_event_2.invitees.first
-            expect(invitee.status).to eq(1)
-            expect(invitee.post_id).to eq(post_1.id)
-            expect(invitee.user_id).to eq(user.id)
-          end
+      it "destroys the invitee as the invitee owner" do
+        sign_in(invitee_user)
 
-          it "creates an invitee" do
-            expect(post_event_2.invitees.length).to eq(0)
+        delete "/discourse-post-event/events/#{event.id}/invitees/#{invitee.id}.json"
 
-            post "/discourse-post-event/events/#{post_event_2.id}/invitees.json",
-                 params: {
-                   invitee: {
-                     status: "interested",
-                   },
-                 }
+        expect(response.status).to eq(200)
+        expect(Invitee.exists?(invitee.id)).to eq(false)
+      end
 
-            post_event_2.reload
+      it "returns 403 when user cannot act on invitee" do
+        lurker = Fabricate(:user)
+        sign_in(lurker)
 
-            invitee = post_event_2.invitees.first
-            expect(invitee.status).to eq(1)
-            expect(invitee.post_id).to eq(post_1.id)
-          end
-        end
+        delete "/discourse-post-event/events/#{event.id}/invitees/#{invitee.id}.json"
 
-        context "when event has max attendees and is full" do
-          fab!(:post_2) { create_post(user: Fabricate(:admin), category: Fabricate(:category)) }
-          fab!(:user_a, :user)
-          fab!(:user_b, :user)
-          fab!(:post_event_full) do
-            pe = Fabricate(:event, post: post_2, max_attendees: 1)
-            pe.create_invitees([{ user_id: user_a.id, status: Invitee.statuses[:going] }])
-            pe
-          end
+        expect(response.status).to eq(403)
+        expect(Invitee.exists?(invitee.id)).to eq(true)
+      end
 
-          context "when updating an invitee" do
-            fab!(:invitee) do
-              Fabricate(
-                :invitee,
-                post_id: post_2.id,
-                user_id: user_b.id,
-                status: Invitee.statuses[:interested],
-              )
-            end
-
-            context "when invitee was interested" do
-              it "returns 422 when trying to join as going" do
-                sign_in(user_b)
-
-                put "/discourse-post-event/events/#{post_event_full.id}/invitees/#{invitee.id}.json",
-                    params: {
-                      invitee: {
-                        status: "going",
-                      },
-                    }
-
-                expect(response.status).to eq(422)
-                expect(response.parsed_body["errors"].join).to include("full")
-              end
-            end
-
-            context "when invitee was going" do
-              it "allows upading to interested" do
-                sign_in(user_b)
-
-                put "/discourse-post-event/events/#{post_event_full.id}/invitees/#{invitee.id}.json",
-                    params: {
-                      invitee: {
-                        status: "interested",
-                      },
-                    }
-
-                expect(response.status).to eq(200)
-              end
-            end
-          end
+      it "returns 404 when invitee does not exist" do
+        delete "/discourse-post-event/events/#{event.id}/invitees/999999.json"
 
-          context "when creating an invitee" do
-            it "returns 422 when trying to join as going" do
-              sign_in(user_b)
-
-              post "/discourse-post-event/events/#{post_event_full.id}/invitees.json",
-                   params: {
-                     invitee: {
-                       status: "going",
-                     },
-                   }
-
-              expect(response.status).to eq(422)
-              expect(response.parsed_body["errors"].join).to include("full")
-            end
-
-            it "allows interested when full" do
-              sign_in(user_b)
-
-              post "/discourse-post-event/events/#{post_event_full.id}/invitees.json",
-                   params: {
-                     invitee: {
-                       status: "interested",
-                     },
-                   }
-
-              expect(response.status).to eq(200)
-            end
-
-            it "allows not_going when full" do
-              sign_in(user_b)
-
-              post "/discourse-post-event/events/#{post_event_full.id}/invitees.json",
-                   params: {
-                     invitee: {
-                       status: "not_going",
-                     },
-                   }
-
-              expect(response.status).to eq(200)
-            end
-          end
-        end
+        expect(response.status).to eq(404)
       end
     end
   end
diff --git a/plugins/discourse-calendar/spec/services/discourse_post_event/create_invitee_spec.rb b/plugins/discourse-calendar/spec/services/discourse_post_event/create_invitee_spec.rb
new file mode 100644
index 0000000000000..91821cf7e8ff8
--- /dev/null
+++ b/plugins/discourse-calendar/spec/services/discourse_post_event/create_invitee_spec.rb
@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+RSpec.describe(DiscoursePostEvent::CreateInvitee) do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:event_id) }
+    it do
+      is_expected.to validate_inclusion_of(:status).in_array(
+        DiscoursePostEvent::Invitee.statuses.keys.map(&:to_s),
+      )
+    end
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:current_user) { Fabricate(:user, refresh_auto_groups: true) }
+    fab!(:topic) { Fabricate(:topic, user: current_user) }
+    fab!(:post) { Fabricate(:post, user: current_user, topic: topic) }
+    fab!(:event) { Fabricate(:event, post: post) }
+
+    let(:params) { { event_id: event.id, status: "going" } }
+    let(:dependencies) { { guardian: current_user.guardian } }
+
+    before do
+      Jobs.run_immediately!
+      SiteSetting.calendar_enabled = true
+      SiteSetting.discourse_post_event_enabled = true
+    end
+
+    context "when contract is invalid" do
+      let(:params) { { event_id: event.id, status: "invalid" } }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when event does not exist" do
+      let(:params) { { event_id: -1, status: "going" } }
+
+      it { is_expected.to fail_to_find_a_model(:event) }
+    end
+
+    context "when user cannot see the event post" do
+      fab!(:private_event)
+
+      let(:params) { { event_id: private_event.id, status: "going" } }
+
+      it { is_expected.to fail_a_policy(:can_see_event) }
+    end
+
+    context "when event is closed" do
+      fab!(:closed_post) { Fabricate(:post, topic: topic) }
+      fab!(:closed_event) { Fabricate(:event, post: closed_post, closed: true) }
+
+      let(:params) { { event_id: closed_event.id, status: "going" } }
+
+      it { is_expected.to fail_a_policy(:can_update_attendance) }
+    end
+
+    context "when event is expired" do
+      fab!(:expired_post) { Fabricate(:post, topic: topic) }
+      fab!(:expired_event) do
+        Fabricate(
+          :event,
+          post: expired_post,
+          original_starts_at: 2.days.ago,
+          original_ends_at: 1.day.ago,
+        )
+      end
+
+      let(:params) { { event_id: expired_event.id, status: "going" } }
+
+      it { is_expected.to fail_a_policy(:can_update_attendance) }
+    end
+
+    context "when non-staff user tries to invite another user" do
+      fab!(:other_user, :user)
+      let(:params) { { event_id: event.id, status: "going", user_id: other_user.id } }
+
+      it { is_expected.to fail_a_policy(:can_invite_user) }
+    end
+
+    context "when event is at max capacity" do
+      fab!(:other_user, :user)
+      fab!(:full_post) { Fabricate(:post, topic: topic) }
+      fab!(:full_event) { Fabricate(:event, post: full_post, max_attendees: 1) }
+
+      before do
+        full_event.create_invitees(
+          [{ user_id: other_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+      end
+
+      let(:params) { { event_id: full_event.id, status: "going" } }
+
+      it { is_expected.to fail_a_policy(:has_capacity) }
+    end
+
+    context "when everything is valid" do
+      it { is_expected.to run_successfully }
+
+      it "creates the invitee" do
+        expect { result }.to change { DiscoursePostEvent::Invitee.count }.by(1)
+        expect(result[:invitee]).to have_attributes(
+          user_id: current_user.id,
+          post_id: event.id,
+          status: DiscoursePostEvent::Invitee.statuses[:going],
+        )
+      end
+    end
+
+    context "when staff invites another user" do
+      fab!(:admin, :admin)
+      fab!(:other_user, :user)
+
+      let(:dependencies) { { guardian: admin.guardian } }
+      let(:params) { { event_id: event.id, status: "interested", user_id: other_user.id } }
+
+      it { is_expected.to run_successfully }
+
+      it "creates the invitee for the other user" do
+        expect { result }.to change { DiscoursePostEvent::Invitee.count }.by(1)
+        expect(result[:invitee]).to have_attributes(
+          user_id: other_user.id,
+          status: DiscoursePostEvent::Invitee.statuses[:interested],
+        )
+      end
+    end
+  end
+end
diff --git a/plugins/discourse-calendar/spec/services/discourse_post_event/destroy_invitee_spec.rb b/plugins/discourse-calendar/spec/services/discourse_post_event/destroy_invitee_spec.rb
new file mode 100644
index 0000000000000..9b9b8d2285096
--- /dev/null
+++ b/plugins/discourse-calendar/spec/services/discourse_post_event/destroy_invitee_spec.rb
@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+RSpec.describe(DiscoursePostEvent::DestroyInvitee) do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:post_id) }
+    it { is_expected.to validate_presence_of(:id) }
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:admin, :admin)
+    fab!(:topic) { Fabricate(:topic, user: admin) }
+    fab!(:post) { Fabricate(:post, user: admin, topic: topic) }
+    fab!(:event) { Fabricate(:event, post: post) }
+    fab!(:invitee_user) { Fabricate(:user, refresh_auto_groups: true) }
+    fab!(:invitee) do
+      event.create_invitees(
+        [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+      )
+      event.invitees.find_by(user_id: invitee_user.id)
+    end
+
+    let(:params) { { post_id: event.id, id: invitee.id } }
+    let(:dependencies) { { guardian: invitee_user.guardian } }
+
+    before do
+      Jobs.run_immediately!
+      SiteSetting.calendar_enabled = true
+      SiteSetting.discourse_post_event_enabled = true
+    end
+
+    context "when contract is invalid" do
+      let(:params) { { post_id: nil, id: nil } }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when event does not exist" do
+      let(:params) { { post_id: -1, id: invitee.id } }
+
+      it { is_expected.to fail_to_find_a_model(:event) }
+    end
+
+    context "when invitee does not exist" do
+      let(:params) { { post_id: event.id, id: -1 } }
+
+      it { is_expected.to fail_to_find_a_model(:invitee) }
+    end
+
+    context "when user cannot act on invitee" do
+      fab!(:other_user, :user)
+      let(:dependencies) { { guardian: other_user.guardian } }
+
+      it { is_expected.to fail_a_policy(:can_act_on_invitee) }
+    end
+
+    context "when user cannot see the event post" do
+      fab!(:private_event)
+      fab!(:private_invitee) do
+        private_event.create_invitees(
+          [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+        private_event.invitees.find_by(user_id: invitee_user.id)
+      end
+
+      let(:params) { { post_id: private_event.id, id: private_invitee.id } }
+
+      it { is_expected.to fail_a_policy(:can_see_event) }
+    end
+
+    context "when event is closed" do
+      fab!(:closed_post) { Fabricate(:post, topic: topic) }
+      fab!(:closed_event) { Fabricate(:event, post: closed_post, closed: true) }
+      fab!(:closed_invitee) do
+        closed_event.create_invitees(
+          [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+        closed_event.invitees.find_by(user_id: invitee_user.id)
+      end
+
+      let(:params) { { post_id: closed_event.id, id: closed_invitee.id } }
+
+      it { is_expected.to fail_a_policy(:can_update_attendance) }
+    end
+
+    context "when event is expired" do
+      fab!(:expired_post) { Fabricate(:post, topic: topic) }
+      fab!(:expired_event) do
+        Fabricate(
+          :event,
+          post: expired_post,
+          original_starts_at: 2.days.ago,
+          original_ends_at: 1.day.ago,
+        )
+      end
+      fab!(:expired_invitee) do
+        expired_event.create_invitees(
+          [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+        expired_event.invitees.find_by(user_id: invitee_user.id)
+      end
+
+      let(:params) { { post_id: expired_event.id, id: expired_invitee.id } }
+
+      it { is_expected.to fail_a_policy(:can_update_attendance) }
+    end
+
+    context "when everything is valid" do
+      it { is_expected.to run_successfully }
+
+      it "destroys the invitee" do
+        expect { result }.to change { DiscoursePostEvent::Invitee.count }.by(-1)
+        expect(DiscoursePostEvent::Invitee.exists?(invitee.id)).to eq(false)
+      end
+    end
+
+    context "when staff destroys another user's invitee" do
+      let(:dependencies) { { guardian: admin.guardian } }
+
+      it { is_expected.to run_successfully }
+
+      it "destroys the invitee" do
+        expect { result }.to change { DiscoursePostEvent::Invitee.count }.by(-1)
+      end
+    end
+  end
+end
diff --git a/plugins/discourse-calendar/spec/services/discourse_post_event/update_invitee_spec.rb b/plugins/discourse-calendar/spec/services/discourse_post_event/update_invitee_spec.rb
new file mode 100644
index 0000000000000..ffc1a1df3a9f5
--- /dev/null
+++ b/plugins/discourse-calendar/spec/services/discourse_post_event/update_invitee_spec.rb
@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+
+RSpec.describe(DiscoursePostEvent::UpdateInvitee) do
+  describe described_class::Contract, type: :model do
+    it { is_expected.to validate_presence_of(:event_id) }
+    it { is_expected.to validate_presence_of(:invitee_id) }
+    it do
+      is_expected.to validate_inclusion_of(:status).in_array(
+        DiscoursePostEvent::Invitee.statuses.keys.map(&:to_s),
+      )
+    end
+  end
+
+  describe ".call" do
+    subject(:result) { described_class.call(params:, **dependencies) }
+
+    fab!(:admin, :admin)
+    fab!(:topic) { Fabricate(:topic, user: admin) }
+    fab!(:post) { Fabricate(:post, user: admin, topic: topic) }
+    fab!(:event) { Fabricate(:event, post: post) }
+    fab!(:invitee_user) { Fabricate(:user, refresh_auto_groups: true) }
+    fab!(:invitee) do
+      event.create_invitees(
+        [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+      )
+      event.invitees.find_by(user_id: invitee_user.id)
+    end
+
+    let(:params) { { event_id: event.id, invitee_id: invitee.id, status: "interested" } }
+    let(:dependencies) { { guardian: invitee_user.guardian } }
+
+    before do
+      Jobs.run_immediately!
+      SiteSetting.calendar_enabled = true
+      SiteSetting.discourse_post_event_enabled = true
+    end
+
+    context "when contract is invalid" do
+      let(:params) { { event_id: event.id, invitee_id: invitee.id, status: "invalid" } }
+
+      it { is_expected.to fail_a_contract }
+    end
+
+    context "when invitee does not exist" do
+      let(:params) { { event_id: event.id, invitee_id: -1, status: "interested" } }
+
+      it { is_expected.to fail_to_find_a_model(:invitee) }
+    end
+
+    context "when user cannot act on invitee" do
+      fab!(:other_user, :user)
+      let(:dependencies) { { guardian: other_user.guardian } }
+
+      it { is_expected.to fail_a_policy(:can_act_on_invitee) }
+    end
+
+    context "when user cannot see the event post" do
+      fab!(:private_event)
+      fab!(:private_invitee) do
+        private_event.create_invitees(
+          [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+        private_event.invitees.find_by(user_id: invitee_user.id)
+      end
+
+      let(:params) do
+        { event_id: private_event.id, invitee_id: private_invitee.id, status: "interested" }
+      end
+
+      it { is_expected.to fail_a_policy(:can_see_event) }
+    end
+
+    context "when event is closed" do
+      fab!(:closed_post) { Fabricate(:post, topic: topic) }
+      fab!(:closed_event) { Fabricate(:event, post: closed_post, closed: true) }
+      fab!(:closed_invitee) do
+        closed_event.create_invitees(
+          [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+        closed_event.invitees.find_by(user_id: invitee_user.id)
+      end
+
+      let(:params) do
+        { event_id: closed_event.id, invitee_id: closed_invitee.id, status: "not_going" }
+      end
+
+      it { is_expected.to fail_a_policy(:can_update_attendance) }
+    end
+
+    context "when event is expired" do
+      fab!(:expired_post) { Fabricate(:post, topic: topic) }
+      fab!(:expired_event) do
+        Fabricate(
+          :event,
+          post: expired_post,
+          original_starts_at: 2.days.ago,
+          original_ends_at: 1.day.ago,
+        )
+      end
+      fab!(:expired_invitee) do
+        expired_event.create_invitees(
+          [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+        expired_event.invitees.find_by(user_id: invitee_user.id)
+      end
+
+      let(:params) do
+        { event_id: expired_event.id, invitee_id: expired_invitee.id, status: "not_going" }
+      end
+
+      it { is_expected.to fail_a_policy(:can_update_attendance) }
+    end
+
+    context "when event is at max capacity" do
+      fab!(:other_user, :user)
+      fab!(:full_post) { Fabricate(:post, topic: topic) }
+      fab!(:full_event) { Fabricate(:event, post: full_post, max_attendees: 1) }
+      fab!(:going_invitee) do
+        full_event.create_invitees(
+          [{ user_id: other_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],
+        )
+        full_event.invitees.find_by(user_id: other_user.id)
+      end
+      fab!(:interested_invitee) do
+        full_event.create_invitees(
+          [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:interested] }],
+        )
+        full_event.invitees.find_by(user_id: invitee_user.id)
+      end
+
+      let(:params) do
+        { event_id: full_event.id, invitee_id: interested_invitee.id, status: "going" }
+      end
+
+      it { is_expected.to fail_a_policy(:has_capacity) }
+    end
+
+    context "when everything is valid" do
+      it { is_expected.to run_successfully }
+
+      it "updates the invitee status" do
+        expect { result }.to change { invitee.reload.status }.from(
+          DiscoursePostEvent::Invitee.statuses[:going],
+        ).to(DiscoursePostEvent::Invitee.statuses[:interested])
+      end
+    end
+  end
+end

From 4e32eae3efbf878dd3fef5b8fa1a4b47c0f3cea6 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 25 Feb 2026 11:24:41 +0000
Subject: [PATCH 073/168] DEV: Cache AssetProcessor code in development
 (#38036)

Previously, the asset-processor javascript was only cached in
production. In development, it would be built on-demand using esbuild
every time it was needed. Originally this was incredibly fast. But over
the years complexity has increased, and it now takes more than a second,
even on fast hardware.

This commit adds some caching logic, keyed on the filenames/content of
all known input files. In production, this will make things slightly
more efficient because the cache will be re-used if an up-to-date
version already exists. In development, it will be much more efficient,
because `esbuild` will only be invoked when changes are made to the
asset process source code.

A file-based lock is used to ensure multiple processes do not fight with
each other to generate the processor simultaneously.
---
 lib/asset_processor.rb                 | 76 ++++++++++++++++++++++----
 lib/tasks/assets.rake                  |  2 +-
 spec/requests/qunit_controller_spec.rb |  5 --
 spec/tasks/assets_precompile_spec.rb   |  5 +-
 4 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/lib/asset_processor.rb b/lib/asset_processor.rb
index 06e8cadbb42fd..34b3734298dc2 100644
--- a/lib/asset_processor.rb
+++ b/lib/asset_processor.rb
@@ -1,11 +1,19 @@
 # frozen_string_literal: true
 
 class AssetProcessor
-  PROCESSOR_PATH = "tmp/asset-processor.js"
+  PROCESSOR_DIR = "tmp/asset-processor"
+  LOCK_FILE = "#{PROCESSOR_DIR}/build.lock"
+
+  CACHE_DEPENDENCY_GLOBS = %w[
+    node_modules/.pnpm/lock.yaml
+    frontend/asset-processor/**/*.js
+    frontend/discourse/lib/babel-transform-module-renames.js
+    frontend/discourse/config/targets.js
+    frontend/discourse-plugins/transform-action-syntax.js
+  ]
 
   @mutex = Mutex.new
   @ctx_init = Mutex.new
-  @processor_mutex = Mutex.new
 
   class TranspileError < StandardError
   end
@@ -27,9 +35,60 @@ def self.build_asset_processor
     Discourse::Utils.execute_command("pnpm", "-C=frontend/asset-processor", "node", "build.js")
   end
 
-  def self.build_production_asset_processor
-    File.write(PROCESSOR_PATH, build_asset_processor)
-    PROCESSOR_PATH
+  def self.inputs_digest
+    digest = Digest::MD5.new
+
+    CACHE_DEPENDENCY_GLOBS.each do |pattern|
+      files = Dir.glob(pattern).sort
+      raise "No files matched #{pattern}" if files.empty?
+
+      files.each do |file|
+        digest.update(file)
+        digest.update(File.read(file))
+      end
+    end
+
+    digest.hexdigest.to_i(16).to_s(36) # base36
+  end
+
+  def self.processor_file_path
+    "#{PROCESSOR_DIR}/asset-processor-#{inputs_digest}.js"
+  end
+
+  def self.with_file_lock(&block)
+    lock_path = "#{Rails.root}/#{LOCK_FILE}"
+    FileUtils.mkdir_p(File.dirname(lock_path))
+    File.open(lock_path, File::CREAT | File::RDWR) do |lock_file|
+      lock_file.flock(File::LOCK_EX)
+      yield
+    end
+  end
+
+  def self.cleanup_old_cache_files
+    Dir
+      .glob("#{PROCESSOR_DIR}/asset-processor-*.js")
+      .reject { it.end_with?(processor_file_path) }
+      .each { File.delete(it) }
+  end
+
+  def self.load_or_build_processor_source
+    cache_path = processor_file_path
+
+    if File.exist?(cache_path)
+      File.read(cache_path)
+    else
+      with_file_lock do
+        if File.exist?(cache_path)
+          File.read(cache_path)
+        else
+          built_source = build_asset_processor
+          FileUtils.mkdir_p(PROCESSOR_DIR)
+          File.write(cache_path, built_source)
+          cleanup_old_cache_files
+          built_source
+        end
+      end
+    end
   end
 
   def self.create_new_context
@@ -59,12 +118,7 @@ def self.create_new_context
       end,
     )
 
-    source =
-      if Rails.env.production?
-        File.read(PROCESSOR_PATH)
-      else
-        @processor_mutex.synchronize { build_asset_processor }
-      end
+    source = load_or_build_processor_source
 
     ctx.eval(source, filename: "asset-processor.js")
 
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 7a62d2d63bc52..57ef1e7c5c400 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -152,7 +152,7 @@ task "assets:precompile:compress_js": "environment" do
 end
 
 task "assets:precompile:asset_processor": "environment" do
-  AssetProcessor.build_production_asset_processor
+  AssetProcessor.load_or_build_processor_source
 end
 
 # Run these tasks **before** Rails' "assets:precompile" task
diff --git a/spec/requests/qunit_controller_spec.rb b/spec/requests/qunit_controller_spec.rb
index 6bb2752ad3a6c..99f0073a274a8 100644
--- a/spec/requests/qunit_controller_spec.rb
+++ b/spec/requests/qunit_controller_spec.rb
@@ -10,11 +10,6 @@ def production_sign_in(user)
     Rails.env.stubs(:production?).returns(true)
   end
 
-  # rubocop:disable RSpec/BeforeAfterAll
-  before(:all) { AssetProcessor.build_production_asset_processor }
-
-  after(:all) { File.delete(AssetProcessor::PROCESSOR_PATH) }
-
   it "hides page for regular users in production" do
     production_sign_in(Fabricate(:user))
     get "/theme-qunit"
diff --git a/spec/tasks/assets_precompile_spec.rb b/spec/tasks/assets_precompile_spec.rb
index ece49dda189bd..f2f8ddc28006e 100644
--- a/spec/tasks/assets_precompile_spec.rb
+++ b/spec/tasks/assets_precompile_spec.rb
@@ -3,9 +3,10 @@
 RSpec.describe "assets:precompile" do
   describe "assets:precompile:asset_processor" do
     it "compiles the js processor" do
-      path = Rake::Task["assets:precompile:asset_processor"].actions.first.call
+      FileUtils.rm_rf AssetProcessor::PROCESSOR_DIR
+      Rake::Task["assets:precompile:asset_processor"].actions.first.call
 
-      expect(path).to end_with("tmp/asset-processor.js")
+      path = AssetProcessor.processor_file_path
       expect(File.exist?(path)).to eq(true)
     end
   end

From fda96d735120bada6a8365e2898b322dbf46bef4 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@gmail.com>
Date: Wed, 25 Feb 2026 19:49:09 +0800
Subject: [PATCH 074/168] DEV: Wrap specs in appropriate locale (#38056)

These specs cover untranslated i18n keys, but now with them translated
in https://github.com/discourse/discourse/pull/37917, we need to make
sure we wrap them in the appropriate locale.
---
 .../content_localization_language_switcher_spec.rb       | 8 +++++---
 spec/system/content_localization_spec.rb                 | 9 +++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/spec/system/content_localization_language_switcher_spec.rb b/spec/system/content_localization_language_switcher_spec.rb
index ae97d2d680ee1..168cc7c46c1d4 100644
--- a/spec/system/content_localization_language_switcher_spec.rb
+++ b/spec/system/content_localization_language_switcher_spec.rb
@@ -158,9 +158,11 @@
 
     page.find(TOGGLE_LOCALIZE_BUTTON_SELECTOR).click
     expect(topic_list).to have_content("Life strategies from The Art of War")
-    expect(page.find(TOGGLE_LOCALIZE_BUTTON_SELECTOR)["title"]).to eq(
-      I18n.t("js.content_localization.toggle_localized.not_translated"),
-    )
+    I18n.with_locale(:ja) do
+      expect(page.find(TOGGLE_LOCALIZE_BUTTON_SELECTOR)["title"]).to eq(
+        I18n.t("js.content_localization.toggle_localized.not_translated"),
+      )
+    end
 
     select_language("es")
 
diff --git a/spec/system/content_localization_spec.rb b/spec/system/content_localization_spec.rb
index c6abb6a242ef4..5b8a0978bc838 100644
--- a/spec/system/content_localization_spec.rb
+++ b/spec/system/content_localization_spec.rb
@@ -90,10 +90,11 @@ def scroll_to_post(post_number)
       page.find(TOGGLE_LOCALIZE_BUTTON_SELECTOR).click
 
       expect(topic_page.has_topic_title?("Life strategies from The Art of War")).to eq(true)
-      expect(page.find(TOGGLE_LOCALIZE_BUTTON_SELECTOR)["title"]).to eq(
-        I18n.t("js.content_localization.toggle_localized.not_translated"),
-      )
-
+      I18n.with_locale(:ja) do
+        expect(page.find(TOGGLE_LOCALIZE_BUTTON_SELECTOR)["title"]).to eq(
+          I18n.t("js.content_localization.toggle_localized.not_translated"),
+        )
+      end
       visit("/")
       topic_list.visit_topic_with_title("Life strategies from The Art of War")
     end

From fcccb3ac825e1382487f2e362b0fe803c1ac6498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 25 Feb 2026 14:12:56 +0100
Subject: [PATCH 075/168] FIX: disable "Open channel" button on archived and
 read-only chat channels (#38053)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The channel settings page used a simple `isOpen` / `else` conditional to
render the close/open channel toggle. Any non-open channel (closed,
read-only, archived) would show an "Open channel" button. Clicking it on
an archived or read-only channel would open the "Close channel" modal
instead, which then failed with a server error because the guardian only
allows `closed → open` transitions.

Replace the `else` branch with an explicit `isClosed` check so only
closed channels get an active "Open channel" button. For archived and
read-only channels, render a disabled button wrapped in a `DTooltip`
that explains why reopening is not possible.

Here's how the tooltip looks like

<img width="1590" height="1343" alt="2026-02-25 @ 08 57 34"
src="https://github.com/user-attachments/assets/7220065a-6c03-480c-bb91-b24da04ae496"
/>


https://meta.discourse.org/t/396707
---
 .../chat/routes/channel-info-settings.gjs     | 31 ++++++++++-
 plugins/chat/config/locales/client.en.yml     |  2 +
 .../system/archived_channel_settings_spec.rb  | 54 +++++++++++++++++++
 .../chat/chat_channel_settings.rb             | 25 +++++++++
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 plugins/chat/spec/system/archived_channel_settings_spec.rb

diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
index 5313ce65f7d44..3098900f621d7 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs
@@ -6,6 +6,7 @@ import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import DToggleSwitch from "discourse/components/d-toggle-switch";
+import DTooltip from "discourse/float-kit/components/d-tooltip";
 import categoryBadge from "discourse/helpers/category-badge";
 import icon from "discourse/helpers/d-icon";
 import replaceEmoji from "discourse/helpers/replace-emoji";
@@ -90,6 +91,17 @@ export default class ChatRouteChannelInfoSettings extends Component {
     return this.chatGuardian.canArchiveChannel(this.args.channel);
   }
 
+  get canToggleChannelState() {
+    return this.args.channel.isClosed;
+  }
+
+  get openChannelDisabledReason() {
+    if (this.args.channel.isArchived) {
+      return i18n("chat.channel_settings.open_channel_disabled_archived");
+    }
+    return i18n("chat.channel_settings.open_channel_disabled_read_only");
+  }
+
   get toggleChannelWideMentionsAvailable() {
     return this.args.channel.isCategoryChannel && this.args.channel.isOpen;
   }
@@ -549,13 +561,30 @@ export default class ChatRouteChannelInfoSettings extends Component {
                         @icon="lock"
                         class="close-btn chat-form__btn btn-transparent"
                       />
-                    {{else}}
+                    {{else if this.canToggleChannelState}}
                       <DButton
                         @action={{this.onToggleChannelState}}
                         @label="chat.channel_settings.open_channel"
                         @icon="unlock"
                         class="open-btn chat-form__btn btn-transparent"
                       />
+                    {{else}}
+                      <DTooltip
+                        @identifier="channel-open-disabled"
+                        @placement="left"
+                      >
+                        <:trigger>
+                          <DButton
+                            @label="chat.channel_settings.open_channel"
+                            @icon="unlock"
+                            @disabled={{true}}
+                            class="open-btn chat-form__btn btn-transparent"
+                          />
+                        </:trigger>
+                        <:content>
+                          {{this.openChannelDisabledReason}}
+                        </:content>
+                      </DTooltip>
                     {{/if}}
                   </:action>
                 </section.row>
diff --git a/plugins/chat/config/locales/client.en.yml b/plugins/chat/config/locales/client.en.yml
index e2832762d10de..b80d1f5a81305 100644
--- a/plugins/chat/config/locales/client.en.yml
+++ b/plugins/chat/config/locales/client.en.yml
@@ -95,6 +95,8 @@ en:
         unstar_channel: "Unstar channel"
         close_channel: "Close channel"
         open_channel: "Open channel"
+        open_channel_disabled_archived: "Archived channels cannot be reopened."
+        open_channel_disabled_read_only: "Read-only channels cannot be reopened."
         archive_channel: "Archive channel"
         delete_channel: "Delete channel"
         join_channel: "Join channel"
diff --git a/plugins/chat/spec/system/archived_channel_settings_spec.rb b/plugins/chat/spec/system/archived_channel_settings_spec.rb
new file mode 100644
index 0000000000000..b9f3dc71eff55
--- /dev/null
+++ b/plugins/chat/spec/system/archived_channel_settings_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+RSpec.describe "Archived channel settings", type: :system do
+  fab!(:channel_1, :chat_channel)
+  fab!(:current_user, :admin)
+
+  let(:chat) { PageObjects::Pages::Chat.new }
+  let(:channel_settings) { PageObjects::Pages::ChatChannelSettings.new }
+
+  before do
+    chat_system_bootstrap
+    SiteSetting.chat_allow_archiving_channels = true
+    channel_1.add(current_user)
+    sign_in(current_user)
+  end
+
+  context "when channel is archived" do
+    before { channel_1.update!(status: :archived) }
+
+    it "shows a disabled open channel button with a tooltip" do
+      chat.visit_channel_settings(channel_1)
+
+      expect(channel_settings).to have_open_button(disabled: true)
+      expect(channel_settings).to have_no_close_button
+
+      channel_settings.hover_open_button
+      expect(page).to have_content(
+        I18n.t("js.chat.channel_settings.open_channel_disabled_archived"),
+      )
+    end
+
+    it "does not show the archive channel button" do
+      chat.visit_channel_settings(channel_1)
+
+      expect(page).to have_no_content(I18n.t("js.chat.channel_settings.archive_channel"))
+    end
+  end
+
+  context "when channel is read-only" do
+    before { channel_1.update!(status: :read_only) }
+
+    it "shows a disabled open channel button with a tooltip" do
+      chat.visit_channel_settings(channel_1)
+
+      expect(channel_settings).to have_open_button(disabled: true)
+      expect(channel_settings).to have_no_close_button
+
+      channel_settings.hover_open_button
+      expect(page).to have_content(
+        I18n.t("js.chat.channel_settings.open_channel_disabled_read_only"),
+      )
+    end
+  end
+end
diff --git a/plugins/chat/spec/system/page_objects/chat/chat_channel_settings.rb b/plugins/chat/spec/system/page_objects/chat/chat_channel_settings.rb
index 7d0373cb5e5fc..fbfa58f9d2301 100644
--- a/plugins/chat/spec/system/page_objects/chat/chat_channel_settings.rb
+++ b/plugins/chat/spec/system/page_objects/chat/chat_channel_settings.rb
@@ -18,6 +18,31 @@ def has_slug?(slug)
       def has_name?(name)
         page.has_css?(".c-channel-settings__name", text: name)
       end
+
+      def has_open_button?(disabled: false)
+        if disabled
+          page.has_css?(".open-btn[disabled]")
+        else
+          page.has_css?(".open-btn:not([disabled])")
+        end
+      end
+
+      def has_no_open_button?
+        page.has_no_css?(".open-btn")
+      end
+
+      def has_close_button?
+        page.has_css?(".close-btn")
+      end
+
+      def has_no_close_button?
+        page.has_no_css?(".close-btn")
+      end
+
+      def hover_open_button
+        find(".open-btn").hover
+        self
+      end
     end
   end
 end

From bf411203f62d29fe3d46f91bfbce7a0c63f38db9 Mon Sep 17 00:00:00 2001
From: Osama Sayegh <asooomaasoooma90@gmail.com>
Date: Wed, 25 Feb 2026 16:17:40 +0300
Subject: [PATCH 076/168] FIX: Remove redundant scheme in avatar URL in MS
 Teams integration (#38061)

---
 .../discourse_chat_integration/provider/teams/teams_provider.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/teams/teams_provider.rb b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/teams/teams_provider.rb
index 2417ad94811ef..ec61dfe81819a 100644
--- a/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/teams/teams_provider.rb
+++ b/plugins/discourse-chat-integration/lib/discourse_chat_integration/provider/teams/teams_provider.rb
@@ -101,7 +101,7 @@ def self.get_message(post)
               {
                 type: "Image",
                 style: "Person",
-                url: "http:#{post.user.small_avatar_url}",
+                url: post.user.small_avatar_url,
                 altText: display_name,
                 size: "Small",
               },

From 508b75ebf4cecf4e172cf2bf0173378cd15d0679 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Wed, 25 Feb 2026 10:44:32 -0300
Subject: [PATCH 077/168] FEATURE: Add Reddit OAuth support for onebox (#38040)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reddit blocks many server IPs from accessing their `.json` endpoint.
This adds optional OAuth support using `client_credentials` flow so
authenticated requests go through `oauth.reddit.com`, bypassing IP
blocks.

- Adds `reddit_onebox_client_id` and `reddit_onebox_client_secret` site
settings
- Bearer token is cached for 50 minutes (Reddit tokens last 60 min)
- Falls back to unauthenticated `www.reddit.com` when credentials are
not configured

---------

Co-authored-by: Régis Hanol <regis@hanol.fr>
---
 config/locales/server.en.yml                  |  2 +
 config/site_settings.yml                      |  6 ++
 lib/onebox/engine/reddit_media_onebox.rb      |  9 ++-
 lib/onebox/mixins/reddit_auth_header.rb       | 49 ++++++++++++++++
 .../onebox/engine/reddit_media_onebox_spec.rb | 56 +++++++++++++++++++
 5 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 lib/onebox/mixins/reddit_auth_header.rb

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 15bf5e6c880c9..d7af6233664be 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1814,6 +1814,8 @@ en:
     max_oneboxes_per_post: "Set the maximum number of oneboxes that can be included in a single post. Oneboxes provide a preview of linked content within the post."
     facebook_app_access_token: "A token generated from your Facebook app ID and secret. Used to generate Instagram oneboxes."
     github_onebox_access_tokens: "A mapping of a GitHub organisation or user to a GitHub access token which is used to generate GitHub oneboxes for private repos, commits, pull requests, issues, and file contents. Without this, only public GitHub URLs will be oneboxed."
+    reddit_onebox_client_id: "Reddit API OAuth client ID used for authenticated Reddit oneboxes. Create a 'script' type app at reddit.com/prefs/apps to obtain credentials."
+    reddit_onebox_client_secret: "Reddit API OAuth client secret used for authenticated Reddit oneboxes. Found under the 'script' type app created at reddit.com/prefs/apps."
 
     logo: "The logo image at the top left of your site. Use a wide rectangular image with a height of 120 and an aspect ratio greater than 3:1. If left blank, the site title text will be shown."
     logo_small: "The small logo image at the top left of your site, seen when scrolling down. Use a square 120 × 120 image. If left blank, a home glyph will be shown."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index bd073f46f7f2f..c85bd4877d8e3 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2850,6 +2850,12 @@ onebox:
     type: list
     secret: true
     list_type: secret
+  reddit_onebox_client_id:
+    default: ""
+    secret: true
+  reddit_onebox_client_secret:
+    default: ""
+    secret: true
 spam:
   add_rel_nofollow_to_user_content: true
   hide_post_sensitivity:
diff --git a/lib/onebox/engine/reddit_media_onebox.rb b/lib/onebox/engine/reddit_media_onebox.rb
index 81ab71317a2df..7f46858d0dd0d 100644
--- a/lib/onebox/engine/reddit_media_onebox.rb
+++ b/lib/onebox/engine/reddit_media_onebox.rb
@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require_relative "../mixins/reddit_auth_header"
+
 module Onebox
   module Engine
     class RedditMediaOnebox
       include Engine
+      include Onebox::Mixins::RedditAuthHeader
 
       always_https
       matches_domain(
@@ -112,7 +115,11 @@ def reddit_post
         return @reddit_post if defined?(@reddit_post)
 
         json_url = @url.sub(%r{/?(\?.*)?$}, ".json")
-        response = Onebox::Helpers.fetch_response(json_url)
+        headers = reddit_auth_header
+        if headers.any?
+          json_url = json_url.sub(%r{://(www|old|np|new)\.reddit\.com}, "://oauth.reddit.com")
+        end
+        response = Onebox::Helpers.fetch_response(json_url, headers:)
         parsed = ::MultiJson.load(response)
         @reddit_post = parsed[0]["data"]["children"][0]["data"]
       rescue StandardError
diff --git a/lib/onebox/mixins/reddit_auth_header.rb b/lib/onebox/mixins/reddit_auth_header.rb
new file mode 100644
index 0000000000000..0814f17862000
--- /dev/null
+++ b/lib/onebox/mixins/reddit_auth_header.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Onebox
+  module Mixins
+    module RedditAuthHeader
+      def reddit_auth_header
+        if SiteSetting.reddit_onebox_client_id.blank? ||
+             SiteSetting.reddit_onebox_client_secret.blank?
+          return {}
+        end
+
+        token = fetch_reddit_access_token
+        return {} if token.blank?
+
+        { "Authorization" => "Bearer #{token}" }
+      end
+
+      def reddit_authenticated?
+        SiteSetting.reddit_onebox_client_id.present? &&
+          SiteSetting.reddit_onebox_client_secret.present?
+      end
+
+      private
+
+      def fetch_reddit_access_token
+        Discourse
+          .cache
+          .fetch("reddit_onebox_access_token", expires_in: 50.minutes) do
+            user = SiteSetting.reddit_onebox_client_id
+            password = SiteSetting.reddit_onebox_client_secret
+
+            response =
+              Excon.post(
+                "https://www.reddit.com/api/v1/access_token",
+                body: URI.encode_www_form(grant_type: "client_credentials"),
+                headers: {
+                  "Content-Type" => "application/x-www-form-urlencoded",
+                  "User-Agent" => Onebox::Helpers.user_agent,
+                },
+                user:,
+                password:,
+              )
+
+            ::MultiJson.load(response.body)["access_token"] if response.status == 200
+          end
+      end
+    end
+  end
+end
diff --git a/spec/lib/onebox/engine/reddit_media_onebox_spec.rb b/spec/lib/onebox/engine/reddit_media_onebox_spec.rb
index 970f3a1073dcd..dbecef7d566ab 100644
--- a/spec/lib/onebox/engine/reddit_media_onebox_spec.rb
+++ b/spec/lib/onebox/engine/reddit_media_onebox_spec.rb
@@ -87,6 +87,62 @@
     end
   end
 
+  describe "authenticated requests" do
+    let(:image_link) do
+      "https://www.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition"
+    end
+    let(:oauth_json_url) do
+      "https://oauth.reddit.com/r/colors/comments/b4d5xm/literally_nothing_black_edition.json"
+    end
+    let(:token_url) { "https://www.reddit.com/api/v1/access_token" }
+
+    context "when Reddit OAuth credentials are configured" do
+      before do
+        SiteSetting.reddit_onebox_client_id = "test_client_id"
+        SiteSetting.reddit_onebox_client_secret = "test_client_secret"
+
+        stub_request(:post, token_url).to_return(
+          status: 200,
+          body: { access_token: "test_token", token_type: "bearer", expires_in: 3600 }.to_json,
+        )
+
+        stub_request(:get, oauth_json_url).with(
+          headers: {
+            "Authorization" => "Bearer test_token",
+          },
+        ).to_return(status: 200, body: onebox_response("reddit_image"))
+      end
+
+      it "uses oauth.reddit.com with auth header" do
+        described_class.new(image_link).to_html
+        expect(WebMock).to have_requested(:get, oauth_json_url).with(
+          headers: {
+            "Authorization" => "Bearer test_token",
+          },
+        )
+      end
+    end
+
+    context "when Reddit OAuth credentials are blank" do
+      before do
+        SiteSetting.reddit_onebox_client_id = ""
+        SiteSetting.reddit_onebox_client_secret = ""
+
+        stub_request(:get, "#{image_link}.json").to_return(
+          status: 200,
+          body: onebox_response("reddit_image"),
+        )
+      end
+
+      it "uses www.reddit.com without auth header" do
+        described_class.new(image_link).to_html
+        expect(WebMock).to have_requested(:get, "#{image_link}.json").with { |req|
+          req.headers.exclude?("Authorization")
+        }
+      end
+    end
+  end
+
   describe ".===" do
     it "matches valid Reddit URL" do
       valid_url = URI(image_link)

From 9922b9ef5f6d869049280ddc8a5e1b404fef70fd Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Wed, 25 Feb 2026 09:42:49 -0500
Subject: [PATCH 078/168] I18N: Update translations (#37917)

---
 config/locales/client.ar.yml                  | 415 +++++++++++++---
 config/locales/client.be.yml                  |  19 +-
 config/locales/client.bg.yml                  |  25 +-
 config/locales/client.bs_BA.yml               |  32 +-
 config/locales/client.ca.yml                  |  29 +-
 config/locales/client.cs.yml                  |  71 +--
 config/locales/client.da.yml                  |  48 +-
 config/locales/client.de.yml                  | 168 ++++---
 config/locales/client.el.yml                  | 240 +++++++--
 config/locales/client.en_GB.yml               |   3 +
 config/locales/client.es.yml                  | 159 ++++--
 config/locales/client.et.yml                  |  27 +-
 config/locales/client.fa_IR.yml               |  53 +-
 config/locales/client.fi.yml                  |  53 +-
 config/locales/client.fr.yml                  |  61 ++-
 config/locales/client.gl.yml                  |  32 +-
 config/locales/client.he.yml                  |  71 +--
 config/locales/client.hr.yml                  |  51 +-
 config/locales/client.hu.yml                  |  58 +--
 config/locales/client.hy.yml                  |  31 +-
 config/locales/client.id.yml                  |  27 +-
 config/locales/client.it.yml                  |  53 +-
 config/locales/client.ja.yml                  | 457 ++++++++++++++++--
 config/locales/client.ko.yml                  |  39 +-
 config/locales/client.lt.yml                  |  44 +-
 config/locales/client.lv.yml                  |  29 +-
 config/locales/client.nb_NO.yml               |  34 +-
 config/locales/client.nl.yml                  |  53 +-
 config/locales/client.pl_PL.yml               | 117 +++--
 config/locales/client.pt.yml                  |  43 +-
 config/locales/client.pt_BR.yml               |  53 +-
 config/locales/client.ro.yml                  |  50 +-
 config/locales/client.ru.yml                  |  71 +--
 config/locales/client.sk.yml                  |  65 +--
 config/locales/client.sl.yml                  |  27 +-
 config/locales/client.sq.yml                  |  24 +-
 config/locales/client.sr.yml                  |  28 +-
 config/locales/client.sv.yml                  |  36 +-
 config/locales/client.sw.yml                  |  22 +-
 config/locales/client.te.yml                  |  34 +-
 config/locales/client.th.yml                  |  25 +-
 config/locales/client.tr_TR.yml               |  53 +-
 config/locales/client.ug.yml                  |  57 +--
 config/locales/client.uk.yml                  | 107 ++--
 config/locales/client.ur.yml                  |  71 +--
 config/locales/client.vi.yml                  |  51 +-
 config/locales/client.zh_CN.yml               | 395 +++++++--------
 config/locales/client.zh_TW.yml               |  45 +-
 config/locales/server.ar.yml                  | 269 ++++++++++-
 config/locales/server.be.yml                  |   7 -
 config/locales/server.bg.yml                  |   2 -
 config/locales/server.bs_BA.yml               |   2 -
 config/locales/server.ca.yml                  |  12 -
 config/locales/server.cs.yml                  |  22 -
 config/locales/server.da.yml                  |  10 -
 config/locales/server.de.yml                  |  79 ++-
 config/locales/server.el.yml                  | 100 ++--
 config/locales/server.es.yml                  |  27 --
 config/locales/server.et.yml                  |   6 -
 config/locales/server.fa_IR.yml               |  11 -
 config/locales/server.fi.yml                  |  19 -
 config/locales/server.fr.yml                  |  19 -
 config/locales/server.gl.yml                  |  12 -
 config/locales/server.he.yml                  |  28 --
 config/locales/server.hr.yml                  |   6 -
 config/locales/server.hu.yml                  |  27 --
 config/locales/server.hy.yml                  |  12 -
 config/locales/server.id.yml                  |   9 -
 config/locales/server.it.yml                  |  19 -
 config/locales/server.ja.yml                  | 252 +++++++++-
 config/locales/server.ko.yml                  |  12 -
 config/locales/server.lt.yml                  |   8 -
 config/locales/server.lv.yml                  |   2 -
 config/locales/server.nb_NO.yml               |   8 -
 config/locales/server.nl.yml                  |  19 -
 config/locales/server.pl_PL.yml               |  42 +-
 config/locales/server.pt.yml                  |   4 -
 config/locales/server.pt_BR.yml               |  19 -
 config/locales/server.ro.yml                  |  12 -
 config/locales/server.ru.yml                  |  23 -
 config/locales/server.sk.yml                  |  19 -
 config/locales/server.sl.yml                  |   3 -
 config/locales/server.sq.yml                  |   2 -
 config/locales/server.sv.yml                  |  13 -
 config/locales/server.sw.yml                  |   2 -
 config/locales/server.te.yml                  |  13 -
 config/locales/server.th.yml                  |   2 -
 config/locales/server.tr_TR.yml               |  19 -
 config/locales/server.ug.yml                  |  22 -
 config/locales/server.uk.yml                  |  36 +-
 config/locales/server.ur.yml                  |  14 -
 config/locales/server.vi.yml                  |  10 -
 config/locales/server.zh_CN.yml               | 277 +++++------
 config/locales/server.zh_TW.yml               |  12 -
 .../automation/config/locales/client.ar.yml   |  16 +
 .../automation/config/locales/client.de.yml   |   2 +-
 .../automation/config/locales/client.el.yml   |  33 +-
 .../automation/config/locales/client.ja.yml   |  16 +
 .../config/locales/client.zh_CN.yml           |   4 +-
 .../automation/config/locales/server.ar.yml   |  31 ++
 .../automation/config/locales/server.de.yml   |   2 +-
 .../automation/config/locales/server.el.yml   |  17 +
 .../automation/config/locales/server.ja.yml   |  31 ++
 .../config/locales/server.zh_CN.yml           |  40 +-
 plugins/chat/config/locales/client.ar.yml     |  26 +
 plugins/chat/config/locales/client.be.yml     |   1 +
 plugins/chat/config/locales/client.bg.yml     |   1 +
 plugins/chat/config/locales/client.bs_BA.yml  |   1 +
 plugins/chat/config/locales/client.ca.yml     |   1 +
 plugins/chat/config/locales/client.cs.yml     |   1 +
 plugins/chat/config/locales/client.da.yml     |   1 +
 plugins/chat/config/locales/client.de.yml     |  16 +
 plugins/chat/config/locales/client.el.yml     |  13 +
 plugins/chat/config/locales/client.es.yml     |   4 +
 plugins/chat/config/locales/client.et.yml     |   1 +
 plugins/chat/config/locales/client.fa_IR.yml  |   1 +
 plugins/chat/config/locales/client.fi.yml     |   1 +
 plugins/chat/config/locales/client.fr.yml     |   1 +
 plugins/chat/config/locales/client.gl.yml     |   1 +
 plugins/chat/config/locales/client.he.yml     |   1 +
 plugins/chat/config/locales/client.hr.yml     |   1 +
 plugins/chat/config/locales/client.hu.yml     |   1 +
 plugins/chat/config/locales/client.hy.yml     |   1 +
 plugins/chat/config/locales/client.it.yml     |   1 +
 plugins/chat/config/locales/client.ja.yml     |  26 +
 plugins/chat/config/locales/client.ko.yml     |   1 +
 plugins/chat/config/locales/client.lt.yml     |   1 +
 plugins/chat/config/locales/client.lv.yml     |   1 +
 plugins/chat/config/locales/client.nb_NO.yml  |   1 +
 plugins/chat/config/locales/client.nl.yml     |   1 +
 plugins/chat/config/locales/client.pl_PL.yml  |  10 +
 plugins/chat/config/locales/client.pt.yml     |   1 +
 plugins/chat/config/locales/client.pt_BR.yml  |   1 +
 plugins/chat/config/locales/client.ro.yml     |   1 +
 plugins/chat/config/locales/client.ru.yml     |   1 +
 plugins/chat/config/locales/client.sk.yml     |   1 +
 plugins/chat/config/locales/client.sl.yml     |   1 +
 plugins/chat/config/locales/client.sq.yml     |   1 +
 plugins/chat/config/locales/client.sr.yml     |   1 +
 plugins/chat/config/locales/client.sv.yml     |   1 +
 plugins/chat/config/locales/client.sw.yml     |   1 +
 plugins/chat/config/locales/client.te.yml     |   1 +
 plugins/chat/config/locales/client.th.yml     |   1 +
 plugins/chat/config/locales/client.tr_TR.yml  |   1 +
 plugins/chat/config/locales/client.ug.yml     |   1 +
 plugins/chat/config/locales/client.uk.yml     |   2 +-
 plugins/chat/config/locales/client.ur.yml     |   1 +
 plugins/chat/config/locales/client.vi.yml     |   1 +
 plugins/chat/config/locales/client.zh_CN.yml  |  15 +-
 plugins/chat/config/locales/client.zh_TW.yml  |   1 +
 plugins/chat/config/locales/server.ar.yml     |  31 +-
 plugins/chat/config/locales/server.cs.yml     |   7 -
 plugins/chat/config/locales/server.de.yml     |  13 +-
 plugins/chat/config/locales/server.el.yml     |  15 +
 plugins/chat/config/locales/server.es.yml     |   6 +-
 plugins/chat/config/locales/server.fi.yml     |   5 -
 plugins/chat/config/locales/server.fr.yml     |   5 -
 plugins/chat/config/locales/server.he.yml     |   7 -
 plugins/chat/config/locales/server.hu.yml     |   5 -
 plugins/chat/config/locales/server.it.yml     |   5 -
 plugins/chat/config/locales/server.ja.yml     |  22 +-
 plugins/chat/config/locales/server.nl.yml     |   5 -
 plugins/chat/config/locales/server.pl_PL.yml  |  17 +-
 plugins/chat/config/locales/server.pt_BR.yml  |   5 -
 plugins/chat/config/locales/server.ru.yml     |   7 -
 plugins/chat/config/locales/server.sk.yml     |   7 -
 plugins/chat/config/locales/server.sq.yml     |   2 -
 plugins/chat/config/locales/server.tr_TR.yml  |   5 -
 plugins/chat/config/locales/server.ug.yml     |   5 -
 plugins/chat/config/locales/server.uk.yml     |   7 -
 plugins/chat/config/locales/server.ur.yml     |   6 -
 plugins/chat/config/locales/server.zh_CN.yml  |  22 +-
 .../config/locales/client.ar.yml              |  13 +
 .../config/locales/client.de.yml              |   5 +
 .../config/locales/client.el.yml              |   6 +
 .../config/locales/client.ja.yml              |  13 +
 .../config/locales/client.pl_PL.yml           |   2 +-
 .../config/locales/client.zh_CN.yml           |   8 +-
 .../config/locales/server.ar.yml              |  21 +
 .../config/locales/server.ja.yml              |  21 +
 .../config/locales/server.zh_CN.yml           |  22 +-
 .../config/locales/client.de.yml              |   2 +-
 .../discourse-ai/config/locales/client.ar.yml | 230 ++++++++-
 .../discourse-ai/config/locales/client.bg.yml |   1 +
 .../discourse-ai/config/locales/client.ca.yml |   1 +
 .../discourse-ai/config/locales/client.cs.yml |  11 +-
 .../discourse-ai/config/locales/client.da.yml |   3 +-
 .../discourse-ai/config/locales/client.de.yml |  66 ++-
 .../discourse-ai/config/locales/client.el.yml |  25 +-
 .../discourse-ai/config/locales/client.es.yml |  14 +-
 .../discourse-ai/config/locales/client.et.yml |   1 +
 .../config/locales/client.fa_IR.yml           |   4 +-
 .../discourse-ai/config/locales/client.fi.yml |  14 +-
 .../discourse-ai/config/locales/client.fr.yml |  14 +-
 .../discourse-ai/config/locales/client.gl.yml |   1 +
 .../discourse-ai/config/locales/client.he.yml |  15 +-
 .../discourse-ai/config/locales/client.hr.yml |   2 +
 .../discourse-ai/config/locales/client.hu.yml |   3 +-
 .../discourse-ai/config/locales/client.hy.yml |   1 +
 .../discourse-ai/config/locales/client.id.yml |   5 -
 .../discourse-ai/config/locales/client.it.yml |  14 +-
 .../discourse-ai/config/locales/client.ja.yml | 167 ++++++-
 .../discourse-ai/config/locales/client.ko.yml |   1 +
 .../discourse-ai/config/locales/client.lt.yml |   2 +
 .../config/locales/client.nb_NO.yml           |   2 +
 .../discourse-ai/config/locales/client.nl.yml |  14 +-
 .../config/locales/client.pl_PL.yml           |  32 +-
 .../discourse-ai/config/locales/client.pt.yml |   6 +-
 .../config/locales/client.pt_BR.yml           |  14 +-
 .../discourse-ai/config/locales/client.ro.yml |   5 +-
 .../discourse-ai/config/locales/client.ru.yml |  14 +-
 .../discourse-ai/config/locales/client.sk.yml |  14 +-
 .../discourse-ai/config/locales/client.sl.yml |   1 +
 .../discourse-ai/config/locales/client.sq.yml |   1 +
 .../discourse-ai/config/locales/client.sv.yml |   2 +
 .../discourse-ai/config/locales/client.sw.yml |   1 +
 .../discourse-ai/config/locales/client.te.yml |   1 +
 .../config/locales/client.tr_TR.yml           |  14 +-
 .../discourse-ai/config/locales/client.ug.yml |   3 +-
 .../discourse-ai/config/locales/client.uk.yml |  30 +-
 .../discourse-ai/config/locales/client.ur.yml |   2 +
 .../discourse-ai/config/locales/client.vi.yml |   7 +-
 .../config/locales/client.zh_CN.yml           | 131 +++--
 .../config/locales/client.zh_TW.yml           |   3 +-
 .../discourse-ai/config/locales/server.ar.yml |  94 ++++
 .../discourse-ai/config/locales/server.de.yml |  38 +-
 .../discourse-ai/config/locales/server.el.yml |  11 +
 .../discourse-ai/config/locales/server.ja.yml |  88 ++++
 .../config/locales/server.pl_PL.yml           |  39 +-
 .../discourse-ai/config/locales/server.uk.yml |  12 +-
 .../config/locales/server.zh_CN.yml           |  98 ++--
 .../config/locales/server.ar.yml              |   1 +
 .../config/locales/server.ja.yml              |   1 +
 .../config/locales/server.zh_CN.yml           |   2 +-
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.el.yml              |   1 +
 .../config/locales/server.ar.yml              |   1 +
 .../config/locales/server.el.yml              |   1 +
 .../config/locales/server.ja.yml              |   1 +
 .../config/locales/server.zh_CN.yml           |   2 +-
 .../config/locales/client.ar.yml              |   8 +
 .../config/locales/client.de.yml              |   4 +-
 .../config/locales/client.el.yml              |   1 +
 .../config/locales/client.ja.yml              |   8 +
 .../config/locales/client.zh_CN.yml           |   4 +-
 .../config/locales/server.ar.yml              |   3 +
 .../config/locales/server.de.yml              |   3 +-
 .../config/locales/server.ja.yml              |   3 +
 .../config/locales/server.pl_PL.yml           |   1 +
 .../config/locales/server.zh_CN.yml           |   2 +-
 .../config/locales/client.ar.yml              |   2 +
 .../config/locales/client.el.yml              |   5 +
 .../config/locales/client.ja.yml              |   2 +
 .../config/locales/client.ar.yml              |  13 +-
 .../config/locales/client.be.yml              |   3 +-
 .../config/locales/client.bg.yml              |   3 +-
 .../config/locales/client.bs_BA.yml           |   3 +-
 .../config/locales/client.ca.yml              |   9 +-
 .../config/locales/client.cs.yml              |   5 +-
 .../config/locales/client.da.yml              |   7 +-
 .../config/locales/client.de.yml              |   8 +-
 .../config/locales/client.el.yml              |   5 +
 .../config/locales/client.es.yml              |  11 +-
 .../config/locales/client.et.yml              |   8 +-
 .../config/locales/client.fa_IR.yml           |   4 +-
 .../config/locales/client.fi.yml              |  12 +-
 .../config/locales/client.fr.yml              |  10 +-
 .../config/locales/client.gl.yml              |   3 +-
 .../config/locales/client.he.yml              |  11 +-
 .../config/locales/client.hr.yml              |   3 +-
 .../config/locales/client.hu.yml              |  13 +-
 .../config/locales/client.hy.yml              |   9 +-
 .../config/locales/client.id.yml              |   3 +-
 .../config/locales/client.it.yml              |  14 +-
 .../config/locales/client.ja.yml              |  11 +-
 .../config/locales/client.ko.yml              |   9 +-
 .../config/locales/client.lt.yml              |   2 +
 .../config/locales/client.lv.yml              |   3 +-
 .../config/locales/client.nb_NO.yml           |   8 +-
 .../config/locales/client.nl.yml              |  10 +-
 .../config/locales/client.pl_PL.yml           |  20 +-
 .../config/locales/client.pt.yml              |   9 +-
 .../config/locales/client.pt_BR.yml           |  12 +-
 .../config/locales/client.ro.yml              |   3 +
 .../config/locales/client.ru.yml              |   9 +-
 .../config/locales/client.sk.yml              |  14 +-
 .../config/locales/client.sl.yml              |   9 +-
 .../config/locales/client.sq.yml              |   3 +-
 .../config/locales/client.sr.yml              |   3 +-
 .../config/locales/client.sv.yml              |  11 +-
 .../config/locales/client.sw.yml              |   8 +-
 .../config/locales/client.te.yml              |   3 +-
 .../config/locales/client.th.yml              |   3 +-
 .../config/locales/client.tr_TR.yml           |  14 +-
 .../config/locales/client.ug.yml              |   4 +
 .../config/locales/client.uk.yml              |  12 +-
 .../config/locales/client.ur.yml              |   9 +-
 .../config/locales/client.vi.yml              |   4 +
 .../config/locales/client.zh_CN.yml           |  16 +-
 .../config/locales/client.zh_TW.yml           |   3 +-
 .../config/locales/server.de.yml              |  24 +
 .../config/locales/server.pl_PL.yml           |   2 +-
 .../config/locales/server.uk.yml              |   2 -
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.be.yml              |   2 +-
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.el.yml              |   1 +
 .../config/locales/client.ar.yml              |   1 +
 .../config/locales/client.de.yml              |   4 +-
 .../config/locales/client.el.yml              |   5 +
 .../config/locales/client.ja.yml              |   1 +
 .../config/locales/client.zh_CN.yml           |   2 +-
 .../config/locales/server.ar.yml              |   2 +
 .../config/locales/server.de.yml              |   2 +-
 .../config/locales/server.el.yml              |   2 +
 .../config/locales/server.ja.yml              |   2 +
 .../config/locales/server.zh_CN.yml           |   4 +-
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.el.yml              |   5 +
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/server.ar.yml              |   2 +-
 .../config/locales/server.bs_BA.yml           |   1 -
 .../config/locales/server.cs.yml              |   1 -
 .../config/locales/server.da.yml              |   1 -
 .../config/locales/server.de.yml              |   2 +-
 .../config/locales/server.es.yml              |   1 -
 .../config/locales/server.fa_IR.yml           |   1 -
 .../config/locales/server.fi.yml              |   1 -
 .../config/locales/server.fr.yml              |   1 -
 .../config/locales/server.he.yml              |   1 -
 .../config/locales/server.hr.yml              |   1 -
 .../config/locales/server.hu.yml              |   1 -
 .../config/locales/server.it.yml              |   1 -
 .../config/locales/server.ja.yml              |   2 +-
 .../config/locales/server.ko.yml              |   1 -
 .../config/locales/server.nb_NO.yml           |   1 -
 .../config/locales/server.nl.yml              |   1 -
 .../config/locales/server.pl_PL.yml           |   2 +-
 .../config/locales/server.pt_BR.yml           |   1 -
 .../config/locales/server.ro.yml              |   1 -
 .../config/locales/server.ru.yml              |   1 -
 .../config/locales/server.sk.yml              |   1 -
 .../config/locales/server.tr_TR.yml           |   1 -
 .../config/locales/server.ug.yml              |   1 -
 .../config/locales/server.uk.yml              |   1 -
 .../config/locales/server.ur.yml              |   1 -
 .../config/locales/server.vi.yml              |   1 -
 .../config/locales/server.zh_CN.yml           |   3 +-
 .../config/locales/server.ar.yml              |   2 +
 .../config/locales/server.ja.yml              |   2 +
 .../config/locales/server.zh_CN.yml           |   4 +-
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/server.el.yml              |  10 +-
 .../config/locales/client.ar.yml              |   4 +
 .../config/locales/client.ja.yml              |   4 +
 .../config/locales/server.el.yml              |   1 +
 .../config/locales/client.ar.yml              |   4 +
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.ja.yml              |   4 +
 .../config/locales/server.de.yml              |   1 +
 .../config/locales/server.el.yml              |   1 +
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.el.yml              |   5 +
 .../config/locales/server.ar.yml              |   1 +
 .../config/locales/server.ja.yml              |   1 +
 .../config/locales/client.ar.yml              |   2 +
 .../config/locales/client.el.yml              |   3 +
 .../config/locales/client.ja.yml              |   2 +
 .../config/locales/server.ar.yml              |   3 +
 .../config/locales/server.ja.yml              |   3 +
 .../config/locales/server.zh_CN.yml           |   6 +-
 .../config/locales/client.ar.yml              |   7 +
 .../config/locales/client.ja.yml              |   2 +
 .../config/locales/client.zh_CN.yml           |   2 +-
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/server.ar.yml              |   1 +
 .../config/locales/server.ja.yml              |   1 +
 .../config/locales/server.zh_CN.yml           |   2 +-
 .../config/locales/client.ar.yml              | 288 +++++++++++
 .../config/locales/client.de.yml              |   8 +-
 .../config/locales/client.el.yml              |  35 +-
 .../config/locales/client.fr.yml              |   2 +-
 .../config/locales/client.ja.yml              | 190 ++++++++
 .../config/locales/client.zh_CN.yml           | 178 +++----
 .../config/locales/server.ar.yml              |   9 +
 .../config/locales/server.ja.yml              |   9 +
 .../config/locales/server.zh_CN.yml           |  14 +-
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.ar.yml              |   2 +
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.ja.yml              |   2 +
 .../config/locales/server.de.yml              |   1 +
 .../config/locales/server.el.yml              |   1 +
 .../config/locales/server.pl_PL.yml           |   1 +
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.el.yml              |   2 +
 .../config/locales/server.ar.yml              |   1 +
 .../config/locales/server.ja.yml              |   1 +
 .../config/locales/server.zh_CN.yml           |   2 +-
 .../config/locales/client.ar.yml              |   1 +
 .../config/locales/client.de.yml              |   4 +-
 .../config/locales/client.ja.yml              |   1 +
 .../config/locales/client.zh_CN.yml           |   2 +-
 .../config/locales/client.ar.yml              |   4 +
 .../config/locales/client.es.yml              |   2 +
 .../config/locales/client.ja.yml              |   4 +
 .../config/locales/client.zh_CN.yml           |   2 +-
 .../config/locales/server.ar.yml              |   6 +
 .../config/locales/server.ja.yml              |   6 +
 .../config/locales/server.zh_CN.yml           |   4 +-
 .../config/locales/client.ar.yml              |   5 +
 .../config/locales/client.ja.yml              |   5 +
 .../config/locales/server.el.yml              |   2 +-
 .../config/locales/client.de.yml              |   2 +-
 .../config/locales/client.el.yml              |   5 +
 plugins/footnote/config/locales/client.ar.yml |   6 +
 plugins/footnote/config/locales/client.ja.yml |   6 +
 plugins/poll/config/locales/client.ar.yml     |   4 +
 plugins/poll/config/locales/client.de.yml     |   2 +-
 plugins/poll/config/locales/client.ja.yml     |   4 +
 plugins/poll/config/locales/client.zh_CN.yml  |   2 +-
 plugins/poll/config/locales/server.ar.yml     |   2 +
 plugins/poll/config/locales/server.ja.yml     |   2 +
 plugins/poll/config/locales/server.zh_CN.yml  |   2 +-
 .../config/locales/client.de.yml              |   2 +-
 .../styleguide/config/locales/client.ar.yml   |   6 +
 .../styleguide/config/locales/client.de.yml   |   2 +-
 .../styleguide/config/locales/client.ja.yml   |   6 +
 .../config/locales/client.zh_CN.yml           |   2 +-
 429 files changed, 5589 insertions(+), 3117 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index f4739b4aa8db4..d7bafde994ebb 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -274,7 +274,7 @@ ar:
       el:
         name: اليونانية
       en:
-        name: إنجليزي
+        name: الإنجليزية
       en_GB:
         name: الإنجليزية (المملكة المتحدة)
       es:
@@ -771,6 +771,13 @@ ar:
       remove_confirmation: "هل تريد بالتأكيد حذف هذه المسودة؟"
       bulk_delete: "احذف المحدّد"
       bulk_delete_confirmation: "احذف المسودات"
+      bulk_delete_message:
+        zero: "هل تريد بالتأكيد حذف هذه المسودة؟"
+        one: "هل تريد بالتأكيد حذف هذه المسودة؟"
+        two: "هل تريد بالتأكيد حذف هاتين المسودتين؟"
+        few: "هل تريد بالتأكيد حذف %{count} مسودات؟"
+        many: "هل تريد بالتأكيد حذف %{count} مسودة؟"
+        other: "هل تريد بالتأكيد حذف %{count} مسودة؟"
       new_topic: "مسودة موضوع جديد"
       new_private_message: "مسودة رسالة خاصة جديدة"
       edit_topic: "تعديل مسودة الموضوع"
@@ -874,23 +881,13 @@ ar:
       in_reply_to: "ردًا على"
       filtered_flagged_by: "تم الإبلاغ بواسطة"
       unknown:
-        title:
-          zero: "ليس لديك أي عناصر قابلة للمراجعة من المكوِّن الإضافي المُعطّل:"
-          one: "لديك عنصر واحد قابل للمراجعة من المكوِّن الإضافي المُعطّل:"
-          two: "لديك عنصران قابلان للمراجعة من المكوِّن الإضافي المُعطّل:"
-          few: "لديك عناصر قابلة للمراجعة من المكوِّن الإضافي المُعطّل:"
-          many: "لديك عناصر قابلة للمراجعة من المكوِّن الإضافي المُعطّل:"
-          other: "لديك عناصر قابلة للمراجعة من المكوِّن الإضافي المُعطّل:"
         instruction: "لا يمكن عرض تلك العناصر ما لم تفعّل المكوِّن الإضافي ذا الصلة. يُرجى تفعيل المكوِّن الإضافي ثم تحديث الصفحة. أو يمكنك تجاهلها. <a href='%{url}' target='_blank'>معرفة المزيد...</a>"
         reviewable_unknown_source: "%{reviewableType} (مكوِّن إضافي غير معروف)"
         reviewable_known_source: "%{reviewableType} (من المكوِّن الإضافي \"%{pluginName}\")"
         ignore_all: "تجاهل الكل"
         enable_plugins: "تفعيل المكوِّنات الإضافية"
-        delete_confirm: "هل ترغب بالتأكيد في حذف كل المراجعات التي أُنشِئت بواسطة المكوِّنات الإضافية المعطّلة؟"
-        ignore_success: "حُذفت كل المراجعات التي أُنشِئت بواسطة المكوِّنات الإضافية المعطّلة."
       explain:
         why: "اشرح سبب دخول هذا العنصر في قائمة الانتظار"
-        title: "التقييم القابل للمراجعة"
         formula: "المُعادلة"
         subtotal: "الإجمالي الفرعي"
         total: "الإجمالي"
@@ -904,10 +901,8 @@ ar:
           title: "يحصل المستخدمون الذين تم التحقُّق من صحة بلاغاتهم بشكلٍٍ متكرر على مكافأة."
         trust_level_bonus:
           name: "مستوى الثقة"
-          title: "تحظى العناصر القابلة للمراجعة التي أنشأها مستخدمون من مستوى ثقة أعلى بنقاط أعلى."
         type_bonus:
           name: "مكافأة النوع"
-          title: "يمكن لفريق العمل تخصيص مكافأة لبعض الأنواع القابلة للمراجعة لمنحها أولوية أعلى."
       revise_and_reject_post:
         title: "مراجعة"
         reason: "السبب"
@@ -916,7 +911,6 @@ ar:
         custom_reason: "قدِّم وصفًا واضحًا للسبب"
         other_reason: "آخر..."
         optional: "اختياري"
-      stale_help: "تم إجراء هذه المراجعة بواسطة <b>%{username}</b>."
       claim_help:
         optional: "يمكنك المطالبة بهذا العنصر لمنع الآخرين من مراجعته."
         required: "يجب عليك المطالبة بالعناصر قبل أن تتمكن من مراجعتها."
@@ -952,6 +946,7 @@ ar:
       filtered_topic: "لقد قمت بالتصفية لعرض المحتوى القابل للمراجعة في موضوع واحد."
       filtered_user: "المستخدم المبلَّغ عنه"
       filtered_reviewed_by: "تمت المراجعة بواسطة"
+      filtered_claimed_by: "تمت المطالبة بالعلم من قِبل"
       show_all_topics: "عرض كل الموضوعات"
       deleted_post: "(تم حذف المنشور)"
       deleted_user: "(تم حذف المستخدم)"
@@ -1096,6 +1091,10 @@ ar:
         is_this_post: "هل هذا %{reviewable_type} %{reviewable_human_score_types}؟"
         delimiter: "أو"
         something_else_wrong: "هل هناك خطأ ما في %{reviewable_type} هذا؟"
+        approve_user: "هل توافق على هذا المستخدم؟"
+        suspect_user: "هل ينشر هذا المستخدم رسائل عشوائية؟"
+        approve_post: "هل توافق على هذا المنشور؟"
+        approve_topic: "هل توافق على هذا الموضوع؟"
       types:
         reviewable_flagged_post:
           title: "المنشورات المُبلَغ عنها"
@@ -1114,29 +1113,43 @@ ar:
           title: "المنشور"
           noun: "منشور"
         reviewable_ai_chat_message:
+          title: "رسالة دردشة تم الإبلاغ عنها بواسطة الذكاء الاصطناعي"
           noun: "رسالة الدردشة"
         reviewable_ai_post:
+          title: "منشور تم الإبلاغ عنه بواسطة الذكاء الاصطناعي"
           noun: "منشور"
+        reviewable_post_voting_comment:
+          title: "تعليق تم الإبلاغ عنه"
+          noun: "تعليق"
       flagged_as: "صفة الإبلاغ"
       post_flagged_as: "عُلّم على المنشور على أنه"
       chat_flagged_as: "عُلّم على الدردشة على أنها"
+      queued_post_label: "منشور في قائمة الانتظار"
+      queued_topic_label: "الموضوع في قائمة الانتظار"
       user_label: "المستخدم"
+      assigned_to: "المنشور مُخصص لـ"
       moderator_actions: "الإجراءات المتاحة للمشرفين"
       timeline_and_notes: "المخطط الزمني والملاحظات"
       timeline:
         target_created: "تم إنشاء المنشور"
         target_created_by: "أُنشئ المنشور من طرف %{username} · %{relativeDate}"
         target_deleted: "تم حذف المنشور"
+        target_deleted_by: "تم حذف المنشور بواسطة %{username} · %{relativeDate}"
         flagged: "تم الإبلاغ"
         flagged_as_by: "تم الإبلاغ عنه بسبب %{flagReason} من قِبل %{username} · %{relativeDate}"
         claimed: "تمت المطالبة به"
         claimed_by: "تمت المطالبة به من قِبل %{username} · %{relativeDate}"
+        unclaimed_by: "لم يتم المطالبة به من قِبل %{username} · %{relativeDate}"
         reviewed: "أُجريت مراجعته"
+        approved_by: "تمت الموافقة عليه من قِبل %{username} · %{relativeDate}"
+        rejected_by: "تم رفضه من قِبل %{username} · %{relativeDate}"
+        ignored_by: "تم تجاهله من قِبل %{username} · %{relativeDate}"
         view_conversation: "عرض الرسالة الخاصة"
         note_added: "ملاحظة المشرف"
         note_added_by: "ملاحظة المشرف من قِبل %{username} · %{relativeDate}"
         no_events: "لا توجد أحداث زمنية متاحة للعرض"
       notes:
+        add_note_description: "أضف ملاحظة لتوضيح السياق للمشرفين الآخرين."
         add_note_button: "أضف ملاحظة"
         placeholder: "اكتب ملاحظتك هنا..."
         chars_remaining: "متبقي %{count} من الحروف"
@@ -1149,6 +1162,7 @@ ar:
       review_user: "المستخدم"
       need_help: "هل تحتاج إلى مساعدة؟"
       copy_link: "نسخ الرابط"
+      copy_permalink_title: "نسخ رابط هذا العنصر القابل للمراجعة إلى الحافظة"
       copy_link_feedback: "تم نسخ الرابط"
       view_source: "عرض المصدر"
       insights:
@@ -1161,8 +1175,17 @@ ar:
           few: "جرى الإبلاغ بواسطة %{count} مستخدمين مختلفين"
           many: "جرى الإبلاغ بواسطة %{count} مستخدمًا مختلفًا"
           other: "جرى الإبلاغ بواسطة %{count} مستخدم مختلف"
+        similar_posts: "الانتهاكات السابقة"
+        flagged_in_timeframe:
+          zero: "لم يتم تأكيد أي إبلاغ"
+          one: "تم تأكيد إبلاغ واحد"
+          two: "تم تأكيد إبلاغين"
+          few: "تم تأكيد %{count} إبلاغات"
+          many: "تم تأكيد %{count} إبلاغًا"
+          other: "تم تأكيد %{count} إبلاغ"
         user_activity: "معلومات المستخدم"
         activities:
+          joined_on: "تاريخ الانضمام: %{joinDate}"
           trust_level: "مستوى الثقة: %{trustLevelName}"
           posts:
             zero: "%{count} من المنشورات"
@@ -1171,10 +1194,17 @@ ar:
             few: "%{count} منشورات"
             many: "%{count} منشورًا"
             other: "%{count} منشور"
+        moderation_history:
+          label: "تاريخ الإشراف"
+          silenced: "صامت: %{count}"
+          suspended: "معلق: %{count}"
+          rejected_posts: "المنشورات المرفوضة: %{count}"
         solution_marked: "جرى تعيين الحل"
         topic_has_solution: "هناك حل لهذا الموضوع"
         visibility: "الرؤية"
+        topic_unlisted: "هذا الموضوع غير مدرج ولا يمكن الوصول إليه إلا عبر الرابط المباشر."
       help:
+        community_moderation_guide: "دليل الإشراف الخاص بهذا المجتمع"
         moderation_guide: "دليل الإشراف في Discourse"
         flag_priorities: "إدارة سمعة المستخدم وأولويات الإبلاغ"
         spam_detection: "اكتشاف المحتوى العشوائي"
@@ -1351,6 +1381,7 @@ ar:
           title: التفاعل
           posting: النشر
           notification: الإشعارات
+          self_lockout: "أنت على وشك تغيير رؤية المجموعة بطريقة ستؤدي إلى إزالة صلاحية وصولك. هل أنت متأكد من رغبتك في المتابعة؟"
         email:
           title: "البريد الإلكتروني"
           enable_smtp: "تفعيل SMTP"
@@ -1363,6 +1394,7 @@ ar:
           smtp_title: "SMTP"
           smtp_instructions: "عند تفعيل SMTP للمجموعة، سيتم إرسال جميع الرسائل الإلكترونية الصادرة المُرسَلة من صندوق الوارد الخاص بالمجموعة عبر إعدادات SMTP المحدَّدة هنا بدلًا من خادم البريد الذي تم إعداده للرسائل الإلكترونية الأخرى التي يرسلها منتداك."
           additional_settings: "إعدادات إضافية"
+          smtp_disable_confirm: "إذا أوقفت بروتوكول SMTP، فسيُعاد ضبط جميع إعداداته وتُعطل الوظائف المرتبطة به. هل تريد المتابعة فعلاً؟"
           prefill:
             title: "الملء المسبق بإعدادات:"
             gmail: "Gmail"
@@ -1485,6 +1517,8 @@ ar:
         make_owner_description: "جعل <b>%{username}</b> أحد مالكي هذه المجموعة"
         remove_owner: "إزالة كمالك"
         remove_owner_description: "إزالة <b>%{username}</b> كمالك هذه المجموعة"
+        remove_member_self_lockout: "إذا أزلت نفسك من هذه المجموعة، فسيُسحب منك حق الوصول لإدارتها. هل تريد المتابعة فعلاً؟"
+        remove_owner_self_lockout: "إذا أزلت نفسك كمالك، فسيُسحب منك حق الوصول لإدارة هذه المجموعة. هل تريد المتابعة فعلاً؟"
         make_primary: "التعيين كمجموعة أساسية"
         make_primary_description: "جعل هذه المجموعة هي المجموعة الأساسية للمستخدم <b>%{username}</b>"
         remove_primary: "الإزالة كمجموعة أساسية"
@@ -1651,6 +1685,13 @@ ar:
       organisation: المؤسسة
       phone: الهاتف
       other_accounts: "الحسابات الأخرى بعنوان IP هذا:"
+      other_accounts_with_ip:
+        zero: "%{count} من الحسابات الأخرى بعنوان IP هذا"
+        one: "حساب آخر (%{count}) بعنوان IP هذا"
+        two: "حسابان آخران (%{count}) بعنوان IP هذا"
+        few: "%{count} حسابات أخرى بعنوان IP هذا"
+        many: "%{count} حسابًا آخر بعنوان IP هذا"
+        other: "%{count} حساب آخر بعنوان IP هذا"
       delete_other_accounts:
         zero: "حذف %{count}"
         one: "حذف %{count}"
@@ -1694,6 +1735,12 @@ ar:
         for_user:
           upcoming_change: "التغيير القادم"
           enabled: "مفعَّلة؟"
+          why: "لماذا؟"
+        why_reasons:
+          not_in_specific_groups: "المستخدم غير موجود في المجموعات المحددة المطلوبة لإجراء هذا التغيير."
+          in_specific_groups: "المستخدم موجود في المجموعات المحددة المطلوبة لإجراء هذا التغيير."
+          enabled_for_everyone: "هذا التغيير متاح لجميع الأعضاء"
+          enabled_for_no_one: "هذا التغيير غير متاح لجميع الأعضاء"
       user_notifications:
         filters:
           filter_by: "التصفية حسب"
@@ -2068,11 +2115,13 @@ ar:
         interface: "الواجهة"
         apps: "التطبيقات"
         navigation_menu: "قائمة التنقل"
+        upcoming_changes: "التغييرات القادمة"
       change_password:
         success: "(تم إرسال رسالة البريد الإلكتروني)"
         in_progress: "(جارٍ إرسال رسالة البريد الإلكتروني)"
         error: "(خطأ)"
         action: "إرسال رسالة إلكترونية لإعادة تعيين كلمة المرور"
+        staged_user: "المستخدمون المؤقتون لا يمكنهم تلقي رسائل إعادة تعيين كلمة المرور."
         set_password: "تعيين كلمة المرور"
         choose_new: "اختيار كلمة مرور جديدة"
         choose: "اختيار كلمة مرور"
@@ -2732,6 +2781,14 @@ ar:
       no_results: "لا توجد نتائج"
       search: "البحث…"
       label: "تحديد الخيارات"
+    d_otp:
+      screen_reader:
+        zero: أدخل رقمًا
+        one: أدخل رقمًا
+        two: أدخل رقمين
+        few: أدخل %{count} أرقام
+        many: أدخل %{count} رقمًا
+        other: أدخل %{count} رقم
     form_kit:
       reset: إعادة التعيين
       optional: اختياري
@@ -3127,6 +3184,7 @@ ar:
         many: "%{count} موضوعًا في هذه الفئة"
         other: "%{count} موضوع في هذه الفئة"
       read_only: "للقراءة فقط"
+      read_only_description: "هذه الفئة للقراءة فقط، لذا لا يمكنك اختيارها لهذا الموضوع."
     timezone_input:
       ambiguous_ist: "اختصار IST غير واضح، يرجى اختيار منطقة زمنية محددة (مثل: Asia/Kolkata)"
     select_kit:
@@ -3230,7 +3288,7 @@ ar:
         translation: "ترجمة"
         no_translation_yet: "ابدأ الكتابة لرؤية معاينة الترجمة..."
         placeholder: "أدخل ترجمة المنشور هنا…"
-        show_raw_markdown: "اعرض الخام"
+        show_raw_markdown: "اعرض النص الأصلي"
       group_mentioned_limit:
         zero: "<b>تحذير!</b>لقد أشرت إلى <a href='%{group_link}'>%{group}</a>، لكن هذه المجموعة تتضمَّن عدد أعضاء أكثر من حد الإشارة الذي عيَّنه المسؤول وهو %{count} مستخدم. لن يتم إرسال إشعار إلى أي أحد."
         one: "<b>تحذير!</b>لقد أشرت إلى <a href='%{group_link}'>%{group}</a>، لكن هذه المجموعة تتضمَّن عدد أعضاء أكثر من حد الإشارة الذي عيَّنه المسؤول وهو مستخدم واحد (%{count}). لن يتم إرسال إشعار إلى أي أحد."
@@ -3321,8 +3379,8 @@ ar:
       create_shared_draft: "إنشاء مسودة مشتركة"
       edit_shared_draft: "تعديل المسودة المشتركة"
       title: "أو اضغط على %{modifier}Enter"
-      save_and_close: "احفظ وأغلق"
-      discard: "أهمِل"
+      save_and_close: "حفظ وإغلاق"
+      discard: "تجاهل"
       draft_saved: "حُفظت المسودة!"
       users_placeholder: "إضافة مستخدمين أو مجموعات"
       title_placeholder: "ما موضوع هذه المناقشة في جملة واحدة مختصرة؟"
@@ -3390,9 +3448,9 @@ ar:
         no_attributes: "لم تتم إضافة أي سمات بعد."
       wrap_text: "إضافة عنصر احتواء للمحتوى"
       help: "مساعدة تحرير Markdown"
-      collapse: "صغّر لوحة الإنشاء"
-      open: "افتح لوحة الإنشاء"
-      abandon: "إغلاق أداة الإنشاء وأهمِل المسودة"
+      collapse: "تصغير لوحة أداة الإنشاء"
+      open: "فتح لوحة أداة الإنشاء"
+      abandon: "إغلاق أداة الإنشاء وتجاهل المسودة"
       enter_fullscreen: "فتح أداة الإنشاء في وضع ملء الشاشة"
       exit_fullscreen: "اخرج من أداة الإنشاء في وضع ملء الشاشة"
       exit_fullscreen_prompt: "اضغط على <kbd>ESC</kbd> للخروج من وضع الشاشة الكاملة"
@@ -3445,6 +3503,7 @@ ar:
           desc: "الرد دون تغيير تاريخ آخر رد"
         toggle_unlisted:
           label: تفعيل إلغاء الإدراج
+          desc: "لا يمكن الوصول إلى الموضوعات غير المدرجة إلا من خلال الرابط المباشر"
       reload: "إعادة التحميل"
       ignore: "تجاهل"
       image_alt_text:
@@ -3588,6 +3647,7 @@ ar:
           description: "\"%{changeName}\" متاح للمعاينة"
         automatically_promoted:
           title: "التغييرات القادمة"
+          description: "تم تفعيل '%{changeName}' تلقائيًا"
       dismiss_confirmation:
         body:
           default:
@@ -3659,8 +3719,11 @@ ar:
         post_approved: "تمت الموافقة على المنشور"
         membership_request_consolidated: "طلبات العضوية الجديدة"
         reaction: "تفاعل جديد"
-        votes_released: "تم تحرير التصويت"
+        votes_released: "صدَر التصويت"
+        new_features: "تم إطلاق ميزات جديدة في Discourse"
         admin_problems: "نصيحة جديدة بشأن لوحة معلومات موقعك"
+        upcoming_change_available: "التغيير الجديد القادم '%{changeName}' متاح الآن"
+        upcoming_change_automatically_promoted: "تم تفعيل التغيير القادم '%{changeName}' تلقائيًا"
     upload_selector:
       change: "تغيير"
       delete: "حذف"
@@ -3755,6 +3818,7 @@ ar:
           aria_label: التصفية باستخدام الوسوم
         filters:
           label: إرجاع الموضوعات/المنشورات فقط…
+          all: تضمين الرسائل
           title: مطابقة العنوان فقط
           likes: أعجبتني
           posted: نشرت فيها
@@ -3800,8 +3864,6 @@ ar:
         max_views:
           placeholder: الحد الأقصى
           aria_label: التصفية حسب أقصى عدد من المشاهدات
-        additional_options:
-          label: "التصفية حسب عدد المنشورات وعدد مشاهدات الموضوع"
     hamburger_menu: "قائمة التنقل"
     new_item: "جديد"
     go_back: "الرجوع"
@@ -3893,6 +3955,7 @@ ar:
     topics:
       new_messages_marker: "آخر زيارة"
       bulk:
+        select: "تحديد الكل"
         confirm: "تأكيد"
         select_all: "تحديد الكل"
         clear_all: "مسح الكل"
@@ -3915,6 +3978,13 @@ ar:
           few: "حذف المنشورات"
           many: "حذف المنشورات"
           other: "حذف المنشورات"
+        delete_posts_confirmation:
+          zero: "هل تريد بالتأكيد حذف %{count} منشورًا؟"
+          one: "هل تريد بالتأكيد حذف المنشور (%{count})؟"
+          two: "هل تريد بالتأكيد حذف المنشورين (%{count})؟"
+          few: "هل تريد بالتأكيد حذف %{count} منشورات؟"
+          many: "هل تريد بالتأكيد حذف %{count} منشورًا؟"
+          other: "هل تريد بالتأكيد حذف %{count} منشور؟"
         dismiss: "تجاهل"
         dismiss_read: "تجاهل كل الموضوعات غير المقروءة"
         dismiss_read_with_selected:
@@ -4087,7 +4157,7 @@ ar:
         many: "%{count} منشورًا في الموضوع"
         other: "%{count} منشور في الموضوع"
       create: "موضوع جديد"
-      create_long: "أنشئ موضوعًا جديدًا"
+      create_long: "إنشاء موضوع جديد"
       open_draft: "فتح المسودة"
       private_message: "إنشاء رسالة"
       archive_message:
@@ -4612,12 +4682,25 @@ ar:
           many: "لقد حدَّدت <b>%{count}</b> منشورًا."
           other: "لقد حدَّدت <b>%{count}</b> منشور."
       deleted_by_author_simple: "(تم حذف الموضوع بواسطة الكاتب)"
+      localizations:
+        title_edit_warning:
+          message: "هذا عنوان موضوع مترجم.<br><br>هل تريد تعديل الفئة، والوسوم، والعنوان <b>الأصلي</b> بلغة %{language}، أم تعديل هذه <b>الترجمة تحديدًا</b>؟"
+          action_original: "تعديل النسخة الأصلية"
+          action_translation: "تعديل عنوان الموضوع المترجم"
+        editing_translation: "تعديل الترجمة باللغة %{language}"
     post_list:
       title: "آخر المنشورات"
       empty: "لا توجد منشورات"
       aria_post_number: "%{title} - المنشور #%{postNumber}"
       bulk:
-        select_all: "حدّد الكلّ"
+        selected:
+          zero: "لم يتم تحديد أي منشورات"
+          one: "تم تحديد منشور"
+          two: "تم تحديد منشورين"
+          few: "تم تحديد %{count} منشورات"
+          many: "تم تحديد %{count} منشورًا"
+          other: "تم تحديد %{count} منشور"
+        select_all: "تحديد الكل"
         clear_all: "مسح الكل"
         actions: "الإجراءات الجماعية"
     post:
@@ -4747,7 +4830,13 @@ ar:
           edit: "تعديل"
           delete: "حذف"
         add: "أضف ترجمة جديدة"
-        manage: "إدارة الترجمات (الموجودة: %{count})"
+        manage:
+          zero: "إدارة الترجمات (الموجودة: %{count})"
+          one: "إدارة الترجمات (الموجودة: %{count})"
+          two: "إدارة الترجمات (الموجودة: %{count})"
+          few: "إدارة الترجمات (الموجودة: %{count})"
+          many: "إدارة الترجمات (الموجودة: %{count})"
+          other: "إدارة الترجمات (الموجودة: %{count})"
         view:
           zero: "عرض %{count} من لغات الترجمة"
           one: "عرض لغة ترجمة واحدة %{count}"
@@ -4788,7 +4877,7 @@ ar:
         attachment_upload_not_allowed_for_new_user: "عذرًا، لا يمكن للمستخدمين الجُدد تحميل المرفقات."
         attachment_download_requires_login: "عذرًا، عليك تسجيل الدخول لتنزيل المرفقات."
       cancel_composer:
-        confirm: "أتريد إهمال مشاركتك؟"
+        confirm: "أتريد تجاهل مشاركتك؟"
         discard: "تجاهل"
       via_email: "لقد وصل هذا المنشور عبر البريد الإلكتروني"
       via_auto_generated_email: "لقد وصل هذا المنشور عبر رسالة إلكترونية تم إنشاؤها تلقائيًا"
@@ -5120,6 +5209,10 @@ ar:
       all_topics_wiki: "تحويل الموضوعات الجديدة إلى Wiki بشكلٍٍ افتراضي"
       allow_unlimited_owner_edits_on_first_post: "السماح للمالك بعدد غير محدود من التعديلات على أول منشور"
       subcategory_list_style: "نمط قائمة الفئات الفرعية:"
+      sort_order: "ترتيب قائمة الموضوعات حسب:"
+      default_view: "قائمة الموضوعات الافتراضية:"
+      default_top_period: "الفترة الافتراضية للأكثر عرضًا:"
+      default_list_filter: "تصفية القائمة الافتراضية:"
       allow_badges_label: "السماح بمنح الشارات في هذه الفئة"
       edit_permissions: "عدّل الأذونات"
       reviewable_by_group: "بالإضافة إلى فريق العمل، يمكن أيضًا مراجعة المحتوى في هذه الفئة من قِبل:"
@@ -5128,14 +5221,20 @@ ar:
       require_reply_approval: "طلب موافقة المشرف على جميع الردود الجديدة"
       this_year: "هذا العام"
       position: "الترتيب في صفحة الفئات:"
+      default_position: "الترتيب الافتراضي"
       position_disabled: "سيتم عرض الفئات بترتيب النشاط. للتحكم في ترتيب الفئات في القوائم، قم بتفعيل الإعداد <a href='%{url}'>\"المواضع الثابتة للفئات\"</a>."
       minimum_required_tags: "الحد الأدنى من عدد الوسوم المطلوبة في الموضوع:"
+      default_slow_mode: 'تفعيل "الوضع البطيء" للموضوعات الجديدة في هذه الفئة.'
+      subcategory_of: "فئة فرعية من..."
       none_subcategory_text: "لا يوجد"
+      subcategory_permissions_warning: "لا يمكن أن تكون الفئة الفرعية لفئة خاصة عامة."
       visibility:
         title: "الرؤية"
         public: "عام"
         all_members: "جميع الأعضاء"
         group_restricted: "خاص"
+        who_can_see: "من يمكنه رؤية هذه الفئة؟"
+        who_can_post: "من يمكنه النشر في هذه الفئة"
       num_auto_bump_daily: "عدد الموضوعات المفتوحة التي سيتم رفعها تلقائيًا بشكلٍ يومي:"
       auto_bump_cooldown_days: "الحد الأدنى لعدد الأيام قبل رفع الموضوع نفسه مرة أخرى:"
       navigate_to_first_post_after_read: "الانتقال إلى أول منشور بعد قراءة الموضوعات"
@@ -5514,6 +5613,7 @@ ar:
       download: "تنزيل"
       open: "الصورة الأصلية"
       image_info: "معلومات الصورة"
+      quote: "اقتباس الصورة"
       previous: "السابق (مفتاح السهم الأيسر)"
       next: "التالي (مفتاح السهم الأيمن)"
       counter: "%curr% من %total%"
@@ -5541,6 +5641,7 @@ ar:
         latest: "%{shortcut} الحديثة"
         new: "%{shortcut} الجديدة"
         unread: "%{shortcut} غير المقروءة"
+        unseen: "%{shortcut} غير مقروء"
         categories: "%{shortcut} الفئات"
         top: "%{shortcut} الأكثر نشاطًا"
         bookmarks: "%{shortcut} الإشارات المرجعية"
@@ -5555,11 +5656,12 @@ ar:
         back: "%{shortcut} الرجوع"
         up_down: "%{shortcut} نقل التحديد &uarr; &darr;"
         open: "%{shortcut} فتح الموضوع المحدَّد"
+        open_new_window: "%{shortcut} فتح الموضوع المحدد في تبويب/نافذة جديدة"
         next_prev: "%{shortcut} القسم التالي/السابق"
         go_to_unread_post: "%{shortcut} الانتقال إلى أول منشور غير مقروء"
       application:
         title: "التطبيق"
-        create: "%{shortcut} أنشئ موضوع جديد أو رسالة شخصية"
+        create: "%{shortcut} أنشئ موضوعًا جديدًا أو رسالة شخصية"
         notifications: "%{shortcut} فتح الإخطارات"
         hamburger_menu: "%{shortcut} فتح قائمة التنقل"
         user_profile_menu: "%{shortcut} فتح قائمة المستخدم"
@@ -5706,6 +5808,7 @@ ar:
       add_to_calendar: "إضافة إلى التقويم"
       google: "تقويم Google"
       ics: "ICS"
+      default_title: "حدث مجدول"
     tagging:
       all_tags: "كل الوسوم"
       other_tags: "وسوم أخرى"
@@ -5780,7 +5883,20 @@ ar:
         other: "سيتم حذف مرادفاته (%{count}) أيضًا."
       edit_tag: "تعديل اسم الوسم ووصفه"
       edit: "عدِّل هذا الوسم"
-      description: "الوصف (1000 حرف كحد أقصى)"
+      description: "الوصف"
+      settings:
+        title: "الإعدادان"
+        general: "عام"
+        localizations: "التوطينات"
+        back: "رجوع"
+        name: "الاسم"
+        slug: "المسار"
+        name_placeholder: "اسم الوسم"
+        synonyms_subtitle: "عند استخدام الوسوم التالية، سيتم استبدالها بالوسم %{name}"
+      localization:
+        locale: "اللغة"
+        name: "الاسم"
+        description: "الوصف"
       sort_by: "الترتيب حسب:"
       sort_by_count: "العدد"
       sort_by_name: "الاسم"
@@ -5790,7 +5906,23 @@ ar:
       upload_description: "تحميل ملف CSV لإنشاء الوسوم بشكلٍٍ جماعي"
       upload_instructions: "واحد في كل سطر، مع مجموعة وسوم بالتنسيق 'tag_name,tag_group' بشكلٍٍ اختياري."
       upload_successful: "تم تحميل الوسوم بنجاح"
+      bulk_create_inline_placeholder: "إنشاء وسوم (مفصولة بفواصل)"
       bulk_create_button: "إنشاء"
+      bulk_create_success:
+        zero: "الوسوم (%{count}) التي تم إنشاؤها:"
+        one: "الوسم (%{count}) الذي تم إنشاؤه:"
+        two: "الوسمان (%{count}) اللذان تم إنشاؤهما:"
+        few: "الوسوم (%{count}) التي تم إنشاؤها:"
+        many: "الوسوم (%{count}) التي تم إنشاؤها:"
+        other: "الوسوم (%{count}) التي تم إنشاؤها:"
+      bulk_create_already_exist:
+        zero: "%{count} وسم موجود بالفعل:"
+        one: "%{count} وسم موجود بالفعل:"
+        two: "%{count} وسم موجودان بالفعل:"
+        few: "%{count} وسوم موجودين بالفعل:"
+        many: "%{count} وسمًا موجودين بالفعل:"
+        other: "%{count} وسم موجودين بالفعل:"
+      bulk_create_some_failed: "فشل إنشاء بعض الوسوم:"
       delete_unused_confirmation:
         zero: "سيتم حذف %{count} وسم: %{tags}"
         one: "سيتم حذف وسم واحد (%{count}): %{tags}"
@@ -5963,6 +6095,7 @@ ar:
       tags_form_modal:
         title: "يمكنك تعديل التنقل بين الوسوم"
         filter_placeholder: "تصفية الوسوم"
+        no_tags: "لا توجد وسوم مطابقة لعوامل التصفية الحالية."
         subtitle:
           text: "وسنعرض تلقائيًا أهم الوسوم على هذا الموقع"
       edit_navigation_modal_form:
@@ -6060,6 +6193,8 @@ ar:
           header_link_text: "الفئات"
           header_action_title: "تعديل فئات الشريط الجانبي"
           header_action_new: "فئة جديدة"
+          header_action_edit_sidebar: "تعديل فئات الشريط الجانبي"
+          header_action_edit_header_dropdown: "تعديل فئات التنقل"
           configure_defaults: "إعداد الإعدادات الافتراضية"
         community:
           edit_section:
@@ -6140,6 +6275,7 @@ ar:
           dark: "داكن"
           auto: "الوضع التلقائي"
           title: "وضع اللون"
+          aria_label: "وضع الألوان، حاليًا %{mode}"
     welcome_topic_banner:
       title: "إنشاء موضوعك الترحيبي"
       description: "إن موضوعك الترحيبي هو أول ما يقرأه الأعضاء الجُدد. انظر إليه على أنه \"عرض ترويجي\" أو \"بيان مهمة\". دَع الجميع يعرفون الجمهور المستهدف بهذا المجتمع، وما يتوقعون العثور عليه هنا، وما تريد منهم أن يفعلوه أولًا."
@@ -6331,10 +6467,17 @@ ar:
             bookmarks: "الموضوعات في %{category} بدون وسوم التي وضعت إشارة مرجعية عليها"
             default: "الموضوعات في %{category} وفق %{filter} بدون وسوم"
         categories: "كل الفئات"
+    content_localization:
+      toggle_localized:
+        translated: "تمت ترجمة الصفحة آليًا. انقر لعرض النسخة الأصلية."
+        not_translated: "الصفحة غير مترجمة. انقر للترجمة."
+    language_switcher:
+      title: "تغيير لغة الموقع"
   admin_js:
     type_to_filter: "اكتب للتصفية…"
     settings: "الإعدادات"
     reset_filter: "إعادة التعيين"
+    toggle_filters: "تبديل عوامل تصفية القائمة المنسدلة"
     admin:
       title: "مسؤول Discourse"
       moderator: "مشرف"
@@ -6347,9 +6490,13 @@ ar:
           never: "أبدًا"
       reports:
         title: "قائمة التقارير المتاحة"
-        meta_doc: "تُعَد التقارير أداةً قوية لمساعدتك على فيهم ما يحدث على موقعك. ويمكنها مساعدتك في تحديد الاتجاهات الرائجة، واكتشاف المشكلات، واتخاذ القرارات استنادًا إلى البيانات."
         sidebar_title: "التقارير"
         back: "العودة إلى جميع التقارير"
+        group_traffic: "الزيارات"
+        group_members: "الأعضاء"
+        group_moderation: "الإشراف"
+        group_security: "الأمان"
+        group_other: "أخرى"
       config_sections:
         account:
           title: "الحساب"
@@ -6372,15 +6519,34 @@ ar:
         plugin: "الإضافات"
         metadata: "البيانات الوصفية"
         enabled: "مفعَّلة"
+        enabled_for: "مُفعّل لـ..."
         show_image: "اعرض الصورة"
+        edit_groups: "تعديل مجموعات الانضمام الاختياري"
         groups_updated: "حُدثت المجموعات!"
         save_groups: "احفظ المجموعات"
+        add_groups_to_enable: "أضف مجموعات لتفعيل هذه الميزة"
+        no_changes_to_save: "لا توجد تغييرات للحفظ"
         select_groups: "تحديد المجموعات…"
+        opt_in_groups: "مجموعات الانضمام الاختياري"
+        opt_in_groups_instructions: "يمكن استخدام مجموعات الانضمام الاختياري للسماح لمجموعة معينة من المستخدمين باختبار تغييرٍ ما قبل طرحه للجميع. يرجى ملاحظة أن هذه المجموعات لن تكون ذات صلة بمجرد انتقال التغيير إلى الحالة المستقرة."
+        enabled_for_throttle: "لقد قمت بتغيير الأشخاص المفعَّلة لديهم هذه الميزة بسرعة كبيرة. يرجى الانتظار لبضع ثوانٍ قبل المحاولة مرة أخرى."
+        change_enabled_for_success: "لقد فعلت هذا التغيير لـ %{enabledFor}"
+        change_disabled: "تم إلغاء اشتراكك في هذا التغيير"
+        permanent_notice: "أصبح هذا التغيير دائمًا وسيتم إزالته قريبًا. لم يعد بإمكانك إلغاء الاشتراك."
+        permanent_no_group_selection: "لا ينطبق؛ حيث تسري التغييرات الدائمة على كافة المجموعات"
+        no_changes: "لا توجد تغييرات قادمة في الوقت الحالي."
         preview: "معاينة"
         enabled_for_options:
           no_one: "لا أحد"
           everyone: "الجميع"
-          staff: "لفريق العمل فقط"
+          specific_groups: "مجموعة (مجموعات) محددة"
+          specific_groups_with_group_names:
+            zero: "المجموعة %{groupNames}"
+            one: "المجموعة %{groupNames}"
+            two: "المجموعتان %{groupNames}"
+            few: "المجموعات %{groupNames}"
+            many: "المجموعات %{groupNames}"
+            other: "المجموعات %{groupNames}"
         statuses:
           experimental: "تجريبي"
           alpha: "ألفا"
@@ -6394,12 +6560,22 @@ ar:
           all_members: "جميع الأعضاء"
           developers: "المطوّرون"
         filter:
+          search_placeholder: "تصفية حسب الاسم، أو الوصف، أو المكون الإضافي..."
+          no_results: "لا توجد تغييرات قادمة تطابق معايير التصفية"
           all: "الكل"
           enabled: "مفعَّلة"
           disabled: "متوقفة"
+          impact_type_all: "كل أنواع التأثيرات"
           impact_type_feature: "الميزة"
           impact_type_other: "أخرى"
+          status_all: "جميع الحالات"
+          status_conceptual: "مفاهيمي"
           status_experimental: "تجريبي"
+          status_alpha: "ألفا"
+          status_beta: "تجريبي"
+          status_stable: "مستقر"
+          status_permanent: "دائم"
+          impact_role_all: "جميع الأدوار المتأثرة"
           impact_role_admins: "المسؤولون"
           impact_role_moderators: "المشرفون"
           impact_role_staff: "فريق العمل"
@@ -6435,17 +6611,31 @@ ar:
           title: "التوطين"
           header_description: "ضبط لغة واجهة المنتدى وخيارات التوطين الأخرى لأعضاء مجتمعك"
           keywords: "اللغة|اللغة|المنطقة الزمنية|unicode|من اليسار إلى اليمين"
+        upcoming_changes:
+          title: "التغييرات القادمة"
         login:
           title: "تسجيل الدخول والمصادقة"
-          header_description: "تكوين كيفية تسجيل دخول المستخدمين ومصادقتهم، والعبارات السرية، والمفاتيح، ومقِّدمي OAuth2، وغير ذلك"
+          header_description: "تكوين كيفية تسجيل دخول المستخدمين ومصادقتهم، والعبارات السرية، والمفاتيح، ومقدِّمي المصادقة الثنائية، وغير ذلك"
           sub_pages:
             common_settings:
-              title: "الإعدادان"
+              title: "الإعدادات"
+            authenticators:
+              title: "تسجيل الدخول بحساب تواصل اجتماعي"
+            discourseconnect:
+              title: "Discourse Connect"
             discourse_id:
               title: "معرّف Discourse"
         discourse_id:
           title: "معرّف Discourse"
+          stats:
+            total_users: "إجمالي المستخدمين"
+            signups_30_days: "عمليات التسجيل (آخر 30 يومًا)"
+            logins_30_days: "تسجيلات الدخول (آخر 30 يومًا)"
+          regenerate_credentials: "إعادة إنشاء بيانات الاعتماد"
+          regenerate_confirm: "هل أنت متأكد من رغبتك في إعادة إنشاء بيانات اعتماد معرف Discourse لديك؟ سيؤدي ذلك إلى إنشاء سر عميل جديد. عادةً لا يكون إعادة إنشاء بيانات الاعتماد ضروريًا، لكنه قد يكون مفيدًا لتعزيز الأمان."
+          description: "يعد معرف Discourse خدمة تسجيل دخول موحد تتيح للمستخدمين الوصول إلى عدة مواقع Discourse باستخدام حساب واحد فقط. كما يدعم مقدمو خدمات تسجيل الدخول عبر حسابات التواصل الاجتماعي الشائعة مثل Google وFacebook وApple وGitHub دون الحاجة إلى إعدادات إضافية."
           learn_more: "معرفة المزيد"
+          regenerate_success: "تم إعادة إنشاء بيانات الاعتماد بنجاح."
         logo:
           title: "الشعار"
           header_description: "ضبط الشعارات والرموز المستخدمة في جميع أنحاء موقعك"
@@ -6461,7 +6651,6 @@ ar:
               help_text: "الحجم الموصى به هو 600 × 80 بكسل."
             large_icon:
               title: "أيقونة مربعة"
-              description: "يُعرض إصدار مربع من صورة الشعار في الجزء العلوي من واجهة الإدارة، ويُستخدم أيضًا كشعار لتطبيق الهاتف على الشاشة الرئيسية."
               help_text: "الحجم الموصى به هو 512 × 512 بكسل."
             square_icon_dark:
               required: "هل تريد استخدام أيقونة مربعة مختلفة للوضع الداكن؟"
@@ -6537,26 +6726,61 @@ ar:
             modal_yes: "نعم"
             modal_no: "لا، يُطبَّق ذلك فقط على الاستخدامات المستقبلية"
         welcome_banner:
+          title: "بانر الترحيب"
+          header_description: "اضبط البانر التي يحتوي على شريط بحث ويعرض لزوار موقعك."
+          saved: "تم حفظ إعدادات بانر الترحيب بنجاح."
           form:
+            enabled_themes:
+              label: "مفعّل على السمات..."
+              description: "اختر السمات التي يجب أن تعرض البانر. يتم عرض السمات النشطة فقط."
+              select_label: "اختر السمات"
+            background_image:
+              label: "صورة الخلفية"
+              description: "ستُعرض هذه الصورة خلف نص البانر."
             text_color:
               label: "لون النص"
+              description: "عند تحميل \"صورة الخلفية\" أعلاه، استخدم هذا الإعداد لتغيير لون نص البانر لضمان وضوحه. إذا تُرك فارغًا أو لم يتم تحميل صورة خلفية، تتحكم السمة النشطة في اللون."
             page_visibility:
+              label: "رؤية الصفحة"
+              description: "اختر موقع عرض البانر"
               options:
                 top_menu_pages: "الصفحات المدرجة في القائمة العلوية"
+                homepage: "الصفحة الرئيسية فقط"
+                discovery: "صفحات الاستكشاف"
                 all_pages: "جميع الصفحات"
             location:
               label: "الموقع الجغرافي"
+              description: "اختر مكان ظهور البانر على الصفحة."
               options:
                 above_topic_content: "فوق محتوى الموضوع"
                 below_site_header: "أسفل رأس الموقع"
             text_section:
+              title: "نص قابل للتخصيص"
               locale_label: "اللغة"
             header_new_members:
+              label: "رأس الصفحة للأعضاء الجدد"
+              description: "المتغيرات المتاحة: <code>&percnt;{site_name}</code>, <code>&percnt;{preferred_display_name}</code>"
               placeholder: "مرحبًا بك، %{preferred_display_name}!"
             header_logged_in:
+              label: "رأس الصفحة للأعضاء المسجلين"
+              description: "المتغيرات المتاحة: <code>&percnt;{site_name}</code>, <code>&percnt;{preferred_display_name}</code>"
               placeholder: "مرحبًا بعودتك يا %{preferred_display_name}!"
             header_anonymous:
+              label: "رأس الصفحة للزوار المجهولين"
+              description: "المتغيرات المتاحة: <code>&percnt;{site_name}</code>"
               placeholder: "مرحبًا بك في %{site_name}!"
+            subheader_logged_in:
+              label: "العنوان الفرعي للأعضاء المسجلين"
+              description: "النص الثانوي المعروض أسفل الرأس للأعضاء المسجلين."
+              placeholder: "اكتشف كل جديد في المجتمع"
+            subheader_anonymous:
+              label: "العنوان الفرعي للزوار المجهولين"
+              description: "النص الثانوي المعروض أسفل الرأس للزوار المجهولين."
+              placeholder: "انضم إلى مجتمعنا للمشاركة في المناقشات"
+            search_placeholder:
+              label: "نص العنصر النائب للبحث"
+              description: "نص العنصر النائب لمربع البحث في بانر الترحيب."
+              placeholder: "موضوعات البحث..."
         navigation:
           title: "التنقل"
           header_description: "تكوين روابط التنقل وعناصر القائمة لموقعك. يتضمَّن ذلك الموقع وسلوك قائمة التنقل الرئيسية، والروابط السريعة في أعلى الصفحة الرئيسية، والشريط الجانبي للمسؤول"
@@ -6618,7 +6842,7 @@ ar:
           header_description: "تُعَد التقارير أداةً قوية لمساعدتك على فيهم ما يحدث على موقعك. ويمكنها مساعدتك على تحديد الاتجاهات الرائجة، واكتشاف المشكلات، واتخاذ القرارات استنادًا إلى البيانات."
           sub_pages:
             settings:
-              title: "إعدادات لوحة المعلومات"
+              title: "الإعدادان"
         badges:
           title: "الشارات"
           header_description: "تكافئ الشارات المستخدمين على أنشطتهم ومساهماتهم وإنجازاتهم، بهدف الاعتراف بجهودهم وتقديرها وتشجيع السلوك الإيجابي وتعزيز التفاعل داخل المجتمع."
@@ -6759,6 +6983,8 @@ ar:
         select_setting: "اختر إعدادًا من الموقع لعرض القيم الحالية للسمة"
         add: "اذهب إلى إعدادات سمة الموقع"
         help: "السمة التي تستخدمها حاليًا هي <a href='%{basePath}/admin/customize/themes/%{currentThemeId}'>%{currentTheme}</a>. انتقل إلى <a href='%{basePath}/admin/customize/themes/%{currentThemeId}'>صفحة إعدادات السمة</a> لتعديل إعدادات موقع السمة، أو انقر على أي سمة مرتبطة في الجدول أدناه لتعديل إعداداته."
+        filter: "تصفية إعدادات موقع السمة حسب اسم الإعداد، أو الوصف، أو اسم السمة..."
+        filter_no_results: "لا توجد إعدادات لموقع السمة تتطابق مع عامل التصفية"
         site_setting_warning: 'تتم إدارة هذا الإعداد بواسطة القالب الافتراضي لموقعك (%{defaultThemeName}). يمكنك تعديله من <a href="%{basePath}/admin/customize/themes/%{defaultThemeId}">صفحة تحرير القالب</a>.'
       search:
         modal_title: "ابحث عن كل شيء في المسؤول"
@@ -6773,42 +6999,6 @@ ar:
           few: '%{count} نتائج عن "%{filter}"'
           many: '%{count} نتيجة عن "%{filter}"'
           other: '%{count} نتيجة عن "%{filter}"'
-        result_types:
-          page:
-            zero: "صفحات"
-            one: "صفحة"
-            two: "صفحتان"
-            few: "صفحات"
-            many: "صفحات"
-            other: "صفحات"
-          report:
-            zero: "التقارير"
-            one: "التقرير"
-            two: "التقريران"
-            few: "التقارير"
-            many: "التقارير"
-            other: "التقارير"
-          setting:
-            zero: "الإعدادات"
-            one: "الإعداد"
-            two: "الإعدادان"
-            few: "الإعدادات"
-            many: "الإعدادات"
-            other: "الإعدادات"
-          theme:
-            zero: "السمات"
-            one: "السمة"
-            two: "السمتان"
-            few: "السمات"
-            many: "السمات"
-            other: "السمات"
-          component:
-            zero: "المكوِّنات"
-            one: "المكوِّن"
-            two: "المكوِّنان"
-            few: "المكوِّنات"
-            many: "المكوِّنات"
-            other: "المكوِّنات"
       new_features:
         title: "ما الجديد؟"
         check_for_updates: "تحقَّق من وجود تحديثات"
@@ -6931,6 +7121,7 @@ ar:
           daily: يوميًا
           monthly: شهريًا
           weekly: أسبوعيًا
+          value_so_far: "%{value} (حتى الآن)"
           dates: "التواريخ (بالتوقيت العالمي الموحَّد)"
           groups: "كل المجموعات"
           disabled: "هذا التقرير متوقف"
@@ -6941,7 +7132,9 @@ ar:
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">سجلات البحث</a>'
             disabled: 'تقرير عبارات البحث الرائجة متوقف. قم بتفعيل <a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">تسجيل استعلامات البحث</a> لجمع البيانات.'
+          average_chart_label: عرض المتوسطات، وليس الإجمالي
           sort_button: "الترتيب حسب %{column}"
+          sort_button_current: "مرتب حسب %{column}، %{direction}"
           sort_ascending: "تصاعدي"
           sort_descending: "تنازلي"
           filters:
@@ -7126,6 +7319,7 @@ ar:
               recover: استرداد موضوع
               read_lists: قراءة قوائم الموضوعات مثل الأكثر نشاطًا، والجديدة، والحديثة، وما إلى ذلك. يتم دعم RSS أيضًا.
               status: "تحديث حالة موضوع. الحالة: مغلق، مؤرشف، مرئي، مثبَّت. مفعَّل: true, false. حدِّد category_id هنا وفي حمولة الطلب للسماح بتغييرات الحالة في الموضوعات في تلك الفئة فقط."
+              change_owner: تغيير ملكية المنشورات في موضوع معين.
             posts:
               edit: تعديل أي منشور أو منشور معيَّن.
               delete: حذف منشور.
@@ -7158,6 +7352,7 @@ ar:
               suspend: تعليق حسابات المستخدمين.
               delete: حذف حسابات المستخدمين
               list: الحصول على قائمة بالمستخدمين.
+              create: إنشاء مستخدم جديد.
             user_status:
               read: قراءة حالة المستخدم.
               update: تحديث حالة المستخدم.
@@ -7261,6 +7456,7 @@ ar:
           user_destroyed: "تم حذف المستخدم"
           user_suspended: "تم تعليق المستخدم"
           user_unsuspended: "تم إلغاء تعليق المستخدم"
+          user_anonymized: "المستخدم مجهول"
         reviewable_event:
           group_name: "الأحداث القابلة للمراجعة"
           reviewable_created: "أصبح العنصر القابل للمراجعة جاهزًا"
@@ -7505,8 +7701,10 @@ ar:
           install: "تثبيت"
           theme_site_settings:
             title: "إعدادات موقع السمات"
+            description: "إعدادات تتيح للسمات التحكم بشكل أكبر في تجربة الموقع بالكامل من خلال تجاوز مجموعة محددة من إعدادات الموقع الأساسية."
           themes:
             title: "السمات"
+            description: "السمات الشاملة للموقع التي تغيّر المظهر العام وتجربة استخدام الموقع لجميع المستخدمين."
             themes_intro: "ثبّت سِمة جديدة للبدء، أو أنشئ سِمتك الخاصة من الصفر باستخدام هذه الموارد."
             new_theme: "سمة جديدة"
             back: "الرجوع إلى قائمة السمات"
@@ -7576,6 +7774,8 @@ ar:
             title: "خيارات اللون"
             toggle: "قابلة للاختيار من قِبل المستخدم"
             toggle_description: "يمكن تحديد لوحة الألوان من قِبل المستخدمين"
+            toggle_default_light_on_theme: "لوحة الألوان هي لوحة الألوان الفاتحة الافتراضية في السمة الافتراضية (%{themeName})"
+            toggle_default_dark_on_theme: "لوحة الألوان هي لوحة الألوان الداكنة الافتراضية في السمة الافتراضية (%{themeName})"
           colors:
             title: "الألوان"
           save_changes: "حفظ التغييرات"
@@ -7666,6 +7866,7 @@ ar:
             confirm: "هل تريد بالتأكيد مسح هذه النسخة الاحتياطية؟"
           restore:
             is_disabled: "تم تعطيل الاستعادة حاليًا. لتفعيلها، انتقل إلى <a href='%{url}'>إعدادات الموقع</a>."
+            is_disabled_title: "تم تعطيل عملية الاستعادة حاليًا. لتفعيلها، ابحث عن \"السماح بالاستعادة\" (allow restore) في إعدادات الموقع."
             label: "استعادة"
             title: "استعادة النسخة الاحتياطية"
             confirm: "هل تريد بالتأكيد استعادة هذه النسخة الاحتياطية؟"
@@ -7719,10 +7920,14 @@ ar:
           title: "البريد الإلكتروني"
           subject: "الموضوع"
           multiple_subjects: "توجد موضوعات متعددة في نموذج البريد الإلكتروني هذا."
+          multiple_bodies: "يحتوي قالب البريد الإلكتروني على عدة نصوص محتوى."
           body: "النص الأساسي"
           revert: "التراجع عن التغييرات"
           revert_confirm: "هل تريد بالتأكيد التراجع عن التغييرات؟"
+          search_templates: "تصفية حسب اسم القالب..."
+          no_templates_found: "لا توجد قوالب تطابق عوامل التصفية"
           edit: "تعديل"
+          back: "العودة إلى القوالب"
         component:
           all_filter: "الكل"
           used_filter: "مُستخدَم"
@@ -7757,6 +7962,8 @@ ar:
           create_name: "الاسم"
           save: "حفظ"
           long_title: "تعديل الألوان ومحتويات CSS وHTML لموقعك"
+          dark_mode: "%{themeName} الوضع الداكن"
+          light_mode: "%{themeName} الوضع الفاتح"
           edit: "تعديل"
           edit_confirm: "هذه سمة بعيدة، إذا أجريت تعديلات على CSS/HTML، فسيتم مسح تغييراتك عند تحديث السمة في المرة التالية."
           update_confirm: "سيؤدي التحديث إلى محو التغييرات المحلية. هل تريد بالتأكيد المتابعة؟"
@@ -7783,7 +7990,8 @@ ar:
           dark_color_scheme: "لوحة ألوان داكنة"
           default_light_scheme: "فاتحة (افتراضي)"
           color_scheme_select: "تحديد الألوان التي ستستخدمها السمة."
-          edit_colors: "عدِّل الألوان"
+          dark_color_scheme_select: "اختر الألوان التي ستستخدمها السمة في الوضع الداكن."
+          edit_colors: "تعديل الألوان"
           custom_sections: "الأقسام المخصَّصة:"
           theme_components: "مكوِّنات السمة"
           add_all_themes: "إضافة جميع السمات"
@@ -7795,11 +8003,12 @@ ar:
           convert_theme_alert_generic: "هل تريد بالتأكيد تحويل هذه السمة إلى مكوِّن؟"
           convert_theme_tooltip: "تحويل هذه السمة إلى مكوِّن"
           inactive_themes: "السمات غير النشطة:"
-          set_default_theme: "عيّن مبدئي"
+          set_default_theme: "تعيين افتراضي"
           default_theme: "السمة الافتراضية"
           set_default_success: "السمة الافتراضية مُعيَّنة على %{theme}"
           setting_was_saved: "حُفظت إعدادات السمة"
           install_success: "تم تثبيت السمة %{theme} بنجاح!"
+          delete_success: "تم حذف %{theme} بنجاح!"
           inactive_components: "المكوِّنات غير المستخدمة:"
           selected:
             zero: "المحدَّدة: %{count}"
@@ -8000,6 +8209,8 @@ ar:
           select_base:
             title: "تحديد لوحة الألوان الأساسية"
             description: "لوحة الألوان الأساسية:"
+          non_default_theme_warning: "تختلف <a href='%{link}'>تفضيلاتك الشخصية</a> للسمة عن الإعدادات الافتراضية. قد لا تنطبق التغييرات التي تجريها هنا عليك، لكنها ستنطبق على جميع المستخدمين الذين يستخدمون السمة الافتراضية (%{themeName})."
+          custom_schemes_warning: "تختلف <a href='%{link}'>تفضيلاتك الشخصية</a> للوحة الألوان %{colorModes} عن الإعدادات الافتراضية. قد لا تنطبق التغييرات التي تجريها على لوحة %{colorModes} عليك، لكنها ستنطبق على جميع المستخدمين الذين يستخدمون الإعداد الافتراضي."
           light: "فاتح"
           dark: "داكن"
           title: "الألوان"
@@ -8007,6 +8218,7 @@ ar:
           view: "اعرض"
           set_default_light: "تعيينها كلوحة ألوان فاتحة للسمة الافتراضية (%{theme})"
           set_default_dark: "تعيينها كلوحة ألوان داكنة للسمة الافتراضية (%{theme})"
+          set_default_success: "تم تعيين %{schemeName} كلوحة ألوان افتراضية للسمة %{themeName}"
           saved_refreshing: "تم الحفظ! جاري تحديث الألوان..."
           from_theme: "من السمة: %{name}"
           filters:
@@ -8016,7 +8228,7 @@ ar:
             from_theme: "من السمة"
             no_results: "لم يتم العثور على لوحات الألوان"
           default_light_badge:
-            text: "فاتح المبدئي"
+            text: "فاتح افتراضي"
             title: "لوحة الألوان الفاتحة الافتراضية"
             reset: "إعادة تعيين عوامل التصفية"
           default_dark_badge:
@@ -8342,7 +8554,10 @@ ar:
             delete_associated_accounts: "حذف الحسابات المرتبطة"
             change_theme_site_setting: "تغيير إعدادات السمة على مستوى الموقع"
             stop_impersonating: "توقف عن انتحال الشخصية"
+            upcoming_change_toggled: "تم تبديل حالة التغيير القادم"
+            upcoming_change_available: "التغيير القادم متاح"
             change_site_setting_groups: "غيّر مجموعات إعدادات الموقع"
+            discourse_id_regenerate_credentials: "إعادة إنشاء بيانات اعتماد معرف Discourse"
         screened_emails:
           title: "عناوين البريد الإلكتروني الخاضعة للمراقبة"
           description: "عندما يحاول شخص ما إنشاء حساب جديد، سيتم التحقُّق من عناوين البريد الإلكتروني التالية وحظر التسجيل، أو اتخاذ إجراء آخر."
@@ -8401,6 +8616,7 @@ ar:
         clear_all: مسح الكل
         clear_all_confirm: "هل تريد بالتأكيد مسح جميع الكلمات المُراقَبة للإجراء %{action}؟"
         invalid_regex: 'الكلمة المُراقَبة "%{word}" هي تعبير عادي غير صالح.'
+        invalid_regex_multiple: "تعابير نمطية غير صالحة:"
         regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">الكلمات المُراقَبة هي تعبيرات عادية</a> ولا تتضمَّن حدود الكلمات تلقائيًا. إذا كنت تريد أن يتطابق التعبير العادي مع الكلمات الكاملة، فضع <code>\b</code> في بداية التعبير العادي ونهايته.'
         actions:
           block: "حظر"
@@ -8433,6 +8649,7 @@ ar:
           success: "تم بنجاح"
           exists: "موجودة بالفعل"
           upload: "الإضافة من ملف"
+          upload_successful: "تم التحميل بنجاح. ستتم معالجة الكلمات قريبًا."
           case_sensitivity_label: "حساس لحالة الأحرف"
           case_sensitivity_description: "الكلمات ذات حالة الأحرف المطابقة فقط"
           html_label: "HTML"
@@ -8483,6 +8700,7 @@ ar:
           upload: "تحميل ملف"
           multiselect: "اختيارات متعددة"
           tagchooser: "محدد مجموعة الوسوم"
+          composer: "إجابة بتنسيق Markdown"
         validations_modal:
           button_title: "عمليات التحقق"
           modal_title: "خيارات التحقق"
@@ -8524,7 +8742,10 @@ ar:
             second: "الخيار 2"
             third: "الخيار 3"
         edit_category:
+          toggle_freeform: "تم تعطيل قالب النموذج"
+          toggle_form_template: "تم تفعيل قالب النموذج"
           select_template: "التحديد من القوالب"
+          select_template_help: "إضافة/تعديل قوالب النماذج"
         errors:
           multiple_tags_not_allowed: 'لا يمكنك اختيار المزيد من الوسوم من "%{tag_name}". لتجنب المشكلات، استخدم قالب النموذج'
       impersonate:
@@ -8532,7 +8753,7 @@ ar:
         help: "استخدم هذه الأداة لانتحال شخصية حساب مستخدم لأغراض تصحيح الأخطاء. عليك تسجيل الخروج بعد الانتهاء."
         not_found: "يتعذَّر العثور على هذا المستخدم."
         invalid: "عذرًا، لا يمكنك انتحال شخصية هذا المستخدم."
-        error: "عذراً، حدث خطأ غير متوقع."
+        error: "عذرًا، حدث خطأ غير متوقع."
       users:
         title: "المستخدمون"
         description: "عرض المستخدمين وإدراتهم."
@@ -8657,6 +8878,16 @@ ar:
         penalty_post_actions: "ما الذي ترغب في فعله بالمنشور ذي الصلة؟"
         penalty_post_delete: "حذف المنشور"
         penalty_post_delete_replies: "حذف المنشور + أي ردود"
+        penalty_post_delete_all: "حذف جميع الموضوعات التي أنشأها المستخدم بالإضافة إلى أي ردود عليها"
+        penalty_post_delete_all_confirmation_MF: |
+          <span>سيؤدي هذا إلى حذف { TOPICS, plural,
+              one {موضوع واحد} two {موضوعين} few {# موضوعات} many {# موضوعًا}
+            other {# موضوع}
+          } و
+          { REPLIES, plural,
+              one {رد واحد} two {ردين} few {# ردود} many {# ردًا}
+            other {# رد}
+          }. <b>هذا الإجراء لا يمكن التراجع عنه!</b> هل ترغب بالتأكيد في القيام بذلك؟</span>
         penalty_post_edit: "تعديل المنشور"
         penalty_post_none: "عدم اتخاذ أي إجراء"
         penalty_count: "عدد العقوبات"
@@ -8714,6 +8945,11 @@ ar:
         approve_bulk_success: "تم بنجاح! لقد تمت الموافقة على جميع الأعضاء المحدَّدين وإرسال إشعارات إليهم."
         time_read: "وقت القراءة"
         post_edits_count: "تعديلات المنشور"
+        upcoming_changes:
+          title: "التغييرات القادمة للمستخدم"
+          description: "لتعديل المجموعات أو لتفعيل التغييرات القادمة أو تعطيلها، يرجى زيارة <a href='%{basePath}/admin/config/upcoming-changes'>صفحة إعدادات التغييرات القادمة</a>."
+          filter_placeholder: "تصفية التغييرات القادمة حسب الاسم أو الوصف"
+          filter_no_results: "لا توجد تغييرات قادمة"
         exports:
           title: عمليات تصدير المستخدم
           download:
@@ -8742,6 +8978,13 @@ ar:
           button: "حذف كل المنشورات"
           progress:
             title: "تقدُّم حذف المنشورات"
+            description:
+              zero: "جارٍ حذف كل المنشورات من @%{username}..."
+              one: "جارٍ حذف منشور واحد من @%{username}..."
+              two: "جارٍ حذف منشورين من @%{username}..."
+              few: "جارٍ حذف %{count} منشورات من @%{username}..."
+              many: "جارٍ حذف %{count} منشورًا من @%{username}..."
+              other: "جارٍ حذف %{count} منشور من @%{username}..."
           confirmation:
             title: "حذف كل المنشورات من @%{username}"
             description: |
@@ -8753,6 +8996,7 @@ ar:
             text: "حذف المنشورات من @%{username}"
             delete: "حذف المنشورات من @%{username}"
             cancel: "إلغاء"
+          all_enqueued: "تمت إضافة جميع منشورات @%{username}إلى قائمة الانتظار للحذف"
         merge:
           button: "دمج"
           prompt:
@@ -8779,6 +9023,8 @@ ar:
             cancel: "إلغاء"
         merging_user: "جارٍ دمج المستخدم…"
         merge_failed: "حدث خطأ في أثناء دمج المستخدمين."
+        delete_forbidden_because_admin: "لا يمكن حذف المسؤولين."
+        delete_posts_forbidden_because_admin: "لا يمكن حذف جميع منشورات المسؤولين."
         delete_forbidden:
           zero: "لا يمكن حذف المستخدمين إذا كان لديهم منشورات. احذف كل المنشورات أولًا قبل محاولة حذف المستخدم. (لا يمكنك حذف المشاركات التي مضى عليها %{count} يوم.)"
           one: "لا يمكن حذف المستخدمين إذا كان لديهم منشورات. احذف كل المنشورات أولًا قبل محاولة حذف المستخدم. (لا يمكنك حذف المشاركات التي مضى عليها يوم واحد (%{count}))."
@@ -8945,6 +9191,10 @@ ar:
           title: "العرض على بطاقة المستخدم"
           enabled: "معروض على بطاقة المستخدم"
           disabled: "غير معروض على بطاقة المستخدم"
+        show_on_signup:
+          title: "عرض في نموذج التسجيل"
+          enabled: "معروض في نموذج التسجيل"
+          disabled: "غير معروض في نموذج التسجيل"
         searchable:
           title: "قابل للبحث"
           enabled: "قابل للبحث"
@@ -8952,6 +9202,7 @@ ar:
         field_types:
           text: "النص"
           textarea: "منطقة النص"
+          date: "التاريخ"
           confirm: "تأكيد"
           dropdown: "قائمة منسدلة"
           multiselect: "حقل اختيارات متعددة"
@@ -9035,6 +9286,9 @@ ar:
             label: "تحميل"
             title: "تحميل الصور"
         download_file: "تنزيل"
+        upload_restrictions:
+          extensions: "مقبول: %{extensions}"
+          max_size: "الحد الأقصى: %{size}"
         selectable_avatars:
           title: "قائمة الصور الرمزية التي يمكن للمستخدمين الاختيار منها"
         table_column_heading:
@@ -9073,6 +9327,7 @@ ar:
           experimental: "تجريبي"
         secret_list:
           invalid_input: "لا يمكن ترك حقول الإدخال فارغة أو أن تتضمَّن شريطًا عموديًا."
+          already_exists: "إدخال المفتاح %{key} موجود بالفعل."
         default_categories:
           modal_description:
             zero: "هل ترغب في تطبيق هذا التغيير بأثر رجعي؟ سيؤدي ذلك إلى تغيير التفضيلات لعدد %{count} مستخدم حالي."
@@ -9101,13 +9356,20 @@ ar:
             prompt: "قد يؤدي تغيير هذا الإعداد إلى عواقب بعيدة المدى أو غير مقصودة على موقعك. هل تريد بالتأكيد المتابعة؟"
             confirm: "نعم، أنا متأكد"
           min_password_length:
+            prompt: "أنت على وشك تغيير سياسة كلمة المرور. سيؤثر هذا على جميع المستخدمين الذين سيغيرون كلمات مرورهم من الآن فصاعدًا. هل أنت متأكد أنك تريد المتابعة؟"
             confirm: "نعم، تحديث سياسة كلمة المرور"
           min_admin_password_length:
+            prompt: "أنت على وشك تغيير سياسة كلمة المرور. سيؤثر هذا على جميع المسؤولين الذين سيغيرون كلمات مرورهم من الآن فصاعدًا. هل أنت متأكد أنك تريد المتابعة؟"
             confirm: "نعم، تحديث سياسة كلمة المرور"
           password_unique_charactes:
+            prompt: "أنت على وشك تغيير سياسة كلمة المرور. سيؤثر هذا على جميع المستخدمين الذين سيغيرون كلمات مرورهم من الآن فصاعدًا. هل أنت متأكد أنك تريد المتابعة؟"
             confirm: "نعم، تحديث سياسة كلمة المرور"
           block_common_passwords:
+            prompt: "أنت على وشك تغيير سياسة كلمة المرور. سيؤثر هذا على جميع المستخدمين الذين سيغيرون كلمات مرورهم من الآن فصاعدًا. هل أنت متأكد أنك تريد المتابعة؟"
             confirm: "نعم، تحديث سياسة كلمة المرور"
+          clean_up_inactive_users_after_days:
+            prompt: "سيؤدي تعيين هذه القيمة إلى أي رقم غير 0 إلى حذف المستخدمين غير النشطين لمدة هذا العدد من الأيام نهائيًا. هل أنت متأكد أنك تريد المتابعة؟"
+            confirm: "نعم، أفهم أنه سيتم حذف المستخدمين غير النشطين نهائيًا ما لم تُعيّن هذه القيمة على 0"
         job_status:
           completed: "اكتمل التحديث"
           enqueued: "التحديث قيد التقدم"
@@ -9147,7 +9409,7 @@ ar:
         sections:
           design: تصميم
           query: استعلام
-          settings: الإعدادان
+          settings: الإعدادات
         usage_heading: الاستخدام
         allow_title: السماح للمستخدمين باستخدام الشارة كعنوان
         multiple_grant: يمكن منحها عدة مرات
@@ -9260,6 +9522,7 @@ ar:
         category: "النشر في الفئة"
         tags: "وسوم الموضوع"
         post_author: "مؤلف المنشور"
+        post_author_description: "المؤلف لجميع الموضوعات المضمنة من هذا المضيف، مع تجاوز وسوم التعريف الخاصة بصفحة المدونة. اترك هذا الحقل فارغًا لقراءة اسم المؤلف من وسوم <meta name='discourse-username'> أو <meta name='author'> الموجودة في الصفحة."
         post_author_with_default: "مؤلف المنشور (القيمة الافتراضية هي %{author})"
         add_host: "إضافة مضيف"
         posts_and_topics: "تكوين المنشورات والموضوعات"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index a812a687aca8a..2cfa1ad8aa38e 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -876,7 +876,7 @@ be:
       remove_filter: "выдаліць фільтр"
       category: "Катэгорыя"
       reorder:
-        apply_all: "Ужыць"
+        apply_all: "Прымяніць"
         position: "Пазіцыя"
       posts: "Допісы"
       topics: "Тэмы"
@@ -1838,6 +1838,15 @@ be:
       tags: "тэгі"
       choose_for_topic: "дадатковыя тэгі"
       add_synonyms: "дадаць"
+      description: "Апісанне"
+      settings:
+        title: "Налады"
+        general: "Агульныя"
+        back: "Назад"
+        name: "Імя"
+      localization:
+        name: "Імя"
+        description: "Апісанне"
       sort_by: "Сартаваць па:"
       sort_by_count: "падлічваць"
       sort_by_name: "Імя"
@@ -1973,6 +1982,11 @@ be:
           never: "ніколі"
       reports:
         sidebar_title: "Справаздачы"
+        group_traffic: "трафік"
+        group_members: "Члены"
+        group_moderation: "Мадэрацыя"
+        group_security: "Бяспека"
+        group_other: "Іншае"
       config_sections:
         account:
           title: "Аккаўнт"
@@ -2057,6 +2071,9 @@ be:
               title: "Логі"
         reports:
           title: "Справаздачы"
+          sub_pages:
+            settings:
+              title: "Налады"
         badges:
           title: "значкі"
         permalinks:
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 2862e542092dc..5986227396a08 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -424,7 +424,6 @@ bg:
       in_reply_to: "в отговор на"
       explain:
         why: "обясни защо този елемент се озова в опашката"
-        title: "Оценяване с възможност за преразглеждане"
         formula: "Формула"
         subtotal: "Междинна сума"
         total: "Общо"
@@ -438,17 +437,14 @@ bg:
           title: "Потребителите, чиито сигнали исторически са били съгласувани, получават бонус."
         trust_level_bonus:
           name: "ниво на доверие"
-          title: "Елементите, които могат да се преглеждат, създадени от потребители с по-високо ниво на доверие, имат по-висок резултат."
         type_bonus:
           name: "тип бонус"
-          title: "Определени типове, подлежащи на преглед, могат да получат бонус от персонала, за да бъдат с по-висок приоритет."
       revise_and_reject_post:
         title: "Преразглеждане"
         reason: "Причина"
         send_pm: "Изпратете ЛС"
         feedback: "Обратна връзка"
         optional: "по избор"
-      stale_help: "Този преглед е разрешен от <b>%{username}</b>."
       claim_help:
         optional: "Можете да заявите този артикул, за да попречите на други да го преглеждат."
         required: "Трябва да заявите артикули, преди да можете да ги прегледате."
@@ -3248,6 +3244,16 @@ bg:
       choose_for_topic: "етикети по желание"
       add_synonyms: "Добави"
       delete_tag: "Изтрийте таг"
+      description: "Описание"
+      settings:
+        title: "Настройки"
+        general: "Основни"
+        back: "Назад"
+        name: "Име"
+        slug: "Slug"
+      localization:
+        name: "Име "
+        description: "Описание"
       sort_by: "Сортирай по:"
       sort_by_count: "брой"
       sort_by_name: "име"
@@ -3421,6 +3427,11 @@ bg:
         remove_muted_tags_from_latest:
           always: "винаги"
           never: "никога"
+      reports:
+        group_traffic: "Трафик"
+        group_members: "Членове"
+        group_security: "Сигурност"
+        group_other: "Други"
       config_sections:
         account:
           title: "Профил"
@@ -3438,7 +3449,6 @@ bg:
         preview: "Преглед"
         enabled_for_options:
           everyone: "Всички"
-          staff: "Само за екипа"
         impact_roles:
           admins: "Админи"
           moderators: "Модератори"
@@ -3502,6 +3512,10 @@ bg:
           sub_pages:
             logs:
               title: "Логове"
+        reports:
+          sub_pages:
+            settings:
+              title: "Настройки"
         badges:
           title: "Значки"
         permalinks:
@@ -4329,6 +4343,7 @@ bg:
           title: "Показване в потребителската карта"
         field_types:
           text: "Текст"
+          date: "Дата"
           confirm: "Потвърждение"
           dropdown: "Падащо"
       site_text:
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 9f910a5075cf6..59e7c76939265 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -385,7 +385,6 @@ bs_BA:
       in_reply_to: "odgovori na"
       explain:
         why: "objasnite zašto je ovaj objekat završio na listi za čekanje"
-        title: "Ocjenjiv Skor"
         formula: "Formula"
         subtotal: "Podsuma"
         total: "Suma"
@@ -399,10 +398,8 @@ bs_BA:
           title: "Korisnicima čije su zastave prethodno bivale usaglašene dobivaju bonus."
         trust_level_bonus:
           name: "nivo povjerenja"
-          title: "Ocjenjivi objekti kreirani od strane korisnika sa višim nivoom povjerenja imaju viši skor."
         type_bonus:
           name: "bonus tip"
-          title: "Neki ocjenjivi tipovi mogu zaprimiti bonus od strane osoblja foruma kako bi tim tipovima podigli prioritet"
       revise_and_reject_post:
         reason: "Reason"
         optional: "opciono"
@@ -2954,6 +2951,16 @@ bs_BA:
         one: "Pripadajući sinonim će također biti obrisan."
         few: "Pripadajućih %{count} sinonima će također biti obrisano."
         other: "Pripadajućih %{count} sinonima će također biti obrisano."
+      description: "Opis"
+      settings:
+        title: "Postavke"
+        general: "General"
+        back: "Prethodno"
+        name: "Ime"
+        synonyms_subtitle: "U slučaju da se sljedeće oznake koriste, iste će biti zamijenjene sa %{name}"
+      localization:
+        name: "Ime"
+        description: "Opis"
       sort_by: "Sortiraj po:"
       sort_by_count: "brojenje"
       sort_by_name: "ime"
@@ -3145,6 +3152,11 @@ bs_BA:
       reports:
         title: "Lista dostupnih izvještaja"
         sidebar_title: "Izvještaji"
+        group_traffic: "Promet"
+        group_members: "Članovi"
+        group_moderation: "Moderacija"
+        group_security: "Security"
+        group_other: "Other"
       config_sections:
         account:
           title: "Račun"
@@ -3166,7 +3178,6 @@ bs_BA:
         preview: "Pregled"
         enabled_for_options:
           everyone: "Svatko"
-          staff: "Samo za urednike i admine"
         impact_roles:
           admins: "Admins"
           moderators: "Moderators"
@@ -3236,6 +3247,9 @@ bs_BA:
               title: "Logs"
         reports:
           title: "Izvještaji"
+          sub_pages:
+            settings:
+              title: "Postavke"
         badges:
           title: "Bedž"
         permalinks:
@@ -3283,15 +3297,6 @@ bs_BA:
         default_value: "Uobičajen"
       search:
         title: "Pretraži"
-        result_types:
-          theme:
-            one: "Izgled"
-            few: "Teme"
-            other: "Teme"
-          component:
-            one: "Komponenta"
-            few: "Komponenti"
-            other: "Komponenti"
       dashboard:
         title: "Dashboard"
         last_updated: "Nadzorna ploča je ažurirana:"
@@ -4360,6 +4365,7 @@ bs_BA:
           title: "Prikaži na korisničkoj kartici"
         field_types:
           text: "Poruka"
+          date: "Datum"
           confirm: "Confirmation"
           dropdown: "Ispustiti"
       site_text:
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 616be43059bdb..d38c8897ff244 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -440,7 +440,6 @@ ca:
       in_reply_to: "en resposta a"
       explain:
         why: "expliqueu per què aquest element ha acabat a la cua"
-        title: "Puntuació revisable"
         formula: "Fórmula"
         subtotal: "Subtotal"
         total: "Total"
@@ -454,10 +453,8 @@ ca:
           title: "Es dóna una bonificació als usuaris que hagin creat banderes amb les quals històricament s'hagi estat d'acord. "
         trust_level_bonus:
           name: "nivell de confiança"
-          title: "Els elements revisables creats per usuaris de nivell superior de confiança tenen una puntuació més alta."
         type_bonus:
           name: "bonificació tipus"
-          title: "El personal pot assignar una bonificació a certs tipus revisables perquè tinguin una prioritat més alta."
       revise_and_reject_post:
         reason: "Motiu"
         optional: "opcional"
@@ -2865,6 +2862,15 @@ ca:
         one: "Esteu segur que voleu suprimir aquesta etiqueta i eliminar-la del tema %{count} al qual és assignada?"
         other: "Esteu segur que voleu suprimir aquesta etiqueta i eliminar-la dels %{count} temes als quals és assignada?"
       delete_confirm_no_topics: "Esteu segur que voleu suprimir aquesta etiqueta?"
+      description: "Descripció"
+      settings:
+        title: "Configuració"
+        general: "General"
+        back: "Enrere"
+        name: "Nom"
+      localization:
+        name: "Nom"
+        description: "Descripció"
       sort_by: "Ordena per:"
       sort_by_count: "comptabilitza"
       sort_by_name: "nom"
@@ -3055,6 +3061,11 @@ ca:
       reports:
         title: "Llista de reports disponibles"
         sidebar_title: "Reports"
+        group_traffic: "Tràfic"
+        group_members: "Membres"
+        group_moderation: "Moderació"
+        group_security: "Seguretat"
+        group_other: "Altres"
       config_sections:
         account:
           title: "Compte"
@@ -3076,7 +3087,6 @@ ca:
         preview: "Previsualitza"
         enabled_for_options:
           everyone: "Tothom"
-          staff: "Només l'equip responsable"
         impact_roles:
           admins: "Administradors"
           moderators: "Moderadors"
@@ -3148,6 +3158,9 @@ ca:
               title: "Registres"
         reports:
           title: "Reports"
+          sub_pages:
+            settings:
+              title: "Configuració"
         badges:
           title: "Insígnies"
         permalinks:
@@ -3196,13 +3209,6 @@ ca:
         default_value: "Per defecte"
       search:
         title: "Cerca"
-        result_types:
-          theme:
-            one: "Aparença"
-            other: "Aparences"
-          component:
-            one: "Component"
-            other: "Components"
       dashboard:
         title: "Tauler de control"
         last_updated: "Tauler de control actualitzat:"
@@ -4284,6 +4290,7 @@ ca:
           title: "Mostra en la targeta d'usuari"
         field_types:
           text: "Text"
+          date: "Data"
           confirm: "Confirmació"
           dropdown: "Desplega"
       site_text:
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 430d5f40cbb57..5ed2af18a19fb 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -774,21 +774,13 @@ cs:
       in_reply_to: "v odpovědi na"
       filtered_flagged_by: "Nahlásil"
       unknown:
-        title:
-          one: "Máte nevyřízené revize ze zakázaného pluginu:"
-          few: "Máte nevyřízené revize ze zakázaných pluginů:"
-          many: "Máte nevyřízené revize ze zakázaných pluginů:"
-          other: "Máte nevyřízené revize ze zakázaných pluginů:"
         instruction: "Nelze je správně zobrazit, dokud neaktivujete příslušný plugin. Povolte prosím plugin a obnovte stránku. Případně je můžete ignorovat. <a href='%{url}' target='_blank'>Další informace...</a>"
         reviewable_unknown_source: "%{reviewableType} (neznámý plugin)"
         reviewable_known_source: "%{reviewableType} (z pluginu '%{pluginName}')"
         ignore_all: "Ignorovat vše"
         enable_plugins: "Povolit pluginy"
-        delete_confirm: "Opravdu chcete smazat všechny revize vytvořené zakázanými pluginy?"
-        ignore_success: "Všechny revize vytvořené zakázanými pluginy byly smazány."
       explain:
         why: "vysvětlete, proč tato položka skončila ve frontě"
-        title: "Hodnocení nahlášeného příspěvku"
         formula: "Vzorec"
         subtotal: "Mezisoučet"
         total: "Celkem"
@@ -802,10 +794,8 @@ cs:
           title: "Uživatelé, jejichž nahlášení byla historicky odsouhlasena, dostávají bonus."
         trust_level_bonus:
           name: "úroveň důvěry"
-          title: "Kontrolovatelné položky vytvořené uživateli s vyšší úrovní důvěry mají vyšší skóre."
         type_bonus:
           name: "bonus za psaní"
-          title: "Některým revidovatelným typům mohou redaktoři přidělit bonus, aby měly vyšší prioritu."
       revise_and_reject_post:
         title: "Revidovat"
         reason: "Důvod"
@@ -814,7 +804,6 @@ cs:
         custom_reason: "Uveďte jasný popis důvodu"
         other_reason: "Ostatní..."
         optional: "volitelné"
-      stale_help: "Tuto revizi vyřešil/a <b>%{username}</b>."
       claim_help:
         optional: "Tuto položku si můžete nárokovat, abyste zabránili ostatním v její kontrole."
         required: "Než budete moci položky revidovat, musíte si je nárokovat."
@@ -3588,8 +3577,6 @@ cs:
         max_views:
           placeholder: maximum
           aria_label: filtrovat podle maximálního počtu zobrazení
-        additional_options:
-          label: "Filtrovat podle počtu příspěvků a zobrazení tématu"
     hamburger_menu: "Navigační nabídka"
     new_item: "nové"
     go_back: "jít zpět"
@@ -4446,7 +4433,11 @@ cs:
           edit: "Upravit"
           delete: "Smazat"
         add: "Přidat nový překlad"
-        manage: "Správa překladů (%{count} existujících)"
+        manage:
+          one: "Správa překladů (%{count} existujících)"
+          few: "Správa překladů (%{count} existujících)"
+          many: "Správa překladů (%{count} existujících)"
+          other: "Správa překladů (%{count} existujících)"
         view:
           one: "Zobrazit %{count} překlad"
           few: "Zobrazit %{count} překlady"
@@ -5426,7 +5417,20 @@ cs:
         other: "Jeho %{count} synonym bude také smazáno."
       edit_tag: "Upravit název a popis štítku"
       edit: "Upravit tento štítek"
-      description: "Popis (max. 1000 znaků)"
+      description: "Popis"
+      settings:
+        title: "Nastavení"
+        general: "Obecné"
+        localizations: "Lokalizace"
+        back: "Zpět"
+        name: "Jméno"
+        slug: "URL"
+        name_placeholder: "Název štítku"
+        synonyms_subtitle: "Pokud jsou použity následující štítky, budou nahrazeny %{name}"
+      localization:
+        locale: "Jazyk"
+        name: "Název"
+        description: "Popis"
       sort_by: "Seřadit dle:"
       sort_by_count: "počtu"
       sort_by_name: "názvu"
@@ -5988,9 +5992,13 @@ cs:
           never: "nikdy"
       reports:
         title: "Seznam dostupných sestav"
-        meta_doc: "Sestavy jsou mocným nástrojem, který vám pomůže pochopit, co se děje na vašich stránkách. Mohou vám pomoci rozpoznat trendy, problémy a činit rozhodnutí na základě dat."
         sidebar_title: "Sestavy"
         back: "Zpět na všechny sestavy"
+        group_traffic: "Provoz"
+        group_members: "Členové"
+        group_moderation: "Moderování"
+        group_security: "Zabezpečení"
+        group_other: "Ostatní"
       config_sections:
         account:
           title: "Účet"
@@ -6033,7 +6041,6 @@ cs:
         enabled_for_options:
           no_one: "Nikdo"
           everyone: "Všichni"
-          staff: "Pouze redakce"
           specific_groups: "Specifické skupiny"
           specific_groups_with_group_names:
             one: "skupina %{groupNames}"
@@ -6146,7 +6153,6 @@ cs:
               help_text: "Doporučená velikost je 600 x 80 pixelů."
             large_icon:
               title: "Čtvercová ikona"
-              description: "Čtvercová verze obrázku loga se zobrazuje v horní části administrace a je zároveň logem mobilní aplikace na domovské obrazovce."
               help_text: "Doporučená velikost je 512 x 512 pixelů."
             square_icon_dark:
               required: "Použít pro tmavý režim jinou čtvercovou ikonu?"
@@ -6336,7 +6342,7 @@ cs:
           header_description: "Sestavy jsou mocným nástrojem, který vám pomůže pochopit, co se děje na vašich stránkách. Mohou vám pomoci rozpoznat trendy, problémy a činit rozhodnutí na základě dat."
           sub_pages:
             settings:
-              title: "Nastavení nástěnky"
+              title: "Nastavení"
         badges:
           title: "Odznaky"
           header_description: "Odznaky odměňují uživatele za jejich aktivity, příspěvky a úspěchy, aby uznaly, potvrdily a podpořily pozitivní chování a zapojení v rámci komunity"
@@ -6491,32 +6497,6 @@ cs:
           few: '%{count} výsledky pro „%{filter}“'
           many: '%{count} výsledků pro „%{filter}“'
           other: '%{count} výsledků pro „%{filter}“'
-        result_types:
-          page:
-            one: "Stránka"
-            few: "Stránky"
-            many: "Stránek"
-            other: "Stránek"
-          report:
-            one: "Sestava"
-            few: "Sestavy"
-            many: "Sestav"
-            other: "Sestav"
-          setting:
-            one: "Nastavení"
-            few: "Nastavení"
-            many: "Nastavení"
-            other: "Nastavení"
-          theme:
-            one: "Téma"
-            few: "Motivy"
-            many: "Motivy"
-            other: "Motivy"
-          component:
-            one: "Komponenta"
-            few: "Komponenty"
-            many: "Komponenty"
-            other: "Komponenty"
       new_features:
         title: "Co je nového?"
         check_for_updates: "Aktualizovat"
@@ -8676,6 +8656,7 @@ cs:
         field_types:
           text: "Text"
           textarea: "Textová oblast"
+          date: "Datum"
           confirm: "Potvrzení"
           dropdown: "Rozbalovací nabídka"
           multiselect: "Více možností"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index f69438cadb5fe..cdb9f029edf5f 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -589,19 +589,13 @@ da:
       in_reply_to: "som svar til"
       filtered_flagged_by: "Anmeldt af"
       unknown:
-        title:
-          one: "Du har afventende gennemgange fra deaktiveret plugin:"
-          other: "Du har afventende gennemgange fra deaktiveret plugins:"
         instruction: "De kan ikke vises korrekt, før du aktiverer det relevante plugin. Aktivér venligst plugin'et, og opdater siden. Alternativt kan du ignorere dem. <a href='%{url}' target='_blank'>Få mere at vide...</a>"
         reviewable_unknown_source: "%{reviewableType} (ukendt plugin)"
         reviewable_known_source: "%{reviewableType} (fra '%{pluginName}' plugin)"
         ignore_all: "Ignorer alle"
         enable_plugins: "Aktivér plugins"
-        delete_confirm: "Er du sikker på, at du vil slette alle anmeldelser oprettet af deaktiverede plugins?"
-        ignore_success: "Alle anmeldelser oprettet af deaktiverede plugins er blevet slettet."
       explain:
         why: "forklar hvorfor dette punkt endte i køen"
-        title: "Scoring, der kan gennemgås"
         formula: "Formular"
         subtotal: "Mellemtotal"
         total: "Total"
@@ -615,10 +609,8 @@ da:
           title: "Brugere, hvis markeringer historisk er blevet bekræftet/godkendt, får en bonus."
         trust_level_bonus:
           name: "tillidsniveau"
-          title: "Punkter til gennemgang, som er oprettet af brugere med højere tillidsniveau, har en højere score."
         type_bonus:
           name: "skriv bonus"
-          title: "Visse gennemgåelige typer kan tildeles en bonus af medarbejdere, for at give dem til en højere prioritet."
       revise_and_reject_post:
         title: "Revidere"
         reason: "Begrundelse"
@@ -627,7 +619,6 @@ da:
         custom_reason: "Giv en klar beskrivelse af årsagen"
         other_reason: "Andet..."
         optional: "valgfri"
-      stale_help: "Denne gennemgang er blevet løst af <b>%{username}</b>."
       claim_help:
         optional: "Du kan gøre krav på dette punkt, for at forhindre andre i at gennemgå det."
         required: "Du skal kræve punkter, før du kan gennemgå dem."
@@ -3981,7 +3972,18 @@ da:
         one: "Dets synonym slettes også."
         other: "Dets %{count} synonymer slettes også."
       edit_tag: "Rediger mærke navn og beskrivelse"
-      description: "Beskrivelse (maks. 1000 tegn)"
+      description: "Beskrivelse"
+      settings:
+        title: "Indstillinger"
+        general: "Overordnet"
+        back: "Tilbage"
+        name: "Navn"
+        slug: "Alias (Slug)"
+        name_placeholder: "Mærke navn"
+        synonyms_subtitle: "Når følgende tags bruges, vil de blive erstattet med %{name}"
+      localization:
+        name: "Navn"
+        description: "Beskrivelse"
       sort_by: "Sortér efter:"
       sort_by_count: "antal"
       sort_by_name: "navn"
@@ -4332,6 +4334,11 @@ da:
         title: "Liste over tilgængelige rapporter"
         sidebar_title: "Rapporter"
         back: "Tilbage til alle rapporter"
+        group_traffic: "Trafik"
+        group_members: "Brugere"
+        group_moderation: "Moderation"
+        group_security: "Sikkerhed"
+        group_other: "Andre"
       config_sections:
         account:
           title: "Konto"
@@ -4356,7 +4363,6 @@ da:
         preview: "Forhåndsvisning"
         enabled_for_options:
           everyone: "Alle"
-          staff: "Kun personale"
         statuses:
           experimental: "Eksperimentel"
         impact_roles:
@@ -4481,6 +4487,9 @@ da:
               title: "Logs"
         reports:
           title: "Rapporter"
+          sub_pages:
+            settings:
+              title: "Indstillinger"
         badges:
           title: "Emblemer"
         content:
@@ -4545,22 +4554,6 @@ da:
         result_count:
           one: '%{count} resultat for "%{filter}"'
           other: '%{count} resultater for "%{filter}"'
-        result_types:
-          page:
-            one: "Side"
-            other: "Sider"
-          report:
-            one: "Rapport"
-            other: "Rapporter"
-          setting:
-            one: "Indstilling"
-            other: "Indstillinger"
-          theme:
-            one: "Tema"
-            other: "Temaer"
-          component:
-            one: "Komponent"
-            other: "komponenter"
       new_features:
         title: "Hvad er nyt?"
         check_for_updates: "Se efter opdateringer"
@@ -6073,6 +6066,7 @@ da:
         field_types:
           text: "Tekst"
           textarea: "Tekstområde"
+          date: "Dato"
           confirm: "Bekræft"
           dropdown: "Rulleboks"
           multiselect: "Multivælg"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index e73ffc029378e..190104abab9ca 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -297,6 +297,7 @@ de:
     skip_to_top: "Zum Seitenanfang springen"
     skip_user_nav: "Zum Profilinhalt springen"
     emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt."
+    emails_are_disabled_no_smtp: "Die ausgehende E-Mail-Kommunikation ist deaktiviert, weil kein SMTP-Server konfiguriert wurde. Es können keinerlei E-Mails verschickt werden."
     emails_are_disabled_non_staff: "Ausgehende E-Mails wurden für Benutzer, die nicht zum Team gehören, deaktiviert."
     software_update_prompt:
       message: "Wir haben diese Website aktualisiert. <span>Bitte aktualisiere</span>, damit alles reibungslos funktioniert."
@@ -417,20 +418,32 @@ de:
       pill: "Empfohlen"
       pm_title: "Vorgeschlagene Nachrichten"
     admin_onboarding_banner:
+      launch_in_easy_steps: "Starte in %{step_count} einfachen Schritten"
+      skipped: "Die Checkliste für das Onboarding von Administratoren wurde übersprungen. Um sie wieder zu aktivieren, suche in den Website-Einstellungen nach „enable site owner onboarding“."
+      congrats_onboarding_complete: "Herzlichen Glückwunsch zum Abschluss des Onboarding-Prozesses!"
+      invite_collaborators:
+        title: "Mitstreiter einladen"
+        description: "Die ersten Mitglieder tragen dazu bei, deine Community zum Leben zu erwecken"
+        action: "Einladung erstellen"
       start_posting:
+        title: "Beginne mit dem Erstellen von Beiträgen"
         description: "Gib den Leuten etwas, worüber sie gemeinsam reden können"
+        action: "Fragen zum Einstieg"
         icebreakers:
           fun_facts:
             title: "Was sind ein paar interessante Fakten über dich?"
             body: "Hallo zusammen! Ich freue mich, diese neue Community hier zu starten. Zum Auftakt lasst uns doch eine interessante Kleinigkeit über uns teilen. Ich mache den Anfang: Ich liebe es, zu wandern und neue Wege zu erkunden! Was ist eine interessante Kleinigkeit über dich?"
           coolest_thing_you_have_seen_today:
             title: "Was ist das Coolste, das du heute gesehen hast?"
+            body: "Was war das Coolste, das du heute gesehen oder erlebt hast? Das kann alles sein, von einem wunderschönen Sonnenuntergang bis hin zu einer netten Geste. Ich fange mal an: Ich habe einen Hund gesehen, der einer älteren Person beim Überqueren der Straße geholfen hat!"
           introduce_yourself:
             title: "Stell dich vor"
+            body: "Willkommen in der Community! Lasst uns einander kennenlernen. Bitte stelle dich vor und erzähle ein wenig über deine Interessen. Ich fange an: Ich habe eine Leidenschaft für Technik und liebe es, mein Wissen weiterzugeben!"
           what_is_your_favorite_food:
             title: "Was ist dein Lieblingsessen?"
             body: "Teile dein Lieblingsessen mit der Community! Ich fange an: Ich liebe Pizza, besonders mit extra viel Käse und Peperoni."
       spread_the_word:
+        title: "Mach deine Community bekannt!"
         description: "Teile einen Link mit deinem Netzwerk"
         action: "Link kopieren"
         copied_to_clipboard: "Link in die Zwischenablage kopiert!"
@@ -608,6 +621,10 @@ de:
         other_drafts:
           one: "+%{count} anderer Entwurf"
           other: "+%{count} andere Entwürfe"
+    embed_mode:
+      storage_access_prompt: "Hast du bereits ein Konto bei %{site_name}? Erlaube den Zugriff auf deine Sitzung, um als angemeldeter Benutzer zu kommentieren."
+      allow_access: "Zugriff erlauben"
+      continue_as_guest: "Als Gast fortfahren"
     topic_count_all:
       one: "Zeige %{count} neues Thema"
       other: "Zeige %{count} neue Themen"
@@ -667,24 +684,25 @@ de:
       show_more: "Mehr anzeigen"
       show_less: "Weniger anzeigen"
       back_to_queue: "Zurück zur Warteschlange"
+      editing_post: "Beitrag wird bearbeitet …"
       order_by: "Sortieren nach"
       date_filter: "Gepostet zwischen"
       in_reply_to: "Antwort auf"
       filtered_flagged_by: "Gemeldet von"
       unknown:
         title:
-          one: "Du hast ausstehende Überprüfungen von einem deaktivierten Plug-in:"
-          other: "Du hast ausstehende Überprüfungen von deaktivierten Plug-ins:"
+          one: "Du hast ausstehende Elemente in der Warteschlange zur Überprüfung von einem deaktivierten Plug-in:"
+          other: "Du hast ausstehende Elemente in der Warteschlange zur Überprüfung von diesen deaktivierten Plug-ins:"
         instruction: "Sie können erst dann richtig angezeigt werden, wenn du das entsprechende Plug-in aktivierst. Bitte aktiviere das Plug-in und aktualisiere die Seite. Alternativ kannst du sie auch ignorieren. <a href='%{url}' target='_blank'>Mehr erfahren …</a>"
         reviewable_unknown_source: "%{reviewableType} (unbekanntes Plug-in)"
         reviewable_known_source: "%{reviewableType} (von dem Plug-in '%{pluginName}')"
         ignore_all: "Alle ignorieren"
         enable_plugins: "Plug-ins aktivieren"
-        delete_confirm: "Bist du sicher, dass du alle Bewertungen löschen willst, die von deaktivierten Plug-ins erstellt wurden?"
-        ignore_success: "Alle Bewertungen, die von deaktivierten Plug-ins erstellt wurden, wurden gelöscht."
+        delete_confirm: "Bist du sicher, dass du alle Elemente aus der Warteschlange zur Überprüfung löschen willst, die von deaktivierten Plug-ins erstellt wurden?"
+        ignore_success: "Alle Elemente in der Warteschlange zur Überprüfung, die von deaktivierten Plug-ins erstellt wurden, wurden gelöscht."
       explain:
         why: "erkläre, warum dieses Element in der Warteschlange gelandet ist"
-        title: "Überprüfbares Scoring"
+        title: "Scoring für das zu überprüfende Element"
         formula: "Formel"
         subtotal: "Zwischensumme"
         total: "Gesamt"
@@ -698,10 +716,10 @@ de:
           title: "Benutzer, deren Meldungen in der Vergangenheit zugestimmt wurde, erhalten einen Bonus."
         trust_level_bonus:
           name: "Vertrauensstufe"
-          title: "Überprüfbare Elemente, die von Benutzern höherer Vertrauensstufen angelegt wurden, haben einen höheren Score."
+          title: "Meldungen, die von Benutzern höherer Vertrauensstufen erstellt wurden, haben einen höheren Score."
         type_bonus:
           name: "Bonustyp"
-          title: "Bestimmte überprüfbare Typen können vom Team mit einem Bonus ausgestattet werden, damit sie höher priorisiert sind."
+          title: "Bestimmte Meldungs-Typen können vom Team mit einem Bonus ausgestattet werden, damit sie höher priorisiert sind."
       revise_and_reject_post:
         title: "Überarbeiten"
         reason: "Grund"
@@ -710,7 +728,7 @@ de:
         custom_reason: "Gib eine klare Beschreibung des Grundes an"
         other_reason: "Sonstiges …"
         optional: "optional"
-      stale_help: "Diese Überprüfung wurde von <b>%{username}</b> gelöst."
+      stale_help: "Dieses Element wurde durch <b>%{username}</b> gelöst."
       claim_help:
         optional: "Du kannst dieses Element reservieren, damit andere es nicht überprüfen."
         required: "Du musst Elemente reservieren, bevor du sie überprüfen kannst."
@@ -718,9 +736,9 @@ de:
         claimed_by_other: "Dieses Element kann nur von <b>%{username}</b> überprüft werden."
         automatically_claimed_by: "Dieses Element wird derzeit von <b>%{username}</b> überprüft."
       claim:
-        title: "Dieses Thema reservieren"
+        title: "Dieses Thema übernehmen"
       unclaim:
-        help: "Diese Reservierung entfernen"
+        help: "Diese Übernahme entfernen"
       awaiting_approval: "Wartet auf Genehmigung"
       delete: "Löschen"
       settings:
@@ -885,10 +903,10 @@ de:
           title: "Beitrag"
           noun: "Beitrag"
         reviewable_ai_chat_message:
-          title: "von KI gemeldete Chatnachricht"
+          title: "KI-gemeldete Chat-Nachricht"
           noun: "Chat-Nachricht"
         reviewable_ai_post:
-          title: "von KI gemeldeter Beitrag"
+          title: "KI-gemeldeter Beitrag"
           noun: "Beitrag"
         reviewable_post_voting_comment:
           title: "Gemeldeter Kommentar"
@@ -911,7 +929,7 @@ de:
         flagged_as_by: "Gemeldet als %{flagReason} von %{username} · %{relativeDate}"
         claimed: "Übernommen"
         claimed_by: "Übernommen von %{username} · %{relativeDate}"
-        unclaimed_by: "Abgegeben von %{username} · %{relativeDate}"
+        unclaimed_by: "Übernahme entfernt von %{username} · %{relativeDate}"
         reviewed: "Überprüft"
         approved_by: "Genehmigt von %{username} · %{relativeDate}"
         rejected_by: "Abgelehnt von %{username} · %{relativeDate}"
@@ -2035,7 +2053,7 @@ de:
         first_time_and_daily: "Für das erste „Gefällt mir“ sowie maximal täglich"
         first_time: "Nur für das erste „Gefällt mir“ eines Beitrags"
         never: "Nie"
-      notify_on_linked_posts: "Benachrichtige mich, wenn jemand einen Link zu einem meiner Beiträge teilt"
+      notify_on_linked_posts: "Mich benachrichtigen, wenn jemand einen Link zu einem meiner Beiträge teilt"
       email_previous_replies:
         title: "Füge vorherige Beiträge ans Ende von E-Mails an"
         unless_emailed: "sofern noch nicht gesendet"
@@ -2095,7 +2113,7 @@ de:
         redeemed_tab_with_count: "Angenommen (%{count})"
         invited_via: "Einladung"
         invited_via_link: "Link %{key} (%{count}/%{max} angenommen)"
-        generating_link: "Link wird generiert..."
+        generating_link: "Link wird generiert …"
         groups: "Gruppen"
         topic: "Thema"
         sent: "Erstellt/Zuletzt gesendet"
@@ -2713,7 +2731,7 @@ de:
       topic_count:
         one: "%{count} Thema in dieser Kategorie"
         other: "%{count} Themen in dieser Kategorie"
-      read_only: "nur Lesen"
+      read_only: "schreibgeschützt"
       read_only_description: "Du hast in dieser Kategorie nur Leserechte, daher kannst du sie nicht auswählen."
     timezone_input:
       ambiguous_ist: "IST ist zweideutig, bitte wähle eine bestimmte Zeitzone (z. B. Asien/Kolkata)"
@@ -2803,8 +2821,8 @@ de:
         original_content: "Original-Beitrag"
         translation_preview: "Übersetzungsvorschau"
         original: "Original"
-        translation: "Übersetzen"
-        no_translation_yet: "Fang an zu tippen, um eine Vorschau der Übersetzung zu sehen..."
+        translation: "Übersetzung"
+        no_translation_yet: "Fang an zu tippen, um eine Vorschau der Übersetzung zu sehen …"
         placeholder: "Übersetzung für den Beitrag hier eingeben …"
         show_raw_markdown: "Rohversion anzeigen"
       group_mentioned_limit:
@@ -2916,6 +2934,7 @@ de:
       upload_description: "gib hier eine Beschreibung des Uploads ein"
       olist_title: "Nummerierte Liste"
       ulist_title: "Liste mit Aufzählungszeichen"
+      list_title: "Listen"
       list_item: "Listenelement"
       toggle_direction: "Schreibrichtung wechseln"
       apply_wrap_title: "Wrap anwenden"
@@ -2938,7 +2957,7 @@ de:
       exit_fullscreen_prompt: "Drücke <kbd>ESC</kbd>, um den Vollbildmodus zu verlassen"
       show_toolbar: "Editor-Werkzeugleiste anzeigen"
       hide_toolbar: "Editor-Werkzeugleiste ausblenden"
-      peek_mode_toggle: "Editior-Position umschalten"
+      peek_mode_toggle: "Editor-Position umschalten"
       modal_ok: "OK"
       cant_send_pm: "Entschuldige, aber du kannst keine Nachricht an %{username} senden."
       create_message_error: "Entschuldige, es gab einen Fehler beim Erstellen der Nachricht. Bitte versuche es noch einmal."
@@ -3286,8 +3305,6 @@ de:
         max_views:
           placeholder: Maximum
           aria_label: nach maximaler Anzahl von Aufrufen filtern
-        additional_options:
-          label: "Nach Beitragsanzahl und Themenaufrufen filtern"
     hamburger_menu: "Navigationsmenü"
     new_item: "neu"
     go_back: "zurückgehen"
@@ -3456,7 +3473,7 @@ de:
           unread: "Nichts ungelesen … beeindruckend!"
           new_new: "Im Moment gibt es nichts Neues … Schau bald wieder vorbei!"
           new: "Im Moment gibt es nichts Neues … Schau bald wieder vorbei!"
-          generic: "Hier gibt es nichts zu sehen... Schau bald wieder vorbei!"
+          generic: "Hier gibt es nichts zu sehen … Schau bald wieder vorbei!"
     topic_bulk_actions:
       dismiss:
         name: "Verwerfen"
@@ -3499,7 +3516,7 @@ de:
         one: "%{count} Beitrag im Thema"
         other: "%{count} Beiträge im Thema"
       create: "Neues Thema"
-      create_long: "Erstelle ein neues Thema"
+      create_long: "Neues Thema erstellen"
       create_group: "Neues Thema und Entwürfe"
       open_draft: "Entwurf öffnen"
       private_message: "Eine Unterhaltung beginnen"
@@ -3939,7 +3956,7 @@ de:
       deleted_by_author_simple: "(Thema vom Verfasser gelöscht)"
       localizations:
         title_edit_warning:
-          message: "Dies ist ein übersetzter Thementitel.<br><br>Willst du die <b>ursprüngliche</b> Kategorie, die Schlagwörter und den Titel in %{language} oder diese spezielle <b>Übersetzung</b> bearbeiten?"
+          message: "Dies ist ein übersetzter Thementitel.<br><br>Willst du die <b>ursprüngliche</b> Kategorie, die Schlagwörter und den Titel auf %{language} oder diese spezielle <b>Übersetzung</b> bearbeiten?"
           action_original: "Original bearbeiten"
           action_translation: "Übersetzten Thementitel bearbeiten"
         editing_translation: "Übersetzung nach %{language} bearbeiten"
@@ -3984,8 +4001,8 @@ de:
       load_more_posts_below: "Darunter weitere Beiträge laden"
       sr_collapse_replies: "Eingebettete Antworten einklappen"
       sr_load_more_replies: "Weitere eingebettete Antworten laden"
-      loading_more_posts_above: "Weitere Beiträge werden darüber geladen..."
-      loading_more_posts_below: "Weitere Beiträge werden darunter geladen..."
+      loading_more_posts_above: "Weitere Beiträge werden darüber geladen …"
+      loading_more_posts_below: "Weitere Beiträge werden darunter geladen …"
       loading_complete: "Laden abgeschlossen"
       sr_date: "Beitragsdatum"
       sr_expand_replies:
@@ -4041,7 +4058,9 @@ de:
           edit: "Bearbeiten"
           delete: "Löschen"
         add: "Neue Übersetzung hinzufügen"
-        manage: "Übersetzungen verwalten (%{count} vorhanden)"
+        manage:
+          one: "Übersetzungen verwalten (%{count} vorhanden)"
+          other: "Übersetzungen verwalten (%{count} vorhanden)"
         view:
           one: "%{count} übersetzte Sprachvariante anzeigen"
           other: "%{count} übersetzte Sprachvarianten anzeigen"
@@ -4352,6 +4371,9 @@ de:
         reply: "Antworten"
         create: "Erstellen"
         no_groups_selected: "Es wurde keinen Gruppen Zugriff gewährt. Diese Kategorie ist nur für das Team sichtbar."
+        everyone_full_access: 'Diese Kategorie ist öffentlich, jeder kann Beiträge sehen, beantworten und erstellen. Entferne eine oder mehrere der Berechtigungen, die der Gruppe „%{everyone_group}“ erteilt wurden, um die Berechtigungen einzuschränken.'
+        everyone_reply_access: 'Diese Kategorie ist öffentlich, jeder kann Beiträge sehen und auf Themen antworten. Entferne die Gruppe „%{everyone_group}“, um die Berechtigungen einzuschränken.'
+        everyone_see_access: 'Diese Kategorie ist öffentlich, jeder kann die Beiträge sehen. Entferne die Gruppe „%{everyone_group}“, um die Berechtigungen einzuschränken.'
         specific_groups_have_access: "Diese Kategorie ist privat. Nur die ausgewählten Gruppen können Beiträge sehen, beantworten und erstellen."
         all_parent_groups_used: "Alle Gruppen aus der übergeordneten Kategorie sind hinzugefügt worden. Um weitere Gruppen hinzuzufügen, füge sie zuerst der übergeordneten Kategorie hinzu."
         toggle_reply: "Antwortberechtigung umschalten"
@@ -4390,7 +4412,7 @@ de:
       position_disabled: "Die Kategorien werden in der Reihenfolge ihrer Aktivität angezeigt. Um die Reihenfolge der Kategorien in den Listen zu kontrollieren, aktiviere die Einstellung <a href='%{url}'>„fixed category positions“</a>."
       minimum_required_tags: "Mindestanzahl an Schlagwörtern, die ein Thema erfordert"
       default_slow_mode: '„Langsamer Modus“ für neue Themen in dieser Kategorie aktivieren.'
-      subcategory_of: "Unterkategorie von..."
+      subcategory_of: "Unterkategorie von …"
       none_subcategory_text: "Keiner"
       subcategory_permissions_warning: "Eine Unterkategorie einer privaten Kategorie kann nicht öffentlich sein."
       visibility:
@@ -4914,13 +4936,19 @@ de:
       category_restricted: "Dieses Schlagwort ist auf Kategorien beschränkt, für die du keine Zugriffsberechtigung hast."
       synonyms: "Synonyme"
       synonyms_description: "Wenn die folgenden Schlagwörter verwendet werden, werden sie durch <b>%{base_tag_name}</b> ersetzt."
+      synonyms_inline: "Diese Synonyme werden durch %{base_tag_name} ersetzt:"
       save: "Name und Beschreibung des Schlagwortes speichern"
       tag_groups_info:
         one: 'Dieses Schlagwort gehört zur Gruppe „%{tag_groups}“.'
         other: "Dieses Schlagwort gehört zu diesen Gruppen: %{tag_groups}"
+      tag_groups_info_prefix:
+        one: "Dieses Schlagwort gehört zur Gruppe: "
+        other: "Dieses Schlagwort gehört zu diesen Gruppen: "
       category_restrictions:
         one: "Es kann nur in dieser Kategorie verwendet werden:"
         other: "Es kann nur in folgenden Kategorien verwendet werden:"
+      restricted_to: "Beschränkt auf"
+      no_synonyms: "Dieses Schlagwort hat keine Synonyme."
       edit_synonyms: "Synonyme bearbeiten"
       add_synonyms_label: "Synonyme hinzufügen:"
       add_synonyms: "Hinzufügen"
@@ -4940,7 +4968,34 @@ de:
         other: "Es werden %{count} weitere Synonyme ebenfalls gelöscht."
       edit_tag: "Name und Beschreibung des Schlagwortes bearbeiten"
       edit: "Dieses Schlagwort bearbeiten"
-      description: "Beschreibung (max. 1000 Zeichen)"
+      description: "Beschreibung"
+      settings:
+        title: "Einstellungen"
+        edit_title: "Schlagwort bearbeiten: %{name}"
+        edit_tag_prefix: "Schlagwort bearbeiten:"
+        select_tag: "Schlagwort zum Bearbeiten auswählen"
+        general: "Allgemein"
+        localizations: "Lokalisierungen"
+        back: "Zurück"
+        name: "Name"
+        slug: "Sprechender Name für URL"
+        name_placeholder: "Name des Schlagworts"
+        slug_placeholder: "Sprechender Name des Schlagwortes (optional, wird automatisch aus dem Namen generiert)"
+        saved: "Schlagwort-Einstellungen gespeichert"
+        no_synonyms: "Für dieses Schlagwort sind keine Synonyme definiert."
+        add_synonym_placeholder: "Suche nach Schlagwörtern, die als Synonyme hinzugefügt werden sollen..."
+        synonyms_subtitle: "Wenn die folgenden Schlagwörter verwendet werden, werden sie durch %{name} ersetzt"
+        save: "Schlagwort speichern"
+        delete: "Schlagwort löschen"
+        synonyms_hint: "Wenn diese Schlagwörter verwendet werden, werden sie durch %{baseTagName} ersetzt."
+        add_synonyms_confirm: "Jede Stelle, die aktuell %{synonymNames} verwendet, wird auf %{tagName} umgestellt. Bist du sicher, dass du diese Änderung vornehmen möchtest?"
+      localization:
+        hint: "Füge Übersetzungen hinzu, um Schlagwort-Namen für Benutzer in verschiedenen Sprachen anzuzeigen."
+        locale: "Gebietsschema"
+        name: "Name"
+        description: "Beschreibung"
+        add: "Übersetzung hinzufügen"
+        remove: "Übersetzung entfernen"
       sort_by: "Sortieren nach:"
       sort_by_count: "Anzahl"
       sort_by_name: "Name"
@@ -5459,7 +5514,7 @@ de:
     type_to_filter: "Zum Filtern hier eingeben …"
     settings: "Einstellungen"
     reset_filter: "Zurücksetzen"
-    toggle_filters: "Dropdowns zum Filtern anzeigen/ ausblenden"
+    toggle_filters: "Dropdowns zum Filtern anzeigen/ausblenden"
     admin:
       title: "Discourse-Administrator"
       moderator: "Moderator"
@@ -5472,9 +5527,16 @@ de:
           never: "nie"
       reports:
         title: "Verfügbare Berichte"
-        meta_doc: "Berichte sind ein leistungsfähiges Instrument, das dir hilft zu verstehen, was auf deiner Website passiert. Sie können dir helfen, Trends zu erkennen, Probleme aufzudecken und Entscheidungen auf der Grundlage von Daten zu treffen."
         sidebar_title: "Berichte"
         back: "Zurück zu alle Berichte"
+        group_engagement: "Aktivität & Wachstum"
+        group_traffic: "Traffic"
+        group_members: "Mitglieder"
+        group_content: "Inhalte & Community-Status"
+        group_moderation: "Moderation"
+        group_security: "Sicherheit"
+        group_other: "Sonstiges"
+        legacy_warning: "Dies ist ein älterer Bericht. Er wird demnächst nicht mehr verfügbar sein. Wenn du Hilfe bei der Suche nach einem Ersatz benötigst, wenden dich bitte an den Support."
       config_sections:
         account:
           title: "Konto"
@@ -5497,7 +5559,7 @@ de:
         plugin: "Plug-in"
         metadata: "Metadaten"
         enabled: "Aktiviert"
-        enabled_for: "Aktiviert für..."
+        enabled_for: "Aktiviert für …"
         show_image: "Bild anzeigen"
         edit_groups: "Gruppenweise Aktivierung bearbeiten"
         groups_updated: "Gruppen aktualisiert!"
@@ -5506,7 +5568,8 @@ de:
         no_changes_to_save: "Keine Änderungen zu speichern"
         select_groups: "Gruppen auswählen …"
         opt_in_groups: "Gruppenweise Aktivierung"
-        opt_in_groups_instructions: "Die gruppenweise Aktivierung kann verwendet werden, um einer bestimmten Benutzergruppe zu ermöglichen, eine Änderung zu testen, bevor sie für alle veröffentlicht wird. Beachte, dass diese Gruppen irrelevant werden, sobald eine Änderung den Status „dauerhaft“ erreicht."
+        show_related_settings: "Verwandte Einstellungen anzeigen..."
+        opt_in_groups_instructions: "Die gruppenweise Aktivierung kann verwendet werden, um einer bestimmten Benutzergruppe zu ermöglichen, eine Änderung zu testen, bevor sie für alle veröffentlicht wird. Beachte, dass diese Gruppen irrelevant werden, sobald eine Änderung den Status „stabil“ erreicht."
         enabled_for_throttle: "Du hast zu schnell geändert, für wen diese Änderung aktiviert ist. Bitte warte ein paar Sekunden, bevor du es erneut versuchst."
         change_enabled_for_success: "Du hast diese Änderung für %{enabledFor} aktiviert."
         change_disabled: "Du hast diese Änderung deaktiviert"
@@ -5541,7 +5604,7 @@ de:
           all: "Gesamt"
           enabled_all: "Alle Aktivierungszustände"
           enabled: "Aktiviert"
-          enabled_for_staff: "Für Team-Mitglieder aktiviert"
+          enabled_for_staff: "Für %{staffGroupName} aktiviert"
           enabled_for_specific_groups: "Für bestimmte Gruppen aktiviert"
           disabled: "Deaktiviert"
           impact_type_all: "Alle Änderungstypen"
@@ -5613,7 +5676,7 @@ de:
             logins_30_days: "Anmeldungen (30 Tage)"
           regenerate_credentials: "Anmeldedaten neu generieren"
           regenerate_confirm: "Bist du sicher, dass du deine Discourse ID-Anmeldedaten neu generieren willst? Dadurch wird ein neues Client-Geheimnis generiert. Die Erneuerung der Anmeldedaten ist normalerweise nicht erforderlich, kann aber für mehr Sicherheit nützlich sein."
-          description: "Discourse ID ist einen Single-Sign-On-Dienst, der es Benutzern ermöglicht, sich mit einem einzigen Konto bei mehreren Discourse-Seiten anzumelden. Gängige Social-Login-Anbieter wie Google, Facebook, Apple und GitHub werden ohne zusätzliche Konfiguration unterstützt."
+          description: "Discourse ID ist ein Single-Sign-On-Dienst, der es Benutzern ermöglicht, sich mit einem einzigen Konto bei mehreren Discourse-Seiten anzumelden. Gängige Social-Login-Anbieter wie Google, Facebook, Apple und GitHub werden ohne zusätzliche Konfiguration unterstützt."
           learn_more: "Mehr erfahren"
           regenerate_success: "Die Anmeldedaten wurden erfolgreich neu generiert."
         logo:
@@ -5631,7 +5694,7 @@ de:
               help_text: "Die empfohlene Größe ist 600 x 80 Pixel."
             large_icon:
               title: "Quadratisches Symbol"
-              description: "Eine quadratische Version des Logos erscheint oben in der Verwaltung und ist auch das Logo für den mobilen Startbildschirm der App."
+              description: "Eine quadratische Version des Logos erscheint oben auf der Seite und ist auch das Logo der mobilen App."
               help_text: "Die empfohlene Größe ist 512 x 512 Pixel."
             square_icon_dark:
               required: "Ein anderes quadratisches Symbol für den dunklen Modus verwenden?"
@@ -5708,7 +5771,7 @@ de:
           saved: "Die Einstellungen für das Willkommensbanner wurden erfolgreich gespeichert."
           form:
             enabled_themes:
-              label: "In Themes aktiviert..."
+              label: "In Themes aktiviert …"
               description: "Wähle aus, welche Themes das Banner anzeigen sollen. Nur aktive Themes werden angezeigt."
               select_label: "Themes auswählen"
             background_image:
@@ -5757,7 +5820,7 @@ de:
             search_placeholder:
               label: "Platzhalter für die Suche"
               description: "Platzhaltertext für das Suchfeld im Willkommensbanner."
-              placeholder: "Themen suchen..."
+              placeholder: "Themen suchen …"
         navigation:
           title: "Navigation"
           header_description: "Konfiguriere die Navigationslinks und Menüpunkte für deine Website. Dazu gehören die Position und das Verhalten des Hauptnavigationsmenüs, die Quicklinks oben auf der Homepage und die Administrator-Seitenleiste."
@@ -5819,7 +5882,7 @@ de:
           header_description: "Berichte sind ein leistungsfähiges Instrument, das dir hilft zu verstehen, was auf deiner Website passiert. Sie können dir helfen, Trends zu erkennen, Probleme aufzudecken und Entscheidungen auf der Grundlage von Daten zu treffen."
           sub_pages:
             settings:
-              title: "Dashboard-Einstellungen"
+              title: "Einstellungen"
         badges:
           title: "Abzeichen"
           header_description: "Abzeichen belohnen Benutzer für ihre Aktivitäten, Beiträge und Leistungen, um positives Verhalten sowie Engagement in der Community anzuerkennen, zu bestätigen und zu fördern"
@@ -5975,22 +6038,6 @@ de:
         result_count:
           one: '%{count} Ergebnis für „%{filter}“'
           other: '%{count} Ergebnisse für „%{filter}“'
-        result_types:
-          page:
-            one: "Seite"
-            other: "Seiten"
-          report:
-            one: "Bericht"
-            other: "Berichte"
-          setting:
-            one: "Einstellung"
-            other: "Einstellungen"
-          theme:
-            one: "Theme"
-            other: "Themes"
-          component:
-            one: "Komponente"
-            other: "Komponenten"
       new_features:
         title: "Was ist neu?"
         check_for_updates: "Nach Aktualisierungen suchen"
@@ -6013,6 +6060,7 @@ de:
         new_features:
           title: "Was ist neu?"
           subtitle: "Wir veröffentlichen laufend neue Funktionen und Verbesserungen. Auf dieser Seite findest du die wichtigsten Neuerungen, aber du kannst auch auf „Mehr erfahren“ klicken, um ausführliche Versionshinweise zu lesen."
+          no_new_features_found: "Es gibt keine Einträge im Feed oder der ausgewählte Filter hat keine Ergebnisse zurückgegeben. Du kannst frühere Ankündigungen neuer Funktionen in der <a href='%{url}' target='_blank'>Discourse Meta Community</a> sehen."
           no_new_features_error: "Es gab einen Fehler beim Laden des Feeds. Du kannst frühere Ankündigungen neuer Funktionen in der <a href='%{url}' target='_blank'>Discourse Meta Community</a> sehen."
           learn_more: "Mehr erfahren …"
           experimental: "Experimentell"
@@ -6217,6 +6265,7 @@ de:
         cancel: "Abbrechen"
         continue: "Weiter"
         copy_key: "Kopieren"
+        key_copied_to_clipboard: "API-Schlüssel in die Zwischenablage kopiert"
         back: "Zurück zu API-Schlüsseln"
         revoke: "Widerrufen"
         undo_revoke: "Widerruf rückgängig machen"
@@ -6657,7 +6706,7 @@ de:
             description: "Einstellungen, die es Themes ermöglichen, mehr Kontrolle über das gesamte Website-Erlebnis zu haben, indem sie eine kleine Teilmenge der wichtigsten Website-Einstellungen überschreiben."
           themes:
             title: "Themes"
-            description: "Website-weite Themes, die das Gesamtbild deiner Website für alle Nutzer verändern."
+            description: "Website-weite Themes, die das Gesamtbild deiner Website für alle Benutzer verändern."
             themes_intro: "Installiere ein neues Theme, um loszulegen, oder erstelle dein eigenes von Grund auf mit diesen Ressourcen."
             new_theme: "Neues Theme"
             back: "Zurück zu Themes"
@@ -6875,7 +6924,7 @@ de:
           body: "Nachrichtentext"
           revert: "Änderungen verwerfen"
           revert_confirm: "Möchtest du wirklich deine Änderungen verwerfen?"
-          search_templates: "Nach Vorlagennamen filtern ..."
+          search_templates: "Nach Vorlagennamen filtern …"
           no_templates_found: "Keine Vorlage entspricht deinen Filtern."
           edit: "Bearbeiten"
           back: "Zurück zu Vorlagen"
@@ -7879,8 +7928,8 @@ de:
           progress:
             title: "Fortschritt beim Löschen von Beiträgen"
             description:
-              one: "Lösche %{count} Beitrag von @%{username}..."
-              other: "Lösche %{count} Beiträge von @%{username}..."
+              one: "Lösche %{count} Beitrag von @%{username} …"
+              other: "Lösche %{count} Beiträge von @%{username} …"
           confirmation:
             title: "Alle Beiträge von @%{username} löschen"
             description: |
@@ -8078,6 +8127,7 @@ de:
         field_types:
           text: "Text"
           textarea: "Textbereich"
+          date: "Datum"
           confirm: "Bestätigung"
           dropdown: "Drop-down-Liste"
           multiselect: "Mehrfachauswahl"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 73c201d788272..88683d5946374 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -308,6 +308,9 @@ el:
         logged_in_members: "Καλώς ήρθες πίσω, %{preferred_display_name}!"
         anonymous_members: "Καλώς ήλθατε στην %{site_name}!"
       search_placeholder: "Αναζήτηση"
+    impersonation:
+      notice: "Παριστάνεις τον χρήστη %{username}"
+      stop: "Σταμάτα την πλαστοπροσωπία"
     themes:
       default_description: "Προεπιλογή"
       broken_theme_alert: "Ο ιστότοπός σας ενδέχεται να μην λειτουργεί επειδή ένα θέμα / στοιχείο έχει σφάλματα. Ελέγξτε την κονσόλα του προγράμματος περιήγησης για περισσότερες πληροφορίες."
@@ -412,6 +415,11 @@ el:
       pill: "Προτεινόμενα"
       pm_title: "Προτεινόμενα μηνύματα"
     admin_onboarding_banner:
+      start_posting:
+        icebreakers:
+          coolest_thing_you_have_seen_today:
+            title: "Ποιο είναι το πιο ωραίο πράγμα που είδατε σήμερα;"
+            body: "Ποιο είναι το πιο ωραίο πράγμα που είδατε ή βιώσατε σήμερα; Θα μπορούσε να είναι οτιδήποτε, από ένα όμορφο ηλιοβασίλεμα μέχρι μια τυχαία πράξη καλοσύνης. Θα ξεκινήσω: Είδα έναν σκύλο να βοηθάει έναν ηλικιωμένο να διασχίσει τον δρόμο!"
       spread_the_word:
         action: "Αντιγραφή συνδέσμου"
         copied_to_clipboard: "Ο σύνδεσμος αντιγράφηκε στο πρόχειρο!"
@@ -654,19 +662,13 @@ el:
       in_reply_to: "απαντώντας στο"
       filtered_flagged_by: "Αναφορά από"
       unknown:
-        title:
-          one: "Έχετε εκκρεμή προς αναθεώρηση στοιχεία από απενεργοποιημένο πρόσθετο:"
-          other: "Έχετε εκκρεμή προς αναθεώρηση στοιχεία από απενεργοποιημένα πρόσθετα:"
         instruction: "Δεν μπορούν να εμφανιστούν σωστά μέχρι να ενεργοποιήσετε το σχετικό πρόσθετο. Ενεργοποιήστε το πρόσθετο και ανανεώστε τη σελίδα. Εναλλακτικά, μπορείτε να τα αγνοήσετε. <a href='%{url}' target='_blank'>Μάθετε περισσότερα...</a>"
         reviewable_unknown_source: "%{reviewableType} (άγνωστο πρόσθετο)"
         reviewable_known_source: "%{reviewableType} (από το πρόσθετο '%{pluginName}')"
         ignore_all: "Αγνόηση όλων"
         enable_plugins: "Ενεργοποίηση πρόσθετων"
-        delete_confirm: "Σίγουρα θέλετε να διαγράψετε όλες τις αναθεωρήσεις που δημιουργήθηκαν από απενεργοποιημένα πρόσθετα;"
-        ignore_success: "Όλες οι αναθεωρήσεις που δημιουργήθηκαν από απενεργοποιημένα πρόσθετα έχουν διαγραφεί."
       explain:
         why: "εξηγήστε γιατί αυτό το στοιχείο κατέληξε στην ουρά"
-        title: "Αναθεωρήσιμη βαθμολογία"
         formula: "Τύπος"
         subtotal: "Μερικό σύνολο"
         total: "Σύνολο"
@@ -680,10 +682,8 @@ el:
           title: "Στους χρήστες των οποίων οι σημαίες έχουν συμφωνηθεί ιστορικά, δίνεται ένα μπόνους."
         trust_level_bonus:
           name: "επίπεδο εμπιστοσύνης"
-          title: "Τα αναθεωρήσιμα στοιχεία που δημιουργούνται από χρήστες υψηλότερου επιπέδου εμπιστοσύνης έχουν υψηλότερη βαθμολογία."
         type_bonus:
           name: "τύπος μπόνους"
-          title: "Ορισμένοι τύποι που μπορούν να αναθεωρηθούν μπορούν να λάβουν ένα μπόνους από το προσωπικό για να τους δώσουν υψηλότερη προτεραιότητα."
       revise_and_reject_post:
         title: "Αναθεώρηση"
         reason: "Αιτία"
@@ -692,7 +692,6 @@ el:
         custom_reason: "Δώστε μια σαφή περιγραφή του λόγου"
         other_reason: "Άλλο..."
         optional: "προεραιτικό"
-      stale_help: "Αυτό το προς αναθεώρηση στοιχείο έχει επιλυθεί από <b>%{username}</b>."
       claim_help:
         optional: "Μπορείτε να υποβάλετε αξίωση για αυτό το στοιχείο για να αποτρέψετε την αξιολόγηση από άλλους."
         required: "Πρέπει να διεκδικήσετε στοιχεία για να μπορέσετε να τα ελέγξετε."
@@ -846,6 +845,7 @@ el:
         delimiter: "ή"
         something_else_wrong: "Υπάρχει κάποιο πρόβλημα με αυτό το %{reviewable_type};"
         approve_user: "Έγκριση αυτού του χρήστη;"
+        suspect_user: "Είναι αυτός ο χρήστης spam;"
         approve_post: "Έγκριση αυτής της ανάρτησης;"
         approve_topic: "Έγκριση αυτού του θέματος;"
       types:
@@ -1026,7 +1026,7 @@ el:
       filter_name: "φιλτράρισμα με βάση το όνομα χρήστη"
       title: "Χρήστες"
       likes_given: "Δόθηκαν"
-      likes_received: "Λήφθησαν"
+      likes_received: "Ελήφθησαν"
       topics_entered: "Προβλήθηκαν"
       topics_entered_long: "Προβεβλημένα Θέματα"
       time_read: "Χρόνος Ανάγνωσης"
@@ -1188,7 +1188,7 @@ el:
       group_name: "Όνομα ομάδας"
       user_count: "Χρήστες"
       bio: "Σχετικά με την Ομάδα"
-      selector_placeholder: "εισαγωγή ονόματος χρήστη"
+      selector_placeholder: "εισάγετε όνομα χρήστη"
       owner: "ιδιοκτήτης"
       index:
         title: "Ομάδες"
@@ -1222,7 +1222,10 @@ el:
         make_owner_description: "Κάνε τον/την <b>%{username}</b> κάτοχο αυτής της ομάδας"
         remove_owner: "Αφαίρεση ως κατόχου"
         remove_owner_description: "Αφαίρεση του/της <b>%{username}</b> ως κατόχου αυτής της ομάδας"
+        remove_member_self_lockout: "Αν αφαιρέσετε τον εαυτό σας αυτήν την ομάδα, θα ανακληθεί η πρόσβασή σας στη διαχείριση της. Σίγουρα θέλετε να συνεχίσετε;"
+        remove_owner_self_lockout: "Αν αφαιρέσετε τον εαυτό σας από κάτοχο, θα ανακληθεί η πρόσβασή σας στη διαχείριση αυτής της ομάδας. Σίγουρα θέλετε να συνεχίσετε;"
         remove_members: "Αφαίρεση Μελών"
+        remove_members_description: "Αφαιρέστε τους επιλεγμένους χρήστες από αυτήν την ομάδα"
         make_owners: "Κάνε ιδιοκτήτες"
         make_owners_description: "Ορίστε τους επιλεγμένους χρήστες ως κατόχους αυτής της ομάδας"
         remove_owners: "Αφαίρεση Κατόχων"
@@ -1414,7 +1417,7 @@ el:
         mute_option: "Σε σίγαση"
         mute_option_title: "Δεν θα λαμβάνετε ειδοποιήσεις, προσωπικά μηνύματα ή άμεσα μηνύματα συνομιλίας από αυτόν τον χρήστη."
         normal_option: "Φυσιολογικό"
-        normal_option_title: "Θα ειδοποιηθείτε εάν αυτός ο χρήστης σας απαντήσει, σας παραθέσει ή σας αναφέρει."
+        normal_option_title: "Θα ειδοποιηθείτε εάν αυτός ο χρήστης σας απαντήσει, σας παραθέσει ή σας επισημάνει."
       notification_schedule:
         title: "Χρονοδιάγραμμα Ειδοποιήσεων"
         label: "Ενεργοποίηση προσαρμοσμένου χρονοδιαγράμματος ειδοποιήσεων"
@@ -1474,7 +1477,7 @@ el:
       dismiss_notifications_tooltip: "Σήμανση όλων των αδιάβαστων ειδοποιήσεων ως διαβασμένων"
       dismiss_bookmarks_tooltip: "Σήμανση όλων των αδιάβαστων υπενθυμίσεων σελιδοδεικτών ως διαβασμένων"
       dismiss_messages_tooltip: "Σήμανση όλων των αδιάβαστων ειδοποιήσεων προσωπικών μηνυμάτων ως διαβασμένων"
-      no_likes_title: "Δεν έχετε λάβει ακόμη likes"
+      no_likes_title: "Δεν έχετε λάβει ακόμη \"Μου αρέσει\""
       no_messages_title: "Δεν έχετε κανένα μήνυμα"
       no_messages_body: >
         Χρειάζεσαι μια άμεση προσωπική συνομιλία με κάποιον, εκτός της κανονικής ροής συνομιλίας; Στείλε τους μήνυμα επιλέγοντας το avatar τους και χρησιμοποιώντας το %{icon} κουμπί μηνύματος.<br><br> Εάν χρειάζεσαι βοήθεια, μπορείς να στείλεις <a href='%{aboutUrl}'>μήνυμα σε ένα μέλος του προσωπικού</a>.
@@ -1589,6 +1592,9 @@ el:
       undo_revoke_access: "Απενεργοποίηση Ανάκλησης Πρόσβασης"
       api_approved: "Εγκεκριμένο:"
       api_last_used_at: "Τελευταία χρήση στις:"
+      api_show_permissions:
+        one: "Χορηγημένα δικαιώματα (%{count})"
+        other: "Χορηγημένα δικαιώματα (%{count})"
       theme: "Θέμα"
       save_to_change_theme: 'Το θέμα θα ενημερωθεί αφού κάνετε κλικ στο "%{save_text}"'
       home: "Προεπιλεγμένη Αρχική Σελίδα"
@@ -2576,6 +2582,12 @@ el:
     password_reset:
       continue: "Συνεχίστε στην %{site_name}"
     emoji_set:
+      apple_international: "Apple/International (καταργήθηκε για το Twemoji)"
+      google: "Google (καταργήθηκε για το Noto Emoji)"
+      twitter: "Twitter (καταργήθηκε για το Twemoji)"
+      win10: "Win10 (καταργήθηκε για το Fluent Emoji)"
+      google_classic: "Google Classic (καταργήθηκε για το Noto Emoji)"
+      facebook_messenger: "Facebook Messenger (καταργήθηκε για το Τυπικό)"
       openmoji: OpenMoji
       standard: Τυπικό
       fluentui: Fluent Emoji
@@ -2635,7 +2647,7 @@ el:
       results_count:
         one: "%{count} αποτέλεσμα"
         other: "%{count} αποτελέσματα"
-      filter_placeholder: Αναζήτηση…
+      filter_placeholder: Αναζήτησε…
       filter_placeholder_with_any: Αναζήτησε ή δημιούργησε…
       create: "Δημιουργήστε: '%{content}'"
       max_content_reached:
@@ -2660,7 +2672,7 @@ el:
         size_too_large: "%{provided_file_size} είναι μεγαλύτερο από το μέγιστο επιτρεπόμενο %{max_file_size}"
         size_too_small: "%{provided_file_size} είναι μικρότερο από το ελάχιστο επιτρεπόμενο %{min_file_size}"
     emoji_picker:
-      filter_placeholder: Αναζήτηση για emoji
+      filter_placeholder: Αναζήτησε για emoji
       smileys_&_emotion: Χαμόγελα και συγκίνηση
       people_&_body: Άνθρωποι και Σώμα
       animals_&_nature: Ζώα και Φύση
@@ -2715,6 +2727,7 @@ el:
         translation: "Μετάφραση"
         no_translation_yet: "Ξεκινήστε να πληκτρολογείτε για να δείτε την προεπισκόπηση της μετάφρασης..."
         placeholder: "Εισάγετε τη μετάφραση για την ανάρτηση εδώ..."
+        show_raw_markdown: "Εμφάνιση ακατέργαστου"
       group_mentioned_limit:
         one: "<b>Προειδοποίηση!</b> Επισήμανατε την ομάδα <a href='%{group_link}'>%{group}</a>, ωστόσο αυτή έχει περισσότερα μέλη από το ορισμένο από διαχειριστή όριο επισήμανσης %{count} χρήστη. Κανείς δε θα ειδοποιηθεί."
         other: "<b>Προειδοποίηση!</b> Επισήμανατε την ομάδα <a href='%{group_link}'>%{group}</a>, ωστόσο αυτή έχει περισσότερα μέλη από το ορισμένο από διαχειριστή όριο επισήμανσης %{count} χρηστών. Κανείς δε θα ειδοποιηθεί."
@@ -2725,6 +2738,8 @@ el:
         one: "Η επισήμανση της ομάδας %{group} θα ειδοποιήσει <a href='%{group_link}'>%{count} άτομο</a>. Είστε σίγουροι;"
         other: "Η επισήμανση της ομάδας %{group} θα ειδοποιήσει <a href='%{group_link}'>%{count} άτομα</a>. Είστε σίγουροι;"
       cannot_see_mention:
+        category: "Επισήμανες τον χρήστη @%{username} αλλά δε θα λάβει ειδοποίηση, επειδή δεν έχει πρόσβαση σε αυτή την κατηγορία. Θα πρέπει να τον προσθέσεις σε μια ομάδα που έχει πρόσβαση σε αυτή την κατηγορία."
+        private: "Επισήμανες τον χρήστη @%{username} αλλά δεν θα λάβει ειδοποίηση, επειδή δεν μπορεί να δει αυτό το προσωπικό μήνυμα. Θα πρέπει να τον προσκαλέσεις σε αυτό το ΠΜ."
         muted_topic: "Επισημάνατε τον/την @%{username} αλλά δεν θα ειδοποιηθεί επειδή έχει σε σίγαση αυτό το θέμα."
         not_allowed: "Επισημάνατε τον/την @%{username} αλλά δεν θα ειδοποιηθεί επειδή δεν προσκλήθηκε σε αυτό το θέμα."
       cannot_see_group_mention:
@@ -2769,7 +2784,7 @@ el:
       users_placeholder: "Προσθήκη χρηστών ή ομάδων"
       title_placeholder: "Τι αφορά αυτή η συζήτησης σε μία σύντομη πρόταση;"
       title_or_link_placeholder: "Πληκτρολόγησε τίτλο, ή κάνε επικόλληση ένα σύνδεσμο εδώ"
-      edit_reason_placeholder: "γιατί αναθεωρείς;"
+      edit_reason_placeholder: "γιατί κάνετε επεξεργασία;"
       topic_featured_link_placeholder: "Εισάγετε τον συνδέσμο που εμφανίζεται με τον τίτλο."
       remove_featured_link: "Αφαιρέστε σύνδεσμο από το θέμα."
       reply_placeholder: "Πληκτρολόγησε εδώ. Χρησιμοποίησε Markdown, BBCode, ή HTML για μορφοποίηση. Σύρε ή επικόλλησε εικόνες."
@@ -2839,6 +2854,9 @@ el:
         body: "Αυτή τη στιγμή το μήνυμα στέλνεται μόνο σε εσάς!"
       slow_mode:
         error: "Αυτό το θέμα είναι σε αργή λειτουργία. Έχετε ήδη δημοσιεύσει πρόσφατα. Μπορείτε να δημοσιεύσετε ξανά σε %{timeLeft}."
+      user_not_seen_in_a_while:
+        single: "Το άτομο στο οποίο στέλνετε μήνυμα, <b>%{usernames}</b>, δεν έχει εμφανιστεί εδώ και πολύ καιρό – %{time_ago}. Ενδέχεται να μην λάβει το μήνυμά σας. Ίσως θελήσετε να αναζητήσετε εναλλακτικές μεθόδους επικοινωνίας με τον/την %{usernames}."
+        multiple: "Τα ακόλουθα άτομα στα οποία στέλνετε μήνυμα: <b>%{usernames}</b>, δεν έχουν εμφανιστεί εδώ και πολύ καιρό – %{time_ago}. Ενδέχεται να μην λάβουν το μήνυμά σας. Ίσως θελήσετε να αναζητήσετε εναλλακτικές μεθόδους επικοινωνίας μαζί τους."
       admin_options_title: "Προαιρετικές ρυθμίσεις προσωπικού για αυτό το θέμα"
       composer_actions:
         reply: Απάντηση
@@ -3172,8 +3190,6 @@ el:
         max_views:
           placeholder: μέγιστο
           aria_label: φιλτράρισμα με βάση τις μέγιστες προβολές
-        additional_options:
-          label: "Φιλτράρισμα κατά αριθμό αναρτήσεων και προβολές θέματος"
     hamburger_menu: "Μενού πλοήγησης"
     new_item: "καινούριο"
     go_back: "επιστροφή"
@@ -3833,6 +3849,7 @@ el:
       edit_reason: "Αιτία:"
       post_number: "ανάρτηση %{number}"
       ignored: "Περιεχόμενο που αγνοείται"
+      wiki_last_edited_on: "τελευταία τροποποίηση wiki στις %{dateTime}"
       last_edited_on: "τελευταία τροποποίηση ανάρτησης στις %{dateTime}"
       edit_history: "ιστορικό επεξεργασίας ανάρτησης"
       reply_as_new_topic: "Απάντηση με διασυνδεδεμένο θέμα"
@@ -3904,7 +3921,9 @@ el:
           edit: "Επεξεργασία"
           delete: "Σβήσιμο"
         add: "Προσθήκη νέας μετάφρασης"
-        manage: "Διαχείριση μεταφράσεων (%{count} υπάρχουσες)"
+        manage:
+          one: "Διαχείριση μεταφράσεων (%{count} υπάρχουσες)"
+          other: "Διαχείριση μεταφράσεων (%{count} υπάρχουσες)"
         modal:
           title: "Μεταφράσεις για ανάρτηση"
           confirm_delete: "Σίγουρα θέλετε να διαγράψετε τις μεταφράσεις για '%{languageCode}';"
@@ -3953,7 +3972,7 @@ el:
         edit: "επεξεργασία ανάρτησης"
         edit_action: "Επεξεργασία"
         edit_anonymous: "Λυπούμαστε, αλλά για να επεξεργαστείς αυτή την ανάρτηση πρέπει πρώτα να συνδεθείς."
-        flag_action: "Επισήμανση"
+        flag_action: "Αναφορά"
         flag: "ανέφερε την ανάρτηση στους συντονιστές ή στείλε ένα προσωπικό μήνυμα σχετικά με αυτή"
         anonymous_flag: "στείλτε email στο προσωπικό για να αναφέρετε αυτήν την ανάρτηση"
         delete_action: "Διαγραφή ανάρτησης"
@@ -4198,6 +4217,7 @@ el:
         reply: "Απάντηση"
         create: "Δημιουργία"
         no_groups_selected: "Δεν έχει δοθεί πρόσβαση σε ομάδες. Αυτή η κατηγορία θα είναι ορατή μόνο στο προσωπικό."
+        everyone_full_access: 'Αυτή η κατηγορία είναι δημόσια, όλοι μπορούν να δουν, να απαντήσουν και να δημιουργήσουν αναρτήσεις. Για να περιορίσετε τα δικαιώματα, αφαιρέστε ένα ή περισσότερα από τα δικαιώματα που έχουν εκχωρηθεί στην ομάδα "%{everyone_group}".'
         specific_groups_have_access: "Αυτή η κατηγορία είναι ιδιωτική, μόνο οι επιλεγμένες ομάδες μπορούν να δουν, να απαντήσουν και να δημιουργήσουν αναρτήσεις."
       uncategorized_security_warning: "Αυτή η κατηγορία είναι ξεχωριστή. Προορίζεται ως περιοχή διατήρησης για θέματα που δεν έχουν κατηγορία. Δε μπορεί να έχει ρυθμίσεις ασφαλείας."
       uncategorized_general_warning: 'Αυτή η κατηγορία είναι ξεχωριστή. Χρησιμοποιείται ως προεπιλεγμένη κατηγορία για νέα θέματα που δεν έχουν επιλεγμένη κατηγορία. Αν θέλετε να αποτρέψετε αυτήν τη συμπεριφορά και να επιβάλετε επιλογή κατηγορίας, <a href="%{settingLink}">παρακαλώ απενεργοποιήστε τη ρύθμιση εδώ</a>. Εάν θέλετε να αλλάξετε το όνομα ή την περιγραφή, μεταβείτε στο <a href="%{customizeLink}">Προσαρμογή/Περιεχόμενο κειμένου</a>.'
@@ -4213,6 +4233,10 @@ el:
       all_topics_wiki: "Κάντε τα νέα θέματα wikis από προεπιλογή"
       allow_unlimited_owner_edits_on_first_post: "Να επιτρέπονται απεριόριστες επεξεργασίες κατόχου στην πρώτη ανάρτηση"
       subcategory_list_style: "Μορφή Λίστας Υποκατηγορίων:"
+      sort_order: "Ταξινόμηση λίστας θεμάτων κατά:"
+      default_view: "Προεπιλεγμένη λίστα θεμάτων:"
+      default_top_period: "Προεπιλεγμένη κορυφαία περίοδος:"
+      default_list_filter: "Προεπιλεγμένο φίλτρο λίστας:"
       allow_badges_label: "Να επιτρέπεται η απονομή παράσημων σε αυτή την κατηγορία"
       edit_permissions: "Επεξεργασία δικαιωμάτων"
       reviewable_by_group: "Εκτός από το προσωπικό, το περιεχόμενο αυτής της κατηγορίας μπορεί επίσης να αναθεωρηθεί από:"
@@ -4221,6 +4245,7 @@ el:
       require_reply_approval: "Απαιτήστε έγκριση συντονιστή για όλες τις νέες απαντήσεις"
       this_year: "φέτος"
       position: "Θέση στη σελίδα κατηγοριών:"
+      default_position: "Προεπιλεγμένη θέση"
       minimum_required_tags: "Ελάχιστος αριθμός ετικετών που απαιτούνται σε ένα θέμα:"
       default_slow_mode: 'Ενεργοποιήστε την "Αργή λειτουργία" για νέα θέματα σε αυτήν την κατηγορία.'
       subcategory_of: "Υποκατηγορία του..."
@@ -4237,6 +4262,7 @@ el:
       num_auto_bump_daily: "Αριθμός ανοιχτών θεμάτων για αυτόματη ώθηση καθημερινά:"
       navigate_to_first_post_after_read: "Μεταβείτε στην πρώτη ανάρτηση μετά την ανάγνωση των θεμάτων"
       notifications:
+        title: "αλλαγή επιπέδου ειδοποιήσεων για αυτήν την κατηγορία"
         watching:
           title: "Επιτηρείται"
         watching_first_post:
@@ -4287,7 +4313,7 @@ el:
       title: "Αναφορά παράνομου περιεχομένου"
       description: "Για να αναφέρετε παράνομο περιεχόμενο, παρακαλούμε επικοινωνήστε στο <a href='mailto:%{email}?subject=Illegal content: %{topic_title}&body=This post %{url} contains illegal content.'>%{email}</a>"
     flagging:
-      title: "Σας ευχαριστούμε που κρατάτε την κοινότητα μας πολιτισμένη!"
+      title: "Σας ευχαριστούμε που κρατάτε την κοινότητά μας πολιτισμένη!"
       action: "Αναφορά Ανάρτησης"
       take_action_options:
         default:
@@ -4328,6 +4354,7 @@ el:
           one: "%{count} απομένει"
           other: "%{count} απομένουν"
     flagging_topic:
+      title: "Σας ευχαριστούμε που κρατάτε την κοινότητά μας πολιτισμένη!"
       action: "Αναφορά Θέματος"
       notify_action: "Μήνυμα"
     topic_map:
@@ -4542,6 +4569,7 @@ el:
         latest: "%{shortcut} Τελευταία"
         new: "%{shortcut} Νέα"
         unread: "%{shortcut} Αδιάβαστα"
+        unseen: "%{shortcut} Αδιάβαστες"
         categories: "%{shortcut} Κατηγορίες"
         top: "%{shortcut} Κορυφαία"
         bookmarks: "%{shortcut} Σελιδοδείκτες"
@@ -4556,6 +4584,7 @@ el:
         back: "%{shortcut} Πίσω"
         up_down: "%{shortcut} Μετακίνηση επιλογής &uarr; &darr;"
         open: "%{shortcut} Άνοιγμα επιλεγμένου θέματος"
+        open_new_window: "%{shortcut} Άνοιγμα επιλεγμένου θέματος σε νέα καρτέλα/παράθυρο"
         next_prev: "%{shortcut} Επόμενη/Προηγούμενη ενότητα"
         go_to_unread_post: "%{shortcut} Μετάβαση στην πρώτη αδιάβαστη ανάρτηση"
       application:
@@ -4733,7 +4762,19 @@ el:
         other: "Τα %{count} συνώνυμά του θα διαγραφούν επίσης."
       edit_tag: "Επεξεργασία ονόματος και περιγραφής ετικέτας"
       edit: "Επεξεργασία αυτής της ετικέτας"
-      description: "Περιγραφή (μέγιστο 1000 χαρακτήρες)"
+      description: "Περιγραφή"
+      settings:
+        title: "Ρυθμίσεις"
+        general: "Γενικά"
+        back: "Πίσω"
+        name: "Όνομα"
+        slug: "Slug"
+        name_placeholder: "Όνομα ετικέτας"
+        add_synonym_placeholder: "Αναζήτησε ετικέτες για προσθήκη ως συνώνυμα..."
+        synonyms_subtitle: "Όταν χρησιμοποιούνται οι ακόλουθες ετικέτες, θα αντικατασταθούν με %{name}"
+      localization:
+        name: "Όνομα"
+        description: "Περιγραφή"
       sort_by: "Ταξινόμηση κατά:"
       sort_by_count: "πλήθος"
       sort_by_name: "όνομα"
@@ -4829,7 +4870,7 @@ el:
       share: "Κοινοποίηση"
       dismiss: "Παράβλεψη"
     safe_mode:
-      enabled: "Η λειτουργία ασφαλείας είναι ενεργοποιημένη, για να εξέλθεις από τη λειτουργία ασφαλείας κλείσε το παράθυρο περιήγησης"
+      enabled: "Η ασφαλής λειτουργία είναι ενεργοποιημένη, για να εξέλθετε από την ασφαλή λειτουργία κλείστε αυτό το παράθυρο περίηγησης"
     image_removed: "(η εικόνα αφαιρέθηκε)"
     pause_notifications:
       title: "Παύση ειδοποιήσεων για…"
@@ -4855,6 +4896,8 @@ el:
       no_replies_title_others: "%{username} δεν έχει απαντήσει σε κανένα θέμα ακόμη"
       no_drafts_title: "Δεν έχετε ξεκινήσει κανένα προσχέδιο"
       no_drafts_body: "Δεν είστε έτοιμοι να δημοσιεύσετε; Θα αποθηκεύσουμε αυτόματα ένα νέο προσχέδιο και θα το παραθέσουμε εδώ κάθε φορά που ξεκινάτε να συνθέτετε ένα θέμα, μια απάντηση ή ένα προσωπικό μήνυμα. Επιλέξτε το κουμπί ακύρωσης για απόρριψη ή αποθηκεύστε το προσχέδιο σας για να συνεχίσετε αργότερα."
+      no_likes_title: "Δεν έχετε κάνει \"Μου αρέσει\" σε κανένα θέμα ακόμη"
+      no_likes_title_others: "Ο χρήστης %{username} δεν έχει κάνει \"Μου αρέσει\" σε κανένα θέμα ακόμη"
       no_topics_title: "Δεν έχεις ξεκινήσει κανένα θέμα ακόμη"
       no_topics_title_others: "Ο χρήστης %{username} δεν έχει ξεκινήσει κανένα θέμα ακόμη"
       no_read_topics_title: "Δεν έχεις διαβάσει κανένα θέμα ακόμη"
@@ -5074,6 +5117,18 @@ el:
           tel: "Παρακαλούμε εισάγετε έναν έγκυρο αριθμό τηλεφώνου."
           text: "Παρακαλούμε εισάγετε μια έγκυρη τιμή."
           url: "Παρακαλούμε εισάγετε ένα έγκυρο URL."
+        too_short:
+          one: "Η είσοδος πρέπει να είναι τουλάχιστον %{count} χαρακτήρας."
+          other: "Η είσοδος πρέπει να είναι τουλάχιστον %{count} χαρακτήρες."
+        too_long:
+          one: "Η είσοδος πρέπει να είναι μικρότερη από %{count} χαρακτήρα."
+          other: "Η είσοδος πρέπει να είναι μικρότερη από %{count} χαρακτήρες."
+        range_overflow:
+          one: "Η είσοδος πρέπει να είναι μικρότερη από %{count}."
+          other: "Η είσοδος πρέπει να είναι μικρότερη από %{count}."
+        range_underflow:
+          one: "Η είσοδος πρέπει να είναι μεγαλύτερη από %{count}."
+          other: "Η είσοδος πρέπει να είναι μεγαλύτερη από %{count}."
         pattern_mismatch: "Παρακαλούμε αντιστοιχίστε την απαιτούμενη μορφή."
         bad_input: "Παρακαλούμε εισάγετε μια έγκυρη είσοδο."
     table_builder:
@@ -5088,6 +5143,7 @@ el:
           new_row: "στο τέλος μιας γραμμής για εισαγωγή μιας νέας γραμμής."
           new_col: "στο τέλος μιας στήλης για εισαγωγή μιας νέας στήλης."
           options: "Κάντε δεξί κλικ στα κελιά για πρόσβαση σε περισσότερες επιλογές από ένα αναπτυσσόμενο μενού."
+        confirm_close: "Σίγουρα θέλετε να κλείσετε το εργαλείο δημιουργίας πινάκων; Οποιεσδήποτε μη αποθηκευμένες αλλαγές θα χαθούν."
       edit:
         btn_edit: "Επεξεργασία Πίνακα"
         modal:
@@ -5109,6 +5165,7 @@ el:
         about: "Σχετικά"
         prompts:
           delete_selected_rows: "Σίγουρα θέλετε να διαγράψετε τις επιλεγμένες γραμμές;"
+          delete_selected_cols: "Σίγουρα θέλετε να διαγράψετε τις επιλεγμένες στήλες;"
           conflicts_with_merged_cells: "Υπάρχει σύγκρουση με ένα άλλο συγχωνευμένο κελί"
         invalid_merge_props: "Μη έγκυρες συγχωνευμένες ιδιότητες"
         cells_already_merged: "Το κελί έχει ήδη συγχωνευθεί"
@@ -5132,6 +5189,7 @@ el:
     powered_by_discourse: "Βασισμένο στο Discourse"
     safari_15_warning: "Το πρόγραμμα περιήγησής σας σύντομα δεν θα είναι συμβατό με αυτήν την κοινότητα. Για να συνεχίσετε να συμμετέχετε εδώ, παρακαλούμε αναβαθμίστε το πρόγραμμα περιήγησής σας ή <a href='%{url}'>μάθετε περισσότερα</a>."
     filter:
+      placeholder: "Φιλτράρετε θέματα ανά κατηγορία, ετικέτα ή άλλα κριτήρια"
       description:
         yesterday: "Χτες"
         last_week: "Προηγούμενη εβδομάδα"
@@ -5210,8 +5268,10 @@ el:
     language_switcher:
       title: "Αλλαγή γλώσσας ιστότοπου"
   admin_js:
+    type_to_filter: "Πληκτρολογήστε για φιλτράρισμα…"
     settings: "Ρυθμίσεις"
     reset_filter: "Επαναφορά"
+    toggle_filters: "Εναλλαγή αναπτυσσόμενων φίλτρων"
     admin:
       title: "Διαχειριστής"
       moderator: "Συντονιστής"
@@ -5226,6 +5286,11 @@ el:
         title: "Λίστα διαθέσιμων αναφορών"
         sidebar_title: "Αναφορές"
         back: "Πίσω σε όλες τις αναφορές"
+        group_traffic: "Κίνηση"
+        group_members: "Μέλη"
+        group_moderation: "Συντονισμός"
+        group_security: "Ασφάλεια"
+        group_other: "Άλλα"
       config_sections:
         account:
           title: "Λογαριασμός"
@@ -5250,17 +5315,19 @@ el:
         show_image: "Εμφάνιση εικόνας"
         groups_updated: "Οι ομάδες ενημερώθηκαν!"
         save_groups: "Αποθήκευση ομάδων"
+        add_groups_to_enable: "Προσθέστε ομάδες για να ενεργοποιήσετε αυτήν τη λειτουργία"
         no_changes_to_save: "Δεν υπάρχουν αλλαγές για αποθήκευση"
         select_groups: "Επιλέξτε ομάδες…"
+        change_enabled_for_success: "Έχετε ενεργοποιήσει αυτήν την αλλαγή για %{enabledFor}"
         change_disabled: "Έχετε εξαιρεθεί από αυτήν την αλλαγή"
         permanent_notice: "Αυτή η αλλαγή είναι πλέον μόνιμη και σύντομα θα καταργηθεί. Δεν μπορείτε πλέον να εξαιρεθείτε."
         permanent_soon_notice: "Αυτή η αλλαγή θα γίνει σύντομα μόνιμη. Δεν θα μπορείτε πλέον να εξαιρεθείτε."
+        permanent_no_group_selection: "Κ/Α, οι μόνιμες αλλαγές ισχύουν για όλες τις ομάδες."
         no_changes: "Δεν υπάρχουν επερχόμενες αλλαγές αυτήν τη στιγμή."
         preview: "Προεπισκόπηση"
         enabled_for_options:
           no_one: "Κανέναν"
           everyone: "Όλοι"
-          staff: "Μόνο το προσωπικό"
           specific_groups: "Συγκεκριμένη/ες ομάδα/ες"
           specific_groups_with_group_names:
             one: "η ομάδα %{groupNames}"
@@ -5281,6 +5348,7 @@ el:
           all: "Όλα"
           enabled: "Ενεργοποιημένα"
           disabled: "Απενεργοποιημένο"
+          impact_type_feature: "Λειτουργία"
           impact_type_other: "Άλλα"
           status_all: "Όλες οι καταστάσεις"
           status_experimental: "Πειραματικό"
@@ -5305,6 +5373,7 @@ el:
           keywords: "αναφορά|έλεγχος|ανεπιθύμητο|παράνομο"
         files:
           title: "Αρχεία"
+          header_description: "Ρυθμίσεις που ελέγχουν τα όρια μεγέθους και τύπου αρχείων, τα μεγέθη και τις πηγές avatar, τον αποθηκευτικό χώρο αρχείων, την ποιότητα και συμπίεση εικόνας και πολλά άλλα"
         legal:
           title: "Νομικά"
         theme_site_settings:
@@ -5342,7 +5411,6 @@ el:
               help_text: "Το συνιστώμενο μέγεθος είναι 600 x 80 pixel."
             large_icon:
               title: "Τετράγωνο εικονίδιο"
-              description: "Μια τετράγωνη εκδοχή της εικόνας του λογότυπου εμφανίζεται στο επάνω μέρος της διαχείρισης και είναι επίσης το λογότυπο της εφαρμογής στην αρχική οθόνη του κινητού."
               help_text: "Το συνιστώμενο μέγεθος είναι 512 x 512 pixel."
             square_icon_dark:
               required: "Χρήση διαφορετικού τετράγωνου εικονιδίου για τη σκοτεινή λειτουργία;"
@@ -5373,9 +5441,14 @@ el:
             manifest_icon:
               help_text: "Το συνιστώμενο μέγεθος είναι 512 x 512 pixel."
             apple_touch_icon:
+              title: "Εικονίδιο αφής Apple"
+              description: "Εικονίδιο που χρησιμοποιείται για συσκευές αφής Apple. Εάν αφεθεί κενό, θα χρησιμοποιηθεί το large_icon."
               help_text: "Το συνιστώμενο μέγεθος είναι 180 x 180 pixel. Δεν συνιστάται διαφανές φόντο."
             digest_logo:
+              description: "Η εναλλακτική εικόνα λογότυπου που χρησιμοποιείται στο επάνω μέρος της σύνοψης email του ιστότοπού σας. Εάν αφεθεί κενό, θα χρησιμοποιηθεί η εικόνα από τη ρύθμιση `logo`."
               help_text: "Χρησιμοποιήστε μια ευρεία ορθογώνια εικόνα. Μην χρησιμοποιείτε εικόνα SVG."
+            opengraph_image:
+              title: "Εικόνα OpenGraph"
             x_summary_large_image:
               help_text: "το συνιστώμενο μέγεθος είναι τουλάχιστον 280 x 150 pixel. Μην χρησιμοποιείτε εικόνα SVG."
         fonts:
@@ -5391,10 +5464,17 @@ el:
               title: "Γραμματοσειρά επικεφαλίδας"
             default_text_size:
               title: "Προεπιλεγμένο μέγεθος κειμένου"
+              description: "Αυτό το μέγεθος μπορεί στη συνέχεια να προσαρμοστεί από κάθε χρήστη ανάλογα με τις προτιμήσεις του."
           backfill_modal:
+            title: "Εφαρμογή νέων προεπιλεγμένων ρυθμίσεων κειμένου;"
+            description:
+              one: "Έχετε ενημερώσει το προεπιλεγμένο μέγεθος κειμένου. Θέλετε να εφαρμόσετε αυτήν την αλλαγή στον %{count} υπάρχοντα χρήστη;"
+              other: "Έχετε ενημερώσει το προεπιλεγμένο μέγεθος κειμένου. Θέλετε να εφαρμόσετε αυτήν την αλλαγή στους %{count} υπάρχοντες χρήστες;"
             modal_yes: "Ναι"
+            modal_no: "Όχι, εφαρμογή μόνο από εδώ και στο εξής"
         welcome_banner:
           title: "Banner καλωσορίσματος"
+          saved: "Οι ρυθμίσεις του banner καλωσορίσματος αποθηκεύτηκαν με επιτυχία."
           form:
             enabled_themes:
               label: "Ενεργοποιημένο στα θέματα..."
@@ -5402,10 +5482,12 @@ el:
               select_label: "Επιλογή θεμάτων"
             background_image:
               label: "Εικόνα φόντου"
+              description: "Αυτή η εικόνα θα εμφανίζεται πίσω από το κείμενο του banner."
             text_color:
               label: "Χρώμα κειμένου"
             page_visibility:
               label: "Ορατότητα σελίδας"
+              description: "Επιλέξτε πού θα πρέπει να εμφανίζεται το banner."
               options:
                 top_menu_pages: "Σελίδες μενού κορυφής"
                 homepage: "Αρχική σελίδα μόνο"
@@ -5413,6 +5495,7 @@ el:
                 all_pages: "Όλες οι σελίδες"
             location:
               label: "Τοποθεσία"
+              description: "Επιλέξτε πού θα πρέπει να εμφανίζεται το banner στη σελίδα."
               options:
                 above_topic_content: "Πάνω από το περιεχόμενο του θέματος"
                 below_site_header: "Κάτω από την κεφαλίδα του ιστότοπου"
@@ -5424,13 +5507,21 @@ el:
               description: "Διαθέσιμες μεταβλητές: <code>&percnt;{site_name}</code>, <code>&percnt;{preferred_display_name}</code>"
               placeholder: "Καλώς ήρθες, %{preferred_display_name}!"
             header_logged_in:
+              label: "Επικεφαλίδα για συνδεδεμένα μέλη"
+              description: "Διαθέσιμες μεταβλητές: <code>&percnt;{site_name}</code>, <code>&percnt;{preferred_display_name}</code>"
               placeholder: "Καλώς ήρθες πίσω, %{preferred_display_name}!"
             header_anonymous:
               label: "Κεφαλίδα για ανώνυμους επισκέπτες"
               description: "Διαθέσιμη μεταβλητή: <code>&percnt;{site_name}</code>"
               placeholder: "Καλώς ήλθατε στην %{site_name}!"
+            subheader_logged_in:
+              label: "Υποκεφαλίδα για συνδεδεμένα μέλη"
+              description: "Δευτερεύον κείμενο που εμφανίζεται κάτω από την επικεφαλίδα για συνδεδεμένους χρήστες."
+              placeholder: "Δείτε τι νέο υπάρχει στην κοινότητα"
             subheader_anonymous:
               label: "Υποκεφαλίδα για ανώνυμους επισκέπτες"
+              description: "Δευτερεύον κείμενο που εμφανίζεται κάτω από την επικεφαλίδα για ανώνυμους επισκέπτες."
+              placeholder: "Γίνετε μέλος της κοινότητάς μας για να συμμετάσχετε σε συζητήσεις"
             search_placeholder:
               placeholder: "Αναζητήστε θέματα..."
         navigation:
@@ -5478,7 +5569,7 @@ el:
           title: "Αναφορές"
           sub_pages:
             settings:
-              title: "Ρυθμίσεις πίνακα ελέγχου"
+              title: "Ρυθμίσεις"
         badges:
           title: "Παράσημα"
         analytics:
@@ -5573,16 +5664,21 @@ el:
               header_description: "Τα URL της λίστας χρησιμοποιήθηκαν σε αναρτήσεις από χρήστες που έχουν εντοπιστεί πως αναρτούν ανεπιθύμητα μηνύματα"
             search_logs:
               title: "Αναζήτηση καταγραφών"
+              header_description: "Προβολή ενός αρχείου καταγραφής αναζητήσεων που έχουν πραγματοποιηθεί"
         plugins:
           title: "Εγκατεστημένα πρόσθετα"
           header_description: "Τα πρόσθετα ενισχύουν την κοινότητά σας με πρόσθετες λειτουργίες. Τόσο τα προεγκατεστημένα όσο και τα προσαρμοσμένα πρόσθετα παρατίθενται παρακάτω."
         api_keys:
           title: "Κλειδιά API"
+          keywords: "διακριτικό|πεδίο εφαρμογής"
         webhooks:
           title: "Webhooks"
           keywords: "συμβάν|φορτίο|url"
         embedding:
           title: "Ενσωμάτωση"
+        form_templates:
+          title: "Πρότυπα φόρμας"
+          header_description: "Τα πρότυπα φόρμας σάς επιτρέπουν να επιβάλλετε μια δομημένη φόρμα με επικύρωση δεδομένων ως μέρος της ροής δημιουργίας θεμάτων"
       theme_site_settings:
         setting: "Ρύθμιση"
         overridden_by: "Παρακάμφθηκε από"
@@ -5592,28 +5688,13 @@ el:
         add: "Μετάβαση στις ρυθμίσεις θέματος ιστότοπου"
         filter_no_results: "Καμία ρύθμιση θέματος ιστότοπου δεν αντιστοιχεί με το φίλτρο σας"
       search:
+        modal_title: "Αναζητήστε τα πάντα στη διαχείριση"
         title: "Αναζήτηση"
         full_page_link: "Εναλλαγή σε αναζήτηση πλήρους σελίδας"
         no_results: 'Δεν μπορέσαμε να βρούμε κάτι που να αντιστοιχεί με "%{filter}".'
         result_count:
           one: '%{count} αποτέλεσμα για "%{filter}"'
           other: '%{count} αποτελέσματα για "%{filter}"'
-        result_types:
-          page:
-            one: "Σελίδα"
-            other: "Σελίδες"
-          report:
-            one: "Αναφορά"
-            other: "Αναφορές"
-          setting:
-            one: "Ρύθμιση"
-            other: "Ρυθμίσεις"
-          theme:
-            one: "Θέμα"
-            other: "Θέματα"
-          component:
-            one: "Συστατικό"
-            other: "Συστατικά"
       new_features:
         title: "Τι νέο υπάρχει;"
         check_for_updates: "Ελέγξτε για ενημερώσεις"
@@ -5637,12 +5718,22 @@ el:
           title: "Τι νέο υπάρχει;"
           learn_more: "Μάθε περισσότερα..."
           experimental: "Πειραματικό"
+          only_experiments: "Εμφάνιση μόνο πειραματικών λειτουργιών"
+          experiment_enabled: "Έχετε ενεργοποιήσει την πειραματική λειτουργία."
+          experiment_disabled: "Έχετε απενεργοποιήσει την πειραματική λειτουργία."
+          feature_enabled: "Έχετε ενεργοποιήσει τη λειτουργία."
+          feature_disabled: "Έχετε απενεργοποιήσει τη λειτουργία."
+          toggled_too_fast: "Αλλάξατε την εναλλαγή πολύ γρήγορα. Περιμένετε λίγα δευτερόλεπτα πριν προσπαθήσετε ξανά."
           experiment_tooltip:
+            title_disabled: "Δοκιμάστε αυτήν την πειραματική λειτουργία"
+            title_enabled: "Απενεργοποιήστε την πειραματική λειτουργία"
             content_disabled: "Δώστε μια ματιά στην υπό ανάπτυξη νεότερη λειτουργία μας! Είναι ακόμα στο πειραματικό στάδιο, οπότε μπορεί να το αφαιρέσουμε ανά πάσα στιγμή. Μπορείτε να εξαιρεθείτε όποτε θέλετε.<br/><br/>Αλλάζοντας αυτήν την επιλογή, θα ενεργοποιήσει τη λειτουργία για όλους τους χρήστες."
+            content_enabled: "Αλλάζοντας αυτό θα απενεργοποιηθεί η λειτουργία για όλους τους χρήστες."
           feature_tooltip:
             title_disabled: "Δοκιμάστε αυτήν τη λειτουργία"
             title_enabled: "Απενεργοποίηση λειτουργίας"
             content_disabled: "Δοκιμάστε αυτήν τη νέα λειτουργία! Μπορείτε να εξαιρεθείτε όποτε θέλετε.<br/><br/>Αλλάζοντας αυτήν την επιλογή, η λειτουργία θα είναι διαθέσιμη σε όλους τους χρήστες."
+            content_enabled: "Αλλάζοντας αυτό θα απενεργοποιηθεί η λειτουργία για όλους τους χρήστες."
         last_checked: "Τελευταίος έλεγχος"
         refresh_problems: "Ανανέωση"
         no_problems: "Δεν βρέθηκε κανένα πρόβλημα."
@@ -5895,9 +5986,13 @@ el:
               list: Λίστα ετικετών.
             tag_groups:
               list: Λήψη μιας λίστας των ομάδων ετικετών.
+              show: Λήψη μιας ομάδας ετικετών με βάση το id.
               create: Δημιουργία ομάδας ετικετών.
             categories:
               list: Λήψη μιας λίστας των κατηγοριών.
+              show: Λήψη μιας κατηγορίας με βάση το id.
+            uploads:
+              create: Μεταφορτώνει ένα νέο αρχείο ή ξεκινά άμεσες μεταφορτώσεις μεμονωμένων ή πολλαπλών τμημάτων σε εξωτερικό χώρο αποθήκευσης.
             users:
               bookmarks: Λίστα σελιδοδεικτών χρηστών. Επιστρέφει τις υπενθυμίσεις σελιδοδεικτών όταν χρησιμοποιείτε τη μορφή ICS.
               sync_sso: Συγχρονισμός χρήστη χρησιμοποιώντας το DiscourseConnect.
@@ -6236,6 +6331,7 @@ el:
             filter_by_used: "Χρησιμοποιημένο"
             filter_by_unused: "Αχρησιμοποίητο"
             filter_by_updates_available: "Διαθέσιμες ενημερώσεις"
+            new_update_for_component: "Νέα ενημέρωση διαθέσιμη για %{name}!"
             component_up_to_date: 'Το "%{name}" είναι ενημερωμένο.'
             updated_successfully: 'Το "%{name}" ενημερώθηκε με επιτυχία.'
             delete_confirm: 'Σίγουρα θέλετε να διαγράψετε το «%{name}»;'
@@ -6268,6 +6364,7 @@ el:
             title: "Χρώματα"
           save_changes: "Αποθήκευση αλλαγών"
           unsaved_changes: "Έχετε μη αποθηκευμένες αλλαγές"
+          copy_of: "Αντίγραφο του %{name}"
           copy_created: 'Δημιουργήθηκε ένα νέο αντίγραφο του "%{name}"'
           invalid_color_length: "Το χρώμα πρέπει να έχει τη μορφή #rrggbb ή #rgb"
       plugins:
@@ -6295,11 +6392,15 @@ el:
           no_results: "Κανένα πρόσθετο δεν αντιστοιχεί με τα φίλτρα σας"
       navigation_menu:
         sidebar: "Πλαϊνή μπάρα"
+        header_dropdown: "Αναπτυσσόμενο μενού επικεφαλίδας"
       backups:
         title: "Αντίγραφα ασφαλείας"
+        files_title: "Αρχεία αντιγράφου ασφαλείας"
         menu:
           backups: "Αντίγραφα ασφαλείας"
+          backup_files: "Αρχεία αντιγράφου ασφαλείας"
           logs: "Αρχεία καταγραφής"
+        none: "Δεν υπάρχει διαθέσιμο αντίγραφο ασφαλείας"
         read_only:
           enable:
             title: "Ενεργοποίηση της λειτουργίας \"μόνο-ανάγνωση\""
@@ -6556,6 +6657,8 @@ el:
             text: "Footer"
           embedded_scss:
             text: "Embedded CSS"
+          embedded_header:
+            text: "Ενσωματωμένη επικεφαλίδα"
           color_definitions:
             text: "Ορισμοί χρωμάτων"
             title: "Εισαγωγή προσαρμοσμένων ορισμών χρωμάτων (μόνο για προχωρημένους χρήστες)"
@@ -6569,6 +6672,8 @@ el:
           active_filter: "Ενεργοί"
           inactive_filter: "Ανενεργό"
           updates_available_filter: "Διαθέσιμες ενημερώσεις"
+          theme_setting_saved: "Ρύθμιση θέματος αποθηκεύτηκε!"
+          theme_site_setting_saved: "Ρύθμιση θέματος ιστότοπου αποθηκεύτηκε!"
         schema:
           title: "Επεξεργασία ρύθμισης %{name}"
           back_button: "Πίσω σε %{name}"
@@ -6653,6 +6758,7 @@ el:
             name: "επιτυχία"
           love:
             name: "αγάπη"
+            description: "Κουμπί \"Μου αρέσει\""
           selected:
             name: "επιλεγμένη"
             description: "Ενεργά ή επιλεγμένα στοιχεία"
@@ -6700,6 +6806,7 @@ el:
         html: "html"
         text: "text"
         html_preview: "Προεπισκόπηση περιεχομένου email"
+        last_seen_user: "Εμφανίστηκε τελευταία:"
         no_result: "Δεν βρέθηκαν αποτελέσματα για περίληψη."
         incoming_emails:
           from_address: "Από"
@@ -6717,6 +6824,7 @@ el:
             from_placeholder: "from@example.com"
             to_placeholder: "to@example.com"
             cc_placeholder: "cc@example.com"
+            subject_placeholder: "Θέμα…"
             error_placeholder: "Σφάλμα"
         logs:
           none: "Δεν βρέθηκαν αρχεία καταγραφής"
@@ -6805,6 +6913,7 @@ el:
             revoke_moderation: "ανάκληση συντονιστή"
             backup_create: "δημιουργία αντιγράφου"
             deleted_tag: "διεγραμμένη ετικέτα"
+            update_directory_columns: "ενημέρωση στηλών καταλόγου"
             deleted_unused_tags: "διαγραμμένες αχρησιμοποίητες ετικέτες"
             renamed_tag: "μετονομασμένη ετικέτα"
             revoke_email: "ανακάλεσε το email"
@@ -6868,6 +6977,7 @@ el:
             create_flag: "δημιουργία αναφοράς"
             update_flag: "ενημέρωση αναφοράς"
             delete_flag: "διαγραφή αναφοράς"
+            stop_impersonating: "σταμάτα την πλαστοπροσωπία"
         screened_emails:
           description: "Όταν κάποιος φτιάξει έναν λογαριασμό, οι παρακάτω διευθύνσεις email θα ελεγχθούν και η εγγραφή θα αποκλειστεί ή θα συμβεί κάποια άλλη ενέργεια."
           actions:
@@ -6915,6 +7025,9 @@ el:
           silence: "Σίγαση"
           link: "Σύνδεσμος"
         form:
+          placeholder: "λέξεις ή φράσεις (το * είναι μπαλαντέρ)"
+          placeholder_regexp: "κανονικές εκφράσεις"
+          replace_placeholder: "παράδειγμα"
           link_label: "Σύνδεσμος"
           link_placeholder: "https://example.com"
           add: "Προσθήκη"
@@ -6942,7 +7055,10 @@ el:
         new_template_form:
           submit: "Αποθήκευση"
           cancel: "Ακύρωση"
+          name:
+            placeholder: "Εισαγάγετε ένα όνομα για αυτό το πρότυπο…"
           preview: "Προεπισκόπηση"
+        delete_confirm: "Σίγουρα θέλετε να διαγράψετε αυτό το πρότυπο;"
         quick_insert_fields:
           add_new_field: "Προσθήκη"
           dropdown: "Dropdown"
@@ -6962,11 +7078,18 @@ el:
               key: "τύπος"
         preview_modal:
           title: "Προεπισκόπηση Προτύπου"
+        field_placeholders:
+          none_label: "Επιλέξτε ένα στοιχείο"
+          choices:
+            first: "Επιλογή 1"
+            second: "Επιλογή 2"
+            third: "Επιλογή 3"
       impersonate:
         title: "Υποδυθείτε"
         help: "Χρησιμοποίησε αυτό το εργαλείο για να εντοπίσεις λάθη υποδυόμενος κάποιον άλλο χρήστη. Θα πρέπει να αποσυνδεθείς όταν τελειώσεις."
         not_found: "Ο χρήστης δεν μπορεί να βρεθεί"
         invalid: "Συγγνώμη, δεν μπορείς να υποδυθείς αυτό τον χρήστη"
+        error: "Ωχ. Παρουσιάστηκε ένα μη αναμενόμενο σφάλμα."
       users:
         title: "Χρήστες"
         create: "Προσθήκη Διαχειριστή"
@@ -7051,10 +7174,11 @@ el:
         log_out: "Αποσύνδεση"
         logged_out: "Ο χρήστης αποσυνδέθηκε από όλες τις συσκευές"
         revoke_admin: "Ανάκληση δικαιωμάτων διαχειριστή"
-        grant_admin: "Απόδοση δικαιωμάτων διαχειριστή"
+        grant_admin: "Χορήγηση δικαιωμάτων διαχειριστή"
+        grant_admin_success: "Νέος διαχειριστής επιβεβαιώθηκε."
         grant_admin_confirm: "Έχουμε στείλει ένα email για να επιβεβαιώσουμε τον νέο διαχειριστή. Παρακαλούμε ανοίξτε το και ακολουθήστε τις οδηγίες."
         revoke_moderation: "Ανάκληση δικαιωμάτων συντονιστή"
-        grant_moderation: "Απόδοση δικαιωμάτων συντονιστή"
+        grant_moderation: "Χορήγηση δικαιωμάτων συντονιστή"
         unsuspend: "Αναίρεση αποβολής"
         suspend: "Αποβολή"
         show_flags_received: "Εμφάνιση αναφορών που ελήφθησαν"
@@ -7070,16 +7194,18 @@ el:
         post_count: Δημιουργημένες Αναρτήσεις
         topics_entered: Προβεβλημένα Θέματα
         flags_given_count: Δοσμένες Σημάνσεις
-        flags_received_count: Ληφθείσες Σημάνσεις
+        flags_received_count: Ληφθείσες Αναφορές
         warnings_received_count: Ληφθείσες Προειδοποιήσεις
         warnings_list_warning: |
           Ως συντονιστής, ενδέχεται να μην μπορείτε να δείτε όλα αυτά τα θέματα. Εάν είναι απαραίτητο, ζητήστε από έναν διαχειριστή ή τον συντονιστή που το εξέδωσε να δώσει πρόσβαση στο μήνυμα στους <b>@συντονιστές</b> .
-        flags_given_received_count: "Δοσμένες / Ληφθείσες Σημάνσεις"
+        flags_given_received_count: "Δοσμένες / Ληφθείσες Αναφορές"
         approve: "Έγκριση"
         approved_by: "εγκρίθηκε από τον/την"
         approve_success: "Ο χρήστης εγκρίθηκε και του αποστάλθηκε ένα email με οδηγίες για την ενεργοποίηση του λογαριασμού του."
         approve_bulk_success: "Επιτυχία! Όλοι οι επιλεγμένοι χρήστες εγκρίθηκαν και ειδοποιήθηκαν."
         time_read: "Χρόνος Ανάγνωσης"
+        upcoming_changes:
+          filter_placeholder: "Φιλτράρετε τις επερχόμενες αλλαγές με βάση το όνομα ή την περιγραφή"
         exports:
           download:
             description: Λήψη της τελευταίας εξαγωγής
@@ -7180,10 +7306,10 @@ el:
           posts_read_all_time: "Αναρτήσεις που διαβάστηκαν (συνολικά)"
           flagged_posts: "Αναρτήσεις που αναφέρθηκαν"
           flagged_by_users: "Χρήστες που έκαναν αναφορά"
-          likes_given: "Μου αρέσει που αποδόθηκαν"
-          likes_received: "Μου αρέσει που λήφθησαν"
-          likes_received_days: "Μου αρέσει που ελήφθησαν: ξεχωριστές μέρες"
-          likes_received_users: "Μου αρέσει που ελήφθησαν: ξεχωριστοί χρήστες"
+          likes_given: "Μου αρέσει που δόθηκαν"
+          likes_received: "Ληφθέντα \"Μου αρέσει\""
+          likes_received_days: "Ληφθέντα \"Μου αρέσει\": ξεχωριστές μέρες"
+          likes_received_users: "Ληφθέντα \"Μου αρέσει\": ξεχωριστοί χρήστες"
           suspended: "Σε αναστολή (τελευταίοι 6 μήνες)"
           silenced: "Σε σίγαση (τελευταίοι 6 μήνες)"
           qualifies: "Πληροί τις προϋποθέσεις για το επίπεδο εμπιστοσύνης 3."
@@ -7223,19 +7349,32 @@ el:
           enabled: "Αναζητήσιμο"
         field_types:
           text: "Κείμενο"
+          date: "Ημερομηνία"
           confirm: "Επιβεβαίωση"
           dropdown: "Dropdown"
           multiselect: "Πολλαπλή επιλογή"
       site_text:
+        description: "Μπορείτε να προσαρμόσετε οποιοδήποτε κείμενο στο φόρουμ σας."
         search: "Αναζήτησε το κείμενο που θα ήθελες να επεξεργαστείς"
+        title: "Κείμενα ιστότοπου"
         edit: "Επεξεργασία"
         revert: "Επαναφορά αλλαγών"
         revert_confirm: "Είσαι βέβαιος πως θέλεις να επαναφέρεις τις αλλαγές;"
         go_back: "Πίσω στην αναζήτηση"
         recommended: "Σου προτείνουμε να προσαρμόσεις το ακόλουθο κείμενο στις ανάγκες σου:"
         show_overriden: "Δείξε μόνο αυτά που άλλαξαν"
+        show_outdated: "Εμφάνιση μόνο ξεπερασμένων/μη έγκυρων"
+        show_untranslated: "Εμφάνιση μόνο αμετάφραστων"
+        only_show_selected_locale: "Εμφάνιση αποτελεσμάτων μόνο στην επιλεγμένη γλώσσα"
+        locale: "Γλώσσα:"
         more_than_50_results: "Υπάρχουν περισσότερα από 50 αποτελέσματα. Κάντε πιο συγκεκριμένη την αναζήτησή σας."
+        no_results: "Δεν βρέθηκαν αντίστοιχα κείμενα ιστότοπου"
+        interpolation_keys: "Διαθέσιμα κλειδιά παρεμβολής:"
         outdated:
+          title: "Αυτή η μετάφραση είναι ξεπερασμένη"
+          description: "Η προεπιλεγμένη μετάφραση για αυτό το κλειδί έχει αλλάξει από τότε που δημιουργήθηκε αυτή η παράκαμψη. Ελέγξτε παρακάτω ότι η μετάφρασή σας ταιριάζει με τυχόν αλλαγές που έχουν γίνει στην αρχική πρόθεση."
+          old_default: "Παλιά προεπιλογή"
+          new_default: "Νέα προεπιλογή"
           dismiss: "Παράβλεψη"
       settings:
         show_overriden: "Δείξε μόνο αυτά που άλλαξαν"
@@ -7310,6 +7449,7 @@ el:
           experimental: "Πειραματικό"
         secret_list:
           invalid_input: "Τα πεδία εισαγωγής δε μπορούν να είναι κενά ή να περιέχουν χαρακτήρα κάθετης γραμμής."
+          already_exists: "Η καταχώριση για %{key} υπάρχει ήδη."
         default_categories:
           modal_yes: "Ναι "
           modal_no: "Όχι, εφαρμόστε την αλλαγή μόνο προς τα εμπρός"
diff --git a/config/locales/client.en_GB.yml b/config/locales/client.en_GB.yml
index 10c0e0106d856..8a1b5aa9dafbf 100644
--- a/config/locales/client.en_GB.yml
+++ b/config/locales/client.en_GB.yml
@@ -105,6 +105,9 @@ en_GB:
       navigation:
         title: "Navigation"
     tagging:
+      description: "Description"
+      localization:
+        description: "Description"
       manage_groups_description: "Define groups to organise tags"
     sidebar:
       sections:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 837078a83a22a..5a2c35b12ab4a 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -294,6 +294,8 @@ es:
     software_update_prompt:
       message: "Hemos actualizado este sitio, <span>vuelva a cargarlo</span> para que todo funcione sin problemas."
       dismiss: "Descartar"
+    notifications_tracking:
+      tooltip: "Nivel de notificación: %{level}"
     back_button: "Volver"
     welcome_banner:
       header:
@@ -406,6 +408,15 @@ es:
       pill: "Sugeridos"
       pm_title: "Mensajes sugeridos"
     admin_onboarding_banner:
+      launch_in_easy_steps: "Empieza en %{step_count} sencillos pasos"
+      invite_collaborators:
+        action: "Crear invitación"
+      start_posting:
+        title: "Empezar a publicar"
+        action: "Ideas para romper el hielo"
+        icebreakers:
+          introduce_yourself:
+            title: "Preséntate"
       spread_the_word:
         action: "Copiar enlace"
         copied_to_clipboard: "Enlace copiado en el portapapeles!"
@@ -568,6 +579,10 @@ es:
       resume: "Reanudar"
       remove: "Eliminar"
       remove_confirmation: "¿Seguro que quieres eliminar este borrador?"
+      bulk_delete_confirmation: "Eliminar borradores"
+      bulk_delete_message:
+        one: "¿Seguro que quieres eliminar este borrador?"
+        other: "¿De verdad quieres eliminar estos %{count} borradores?"
       new_topic: "Nuevo borrador de tema"
       new_private_message: "Nuevo borrador de mensaje personal"
       edit_topic: "Editar borrador de tema"
@@ -637,24 +652,19 @@ es:
       show_more: "Mostrar más"
       show_less: "Mostrar menos"
       back_to_queue: "Volver a la cola"
+      editing_post: "Editando publicación…"
       order_by: "Ordenar por"
       date_filter: "Publicado entre"
       in_reply_to: "en respuesta a"
       filtered_flagged_by: "Denunciado por"
       unknown:
-        title:
-          one: "Tienes revisiones pendientes del plugin deshabilitado:"
-          other: "Tienes revisiones pendientes de los plugins deshabilitados:"
         instruction: "No se mostrarán correctamente hasta que actives el plugin correspondiente. Activa el plugin y actualiza la página. También puedes ignorarlos. <a href='%{url}' target='_blank'>Más información...</a>"
         reviewable_unknown_source: "%{reviewableType} (plugin desconocido)"
         reviewable_known_source: "%{reviewableType} (del plugin «%{pluginName}»)"
         ignore_all: "Ignorar todo"
         enable_plugins: "Activar plugins"
-        delete_confirm: "¿Seguro que quieres eliminar todas las revisiones creadas por plugins desactivados?"
-        ignore_success: "Se han eliminado todas las revisiones creadas por los plugins desactivados."
       explain:
         why: "explica por qué este elemento ha acabado en la cola"
-        title: "Puntuación revisable"
         formula: "Fórmula"
         subtotal: "Subtotal"
         total: "Total"
@@ -668,10 +678,8 @@ es:
           title: "Los usuarios con los que se ha coincidido en denuncias anteriores reciben puntos extra."
         trust_level_bonus:
           name: "nivel de confianza"
-          title: "Los elementos revisables creados por usuarios con niveles de confianza elevados reciben una puntuación más alta."
         type_bonus:
           name: "tipo de bonificación"
-          title: "Algunos tipos revisables pueden recibir una bonificación por parte del personal para que tengan mayor prioridad."
       revise_and_reject_post:
         title: "Revisar"
         reason: "Motivo"
@@ -680,7 +688,6 @@ es:
         custom_reason: "Describe claramente el motivo"
         other_reason: "Otro..."
         optional: "opcional"
-      stale_help: "Este revisable ha sido resuelto por <b>%{username}</b>."
       claim_help:
         optional: "Puedes reclamar este elemento para evitar que otros lo revisen."
         required: "Debes reclamar los elementos antes de poder revisarlos."
@@ -833,6 +840,10 @@ es:
         is_this_post: "¿Es este/a %{reviewable_type} %{reviewable_human_score_types}?"
         delimiter: "o"
         something_else_wrong: "¿Hay algún problema con este/a %{reviewable_type}?"
+        approve_user: "¿Aprobar este usuario?"
+        suspect_user: "Este usuario, ¿es spam?"
+        approve_post: "¿Aprobar esta publicación?"
+        approve_topic: "¿Aprobar este tema?"
       types:
         reviewable_flagged_post:
           title: "Publicación denunciada"
@@ -851,9 +862,14 @@ es:
           title: "Publicación"
           noun: "publicación"
         reviewable_ai_chat_message:
+          title: "Mensaje de chat denunciado por IA"
           noun: "mensaje de chat"
         reviewable_ai_post:
+          title: "Publicación denunciada por IA"
           noun: "publicación"
+        reviewable_post_voting_comment:
+          title: "Comentario denunciado"
+          noun: "comentario"
       flagged_as: "Marcado como"
       post_flagged_as: "Publicación denunciada: "
       chat_flagged_as: "Mensaje de chat denunciado: "
@@ -867,6 +883,7 @@ es:
         target_created: "Publicación creada"
         target_created_by: "Publicación creada por %{username} · %{relativeDate}"
         target_deleted: "Publicación eliminada"
+        target_deleted_by: "Publicación eliminada por %{username} · %{relativeDate}"
         flagged: "Marcado"
         flagged_as_by: "Marcado como %{flagReason} por %{username} · %{relativeDate}"
         claimed: "Reclamado"
@@ -1372,6 +1389,7 @@ es:
         title: "Próximos cambios"
         for_user:
           enabled: "¿Activado?"
+          why: "¿Por qué?"
       user_notifications:
         filters:
           filter_by: "Filtrar por"
@@ -2030,6 +2048,7 @@ es:
         redeemed_tab_with_count: "Canjeados (%{count})"
         invited_via: "Invitación"
         invited_via_link: "enlace %{key} (%{count} / %{max} canjeados)"
+        generating_link: "Generando enlace..."
         groups: "Grupos"
         topic: "Tema"
         sent: "Creado/Último enviado"
@@ -2361,6 +2380,7 @@ es:
         }.
     learn_more: "Más información…"
     learn_more_with_link: "<a href='%{url}' target='_blank'>Más información…</a>"
+    feedback_with_link: "<a href='%{url}' target='_blank'>Danos tu opinión…</a>"
     mute: Silenciar
     unmute: No silenciar
     last_post: Fecha de publicación
@@ -2720,7 +2740,11 @@ es:
         title: "Traduciendo publicación"
         select: "Seleccionar traducción"
         save: "Guardar traducción"
+        original_content: "Publicación original"
+        translation_preview: "Vista previa de la traducción"
+        original: "Original"
         translation: "Traducción"
+        no_translation_yet: "Empieza a escribir para ver una vista previa de la traducción..."
         placeholder: "Introduce la traducción del post aquí..."
       group_mentioned_limit:
         one: "<b>Aviso</b> Has mencionado al grupo <a href='%{group_link}'>%{group}</a>, pero tiene más miembros que los que los administradores permiten mencionar (%{count} usuario) de una vez. No se notificará a nadie."
@@ -2776,7 +2800,9 @@ es:
       create_shared_draft: "Crear borrador compartido"
       edit_shared_draft: "Editar borrador compartido"
       title: "O pulsa %{modifier}Intro"
+      save_and_close: "Guardar y cerrar"
       discard: "Descartar"
+      draft_saved: "¡Borrador guardado!"
       users_placeholder: "Añadir usuarios o grupos"
       title_placeholder: "En una frase breve, ¿de qué trata este tema?"
       title_or_link_placeholder: "Escribe un título o pega un enlace aquí"
@@ -2832,9 +2858,15 @@ es:
       list_item: "Lista de elementos"
       toggle_direction: "Mostrar/ocultar dirección"
       wrap_modal:
+        attributes_label: "Atributos"
         apply: "Aplicar"
       help: "Ayuda de edición con Markdown"
+      enter_fullscreen: "Abrir editor en pantalla completa"
+      exit_fullscreen: "Salir del editor en pantalla completa"
       exit_fullscreen_prompt: "Pulsa <kbd>ESC</kbd> para salir del modo pantalla completa"
+      show_toolbar: "Mostrar barra de herramientas del editor"
+      hide_toolbar: "Ocultar barra de herramientas del editor"
+      peek_mode_toggle: "Activar/desactivar el modo vistazo"
       modal_ok: "Aceptar"
       cant_send_pm: "Lo sentimos, no puedes enviar un mensaje a %{username}."
       create_message_error: "Lo sentimos, se produjo un error al crear ese mensaje. Inténtalo de nuevo."
@@ -2881,6 +2913,7 @@ es:
           desc: "Responder sin alterar la fecha de última respuesta"
         toggle_unlisted:
           label: Mostrar/ocultar no listados
+          desc: "Los temas que no están incluidos en la lista solo son accesibles a través de su enlace directo"
       reload: "Recargar"
       ignore: "Ignorar"
       image_alt_text:
@@ -2891,7 +2924,11 @@ es:
         zoom_out: "Disminuir el tamaño de la imagen"
         zoom_in: "Aumentar el tamaño de la imagen"
         remove: "Eliminar imagen"
+        add_to_grid: "Añadir a la retícula"
+        move_outside_grid: "Sacar de la retícula"
       image: "imagen"
+      grid_label: "Se mostrará como una retícula"
+      grid_mode_grid: "Retícula"
       image_scale_button: "Escalar imagen a %{percent} %"
       delete_image_button: Eliminar imagen
       toggle_image_grid: Alternar cuadrícula de imágenes
@@ -3167,8 +3204,6 @@ es:
         max_views:
           placeholder: máximo
           aria_label: filtrar por número máximo de visitas
-        additional_options:
-          label: "Filtra por número de respuestas y visitas del tema"
     hamburger_menu: "Menú de navegación"
     new_item: "nuevo"
     go_back: "volver"
@@ -3320,6 +3355,7 @@ es:
           unread: "No tienes nada por leer... ¡Impresionante!"
           new_new: "No hay nada nuevo en este momento... ¡Vuelve pronto!"
           new: "No hay nada nuevo en este momento... ¡Vuelve pronto!"
+          generic: "No hay nada que ver aquí... ¡vuelve pronto!"
     topic_bulk_actions:
       dismiss:
         name: "Descartar"
@@ -3478,6 +3514,8 @@ es:
           12_hours: "12 Horas"
           24_hours: "24 Horas"
           custom: "Otra duración"
+      slow_mode_notice:
+        duration: "Por favor, espera %{duration} entre tus publicaciones en este tema"
       topic_status_update:
         title: "Temporizador de temas"
         save: "Configurar temporizador"
@@ -3507,6 +3545,8 @@ es:
         title: "Cerrar tema automáticamente después de cierto tiempo de la última publicación"
       auto_delete:
         title: "Eliminar tema automáticamente"
+      auto_delete_after_last_post:
+        title: "Eliminar tema automáticamente cuando pase un tiempo desde la última publicación"
       auto_bump:
         title: "Reflotar tema automáticamente"
       reminder:
@@ -3518,6 +3558,7 @@ es:
         auto_close: "Este tema se cerrará automáticamente %{timeLeft}."
         auto_publish_to_category: "Este tema se publicará en <a href=%{categoryUrl}>#%{categoryName}</a> %{timeLeft}."
         auto_close_after_last_post: "Este tema se cerrará %{duration} después de la última respuesta."
+        auto_delete_after_last_post: "Este tema será eliminado tras %{duration} desde la última publicación."
         auto_delete: "Este tema se eliminará automáticamente %{timeLeft}."
         auto_bump: "Este tema se reflotará automáticamente %{timeLeft}."
         auto_reminder: "Te recordaremos sobre este tema %{timeLeft}."
@@ -3895,7 +3936,9 @@ es:
           edit: "Editar"
           delete: "Eliminar"
         add: "Añadir nueva traducción"
-        manage: "Gestionar traducciones (%{count} existente(s))"
+        manage:
+          one: "Gestionar traducciones (%{count} existente(s))"
+          other: "Gestionar traducciones (%{count} existente(s))"
         view:
           one: "Ver %{count} traducción a idioma local"
           other: "Ver %{count} traducciones a idiomas locales"
@@ -3904,6 +3947,7 @@ es:
           confirm_delete: "¿Seguro que quieres eliminar las traducciones de «%{languageCode}»?"
         success: "Las traducciones se han actualizado correctamente"
         post_language_selector:
+          title: "Idioma de la publicación"
           none: "Ninguno"
         edit_warning:
           message: "Esta publicación ha sido traducida.<br><br>¿Quieres editar la original en %{language} o editar esta traducción específica?"
@@ -4119,6 +4163,7 @@ es:
       general: "General"
       settings: "Ajustes"
       advanced: "Avanzado"
+      show_advanced: "Ajustes avanzados"
       topic_template: "Plantilla"
       tags: "Etiquetas"
       localizations: "Localizaciones"
@@ -4156,6 +4201,7 @@ es:
       errors:
         self_lockout: "Estás a punto de cambiar los permisos de la categoría de una forma que perderías tu propio acceso. ¿De verdad quieres continuar?"
       validations:
+        emoji_required: "Selecciona un emoji."
         icon_required: "Selecciona un icono."
       name: "Nombre de la categoría"
       untitled: "Categoría sin nombre"
@@ -4168,6 +4214,7 @@ es:
       style: "Estilo"
       icon: "Icono"
       emoji: "Emoji"
+      select_emoji: "Seleccionar emoji"
       background_color: "Color"
       foreground_color: "Color del texto"
       color_validations:
@@ -4235,12 +4282,16 @@ es:
       position_disabled: "Las categorías se mostrarán por orden de actividad. Para controlar el orden de las categorías en las listas, activa el ajuste <a href='%{url}'>«posiciones fijas de las categorías»</a>."
       minimum_required_tags: "Número mínimo de etiquetas requeridas en un tema:"
       default_slow_mode: 'Activar el "modo lento" en los nuevos temas de esta categoría.'
+      subcategory_of: "Subcategoría de..."
       none_subcategory_text: "Ninguna"
+      subcategory_permissions_warning: "Una subcategoría de una categoría privada no puede ser pública."
       visibility:
         title: "Visibilidad"
         public: "Público"
         all_members: "Todos los miembros"
         group_restricted: "Privado"
+        who_can_see: "Quién puede ver esta categoría"
+        who_can_post: "Quién puede publicar en esta categoría"
       num_auto_bump_daily: "Número de temas abiertos que se reflotarán diariamente de forma automática:"
       auto_bump_cooldown_days: "Mínimo de días antes de reactivar el mismo tema:"
       navigate_to_first_post_after_read: "Ir a la primera publicación después de haber leído los temas"
@@ -4555,10 +4606,14 @@ es:
     lightbox:
       download: "Descargar"
       open: "Imagen original"
+      image_info: "Información de la imagen"
+      quote: "Citar imagen"
       previous: "Anterior (flecha izquierda)"
       next: "Siguiente (flecha derecha)"
       counter: "%curr% de %total%"
       close: "Cerrar (Esc)"
+      zoom: "Zoom (tecla Z)"
+      error: "No se puede cargar la imagen"
       content_load_error: '<a href="%url%">El contenido</a> no se pudo cargar.'
       image_load_error: '<a href="%url%">La imagen</a> no se pudo cargar.'
     cannot_render_video: Este vídeo no se puede mostrar porque tu navegador no es compatible con el códec.
@@ -4724,6 +4779,7 @@ es:
       add_to_calendar: "Añadir al calendario"
       google: "Calendario de Google"
       ics: "ICS"
+      default_title: "Evento programado"
     tagging:
       all_tags: "Todas las etiquetas"
       other_tags: "Otras etiquetas"
@@ -4738,6 +4794,7 @@ es:
       choose_for_topic_required_group:
         one: "selecciona %{count} etiqueta de «%{name}»…"
         other: "selecciona %{count} etiquetas de «%{name}»…"
+      info: "Mostrar info de la etiqueta"
       default_info: "Esta etiqueta no está restringida a ninguna categoría, y no tiene sinónimos."
       staff_info: "Para añadir restricciones, mete la etiqueta a un <a href=%{basePath}/tag_groups>grupo de etiquetas</a>."
       category_restricted: "Esta etiqueta está restringida para las categorías a las que no tienes permiso de acceso."
@@ -4768,7 +4825,21 @@ es:
         one: "Su sinónimo también se eliminará"
         other: "Sus %{count} sinónimos también se eliminarán."
       edit_tag: "Editar el nombre y la descripción de la etiqueta"
-      description: "Descripción (máx. 1000 caracteres)"
+      edit: "Editar esta etiqueta"
+      description: "Descripción"
+      settings:
+        title: "Ajustes"
+        general: "General"
+        localizations: "Localizaciones"
+        back: "Atrás"
+        name: "Nombre"
+        slug: "Slug"
+        name_placeholder: "Nombre de la etiqueta"
+        synonyms_subtitle: "Cuando las siguientes etiquetas sean usadas, serán reemplazadas por %{name}"
+      localization:
+        locale: "Idioma local"
+        name: "Nombre"
+        description: "Descripción"
       sort_by: "Ordenar por:"
       sort_by_count: "cantidad"
       sort_by_name: "nombre"
@@ -4778,6 +4849,7 @@ es:
       upload_description: "Sube un archivo csv para crear etiquetas en masa"
       upload_instructions: "Una por línea, opcional con un grupo de etiquetas en el formato «tag_name,tag_group»."
       upload_successful: "Etiquetas subidas con éxito"
+      bulk_create_inline_placeholder: "Crear etiquetas (separadas por comas)"
       bulk_create_button: "Crear"
       delete_unused_confirmation:
         one: "%{count} etiqueta será eliminada: %{tags}"
@@ -4812,13 +4884,18 @@ es:
           description: "No se te notificará sobre temas nuevos con esta etiqueta, ni aparecerán en tu pestaña de no leídos."
       groups:
         back_btn: "Volver a todas las etiquetas"
+        title: "Grupos de etiquetas"
         about_heading: "Selecciona un grupo de etiquetas, o crea uno nuevo"
         about_heading_empty: "Crea un nuevo grupo de etiquetas para empezar"
         about_description: "Los grupos de etiquetas te ayudan a gestionar los permisos de muchas etiquetas en un único sitio."
+        new: "Nuevo grupo"
+        new_title: "Crear nuevo grupo"
+        edit_title: "Editar grupo de etiquetas"
         tags_label: "Etiquetas en este grupo"
         parent_tag_label: "Etiqueta principal"
         parent_tag_description: "Las etiquetas de este grupo solo se podrán usar si la etiqueta principal está presente."
         one_per_topic_label: "Limitar las etiquetas de este grupo a utilizarse solo una vez por tema"
+        new_name: "Nuevo grupo de etiquetas"
         name_placeholder: "Nombre"
         save: "Guardar"
         delete: "Eliminar"
@@ -5010,6 +5087,7 @@ es:
           header_link_text: "Categorías"
           header_action_title: "Editar las categorías de tu barra lateral"
           header_action_new: "Crear categoría"
+          header_action_edit_sidebar: "Editar categorías de la barra lateral"
           configure_defaults: "Configurar valores predeterminados"
         community:
           edit_section:
@@ -5256,6 +5334,12 @@ es:
             bookmarks: "Temas en %{category} sin etiquetas que has añadido a marcadores"
             default: "%{filter} temas en %{category} sin etiquetas"
         categories: "Todas las categorías"
+    content_localization:
+      toggle_localized:
+        translations_enabled: "Traducciones activadas"
+        translations_disabled: "Traducciones desactivadas"
+    language_switcher:
+      title: "Cambiar idioma del sitio"
   admin_js:
     type_to_filter: "Escribe para filtrar…"
     settings: "Ajustes"
@@ -5272,9 +5356,13 @@ es:
           never: "nunca"
       reports:
         title: "Lista de informes disponibles"
-        meta_doc: "Los informes son una poderosa herramienta para ayudarte a comprender lo que ocurre en tu sitio. Pueden ayudarte a identificar tendencias, detectar problemas y tomar decisiones basadas en datos."
         sidebar_title: "Informes"
         back: "Volver a todos los informes"
+        group_traffic: "Tráfico"
+        group_members: "Miembros"
+        group_moderation: "Moderación"
+        group_security: "Seguridad"
+        group_other: "Otros"
       config_sections:
         account:
           title: "Cuenta"
@@ -5294,14 +5382,24 @@ es:
           title: "Avanzado"
       upcoming_changes:
         name: "Nombre"
+        plugin: "Plugin"
+        metadata: "Metadatos"
         enabled: "Activado"
+        enabled_for: "Activado para..."
+        show_image: "Ver imagen"
+        groups_updated: "Grupos actualizados"
+        save_groups: "Guardar grupos"
         select_groups: "Seleccionar grupos…"
+        show_related_settings: "Ver ajustes relacionados..."
         preview: "Vista previa"
         enabled_for_options:
+          no_one: "Nadie"
           everyone: "Todos"
-          staff: "Solo personal"
         statuses:
           experimental: "Experimental"
+          alpha: "Alfa"
+          beta: "Beta"
+          stable: "Estable"
           permanent: "Permanente"
         impact_roles:
           admins: "Administradores"
@@ -5380,7 +5478,9 @@ es:
             signups_30_days: "Registros (30 días)"
             logins_30_days: "Inicios de sesión (30 días)"
           regenerate_credentials: "Regenerar credenciales"
+          description: "Discourse ID es un servicio de inicio de sesión único que permite a los usuarios iniciar sesión en varios sitios de Discourse usando una sola cuenta. Es compatible con los proveedores de inicio de sesión de redes sociales comunes como Google, Facebook, Apple y Github, sin ninguna configuración adicional."
           learn_more: "Más información"
+          regenerate_success: "Credenciales regeneradas correctamente."
         logo:
           title: "Logo"
           header_description: "Configura los logotipos e iconos utilizados en todo tu sitio"
@@ -5396,7 +5496,6 @@ es:
               help_text: "El tamaño recomendado es 600 x 80 píxeles."
             large_icon:
               title: "Icono cuadrado"
-              description: "Una versión cuadrada de la imagen del logotipo aparece en la parte superior de la administración y también es el logotipo de la aplicación de la pantalla de inicio del dispositivo móvil."
               help_text: "El tamaño recomendado es 512 x 512 píxeles."
             square_icon_dark:
               required: "¿Usar un icono cuadrado diferente para el modo oscuro?"
@@ -5496,6 +5595,7 @@ es:
               locale_label: "Idioma"
             header_new_members:
               label: "Cabecera para nuevos miembros"
+              placeholder: "¡Hola, %{preferred_display_name}!"
             header_logged_in:
               label: "Cabecera para miembros registrados"
               placeholder: "¡Te damos la bienvenida de nuevo, %{preferred_display_name}!"
@@ -5508,6 +5608,7 @@ es:
               placeholder: "Únete a nuestra comunidad para participar"
             search_placeholder:
               label: "Texto a mostrar en la caja de búsqueda si está vacía"
+              placeholder: "Buscar temas..."
         navigation:
           title: "Navegación"
           header_description: "Configura los enlaces de navegación y los elementos de menú de tu sitio. Esto incluye la ubicación y el comportamiento del menú de navegación principal, los enlaces rápidos de la parte superior de la página de inicio, así como la barra lateral de administración."
@@ -5569,7 +5670,7 @@ es:
           header_description: "Los informes son una poderosa herramienta para ayudarte a comprender lo que ocurre en tu sitio. Pueden ayudarte a identificar tendencias, detectar problemas y tomar decisiones basadas en datos."
           sub_pages:
             settings:
-              title: "Ajustes del panel de control"
+              title: "Ajustes"
         badges:
           title: "Medallas"
           header_description: "Las insignias recompensan a los usuarios por sus actividades, contribuciones y logros para reconocer, validar y fomentar el comportamiento positivo y el compromiso dentro de la comunidad"
@@ -5719,22 +5820,6 @@ es:
         result_count:
           one: '%{count} resultado para «%{filter}»'
           other: '%{count} resultados para «%{filter}»'
-        result_types:
-          page:
-            one: "Página"
-            other: "Páginas"
-          report:
-            one: "Informe"
-            other: "Informes"
-          setting:
-            one: "Ajuste"
-            other: "Ajustes"
-          theme:
-            one: "Tema"
-            other: "Temas"
-          component:
-            one: "Componente"
-            other: "Componentes"
       new_features:
         title: "Novedades"
         check_for_updates: "Buscar actualizaciones"
@@ -6055,6 +6140,7 @@ es:
               suspend: Suspender cuentas de usuario.
               delete: Eliminar cuentas de usuario.
               list: Obtener una lista de usuarios.
+              create: Crear un nuevo usuario.
             user_status:
               read: Lee el estado del usuario.
               update: Actualizar estado de usuario.
@@ -6158,6 +6244,7 @@ es:
           user_destroyed: "Se ha eliminado el usuario"
           user_suspended: "El usuario está suspendido"
           user_unsuspended: "El usuario no está suspendido"
+          user_anonymized: "El usuario está anonimizado"
         reviewable_event:
           group_name: "Eventos revisables"
           reviewable_created: "El elemento revisable está listo"
@@ -6595,6 +6682,7 @@ es:
         copy_to_clipboard: "Copiar al portapapeles"
         copied_to_clipboard: "Copiado al portapapeles"
         copy_to_clipboard_error: "Error al copiar datos al portapapeles"
+        theme_owner: "Propiedad de:"
         email_templates:
           title: "Correo electrónico"
           subject: "Asunto"
@@ -6603,6 +6691,7 @@ es:
           revert: "Revertir los cambios"
           revert_confirm: "¿Seguro que quieres revertir los cambios?"
           edit: "Editar"
+          back: "Volver a plantillas"
         component:
           all_filter: "Todo"
           used_filter: "Usado"
@@ -6637,6 +6726,8 @@ es:
           create_name: "Nombre"
           save: "Guardar"
           long_title: "Modificar los colores, CSS y contenidos HTML de su sitio"
+          dark_mode: "%{themeName} (modo oscuro)"
+          light_mode: "%{themeName} (modo claro)"
           edit: "Editar"
           edit_confirm: "Este es un tema remoto, si editas CSS/HTML, los cambios se eliminarán la próxima vez que actualices el tema."
           update_confirm: "Estos cambios locales se eliminarán por la actualización. ¿Seguro que quieres continuar?"
@@ -7197,6 +7288,7 @@ es:
             tag_group_change: "cambiar grupo de etiquetas"
             delete_associated_accounts: "eliminar cuentas asociadas"
             change_theme_site_setting: "cambiar ajustes del tema del sitio"
+            stop_impersonating: "deja de suplantar"
         screened_emails:
           title: "Correos bloqueados"
           description: "Cuando alguien trate de crear una cuenta nueva, los siguientes correos electrónicos se revisarán y el registro se bloqueará, o se realizará alguna otra acción."
@@ -7761,6 +7853,7 @@ es:
         field_types:
           text: "Texto"
           textarea: "Área de texto"
+          date: "Fecha"
           confirm: "Confirmación"
           dropdown: "Desplegable"
           multiselect: "Selección múltiple"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 4e6fc875a512b..0101f30bcc6ef 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -2548,6 +2548,15 @@ et:
       choose_for_topic: "valikulised sildid"
       add_synonyms: "Lisa"
       delete_tag: "Kustuta silt"
+      description: "Kirjeldus"
+      settings:
+        title: "Seaded"
+        general: "Üldine"
+        back: "Tagasi"
+        name: "Nimi"
+      localization:
+        name: "Nimi"
+        description: "Kirjeldus"
       sort_by: "Järjesta:"
       sort_by_count: "üldarv"
       sort_by_name: "nimi"
@@ -2717,6 +2726,12 @@ et:
         remove_muted_tags_from_latest:
           always: "alati"
           never: "mitte kunagi"
+      reports:
+        group_traffic: "Liiklus"
+        group_members: "Liikmed"
+        group_moderation: "Modereerimine"
+        group_security: "Turve"
+        group_other: "Muu"
       config_sections:
         account:
           title: "Konto"
@@ -2801,6 +2816,10 @@ et:
           sub_pages:
             logs:
               title: "Logid"
+        reports:
+          sub_pages:
+            settings:
+              title: "Seaded"
         badges:
           title: "Märgised"
         permalinks:
@@ -2846,13 +2865,6 @@ et:
         default_value: "Vaikimisi"
       search:
         title: "Otsi"
-        result_types:
-          theme:
-            one: "Kujundusteema"
-            other: "Kujundused"
-          component:
-            one: "Komponent"
-            other: "Komponendid"
       dashboard:
         title: "Armatuurlaud"
         last_updated: "Töölauda on uuendatud:"
@@ -3722,6 +3734,7 @@ et:
           title: "Kuva kasutaja profiilil"
         field_types:
           text: "Tekst"
+          date: "Kuupäev"
           confirm: "Kinnitus"
           dropdown: "Rippmenüü"
       site_text:
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 8513d057d8c5a..a8e4232d2a771 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -567,19 +567,13 @@ fa_IR:
       in_reply_to: "در پاسخ به"
       filtered_flagged_by: "پرچم گذاری شده توسط"
       unknown:
-        title:
-          one: "از طرف افزونه غیرفعال شده، موارد قابل بازبینی معلق دارید:"
-          other: "از طرف افزونه‌های غیرفعال، موارد قابل بازبینی معلق دارید:"
         instruction: "تا زمانی که پلاگین مربوط را فعال نکنید، نمی توانند به درستی نمایش داده شوند. لطفا افزونه را فعال کنید و صفحه را تازه کنید. البته می توانید آنها را نادیده نیز بگیرید. <a href='%{url}' target='_blank'>بیشتر بدانید...</a>"
         reviewable_unknown_source: "%{reviewableType} (افزونه ناشناخته)"
         reviewable_known_source: "%{reviewableType} (از افزونه '%{pluginName}')"
         ignore_all: "چشم‌پوشی از همه"
         enable_plugins: "فعال‌سازی افزونه"
-        delete_confirm: "آیا مطمئن هستید که می‌خواهید تمام بررسی‌های ایجاد شده توسط پلاگین‌های غیرفعال را حذف کنید؟"
-        ignore_success: "تمام بررسی‌های ایجاد شده توسط پلاگین‌های غیرفعال حذف شده‌اند."
       explain:
         why: "توضیح دهید که چرا این مورد در صف پایان یافت"
-        title: "امتیازدهی قابل تجدید نظر"
         formula: "فرمول"
         subtotal: "جمع جزء"
         total: "مجموع"
@@ -593,10 +587,8 @@ fa_IR:
           title: "کاربرانی که پرچم آن ها به طور گروهی پذیرفته شده است، یک امتیاز دریافت می کنند."
         trust_level_bonus:
           name: "سطح اعتماد"
-          title: "موارد قابل بررسی که توسط کاربرانی با میزان اعتماد بیشتر ایجاد شده اند، اولویت بالاتری دارند."
         type_bonus:
           name: "امتیاز را وارد کنید"
-          title: "موارد قابل بررسی خاص می توانند کارمندان دارای امتیاز شوند تا اولویت آن ها را بیشتر کند."
       revise_and_reject_post:
         title: "تجدید نظر کردن"
         reason: "دلیل"
@@ -605,7 +597,6 @@ fa_IR:
         custom_reason: "شرح واضحی از دلیل ارائه دهید"
         other_reason: "غیره…"
         optional: "اختیاری"
-      stale_help: "این موردِ قابل بررسی توسط <b>%{username}</b> حل شده است."
       claim_help:
         optional: "می‌توانید این مورد را درخواست کنید تا دیگران را از بازنگری آن بازنگه دارید."
         required: "قبل از بازنگری موارد باید آن‌ها را درخواست دهید."
@@ -2914,8 +2905,6 @@ fa_IR:
         max_views:
           placeholder: حداکثر
           aria_label: فیلتر بر اساس حداکثر بازدید
-        additional_options:
-          label: "بر اساس تعداد پست‌ها و بازدیدهای موضوع فیلتر کنید"
     new_item: "تازه"
     go_back: "برگردید"
     not_logged_in_user: "صفحه کاربر با خلاصه ای از فعالیت های و تنظیمات"
@@ -4410,7 +4399,20 @@ fa_IR:
         one: "مترادف آن نیز حذف خواهد شد."
         other: "%{count} مترادف آن نیز حذف خواهند شد."
       edit_tag: "ویرایش نام و توضیحات برچسب"
-      description: "توضیحات (حداکثر ۱۰۰۰ نویسه)"
+      description: "توضیح"
+      settings:
+        title: "تنظیم"
+        general: "عمومی"
+        localizations: "محلی‌سازی‌ها"
+        back: "بازگشت"
+        name: "نام"
+        slug: "نشانک (slug)"
+        name_placeholder: "نام برچسب"
+        synonyms_subtitle: "هنگامی که از برچسب‌های زیر استفاده می‌شود، آنها با %{name}جایگزین می‌شوند"
+      localization:
+        locale: "زبان"
+        name: "نام"
+        description: "توضیح"
       sort_by: "مرتب سازی بر اساس:"
       sort_by_count: "تعداد"
       sort_by_name: "نام"
@@ -4842,9 +4844,13 @@ fa_IR:
           never: "هیچوقت"
       reports:
         title: "لیستی از گزارشات موجود"
-        meta_doc: "گزارش‌ها ابزار قدرتمندی هستند که به شما کمک می‌کنند بفهمید چه اتفاقی در سایت شما می‌افتد. آنها می توانند به شما در شناسایی روندها، شناسایی مشکلات و تصمیم گیری بر اساس داده ها کمک کنند."
         sidebar_title: "گزارشات"
         back: "بازگشت به همه گزارش‌ها"
+        group_traffic: "ترافیک"
+        group_members: "اعضاء"
+        group_moderation: "نظارت"
+        group_security: "امنیت"
+        group_other: "دیگر"
       config_sections:
         account:
           title: "حساب کاربری"
@@ -4869,7 +4875,6 @@ fa_IR:
         preview: "پیش‌نمایش"
         enabled_for_options:
           everyone: "همه"
-          staff: "فقط به تیم مدیریت"
         statuses:
           experimental: "آزمایشی"
         impact_roles:
@@ -4987,6 +4992,9 @@ fa_IR:
         reports:
           title: "گزارشات"
           header_description: "گزارش‌ها ابزار قدرتمندی هستند که به شما کمک می‌کنند بفهمید چه اتفاقی در سایت شما می‌افتد. آنها می توانند به شما در شناسایی روندها، شناسایی مشکلات و تصمیم گیری بر اساس داده ها کمک کنند."
+          sub_pages:
+            settings:
+              title: "تنظیم"
         badges:
           title: "نشان‌ها"
         content:
@@ -5071,22 +5079,6 @@ fa_IR:
         default_value: "پیش‌فرض"
       search:
         title: "جستجو"
-        result_types:
-          page:
-            one: "صفحه"
-            other: "صفحه"
-          report:
-            one: "گزارش"
-            other: "گزارش"
-          setting:
-            one: "تنظیم"
-            other: "تنظیم"
-          theme:
-            one: "قالب"
-            other: "قالب‌ها"
-          component:
-            one: "کامپوننت "
-            other: "کامپوننت‌ها"
       new_features:
         title: "چه چیزی جدید شده؟"
         check_for_updates: "برررسی به‌روز‌رسانی‌ها"
@@ -6887,6 +6879,7 @@ fa_IR:
           disabled: "قابل جستجو نیست"
         field_types:
           text: "متن"
+          date: "تاریخ"
           confirm: "تاییدیه"
           dropdown: "کرکره‌ای"
           multiselect: "انتخاب چندگانه"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 3519f8fceeb29..d4b222f1d3a3d 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -636,19 +636,13 @@ fi:
       in_reply_to: "vastauksena:"
       filtered_flagged_by: "Liputtanut"
       unknown:
-        title:
-          one: "Sinulla on odottavia tarkastuksia käytöstä poistetusta lisäosasta:"
-          other: "Sinulla on odottavia tarkastuksia käytöstä poistetuista lisäosista:"
         instruction: "Niitä ei voida näyttää oikein, ennen kuin otat kyseisen lisäosan käyttöön. Ota lisäosa käyttöön ja päivitä sivu. Vaihtoehtoisesti voit jättää ne huomiotta. <a href='%{url}' target='_blank'>Lue lisää...</a>"
         reviewable_unknown_source: "%{reviewableType} (tuntematon lisäosa)"
         reviewable_known_source: "%{reviewableType} (lisäosasta %{pluginName})"
         ignore_all: "Ohita kaikki"
         enable_plugins: "Ota lisäosat käyttöön"
-        delete_confirm: "Oletko varma, että haluat poistaa kaikki arvostelut, jotka on luotu käytöstä poistetuilla lisäosilla?"
-        ignore_success: "Kaikki käytöstä poistettujen lisäosien luomat arvostelut on poistettu."
       explain:
         why: "selitä miksi tämä päätyi jonoon"
-        title: "Käsittelypisteytys"
         formula: "Kaava"
         subtotal: "Välisumma"
         total: "Yhteensä"
@@ -662,10 +656,8 @@ fi:
           title: "Käyttäjät joiden aiemmista lipuista on oltu samaa mieltä saavat bonuspisteitä."
         trust_level_bonus:
           name: "luottamustaso"
-          title: "Korkeampien luottamustasojen käyttäjien luomat käsiteltävät kohteet saavat korkeammat pisteet."
         type_bonus:
           name: "tyyppibonus"
-          title: "Henkilökunta voi määrittää tietyille käsiteltävälle tyypeille bonuksen, jotta ne saavat korkeamman prioriteetin."
       revise_and_reject_post:
         title: "Korjaa"
         reason: "Syy"
@@ -674,7 +666,6 @@ fi:
         custom_reason: "Kuvaile syy selkeästi"
         other_reason: "Muu..."
         optional: "valinnainen"
-      stale_help: "<b>%{username}</b> on ratkaissut tämän käsiteltävän kohteen."
       claim_help:
         optional: "Voit osoittaa tämän kohteen itsellesi, jolloin muut eivät voi käsitellä sitä."
         required: "Sinun täytyy osoittaa kohde itsellesi, ennen kuin voit käsitellä sen."
@@ -3123,8 +3114,6 @@ fi:
         max_views:
           placeholder: enintään
           aria_label: suodata enimmäiskatselukertojen mukaan
-        additional_options:
-          label: "Suodata viestien määrän ja ketjun katselukertojen mukaan"
     hamburger_menu: "Navigointivalikko"
     new_item: "uusi"
     go_back: "palaa takaisin"
@@ -4671,7 +4660,20 @@ fi:
         one: "Sen synonyymi poistetaan myös."
         other: "Sen %{count} synonyymiä poistetaan myös."
       edit_tag: "Muokkaa tunnisteen nimeä ja kuvausta"
-      description: "Kuvaus (enintään 1 000 merkkiä)"
+      description: "Kuvaus"
+      settings:
+        title: "Asetukset"
+        general: "Yleistä"
+        localizations: "Lokalisoinnit"
+        back: "Takaisin"
+        name: "Nimi"
+        slug: "Polkutunnus"
+        name_placeholder: "Tunnisteen nimi"
+        synonyms_subtitle: "Kun näitä tunnisteita käytetään, ne korvataan tunnisteella %{name}"
+      localization:
+        locale: "Kielialue"
+        name: "Nimi"
+        description: "Kuvaus"
       sort_by: "Järjestys:"
       sort_by_count: "lukumäärä"
       sort_by_name: "nimi"
@@ -5174,9 +5176,13 @@ fi:
           never: "ei koskaan"
       reports:
         title: "Saatavilla olevat raportit"
-        meta_doc: "Raportit ovat tehokas työkalu, joka auttaa sinua ymmärtämään, mitä sivustollasi tapahtuu. Niiden avulla voit tunnistaa trendejä, havaita ongelmia ja tehdä päätöksiä tietojen perusteella."
         sidebar_title: "Raportit"
         back: "Takaisin kaikkiin raportteihin"
+        group_traffic: "Liikenne"
+        group_members: "Jäsenet"
+        group_moderation: "Valvonta"
+        group_security: "Tietoturva"
+        group_other: "Muut"
       config_sections:
         account:
           title: "Tili"
@@ -5201,7 +5207,6 @@ fi:
         preview: "Esikatselu"
         enabled_for_options:
           everyone: "Kaikki"
-          staff: "Vain henkilökunnalle"
         statuses:
           experimental: "Kokeellinen"
         impact_roles:
@@ -5274,7 +5279,6 @@ fi:
               help_text: "Suositeltava koko on 600 x 80 pikseliä."
             large_icon:
               title: "Neliökuvake"
-              description: "Logon neliönmuotoinen versio näkyy hallintapaneelin yläosassa ja toimii myös mobiilisovelluksen aloitusnäytön logona."
               help_text: "Suositeltava koko on 512 x 512 pikseliä."
             square_icon_dark:
               required: "Käytetäänkö tummassa tilassa eri neliökuvaketta?"
@@ -5425,7 +5429,7 @@ fi:
           header_description: "Raportit ovat tehokas työkalu, joka auttaa sinua ymmärtämään, mitä sivustollasi tapahtuu. Niiden avulla voit tunnistaa trendejä, havaita ongelmia ja tehdä päätöksiä tietojen perusteella."
           sub_pages:
             settings:
-              title: "Hallintapaneelin asetukset"
+              title: "Asetukset"
         badges:
           title: "Kunniamerkit"
           header_description: "Kunniamerkit palkitsevat käyttäjiä heidän toiminnastaan, panoksestaan ja saavutuksistaan. Tämä auttaa tunnustamaan, validoimaan ja kannustamaan positiivista käyttäytymistä ja aktiivisuutta yhteisössä"
@@ -5575,22 +5579,6 @@ fi:
         result_count:
           one: '%{count} tulos haulla "%{filter}"'
           other: '%{count} tulosta haulla "%{filter}"'
-        result_types:
-          page:
-            one: "Sivu"
-            other: "Sivut"
-          report:
-            one: "Raportti"
-            other: "Raportit"
-          setting:
-            one: "Asetus"
-            other: "Asetukset"
-          theme:
-            one: "Teema"
-            other: "Teemat"
-          component:
-            one: "Komponentti"
-            other: "Komponentit"
       new_features:
         title: "Mitä uutta?"
         check_for_updates: "Tarkista päivitykset"
@@ -7614,6 +7602,7 @@ fi:
         field_types:
           text: "Teksti"
           textarea: "Tekstialue"
+          date: "Päivämäärä"
           confirm: "Vahvistus"
           dropdown: "Pudotusvalikko"
           multiselect: "Monivalinta"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 107ae29bde96f..43e77969d248b 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -295,9 +295,13 @@ fr:
     back_button: "Retour"
     welcome_banner:
       header:
+        new_members: "Bienvenue, %{preferred_display_name}!"
         logged_in_members: "Bienvenue, %{preferred_display_name} !"
         anonymous_members: "Bienvenue sur %{site_name} !"
       search_placeholder: "Recherche"
+    impersonation:
+      notice: "Vous endossez l'identité de %{username}"
+      stop: "Cesser d'endosser l'identité"
     themes:
       default_description: "Par défaut"
       broken_theme_alert: "Il se peut que votre site ne fonctionne pas, car un thème ou un composant comporte des erreurs. Consultez la console du navigateur pour obtenir plus d'informations."
@@ -640,19 +644,13 @@ fr:
       in_reply_to: "en réponse à"
       filtered_flagged_by: "Signalé par"
       unknown:
-        title:
-          one: "Vous avez des éléments en attente de révision provenant d'une extension désactivée :"
-          other: "Vous avez des éléments en attente de révision provenant d'extensions désactivées :"
         instruction: "Ils ne peuvent pas s'afficher correctement tant que vous n'avez pas activé l'extension correspondante. Veuillez l'activer et actualiser la page. Vous pouvez également les ignorer. <a href='%{url}' target='_blank'>En savoir plus...</a>"
         reviewable_unknown_source: "%{reviewableType} (extension inconnue)"
         reviewable_known_source: "%{reviewableType} (de l'extension « %{pluginName} »)"
         ignore_all: "Ignorer tout"
         enable_plugins: "Activer les extensions"
-        delete_confirm: "Voulez-vous vraiment supprimer tous les avis créés par les extensions désactivées ?"
-        ignore_success: "Tous les avis créés par des extensions désactivées ont été supprimés."
       explain:
         why: "expliquer pourquoi cet élément s'est retrouvé dans la file d'attente"
-        title: "Notation de l'élément à examiner"
         formula: "Formule"
         subtotal: "Sous-total"
         total: "Total"
@@ -666,10 +664,8 @@ fr:
           title: "Les utilisateurs dont les signalements ont généralement été approuvés obtiennent un bonus."
         trust_level_bonus:
           name: "niveau de confiance"
-          title: "Les éléments à examiner créés par des utilisateurs au niveau de confiance plus élevé ont un score plus élevé."
         type_bonus:
           name: "indiquer le bonus"
-          title: "Certains types d'éléments à examiner peuvent se voir attribuer un bonus par les responsables pour en élever la priorité."
       revise_and_reject_post:
         title: "Réviser"
         reason: "Raison"
@@ -678,7 +674,6 @@ fr:
         custom_reason: "Donnez une description claire de la raison"
         other_reason: "Autre..."
         optional: "facultatif"
-      stale_help: "Cet élément a fait l'objet d'une décision prise par <b>%{username}</b>."
       claim_help:
         optional: "Vous pouvez vous réserver cet élément pour empêcher d'autres responsables de l'examiner."
         required: "Vous devez réserver un élément avant de l'examiner."
@@ -3134,8 +3129,6 @@ fr:
         max_views:
           placeholder: maximum
           aria_label: filtrer par nombre de vues maximal
-        additional_options:
-          label: "Filtrer par nombre de messages et vues par sujet"
     hamburger_menu: "Menu de navigation"
     new_item: "nouveau"
     go_back: "retour"
@@ -4693,7 +4686,20 @@ fr:
         one: "Son synonyme sera aussi supprimé."
         other: "Ses %{count} synonymes seront aussi supprimés."
       edit_tag: "Modifier le nom et la description de l'étiquette"
-      description: "Description (maximum 1000 caractères)"
+      description: "Description"
+      settings:
+        title: "Paramètres"
+        general: "Général"
+        localizations: "Localisations"
+        back: "Retour"
+        name: "Nom"
+        slug: "Identifiant"
+        name_placeholder: "Nom de l'étiquette"
+        synonyms_subtitle: "Quand les étiquettes suivantes sont utilisées, elles seront remplacées par %{name}"
+      localization:
+        locale: "Paramètre régional"
+        name: "Nom"
+        description: "Description"
       sort_by: "Trier par :"
       sort_by_count: "nombre"
       sort_by_name: "nom"
@@ -5196,9 +5202,13 @@ fr:
           never: "jamais"
       reports:
         title: "Liste des rapports disponibles"
-        meta_doc: "Les rapports sont un outil puissant qui vous permet de comprendre ce qui se passe sur votre site. Ils peuvent vous aider à identifier les tendances, à repérer les problèmes et à prendre des décisions sur la base de données."
         sidebar_title: "Rapports"
         back: "Retour à tous les rapports"
+        group_traffic: "Trafic"
+        group_members: "Membres"
+        group_moderation: "Modération"
+        group_security: "Sécurité"
+        group_other: "Autre"
       config_sections:
         account:
           title: "Compte"
@@ -5223,7 +5233,6 @@ fr:
         preview: "Aperçu"
         enabled_for_options:
           everyone: "Tout le monde"
-          staff: "Responsables seulement"
         statuses:
           experimental: "Expérimental"
         impact_roles:
@@ -5296,7 +5305,6 @@ fr:
               help_text: "La taille recommandée est de 600 x 80 pixels."
             large_icon:
               title: "Icône carrée"
-              description: "Une version carrée de l'image du logo apparaît en haut de l'interface d'administration et constitue également le logo de l'application sur l'écran d'accueil mobile."
               help_text: "La taille recommandée est de 512 x 512 pixels."
             square_icon_dark:
               required: "Utiliser une icône carrée différente pour le mode sombre ?"
@@ -5447,7 +5455,7 @@ fr:
           header_description: "Les rapports sont un outil puissant qui vous permet de comprendre ce qui se passe sur votre site. Ils peuvent vous aider à identifier les tendances, à repérer les problèmes et à prendre des décisions sur la base de données."
           sub_pages:
             settings:
-              title: "Paramètres du tableau de bord"
+              title: "Paramètres"
         badges:
           title: "Badges"
           header_description: "Les badges récompensent les utilisateurs pour leurs activités, leurs contributions et leurs réalisations afin de reconnaître, de valider et d'encourager les comportements et les interactions positives au sein de la communauté"
@@ -5597,22 +5605,6 @@ fr:
         result_count:
           one: '%{count} résultat pour « %{filter} »'
           other: '%{count} résultats pour « %{filter} »'
-        result_types:
-          page:
-            one: "Page"
-            other: "Pages"
-          report:
-            one: "Rapport"
-            other: "Rapports"
-          setting:
-            one: "Paramètre"
-            other: "Paramètres"
-          theme:
-            one: "Thème"
-            other: "Thèmes"
-          component:
-            one: "Composant"
-            other: "Composants"
       new_features:
         title: "Quoi de neuf ?"
         check_for_updates: "Vérifier les mises à jour"
@@ -5765,8 +5757,8 @@ fr:
               title: "Qui peut voir ce groupe ?"
               public: "Tout le monde"
               logged_on_users: "Utilisateurs connectés"
-              members: "Propriétaires, membres et modérateurs de groupes"
-              staff: "Propriétaires et modérateurs de groupes"
+              members: "Propriétaires et membres du groupe, et modérateurs"
+              staff: "Propriétaires du groupe et modérateurs"
               owners: "Propriétaires du groupe"
               description: "Les administrateurs peuvent voir tous les groupes."
             members_visibility_levels:
@@ -7621,6 +7613,7 @@ fr:
         field_types:
           text: "Texte"
           textarea: "Zone de texte"
+          date: "Date"
           confirm: "Confirmation"
           dropdown: "Menu déroulant"
           multiselect: "Sélection multiple"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 57aa9cb034e10..ac76fe3829996 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -364,7 +364,6 @@ gl:
       in_reply_to: "en resposta a"
       explain:
         why: "explica por que este elemento acabou na fila de espera"
-        title: "Puntuación revisábel"
         formula: "Fórmula"
         subtotal: "Subtotal"
         total: "Total"
@@ -378,10 +377,8 @@ gl:
           title: "Os usuarios con alertas que fosen repetidamente aceptadas reciben unha bonificación."
         trust_level_bonus:
           name: "nivel de confianza"
-          title: "Os elementos revisábeis creados por usuarios con maior nivel de confianza teñen unha puntuación superior."
         type_bonus:
           name: "tipo de bonificación"
-          title: "O equipo pode asignar unha bonificación a certos tipos revisábeis para facelos de maior prioridade."
       revise_and_reject_post:
         reason: "Motivo"
         optional: "opcional"
@@ -3192,6 +3189,18 @@ gl:
       delete_confirm_synonyms:
         one: "Tamén se eliminará o seu sinónimo."
         other: "Tamén se eliminarán os seus %{count} sinónimos."
+      description: "Descrición"
+      settings:
+        title: "Configuración"
+        general: "Xeral"
+        back: "Volver"
+        name: "Nome"
+        slug: "Localizador abreviado"
+        name_placeholder: "Nome da etiqueta"
+        synonyms_subtitle: "Cando se usen as seguintes etiquetas, substituílas por %{name}"
+      localization:
+        name: "Nome"
+        description: "Descrición"
       sort_by: "Ordenar por:"
       sort_by_count: "número"
       sort_by_name: "nome"
@@ -3399,6 +3408,11 @@ gl:
       reports:
         title: "Listaxe dos informes dispoñíbeis"
         sidebar_title: "Informes"
+        group_traffic: "Tráfico"
+        group_members: "Membros"
+        group_moderation: "Moderación"
+        group_security: "Seguranza"
+        group_other: "Outro"
       config_sections:
         account:
           title: "Conta"
@@ -3420,7 +3434,6 @@ gl:
         preview: "Visualizar"
         enabled_for_options:
           everyone: "Todos"
-          staff: "Soamente ao equipo"
         impact_roles:
           admins: "Administradores"
           moderators: "Moderadores"
@@ -3500,6 +3513,9 @@ gl:
               title: "Rexistros"
         reports:
           title: "Informes"
+          sub_pages:
+            settings:
+              title: "Configuración"
         badges:
           title: "Insignias"
         permalinks:
@@ -3549,13 +3565,6 @@ gl:
         default_value: "Predeterminado"
       search:
         title: "Buscar"
-        result_types:
-          theme:
-            one: "Tema"
-            other: "Temas"
-          component:
-            one: "Compoñente"
-            other: "Compoñentes"
       dashboard:
         title: "Panel"
         last_updated: "Actualización do panel:"
@@ -4782,6 +4791,7 @@ gl:
           title: "Amosar na tarxeta de usuario"
         field_types:
           text: "Texto"
+          date: "Data"
           confirm: "Confirmación"
           dropdown: "Despregábel"
       site_text:
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 0ba4c2b55c433..0951b5f7fb86d 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -770,21 +770,13 @@ he:
       in_reply_to: "בתגובה ל"
       filtered_flagged_by: "סומן על ידי"
       unknown:
-        title:
-          one: "יש לך פריטים שממתינים לבדיקה מתוסף מושבת:"
-          two: "יש לך פריטים שממתינים לבדיקה מתוספים מושבתים:"
-          many: "יש לך פריטים שממתינים לבדיקה מתוספים מושבתים:"
-          other: "יש לך פריטים שממתינים לבדיקה מתוספים מושבתים:"
         instruction: "אי אפשר להציג אותם כראוי עד להפעלת התוסף המתאים. נא להפעיל את התוסף ולרענן את העמוד. לחלופין, אפשר להתעלם מהם. <a href='%{url}' target='_blank'>מידע נוסף…</a>"
         reviewable_unknown_source: "%{reviewableType} (תוסף לא ידוע)"
         reviewable_known_source: "%{reviewableType} (מהתוסף ‚%{pluginName}’)"
         ignore_all: "התעלמות מהכול"
         enable_plugins: "הפעלת תוספים"
-        delete_confirm: "למחוק את כל הביקורות שנוצרו על ידי תוספים שהושבתו?"
-        ignore_success: "כל הביקורות שנוצרו על ידי תוספים שהושבתו תימחקנה."
       explain:
         why: "נא להסביר למה הפריט הזה הגיע לתור"
-        title: "ניקוד שניתן לסקירה"
         formula: "נוסחה"
         subtotal: "סכום ביניים"
         total: "סה״כ"
@@ -798,10 +790,8 @@ he:
           title: "משתמשים שסימון הדגל שלהם היה מוצדק בעבר מקבלים בונוס."
         trust_level_bonus:
           name: "דרגת אמון"
-          title: "לפריטים לסקירה שנוצרו על ידי משתמשים בדרגות אמון גבוהות יותר יש ניקוד גבוה יותר."
         type_bonus:
           name: "בונוס סוג"
-          title: "לסוגים מסוימים של פריטים לסקירה ניתן להקצות בונוס על ידי הסגל כדי שהעדיפות שלהם תעלה."
       revise_and_reject_post:
         title: "עריכת שינויים"
         reason: "סיבה"
@@ -810,7 +800,6 @@ he:
         custom_reason: "הוספת תיאור ברור של הסיבה"
         other_reason: "אחר…"
         optional: "רשות"
-      stale_help: "הפריט לסקירה נפתר על ידי <b>%{username}</b>."
       claim_help:
         optional: "אפשר לדרוש את הפריט כדי למנוע מאחרים לסקור אותו."
         required: "עליך לדרוש פריטים לפני שיתאפשר לך לסקור אותם."
@@ -3539,8 +3528,6 @@ he:
         max_views:
           placeholder: מרבי
           aria_label: סינון לפי כמות הצפיות המרבית
-        additional_options:
-          label: "סינון לפי כמות פוסטים וצפיות בנושאים"
     hamburger_menu: "תפריט ניווט"
     new_item: "חדש"
     go_back: "חזור אחורה"
@@ -4386,7 +4373,11 @@ he:
           edit: "עריכה"
           delete: "מחיקה"
         add: "הוספת תרגום חדש"
-        manage: "ניהול תרגומים (%{count} קיימים)"
+        manage:
+          one: "ניהול תרגומים (%{count} קיימים)"
+          two: "ניהול תרגומים (%{count} קיימים)"
+          many: "ניהול תרגומים (%{count} קיימים)"
+          other: "ניהול תרגומים (%{count} קיימים)"
         view:
           one: "הצגת שפה מתורגמת"
           two: "הצגת שתי שפות מתורגמות"
@@ -5343,7 +5334,20 @@ he:
         other: "%{count} המילים הנרדפות שקשורות אליה תימחקנה גם כן."
       edit_tag: "עריכת שם התגית ותיאורה"
       edit: "עריכת התגית הזאת"
-      description: "תיאור (1000 תווים לכל היותר)"
+      description: "תיאור"
+      settings:
+        title: "הגדרות"
+        general: "כללי"
+        localizations: "תרגומים"
+        back: "חזרה"
+        name: "שם"
+        slug: "מזהה ייצוגי"
+        name_placeholder: "שם תגית"
+        synonyms_subtitle: "תגיות אלו תוחלפנה בתגית %{name}"
+      localization:
+        locale: "הגדרות מקומיות"
+        name: "שם"
+        description: "תיאור"
       sort_by: "סידור לפי:"
       sort_by_count: "ספירה"
       sort_by_name: "שם"
@@ -5902,9 +5906,13 @@ he:
           never: "אף פעם"
       reports:
         title: "רשימת דיווחים זמינים"
-        meta_doc: "דוחות הם כלי רב עוצמה שמאפשר לך להבין מה קורה באתר שלך. הם יכולים לסייע לך לזהות מגמות, לאתר בעיות ולהחליט על בסיס נתונים."
         sidebar_title: "דוחות"
         back: "חזרה לכל הדוחות"
+        group_traffic: "תנועה"
+        group_members: "חברים"
+        group_moderation: "פיקוח"
+        group_security: "אבטחה"
+        group_other: "אחר"
       config_sections:
         account:
           title: "חשבון"
@@ -5945,7 +5953,6 @@ he:
         enabled_for_options:
           no_one: "אף אחד"
           everyone: "כולם"
-          staff: "סגל בלבד"
           specific_groups: "קבוצה או קבוצות מסוימות"
           specific_groups_with_group_names:
             one: "הקבוצה %{groupNames}"
@@ -6051,7 +6058,6 @@ he:
               help_text: "הגודל המומלץ הוא ‎600 × 80 פיקסלים."
             large_icon:
               title: "סמל מרובע"
-              description: "גרסה מרובעת של תמונת הלוגו מופיעה בחלק העליון של הניהול והיא גם לוגו היישומון במסך הבית של המכשיר הנייד."
               help_text: "הגודל המומלץ הוא ‎512 × 512 פיקסלים."
             square_icon_dark:
               required: "האם להשתמש בסמל מרובע אחר עבור מצב כהה?"
@@ -6237,7 +6243,7 @@ he:
           header_description: "דוחות הם כלי רב עוצמה שמאפשר לך להבין מה קורה באתר שלך. הם יכולים לסייע לך לזהות מגמות, לאתר בעיות ולהחליט על בסיס נתונים."
           sub_pages:
             settings:
-              title: "הגדרות לוח הבקרה"
+              title: "הגדרות"
         badges:
           title: "עיטורים"
           header_description: "עיטורים מתגמלים משתמשים על הפעילויות שלהם וההישגים כדי להוקיר, לתקף ולעודד התנהגות ומעורבות חיובית בתוך הקהילה"
@@ -6387,32 +6393,6 @@ he:
           two: 'שתי תוצאות עבור „%{filter}”'
           many: '%{count} תוצאות עבור „%{filter}”'
           other: '%{count} תוצאות עבור „%{filter}”'
-        result_types:
-          page:
-            one: "עמוד"
-            two: "עמודים"
-            many: "עמודים"
-            other: "עמודים"
-          report:
-            one: "דוח"
-            two: "דוחות"
-            many: "דוחות"
-            other: "דוחות"
-          setting:
-            one: "הגדרה"
-            two: "הגדרות"
-            many: "הגדרות"
-            other: "הגדרות"
-          theme:
-            one: "תמה"
-            two: "תמות"
-            many: "תמות"
-            other: "תמות"
-          component:
-            one: "רכיב"
-            two: "רכיבים"
-            many: "רכיבים"
-            other: "רכיבים"
       new_features:
         title: "מה חדש?"
         check_for_updates: "חיפוש עדכונים"
@@ -8525,6 +8505,7 @@ he:
         field_types:
           text: "טקסט"
           textarea: "אזור טקסט"
+          date: "תאריך"
           confirm: "אישור"
           dropdown: "נגלל"
           multiselect: "מגוון בחירות"
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index 894b4eebd2226..f8c4cbb03393a 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -695,20 +695,13 @@ hr:
       in_reply_to: "odgovor na"
       filtered_flagged_by: "Označio/la"
       unknown:
-        title:
-          one: "Imate na čekanju zahtjeve za reviziju iz onemogućenog plugin-a:"
-          few: "Imate na čekanju zahtjeve za reviziju iz onemogućenih plugin-a:"
-          other: "Imate na čekanju zahtjeve za reviziju iz onemogućenih plugin-a:"
         instruction: "Ne mogu se ispravno prikazati dok ne omogućite odgovarajući plugin. Molimo omogućite plugin i osvježite stranicu. Alternativno, možete ih zanemariti. <a href='%{url}' target='_blank'>Saznajte više...</a>"
         reviewable_unknown_source: "%{reviewableType} (nepoznati plugin)"
         reviewable_known_source: "%{reviewableType} (iz '%{pluginName}' plugina)"
         ignore_all: "Zanemari sve"
         enable_plugins: "Omogući pluginove"
-        delete_confirm: "Jeste li sigurni da želite izbrisati sve recenzije koje su kreirali onemogućeni pluginovi?"
-        ignore_success: "Svi sadržaji za moderaciju koje su stvorili onemogućeni plugini su obrisani."
       explain:
         why: "objasnite zašto je ta stavka završila u redu čekanja"
-        title: "Moguće ocjenjivanje"
         formula: "Formula"
         subtotal: "Suma stavke"
         total: "Ukupno"
@@ -722,10 +715,8 @@ hr:
           title: "Korisnici s čijim se zastavama povijesno dogovara dobivaju bonus."
         trust_level_bonus:
           name: "razina povjerenja"
-          title: "Stavke koje su stvorili korisnici s visokom razinom povjerenja imaju višu ocjenu."
         type_bonus:
           name: "upišite bonus"
-          title: "Određenim vrstama koje mogu pregledati osoblje može im dodijeliti bonus kako bi im postao veći prioritet."
       revise_and_reject_post:
         title: "Revidiraj"
         reason: "Razlog"
@@ -734,7 +725,6 @@ hr:
         custom_reason: "Dajte jasan opis razloga"
         other_reason: "Ostalo..."
         optional: "neobvezno"
-      stale_help: "Ova revizija je riješena <b>%{username}</b>."
       claim_help:
         optional: "Možete prisvojiti ovu stavku kako drugi ne bi mogli dodavati osvrte."
         required: "Morate prisvojiti ovu stavku prije nego dodate osvrt na nju."
@@ -3289,8 +3279,6 @@ hr:
         max_views:
           placeholder: maksimum
           aria_label: filtrirajte prema maksimalnom broju pregleda
-        additional_options:
-          label: "Filtrirajte prema broju postova i pregledima teme"
     hamburger_menu: "Navigacijski izbornik"
     new_item: "novo"
     go_back: "idi natrag"
@@ -4927,7 +4915,20 @@ hr:
         few: "Njegovi %{count} sinonima također će biti izbrisani."
         other: "Njegovi %{count} sinonimi također će biti izbrisani."
       edit_tag: "Uredite naziv i opis oznake"
-      description: "Opis (najviše1000 znakova)"
+      description: "Opis"
+      settings:
+        title: "Postavke"
+        general: "Općenito"
+        localizations: "Lokalizacije"
+        back: "Natrag"
+        name: "Ime"
+        slug: "Puž"
+        name_placeholder: "Naziv oznake"
+        synonyms_subtitle: "Kada se koriste sljedeće oznake, one će biti zamijenjene s %{name}"
+      localization:
+        locale: "Lokalizacija"
+        name: "Ime"
+        description: "Opis"
       sort_by: "Sortiraj po:"
       sort_by_count: "količina"
       sort_by_name: "ime"
@@ -5447,9 +5448,13 @@ hr:
           never: "nikad"
       reports:
         title: "Popis dostupnih izvještaja"
-        meta_doc: "Izvješća su moćan alat koji vam pomaže da shvatite što se događa na vašoj stranici. Mogu vam pomoći u prepoznavanju trendova, uočavanju problema i donošenju odluka na temelju podataka."
         sidebar_title: "Izvještaji"
         back: "Povratak na sva izvješća"
+        group_traffic: "Promet"
+        group_members: "Članovi"
+        group_moderation: "Moderiranje"
+        group_security: "Sigurnost"
+        group_other: "Ostalo"
       config_sections:
         account:
           title: "Račun"
@@ -5474,7 +5479,6 @@ hr:
         preview: "Pregled"
         enabled_for_options:
           everyone: "Svi"
-          staff: "Samo osoblje"
         statuses:
           experimental: "Eksperimentalno"
         impact_roles:
@@ -5552,7 +5556,6 @@ hr:
               help_text: "Preporučena veličina je 600 x 80 piksela."
             large_icon:
               title: "Kvadratna ikona"
-              description: "Kvadratna verzija slike logotipa pojavljuje se na vrhu administracije, a ujedno je i logotip aplikacije početnog zaslona za mobilne uređaje."
               help_text: "Preporučena veličina je 512 x 512 piksela."
             square_icon_dark:
               required: "Koristiti drugu kvadratnu ikonu za tamni način rada?"
@@ -5684,7 +5687,7 @@ hr:
           title: "Izvještaji"
           sub_pages:
             settings:
-              title: "Postavke nadzorne ploče"
+              title: "Postavke"
         badges:
           title: "Značke"
           header_description: "Značke nagrađuju korisnike za njihove aktivnosti, doprinose i postignuća kako bi se prepoznalo, potvrdilo i potaknulo pozitivno ponašanje i angažman unutar zajednice."
@@ -5781,19 +5784,6 @@ hr:
           one: '%{count} rezultat za "%{filter}"'
           few: '%{count} rezultat za "%{filter}"'
           other: '%{count} rezultata za "%{filter}"'
-        result_types:
-          page:
-            one: "Stranica"
-            few: "Stranica"
-            other: "Stranice"
-          theme:
-            one: "Tema"
-            few: "Teme"
-            other: "Teme"
-          component:
-            one: "Komponenta"
-            few: "Komponente"
-            other: "Komponente"
       new_features:
         title: "Što je novo?"
         check_for_updates: "Provjeri ažuriranja"
@@ -7352,6 +7342,7 @@ hr:
         field_types:
           text: "Tekst"
           textarea: "Tekstualno polje"
+          date: "Datum"
           confirm: "Potvrda"
           dropdown: "Padajući izbornik"
           multiselect: "Višestruki odabir"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index adac8971ebac8..d859894a37539 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -657,19 +657,13 @@ hu:
       in_reply_to: "válasz erre:"
       filtered_flagged_by: "Megjelölte"
       unknown:
-        title:
-          one: "Függőben lévő felülvizsgálandó elemek vannak a letiltott bővítményből:"
-          other: "Függőben lévő felülvizsgálandó elemek vannak a letiltott bővítményekből:"
         instruction: "Nem jeleníthetők meg megfelelően, amíg nem engedélyezi a megfelelő bővítményt. Engedélyezze a bővítményt, és frissítse az oldalt. Alternatív megoldásként figyelmen kívül hagyhatja őket. <a href='%{url}' target='_blank'>További információ…</a>"
         reviewable_unknown_source: "%{reviewableType} (ismeretlen bővítmény)"
         reviewable_known_source: "%{reviewableType} (a(z) „%{pluginName}” bővítményből)"
         ignore_all: "Összes figyelmen kívül hagyása"
         enable_plugins: "Bővítmények engedélyezése"
-        delete_confirm: "Biztos benne, hogy törölni szeretné a letiltott bővítmények által létrehozott összes értékelést?"
-        ignore_success: "A letiltott bővítmények által létrehozott összes értékelés törölve lett."
       explain:
         why: "magyarázza el, miért került ez a tétel a sorba"
-        title: "Ellenőrizhető pontozás"
         formula: "Képlet"
         subtotal: "Részösszeg"
         total: "Összesen"
@@ -683,10 +677,8 @@ hu:
           title: "Azok a felhasználók, akik előzőleg egyetértettek a jelzéssel, bónuszt kapnak."
         trust_level_bonus:
           name: "bizalmi szint"
-          title: "A magasabb bizalmi szintű felhasználók által létrehozott felülvizsgálandó elemek magasabb pontszámmal rendelkeznek."
         type_bonus:
           name: "típusbónusz"
-          title: "Bizonyos felülvizsgálandó típusokat a stáb bónuszban részesíthet, hogy magasabb prioritást kapjanak."
       revise_and_reject_post:
         title: "Felülvizsgálat"
         reason: "Ok"
@@ -695,7 +687,6 @@ hu:
         custom_reason: "Adjon egyértelmű leírást az okáról"
         other_reason: "Egyéb…"
         optional: "nem kötelező"
-      stale_help: "Ezt a felülvizsgálandó elemet <b>%{username}</b> oldotta meg."
       claim_help:
         optional: "Zárolhatja ezt az elemet, hogy mások ne hagyhassák jóvá."
         required: "Zárolnia kell az elemeket, hogy jóvá tudja őket hagyni."
@@ -3261,8 +3252,6 @@ hu:
         max_views:
           placeholder: legfeljebb
           aria_label: szűrés a megtekintések legnagyobb száma szerint
-        additional_options:
-          label: "Szűrés bejegyzésszám és témamegtekintések szerint"
     hamburger_menu: "Navigációs menü"
     new_item: "új"
     go_back: "visszalépés"
@@ -4005,7 +3994,9 @@ hu:
           edit: "Szerkesztés"
           delete: "Törlés"
         add: "Új fordítás hozzáadása"
-        manage: "Fordítások kezelése (%{count} meglévő)"
+        manage:
+          one: "Fordítások kezelése (%{count} meglévő)"
+          other: "Fordítások kezelése (%{count} meglévő)"
         view:
           one: "%{count} fordítás megtekintése"
           other: "%{count} fordítás megtekintése"
@@ -4904,7 +4895,20 @@ hu:
         other: "%{count} szinonimája is törlésre kerül."
       edit_tag: "Címke nevének és leírásának szerkesztése"
       edit: "Címke szerkesztése"
-      description: "Leírás (max. 1000 karakter)"
+      description: "Leírás"
+      settings:
+        title: "Beállítások"
+        general: "Általános"
+        localizations: "Lokalizációk"
+        back: "Vissza"
+        name: "Név"
+        slug: "URL slug"
+        name_placeholder: "Címke neve"
+        synonyms_subtitle: "A következő címkék használatakor ezek helyére %{name}kerül"
+      localization:
+        locale: "Nyelv"
+        name: "Név"
+        description: "Leírás"
       sort_by: "Rendezés"
       sort_by_count: "besorol"
       sort_by_name: "név"
@@ -5434,9 +5438,13 @@ hu:
           never: "soha"
       reports:
         title: "Aktív bejelentések listája"
-        meta_doc: "A jelentések egy hatékony eszköz, amely segít megérteni, mi történik a webhelyén. Segítségükkel azonosíthatja a trendeket, felismerheti a problémákat, és adatok alapján hozhat döntéseket."
         sidebar_title: "Jelentések"
         back: "Vissza az összes jelentéshez"
+        group_traffic: "Forgalom"
+        group_members: "Tagok"
+        group_moderation: "Moderálás"
+        group_security: "Biztonság"
+        group_other: "Egyéb"
       config_sections:
         account:
           title: "Fiók"
@@ -5480,7 +5488,6 @@ hu:
         enabled_for_options:
           no_one: "Senki"
           everyone: "Mindenki"
-          staff: "Csak a stáb"
           specific_groups: "Meghatározott csoport(ok)"
           specific_groups_with_group_names:
             one: "a %{groupNames} csoport"
@@ -5503,7 +5510,6 @@ hu:
           all: "Összes"
           enabled_all: "Minden engedélyezett állapot"
           enabled: "Bekapcsolva"
-          enabled_for_staff: "Engedélyezve a személyzet számára"
           enabled_for_specific_groups: "Engedélyezve bizonyos csoportok számára"
           disabled: "Kikapcsolva"
           impact_type_all: "Minden ütközési típus"
@@ -5592,7 +5598,6 @@ hu:
               help_text: "Az ajánlott méret 600×80 képpont."
             large_icon:
               title: "Négyzet alakú ikon"
-              description: "A logó képének négyzetes változata az adminisztráció tetején jelenik meg, és egyben a mobil kezdőképernyőjének logója is."
               help_text: "Az ajánlott méret 512×512 képpont."
             square_icon_dark:
               required: "Másik négyzet ikon használata a sötét módhoz?"
@@ -5780,7 +5785,7 @@ hu:
           header_description: "A jelentések egy hatékony eszköz, amely segít megérteni, mi történik a webhelyén. Segítségükkel azonosíthatja a trendeket, felismerheti a problémákat, és adatok alapján hozhat döntéseket."
           sub_pages:
             settings:
-              title: "Irányítópult beállításai"
+              title: "Beállítások"
         badges:
           title: "Jelvények"
           header_description: "A jelvények jutalmazzák a felhasználókat tevékenységeikért, hozzájárulásaikért és eredményeikért, amelyek célja a közösségen belüli pozitív magatartás és elkötelezettség elismerése, érvényesítése és ösztönzése"
@@ -5933,22 +5938,6 @@ hu:
         result_count:
           one: '%{count} eredmény a(z) „%{filter}” kifejezésre'
           other: '%{count} találat a(z) „%{filter}” kifejezésre'
-        result_types:
-          page:
-            one: "Oldal"
-            other: "Oldalak"
-          report:
-            one: "Jelentés"
-            other: "Jelentések"
-          setting:
-            one: "Beállítás"
-            other: "Beállítások"
-          theme:
-            one: "Téma"
-            other: "Témák"
-          component:
-            one: "Összetevő"
-            other: "Összetevők"
       new_features:
         title: "Újdonságok"
         check_for_updates: "Frissítések keresése"
@@ -8040,6 +8029,7 @@ hu:
         field_types:
           text: "Szöveg"
           textarea: "Szövegmező"
+          date: "Dátum"
           confirm: "Megerősítés"
           dropdown: "Legördülő menü"
           multiselect: "Többszörös kiválasztás"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index a39b10d2bb259..0245055ab635c 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -516,7 +516,6 @@ hy:
       in_reply_to: "ի պատասխան"
       explain:
         why: "Բացատրել, թե ինչու՞ է այդ էլեմենտը հայտնվել հերթի մեջ: "
-        title: "Ամփոփիչ Գնահատական"
         formula: "Բանաձև"
         subtotal: "Միջանկյալ հանրագումար "
         total: "Ամբողջը"
@@ -530,10 +529,8 @@ hy:
           title: "Օգտատերերը, ում գրավոր բողոքները համաձայնեցված են՝ կստանան բոնուս: "
         trust_level_bonus:
           name: "վստահության մակարդակ"
-          title: "Օգտատրիրոջ վստահության առավել մեծ մակարդակ ունենալու դեպքում, ստուգվող էլեմենտները ստանում են ավելի բարձր բալ: "
         type_bonus:
           name: "բոնուսի տեսակը"
-          title: "Որոշ ստուգվող տեսակների դեպքում, աշխատակիցներին կարող են բոնուս նշանակվել, որպեսզի նրանք գերակայության հասնեն: "
       revise_and_reject_post:
         title: "Վերանայել"
         reason: "Պատճառ"
@@ -542,7 +539,6 @@ hy:
         custom_reason: "Տվեք պատճառի հստակ նկարագրությունը"
         other_reason: "Այլ..."
         optional: "ընտրովի"
-      stale_help: "Այս վերանայումը լուծվել է <b>%{username}</b>- ի կողմից:"
       claim_help:
         optional: "Դուք կարող եք պահանջել այդ էլեմենտը, որպեսզի ուրիշները չկարողանան այն դիտել:  "
         required: "Դուք պետք է նախ՝ հայտ ներկայացնեք, որպեսզի կարողանաք այն դիտեք: "
@@ -2519,8 +2515,6 @@ hy:
         max_views:
           placeholder: առավելագույնը
           aria_label: զտել ըստ առավելագույն դիտումների
-        additional_options:
-          label: "Զտել ըստ գրառումների քանակի և թեմայի դիտումների"
     new_item: "նոր"
     go_back: "ետ գնալ"
     not_logged_in_user: "օգտատիրոջ էջը՝ ընթացիկ ակտիվության և նախընտրությունների ամփոփումով"
@@ -3579,6 +3573,15 @@ hy:
         one: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս թեգը և հեռացնել այն %{count} թեմայից, որին այն վերագրված է:"
         other: "Իսկապե՞ս ուզում եք ջնջել այս պիտակը և հեռացնել այն %{count} թեմայից, որոնց այն վերագրված է:"
       delete_confirm_no_topics: "Դուք համոզվա՞ծ եք, որ ցանկանում եք ջնջել այս պիտակը:"
+      description: "Նկարագրություն"
+      settings:
+        title: "Կարգավորումներ"
+        general: "Ընդհանուր"
+        back: "Ետ"
+        name: "Անուն"
+      localization:
+        name: "Անուն"
+        description: "Նկարագրություն"
       sort_by: "Դասավորել ըստ՝ "
       sort_by_count: "քանակի"
       sort_by_name: "անվան"
@@ -3800,6 +3803,11 @@ hy:
       reports:
         title: "Հասանելի հաշվետվությունների ցանկը"
         sidebar_title: "Հաշվետվություններ"
+        group_traffic: "Այցելությունները"
+        group_members: "Անդամներ"
+        group_moderation: "Մոդերացիա"
+        group_security: "Անվտանգություն"
+        group_other: "Այլ"
       config_sections:
         account:
           title: "Հաշիվ"
@@ -3886,6 +3894,9 @@ hy:
               title: "Գրառումներ"
         reports:
           title: "Հաշվետվություններ"
+          sub_pages:
+            settings:
+              title: "Կարգավորումներ"
         badges:
           title: "Կրծքանշաններ"
         permalinks:
@@ -3928,13 +3939,6 @@ hy:
         default_value: "Լռելյայն"
       search:
         title: "Որոնում"
-        result_types:
-          theme:
-            one: "Թեմա"
-            other: "Թեմաներ"
-          component:
-            one: "Բաղադրիչ"
-            other: "Բաղադրիչներ"
       dashboard:
         title: "Կառավարման Հարթակ"
         last_updated: "Կառավարման Հարթակի վերջին թարմացումը՝"
@@ -5086,6 +5090,7 @@ hy:
             title: "Ընտրովի"
         field_types:
           text: "Տեքստ"
+          date: "Ամսաթիվ"
           confirm: "Հաստատում"
           dropdown: "Բացվող Ցուցակ"
       site_text:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 458b55f7af7a5..657dc8d0a3c63 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -407,7 +407,6 @@ id:
       in_reply_to: "sebagai balasan"
       explain:
         why: "jelaskan mengapa butir ini berada dalam antrian"
-        title: "Penilaian yang Dapat Ditinjau"
         formula: "Rumus"
         subtotal: "Subtotal"
         total: "Total"
@@ -421,10 +420,8 @@ id:
           title: "Pengguna yang sebelumnya telah disteujui untuk mendapatkan benderanya, diberikan bonus."
         trust_level_bonus:
           name: "tingkat kepercayaan"
-          title: "Butir yang dapat ditinjau dibuat oleh pengguna dengan tingkat kepercayaan yang lebih tinggi akan memiliki skor yang lebih tinggi."
         type_bonus:
           name: "jenis bonus"
-          title: "Jenis tertentu yang dapat ditinjau akan diberikan bonus oleh staf untuk menjadikannya prioritas yang lebih tinggi."
       revise_and_reject_post:
         title: "Merevisi"
         reason: "Alasan"
@@ -432,7 +429,6 @@ id:
         feedback: "Umpan balik"
         other_reason: "Lainnya..."
         optional: "opsional"
-      stale_help: "Butir tinjauan ini telah diselesaikan oleh <b>%{username}</b>."
       claim_help:
         optional: "Anda dapat mengklaim item ini untuk mencegah orang lain meninjaunya."
         required: "Anda harus mengklaim hal ini sebelum dapat meninjaunya."
@@ -2135,7 +2131,15 @@ id:
       selector_remove_filter: "hapus filter"
       tags: "Label"
       add_synonyms: "Menambahkan"
-      description: "Deskripsi (maks 1000 karakter)"
+      description: "Deskripsi"
+      settings:
+        title: "Pengaturan"
+        general: "Umum"
+        back: "Kembali"
+        name: "Nama"
+      localization:
+        name: "Nama"
+        description: "Deskripsi"
       sort_by_count: "menghitung"
       sort_by_name: "nama"
       bulk_create_button: "Buat"
@@ -2315,6 +2319,9 @@ id:
         remove_muted_tags_from_latest:
           always: "selalu"
           never: "tidak pernah"
+      reports:
+        group_members: "Anggota"
+        group_other: "Lainnya"
       config_sections:
         account:
           title: "Akun"
@@ -2325,7 +2332,6 @@ id:
         enabled: "Diaktifkan"
         enabled_for_options:
           everyone: "Semua orang"
-          staff: "Hanya staf"
         impact_roles:
           moderators: "Moderator"
           staff: "Staf"
@@ -2371,6 +2377,10 @@ id:
           sub_pages:
             logs:
               title: "Log"
+        reports:
+          sub_pages:
+            settings:
+              title: "Pengaturan"
         email_logs:
           sub_pages:
             sent:
@@ -2383,9 +2393,6 @@ id:
         default_value: "Asal"
       search:
         title: "Cari"
-        result_types:
-          setting:
-            other: "Pengaturan"
       dashboard:
         please_update: "Harap perbarui!"
         version_check_pending: "Sepertinya Anda baru saja melakukan pembaruan. Fantastis!"
@@ -2846,6 +2853,8 @@ id:
             title: "Saat mendaftar"
             description: "Saat pengguna baru mendaftar, mereka harus mengisi kolom ini. Pengguna yang sudah ada tidak terpengaruh."
           confirmation: "Ini akan meminta pengguna yang ada untuk mengisi kolom ini dan tidak akan mengizinkan mereka melakukan hal lain di situs Anda hingga kolom tersebut terisi. Lanjutkan?"
+        field_types:
+          date: "Tanggal"
       site_text:
         edit: "Ubah"
         show_outdated: "Hanya tampilkan yang usang/tidak valid"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index d0c8bd76f0323..d380ea47f3353 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -636,19 +636,13 @@ it:
       in_reply_to: "in risposta a"
       filtered_flagged_by: "Contrassegnato da"
       unknown:
-        title:
-          one: "Hai un plugin disabilitato in attesa di revisione:"
-          other: "Hai plugin disabilitati in attesa di revisione:"
         instruction: "Non possono essere visualizzati correttamente finché non attivi il plugin appropriato. Abilita il plugin e aggiorna la pagina. In alternativa, puoi ignorarli. <a href='%{url}' target='_blank'>Scopri di più...</a>"
         reviewable_unknown_source: "%{reviewableType} (plugin sconosciuto)"
         reviewable_known_source: "%{reviewableType} (dal plugin '%{pluginName}')"
         ignore_all: "Ignora tutto"
         enable_plugins: "Abilita i plugin"
-        delete_confirm: "Vuoi davvero eliminare tutte le recensioni create dai plugin disabilitati?"
-        ignore_success: "Tutte le recensioni create da plugin disabilitati sono state eliminate."
       explain:
         why: "spiega perché questo oggetto è stato aggiunto alla coda"
-        title: "Punteggio rivedibile"
         formula: "Formula"
         subtotal: "Totale parziale"
         total: "Totale"
@@ -662,10 +656,8 @@ it:
           title: "Agli utenti le cui segnalazioni sono state storicamente accettate viene concesso un bonus."
         trust_level_bonus:
           name: "livello di attendibilità"
-          title: "Gli articoli revisionabili creati da utenti con un livello di attendibilità più elevato hanno un punteggio più alto."
         type_bonus:
           name: "tipo di bonus"
-          title: "Ad alcune tipologie revisionabili può essere assegnato un bonus dallo staff, per aumentare la loro priorità."
       revise_and_reject_post:
         title: "Revisione"
         reason: "Motivo"
@@ -674,7 +666,6 @@ it:
         custom_reason: "Fornisci una descrizione chiara del motivo"
         other_reason: "Altro..."
         optional: "facoltativo"
-      stale_help: "La revisione di questo elemento è stata condotta da <b>%{username}</b>."
       claim_help:
         optional: "Puoi rivendicare questo elemento per evitare che altri lo revisionino."
         required: "Per poter revisionare gli elementi devi prima rivendicarli."
@@ -3120,8 +3111,6 @@ it:
         max_views:
           placeholder: massimo
           aria_label: filtra per visualizzazioni massime
-        additional_options:
-          label: "Filtra per numero di messaggi e visualizzazioni dell'argomento"
     hamburger_menu: "Menu di navigazione"
     new_item: "nuovo"
     go_back: "indietro"
@@ -4668,7 +4657,20 @@ it:
         one: "Anche il suo sinonimo verrà eliminato."
         other: "I suoi %{count} sinonimi verranno a loro volta eliminati."
       edit_tag: "Modifica il nome e la descrizione dell’etichetta"
-      description: "Descrizione (max 1000 caratteri)"
+      description: "Descrizione"
+      settings:
+        title: "Impostazioni"
+        general: "Generale"
+        localizations: "Localizzazioni"
+        back: "Indietro"
+        name: "Nome"
+        slug: "Abbreviazione"
+        name_placeholder: "Nome etichetta"
+        synonyms_subtitle: "Quando vengono utilizzate le seguenti etichette, verranno sostituite con %{name}"
+      localization:
+        locale: "Localizzazione"
+        name: "Nome"
+        description: "Descrizione"
       sort_by: "Ordina per:"
       sort_by_count: "conteggio"
       sort_by_name: "nome"
@@ -5171,9 +5173,13 @@ it:
           never: "mai"
       reports:
         title: "Elenco dei rapporti disponibili"
-        meta_doc: "I report sono uno strumento potente per aiutarti a capire cosa sta succedendo sul tuo sito. Possono aiutarti a identificare tendenze, individuare problemi e prendere decisioni basate sui dati."
         sidebar_title: "Report"
         back: "Torna a tutti i report"
+        group_traffic: "Traffico"
+        group_members: "Membri"
+        group_moderation: "Moderazione"
+        group_security: "Sicurezza"
+        group_other: "Altri"
       config_sections:
         account:
           title: "Account"
@@ -5198,7 +5204,6 @@ it:
         preview: "Anteprima"
         enabled_for_options:
           everyone: "Chiunque"
-          staff: "Solo staff"
         statuses:
           experimental: "Sperimentale"
         impact_roles:
@@ -5271,7 +5276,6 @@ it:
               help_text: "La dimensione consigliata è 600 x 80 pixel."
             large_icon:
               title: "Icona quadrata"
-              description: "Una versione quadrata dell'immagine del logo appare nella parte superiore dell'amministrazione ed è anche il logo dell'app nella schermata iniziale del dispositivo mobile."
               help_text: "La dimensione consigliata è 512 x 512 pixel."
             square_icon_dark:
               required: "Utilizzare un'icona quadrata diversa per la modalità scura?"
@@ -5422,7 +5426,7 @@ it:
           header_description: "I report sono uno strumento potente per aiutarti a capire cosa sta succedendo sul tuo sito. Possono aiutarti a identificare tendenze, individuare problemi e prendere decisioni basate sui dati."
           sub_pages:
             settings:
-              title: "Impostazioni della dashboard"
+              title: "Impostazioni"
         badges:
           title: "Distintivi"
           header_description: "I distintivi premiano gli utenti per le loro attività, i loro contributi e i loro risultati, per riconoscere, convalidare e incoraggiare comportamenti positivi e l'impegno all'interno della community"
@@ -5572,22 +5576,6 @@ it:
         result_count:
           one: '%{count} risultato per "%{filter}"'
           other: '%{count} risultati per "%{filter}"'
-        result_types:
-          page:
-            one: "Pagina"
-            other: "Pagine"
-          report:
-            one: "Report"
-            other: "Report"
-          setting:
-            one: "Impostazione"
-            other: "Impostazioni"
-          theme:
-            one: "Tema"
-            other: "Temi"
-          component:
-            one: "Componente"
-            other: "Componenti"
       new_features:
         title: "Cosa c'è di nuovo?"
         check_for_updates: "Controlla gli aggiornamenti"
@@ -7596,6 +7584,7 @@ it:
         field_types:
           text: "Testo"
           textarea: "Area di testo"
+          date: "Data"
           confirm: "Conferma"
           dropdown: "A discesa"
           multiselect: "Selezione multipla"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 105129ee79c5b..654e17e2b0b20 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -6,6 +6,10 @@
 
 ja:
   js:
+    carousel:
+      go_to_slide: "スライド %{index} に移動"
+      previous: "前のスライド"
+      next: "次のスライド"
     number:
       format:
         separator: "."
@@ -257,6 +261,12 @@ ja:
       forwarded: "上記のメールを転送しました"
     topic_admin_menu: "トピックの操作"
     skip_to_main_content: "メインコンテンツにスキップ"
+    skip_links_label: "ナビゲーションリンクをスキップ"
+    skip_to_post: "投稿 %{post_number} までスキップ"
+    skip_to_where_you_left_off: "最後に中断した場所までスキップ (投稿 %{post_number})"
+    skip_to_where_you_left_off_last: "最後に中断した場所までスキップ (最後の返信、投稿 %{post_number})"
+    skip_to_last_reply: "最後の返信までスキップ"
+    skip_to_top: "トップへスキップ"
     skip_user_nav: "プロファイルのコンテンツにスキップ"
     emails_are_disabled: "メールの送信は管理者によって無効化されています。メール通知は一切送信されません。"
     emails_are_disabled_non_staff: "スタッフ以外のユーザーの送信メールは無効になっています。"
@@ -266,9 +276,13 @@ ja:
     back_button: "戻る"
     welcome_banner:
       header:
+        new_members: "%{preferred_display_name}、ようこそ！"
         logged_in_members: "%{preferred_display_name}、おかえりなさい！"
         anonymous_members: "%{site_name} へようこそ！"
       search_placeholder: "検索"
+    impersonation:
+      notice: "%{username} の代理操作中です"
+      stop: "代理操作を終了"
     themes:
       default_description: "デフォルト"
       broken_theme_alert: "テーマ / コンポーネントにエラーがあるため、サイトが動作しない可能性があります。詳細はブラウザコンソールを確認してください。"
@@ -514,6 +528,10 @@ ja:
       resume: "再開"
       remove: "削除"
       remove_confirmation: "この下書きを削除してもよろしいですか？"
+      bulk_delete: "選択項目を削除"
+      bulk_delete_confirmation: "下書きを削除"
+      bulk_delete_message:
+        other: "これら %{count} 件の下書きを削除してもよろしいですか？"
       new_topic: "新しいトピックの下書き"
       new_private_message: "新しい個人メッセージの下書き"
       edit_topic: "トピックの下書きを編集"
@@ -575,23 +593,20 @@ ja:
     review:
       show_more: "もっと表示"
       show_less: "表示を減らす"
+      back_to_queue: "キューに戻る"
+      editing_post: "投稿を編集中…"
       order_by: "並べ替え順"
       date_filter: "投稿期間"
       in_reply_to: "返信"
       filtered_flagged_by: "通報者"
       unknown:
-        title:
-          other: "無効化されたプラグインに保留中のレビュー待ち項目があります:"
         instruction: "関連するプラグインが有効化されるまで、正しく表示されません。プラグインを有効化してページを更新してください。または、無視することもできます。<a href='%{url}' target='_blank'>詳細...</a>"
         reviewable_unknown_source: "%{reviewableType} (不明なプラグイン)"
         reviewable_known_source: "%{reviewableType} (「%{pluginName}」プラグイン)"
         ignore_all: "すべて無視"
         enable_plugins: "プラグインを有効化"
-        delete_confirm: "無効化されたプラグインで作成されたすべてのレビューを削除してもよろしいですか？"
-        ignore_success: "無効化されたプラグインで作成されたすべてのレビューは削除されました。"
       explain:
         why: "この項目が、キューに追加された理由を説明してください"
-        title: "レビュー待ち項目スコア"
         formula: "式"
         subtotal: "小計"
         total: "合計"
@@ -605,10 +620,8 @@ ja:
           title: "過去に同意を得た通報を報告したユーザーにはボーナスが与えられます。"
         trust_level_bonus:
           name: "信頼レベル"
-          title: "レビュー待ち項目を作成したユーザーの信頼レベルが高いほど、その項目のスコアが高くなります。"
         type_bonus:
           name: "タイプボーナス"
-          title: "特定のレビュー待ち項目タイプには、スタッフがボーナスを割り当てて優先順位を上げられます。"
       revise_and_reject_post:
         title: "要再校"
         reason: "理由"
@@ -617,13 +630,16 @@ ja:
         custom_reason: "理由を明確に説明してください"
         other_reason: "その他..."
         optional: "オプション"
-      stale_help: "このレビュー待ち項目は <b>%{username}</b> によって解決されました。"
       claim_help:
         optional: "この項目を自分に割り当ててほかのユーザーがレビューしないようにできます。"
         required: "レビューする前に項目を自分に割り当てる必要があります。"
         claimed_by_you: "この項目を自分に割り当てたため、レビューできます。"
         claimed_by_other: "この項目は <b>%{username}</b> のみがレビューできます。"
         automatically_claimed_by: "この項目は現在、<b>%{username}</b> がレビューしています。"
+      claim:
+        title: "このトピックを自分に割り当てる"
+      unclaim:
+        help: "この割り当てを削除する"
       awaiting_approval: "承認待ち"
       delete: "削除"
       settings:
@@ -644,6 +660,7 @@ ja:
       filtered_topic: "1 つのトピックのレビュー待ちコンテンツにフィルターを適用しました。"
       filtered_user: "通報されたユーザー"
       filtered_reviewed_by: "レビュー者:"
+      filtered_claimed_by: "通報担当者"
       show_all_topics: "すべてのトピックを表示"
       deleted_post: "(削除された投稿)"
       deleted_user: "(削除されたユーザー)"
@@ -709,10 +726,13 @@ ja:
           created_at: "作成日"
           created_at_asc: "作成日 (昇順)"
         priority:
+          title: "最低優先度"
           any: "(すべて)"
           low: "低"
           medium: "普通"
           high: "高"
+        active_filters: "有効なフィルタ:"
+        clear_filter: "%{filter} を削除"
       conversation:
         view_full: "会話をすべて表示"
       scores:
@@ -755,6 +775,10 @@ ja:
         is_this_post: "この%{reviewable_type}は%{reviewable_human_score_types}ですか？"
         delimiter: "または"
         something_else_wrong: "この%{reviewable_type}に何か問題がありますか？"
+        approve_user: "このユーザーを承認しますか？"
+        suspect_user: "これは迷惑ユーザーですか？"
+        approve_post: "この投稿を承認しますか？"
+        approve_topic: "このトピックを承認しますか？"
       types:
         reviewable_flagged_post:
           title: "通報された投稿"
@@ -773,27 +797,43 @@ ja:
           title: "投稿"
           noun: "投稿"
         reviewable_ai_chat_message:
+          title: "AI が通報したチャットメッセージ"
           noun: "チャットメッセージ"
         reviewable_ai_post:
+          title: "AI が通報した投稿"
           noun: "投稿"
+        reviewable_post_voting_comment:
+          title: "通報されたコメント"
+          noun: "コメント"
       flagged_as: "通報:"
+      post_flagged_as: "投稿の通報:"
+      chat_flagged_as: "チャットの通報:"
+      queued_post_label: "対応待ちの投稿"
+      queued_topic_label: "対応待ちのトピック"
       user_label: "ユーザー"
+      assigned_to: "投稿の割り当て先:"
       moderator_actions: "モデレーターのアクション"
       timeline_and_notes: "タイムラインとメモ"
       timeline:
         target_created: "投稿を作成"
         target_created_by: "%{username} が投稿を作成 · %{relativeDate}"
-        target_deleted: "削除された投稿"
+        target_deleted: "投稿を削除"
+        target_deleted_by: "%{username} が投稿を削除 · %{relativeDate}"
         flagged: "通報"
         flagged_as_by: "%{username} が%{flagReason}として通報 · %{relativeDate}"
         claimed: "引き受け"
         claimed_by: "%{username} が引き受け · %{relativeDate}"
+        unclaimed_by: "%{username} が割り当てを解除 · %{relativeDate}"
         reviewed: "レビュー"
+        approved_by: "%{username} が承認 · %{relativeDate}"
+        rejected_by: "%{username} が拒否 · %{relativeDate}"
+        ignored_by: "%{username} が無視 · %{relativeDate}"
         view_conversation: "PM を見る"
         note_added: "モデレーターのメモ"
         note_added_by: "%{username} のモデレーターメモ · %{relativeDate}"
         no_events: "表示するタイムラインイベントはありません"
       notes:
+        add_note_description: "他のモデレーターに文脈を伝えるメモを追加してください。"
         add_note_button: "メモを追加"
         placeholder: "ここにメモを入力してください..."
         chars_remaining: "残り %{count} 文字"
@@ -806,20 +846,34 @@ ja:
       review_user: "ユーザー"
       need_help: "ヘルプが必要ですか？"
       copy_link: "リンクをコピー"
+      copy_permalink_title: "このレビュー待ち項目へのリンクをクリップボードにコピー"
+      copy_link_feedback: "リンクがコピーされました"
       view_source: "ソースを表示"
       insights:
         title: "インサイト"
         flag_volume: "通報回数"
         flagged_by_users:
           other: "%{count} 人のユニークユーザーによる通報"
+        similar_posts: "過去の違反"
+        flagged_in_timeframe:
+          other: "%{count} 確認済みの通報"
+        user_activity: "ユーザー情報"
         activities:
+          joined_on: "参加日: %{joinDate}"
           trust_level: "信頼レベル: %{trustLevelName}"
           posts:
             other: "投稿 %{count} 件"
+        moderation_history:
+          label: "モデレーション履歴"
+          silenced: "投稿禁止: %{count}"
+          suspended: "凍結: %{count}"
+          rejected_posts: "拒否された投稿: %{count}"
         solution_marked: "解決策に指定"
         topic_has_solution: "このトピックには解決策があります"
         visibility: "表示状態"
+        topic_unlisted: "このトピックは非表示であり、ダイレクトリンクでのみアクセスできます。"
       help:
+        community_moderation_guide: "このコミュニティーのモデレーションガイド"
         moderation_guide: "Discourse モデレーションガイド"
         flag_priorities: "ユーザーの評判と通報の優先順位の管理"
         spam_detection: "迷惑行為の検出"
@@ -961,6 +1015,7 @@ ja:
           title: 交流
           posting: 投稿
           notification: 通知
+          self_lockout: "グループの表示状態を変更すると、自身のアクセス権が失われます。続行してもよろしいですか？"
         email:
           title: "メール"
           enable_smtp: "SMTP を有効化"
@@ -973,6 +1028,7 @@ ja:
           smtp_title: "SMTP"
           smtp_instructions: "このグループで SMTP を有効化すると、グループの受信トレイから送信されるすべての送信メールは、フォーラムが送信するほかのメール用に構成されているメールサーバーではなく、ここで指定される SMTP 設定を介して送信されます。"
           additional_settings: "追加設定"
+          smtp_disable_confirm: "SMTP を無効にすると、すべての SMTP 設定がリセットされ、関連付けられている機能が無効になります。続行してもよろしいですか？"
           prefill:
             title: "次の設定で事前入力:"
             gmail: "Gmail"
@@ -1090,6 +1146,8 @@ ja:
         make_owner_description: "<b>%{username}</b> をこのグループのオーナーにする"
         remove_owner: "オーナーから削除"
         remove_owner_description: "<b>%{username}</b> をこのグループのオーナーから削除する"
+        remove_member_self_lockout: "このグループから退会すると、グループを管理するアクセス権が取り消されます。続行してもよろしいですか？"
+        remove_owner_self_lockout: "オーナーとして自身を削除すると、このグループを管理するアクセス権が取り消されます。続行してもよろしいですか？"
         make_primary: "プライマリーにする"
         make_primary_description: "これを <b>%{username}</b> のプライマリーグループにします"
         remove_primary: "プライマリーとして削除"
@@ -1209,12 +1267,15 @@ ja:
       n_more:
         other: "カテゴリ (その他 %{count} 個)…"
     ip_lookup:
+      title: IP アドレス
       hostname: ホスト名
       location: 場所
       location_not_found: (不明)
       organisation: 組織
       phone: 電話
       other_accounts: "同じ IP アドレスを持つほかのアカウント:"
+      other_accounts_with_ip:
+        other: "同じ IP アドレスを持つほか %{count} 件のアカウント"
       delete_other_accounts:
         other: "%{count} 件削除"
       username: "ユーザー名"
@@ -1249,8 +1310,16 @@ ja:
       private_message: "メッセージ"
       private_messages: "メッセージ"
       upcoming_changes:
+        title: "次回の変更"
         for_user:
+          upcoming_change: "次回の変更"
           enabled: "有効ですか？"
+          why: "理由"
+        why_reasons:
+          not_in_specific_groups: "ユーザーはこの変更に必要な特定のグループに属しません"
+          in_specific_groups: "ユーザーはこの変更に必要な特定のグループに属します"
+          enabled_for_everyone: "この変更はすべてのメンバーに対して有効です"
+          enabled_for_no_one: "この変更はすべてのメンバーに対して無効です"
       user_notifications:
         filters:
           filter_by: "フィルタ基準:"
@@ -1555,17 +1624,20 @@ ja:
         interface: "表示設定"
         apps: "アプリ連携"
         navigation_menu: "ナビゲーションメニュー"
+        upcoming_changes: "次回の変更"
       change_password:
         success: "(メール送信済み)"
         in_progress: "(メール送信中)"
         error: "(エラー)"
         action: "パスワードのリセットメールを送信"
+        staged_user: "ステージングユーザーはパスワードリセットメールを受信できません。"
         set_password: "パスワードを設定"
         choose_new: "新しいパスワードを選択する"
         choose: "パスワードを選択する"
         verify_identity: "続行するには本人確認を行ってください。"
         title: "パスワードをリセット"
         remove: "パスワードを削除"
+        remove_disabled: "パスワードを削除する前に、アカウントのログイン方法が少なくとももう 1 つ必要です (パスキー、リンクされた外部アカウントなど)。"
         remove_detail: "パスワードをリセットしない限り、アカウントにアクセスできなくなります。"
       second_factor_backup:
         title: "二要素認証のバックアップコード"
@@ -1829,6 +1901,7 @@ ja:
         first_time_and_daily: "投稿の最初の「いいね！」と毎日"
         first_time: "投稿の最初の「いいね！」"
         never: "通知しない"
+      notify_on_linked_posts: "自分の投稿へのリンクを誰かが共有したら通知する"
       email_previous_replies:
         title: "メールの下部に前の返信を含める"
         unless_emailed: "最初だけ"
@@ -1888,6 +1961,7 @@ ja:
         redeemed_tab_with_count: "承諾済み (%{count})"
         invited_via: "招待"
         invited_via_link: "リンク %{key} (%{count}/%{max} 引き換え済み)"
+        generating_link: "リンクを生成中..."
         groups: "グループ"
         topic: "トピック"
         sent: "作成日/最終送信日"
@@ -1951,6 +2025,7 @@ ja:
                 other {# 日}
             }です。
           edit_link_options: "リンクオプションを編集するかメールで送信します。"
+          edit_link_options_only: "リンクのオプションを編集する"
           show_advanced: "高度なオプションを表示"
           hide_advanced: "高度なオプションを非表示"
           description: "説明"
@@ -2137,6 +2212,9 @@ ja:
       no_results: "結果がありません"
       search: "検索…"
       label: "オプションを選択"
+    d_otp:
+      screen_reader:
+        other: '%{count} 桁の数字を入力してください'
     form_kit:
       reset: リセット
       optional: オプション
@@ -2348,6 +2426,7 @@ ja:
       admin_not_allowed_from_ip_address: "その IP アドレスからは管理者としてログインできません。"
       resend_activation_email: "ここをクリックすると、再度アクティベーションメールを送信します。"
       omniauth_disallow_totp: "あなたのアカウントは二要素認証が有効になっています。ログインにはパスワードが必要です。"
+      works_with: "利用可能なログイン方法"
       activate_account: "アカウントを有効化"
       resend_title: "アクティベーションメールの再送"
       change_email: "メールアドレスを変更"
@@ -2464,6 +2543,7 @@ ja:
       topic_count:
         other: "このカテゴリの %{count} 件のトピック"
       read_only: "読み取り専用"
+      read_only_description: "このカテゴリは読み取り専用であるため、このトピックでは選択できません"
     timezone_input:
       ambiguous_ist: "IST はあいまいです。特定のタイムゾーンを選択してください（「アジア/コルカタ」など）"
     select_kit:
@@ -2546,8 +2626,13 @@ ja:
         title: "投稿の翻訳"
         select: "翻訳を選択"
         save: "翻訳を保存"
+        original_content: "元の投稿"
+        translation_preview: "翻訳のプレビュー"
+        original: "原文"
         translation: "翻訳"
+        no_translation_yet: "入力を開始すると翻訳のプレビューが表示されます..."
         placeholder: "ここに投稿の翻訳を入力します..."
+        show_raw_markdown: "コードを表示する"
       group_mentioned_limit:
         other: "<b>警告！</b> <a href='%{group_link}'>%{group}</a> をメンションしましたが、このグループのメンバー数は、管理者がメンション数制限として設定した %{count} 人を超えています。そのため誰にも通知されません。"
       group_mentioned:
@@ -2593,7 +2678,9 @@ ja:
       create_shared_draft: "共有の下書きを作成"
       edit_shared_draft: "共有の下書きを編集"
       title: "または %{modifier}Enter キーを押します"
+      save_and_close: "保存して閉じる"
       discard: "破棄"
+      draft_saved: "下書きが保存されました！"
       users_placeholder: "ユーザーまたはグループを追加"
       title_placeholder: "トピックのタイトルを入力してください"
       title_or_link_placeholder: "タイトルを入力するか、リンクを貼り付けてください"
@@ -2648,10 +2735,27 @@ ja:
       ulist_title: "箇条書き"
       list_item: "リスト項目"
       toggle_direction: "方向の切り替え"
+      apply_wrap_title: "ラップの適用"
       wrap_modal:
+        title: "ラップの編集"
+        name_label: "ラップ名"
+        attributes_label: "属性"
+        add_attribute: "属性を追加する"
+        remove_attribute: "属性を削除する"
         apply: "適用"
+        unwrap: "ラップを解除する"
+        no_attributes: "属性はまだ追加されていません。"
+      wrap_text: "コンテンツをラップする"
       help: "Markdown 編集のヘルプ"
+      collapse: "作成ツールパネルを最小化する"
+      open: "作成ツールパネルを開く"
+      abandon: "作成ツールを閉じて下書きを破棄する"
+      enter_fullscreen: "作成ツールの全画面表示を開始する"
+      exit_fullscreen: "作成ツールの全画面表示を終了する"
       exit_fullscreen_prompt: "<kbd>ESC</kbd> を押して全画面表示を終了"
+      show_toolbar: "作成ツールのツールバーを表示する"
+      hide_toolbar: "作成ツールのツールバーを非表示にする"
+      peek_mode_toggle: "ピークモードを切り替える"
       modal_ok: "OK"
       cant_send_pm: "%{username} にメッセージを送ることはできません。"
       create_message_error: "メッセージを作成中にエラーが発生しました。もう一度お試しください。"
@@ -2698,6 +2802,7 @@ ja:
           desc: "最新の返信日を変更せずに返信します"
         toggle_unlisted:
           label: 非表示の切り替え
+          desc: "非表示のトピックはダイレクトリンクのみでアクセスできます"
       reload: "再読み込み"
       ignore: "無視する"
       image_alt_text:
@@ -2708,7 +2813,14 @@ ja:
         zoom_out: "画像を縮小"
         zoom_in: "画像を拡大"
         remove: "画像の削除"
+        add_to_grid: "グリッドに追加"
+        move_outside_grid: "グリッドの外に移動"
       image: "画像"
+      grid_label: "これはグリッドとして表示されます"
+      grid_mode_grid: "グリッド"
+      grid_mode_carousel: "カルーセル"
+      grid_mode_title: "画像ギャラリーのスタイルを %{mode} に設定"
+      remove_grid: "グリッドを削除する"
       image_scale_button: "画像の表示率を %{percent}% に変更"
       delete_image_button: 画像を削除
       toggle_image_grid: 画像グリッドを切り替える
@@ -2718,6 +2830,7 @@ ja:
         remove: "リンクの削除"
         visit: "外部タブでリンクを開く"
         link_copied: "リンクがコピーされました！"
+      unsupported_token: "リッチテキストエディターではこの投稿で使用されているすべての機能がサポートされていないため、Markdown エディターに切り替えます。"
     notifications:
       tooltip:
         regular:
@@ -2777,6 +2890,13 @@ ja:
       votes_released: "%{description} - 完了"
       new_features: "新機能が公開されました！"
       admin_problems: "サイトダッシュボードに関する新しいアドバイス"
+      upcoming_changes:
+        available:
+          title: "次回の変更"
+          description: "'%{changeName}' をプレビューできます"
+        automatically_promoted:
+          title: "次回の変更"
+          description: "'%{changeName}' は自動的に有効になりました"
       dismiss_confirmation:
         body:
           default:
@@ -2829,7 +2949,10 @@ ja:
         membership_request_consolidated: "新しいメンバーシップリクエスト"
         reaction: "新しいリアクション"
         votes_released: "投票がリリースされました"
+        new_features: "新しい Discourse 機能がリリースされました"
         admin_problems: "サイトダッシュボードに関する新しいアドバイス"
+        upcoming_change_available: "次回の新しい変更 '%{changeName}' を利用できます"
+        upcoming_change_automatically_promoted: "次回の変更 '%{changeName}' は自動的に有効になりました"
     upload_selector:
       change: "変更"
       delete: "削除"
@@ -2919,6 +3042,7 @@ ja:
           aria_label: タグを使ってフィルタ
         filters:
           label: トピック/投稿のみを返す…
+          all: メッセージを含める
           title: タイトルが一致するもの
           likes: '「いいね！」した項目'
           posted: 投稿したもの
@@ -2964,8 +3088,6 @@ ja:
         max_views:
           placeholder: 最大
           aria_label: 最大閲覧数でフィルタ
-        additional_options:
-          label: "投稿数とトピックの閲覧数でフィルタ"
     hamburger_menu: "ナビゲーションメニュー"
     new_item: "新規"
     go_back: "戻る"
@@ -3017,6 +3139,7 @@ ja:
     topics:
       new_messages_marker: "最後の訪問"
       bulk:
+        select: "一括選択"
         confirm: "確認"
         select_all: "すべて選択"
         clear_all: "すべてクリア"
@@ -3027,6 +3150,10 @@ ja:
         delete: "トピックを削除"
         delete_topics_count:
           other: "トピックを削除"
+        delete_posts_count:
+          other: "投稿を削除"
+        delete_posts_confirmation:
+          other: "%{count} 件の投稿を削除してもよろしいですか？"
         dismiss: "閉じる"
         dismiss_read: "未読をすべて閉じる"
         dismiss_read_with_selected:
@@ -3075,6 +3202,7 @@ ja:
           other: "<b>%{count}</b> 件のトピックからすべてのタグが削除されます。よろしいですか？"
         progress:
           other: "進捗状況: <strong>%{count}</strong> 件のトピック"
+        notify: "この変更をユーザーに通知します。"
         performing: "一括操作を実行中です。お待ちください…"
         completed: "一括操作が完了しました！"
         error_topic_count:
@@ -3096,6 +3224,7 @@ ja:
           unread: "未読はありません... お見事！"
           new_new: "今のところ新着はありません... また後で確認してください！"
           new: "今のところ新着はありません... また後で確認してください！"
+          generic: "ここには何もありません... また後で確認してください！"
     topic_bulk_actions:
       dismiss:
         name: "閉じる"
@@ -3214,12 +3343,15 @@ ja:
       created_at: "作成日: %{date}"
       bumped_at: "最新: %{date}"
       browse_latest_topics: "最新のトピックを閲覧する"
+      browse_new_replies: "新しい返信を閲覧する"
+      browse_new_topics: "新しいトピックを閲覧する"
       suggest_create_topic: <a href>新しい会話を開始しますか？</a>
       jump_reply: "投稿の下の場所にジャンプする"
       jump_reply_aria: "元の場所にある @%{username} の投稿にジャンプする"
       jump_reply_button: "投稿にジャンプ"
       deleted: "トピックは削除されました"
       slow_mode_update:
+        title: "低速モード"
         select: "ユーザーはこのトピックに次の頻度でのみ投稿できます。"
         description: "流れの速いディスカッションや論争になりがちなディスカッションで建設的な対話を奨励するため、このトピックへの投稿はしばらく待ってから行う必要があります。"
         enable: "有効化"
@@ -3241,6 +3373,8 @@ ja:
           12_hours: "12 時間"
           24_hours: "24 時間"
           custom: "カスタム期間"
+      slow_mode_notice:
+        duration: "このトピックでは次の投稿まで %{duration}お待ちください"
       topic_status_update:
         title: "トピックタイマー"
         save: "タイマーをセット"
@@ -3270,6 +3404,8 @@ ja:
         title: "最後の投稿の後トピックを自動的にクローズ"
       auto_delete:
         title: "トピックを自動的に削除"
+      auto_delete_after_last_post:
+        title: "最後の投稿の後トピックを自動的に削除"
       auto_bump:
         title: "トピックの自動バンプ"
       reminder:
@@ -3281,6 +3417,7 @@ ja:
         auto_close: "このトピックは後 %{timeLeft}で自動的にクローズします。"
         auto_publish_to_category: "このトピックは後 %{timeLeft}で <a href=%{categoryUrl}>#%{categoryName}</a> に公開されます。"
         auto_close_after_last_post: "このトピックは最後の返信から%{duration}後にクローズされます。"
+        auto_delete_after_last_post: "このトピックは最後の返信から %{duration}後に削除されます。"
         auto_delete: "このトピックは後 %{timeLeft}で自動的に削除されます。"
         auto_bump: "このトピックは後 %{timeLeft}で自動的にバンプされます。"
         auto_reminder: "このトピックについて %{timeLeft}後にリマインダーを通知します。"
@@ -3374,6 +3511,8 @@ ja:
       reply:
         title: "返信"
         help: "このトピックへの返信を作成する"
+      footer_buttons:
+        region_label: "トピックの操作"
       share:
         title: "トピックを共有"
         extended_title: "リンクの共有"
@@ -3541,14 +3680,25 @@ ja:
         description:
           other: "<b>%{count}</b> 件の投稿を選択しました。"
       deleted_by_author_simple: "(作成者が削除したトピック)"
+      localizations:
+        title_edit_warning:
+          message: "これは翻訳されたトピックタイトルです。<br><br><b>元</b>の%{language}のカテゴリ、タグ、およびタイトルを編集しますか？またはこの特定の<b>翻訳</b>を編集しますか？"
+          action_original: "元の項目を編集する"
+          action_translation: "翻訳されたトピックタイトルを編集する"
+        editing_translation: "%{language} 翻訳を編集中"
     post_list:
       title: "最新の投稿"
       empty: "投稿はありません"
       aria_post_number: "%{title} - 投稿 #%{postNumber}"
       bulk:
+        selected:
+          other: "%{count} 件の投稿を選択済み"
+        select_all: "すべて選択"
         clear_all: "すべてクリア"
         actions: "一括操作"
     post:
+      accessible_heading: "%{username} の投稿 %{date}"
+      heading_anchor: "見出しのリンク"
       confirm_delete: "この投稿を削除してもよろしいですか？"
       quote_reply: "引用"
       quote_reply_shortcut: "引用 (または q を押す)"
@@ -3572,8 +3722,13 @@ ja:
       deleted_by_author_simple: "(作成者が削除した投稿)"
       collapse: "折りたたむ"
       load_more_replies: "返信をさらに読み込む"
+      load_more_posts_above: "上にさらに投稿を読み込む"
+      load_more_posts_below: "下にさらに投稿を読み込む"
       sr_collapse_replies: "埋め込まれた返信を折りたたむ"
       sr_load_more_replies: "埋め込み返信をさらに読み込む"
+      loading_more_posts_above: "上にさらに投稿を読み込み中..."
+      loading_more_posts_below: "下にさらに投稿を読み込み中..."
+      loading_complete: "読み込み完了"
       sr_date: "投稿日"
       sr_expand_replies:
         other: "この投稿には %{count} 件の返信があります"
@@ -3618,6 +3773,8 @@ ja:
           edit: "編集"
           delete: "削除"
         add: "新しい翻訳を追加"
+        manage:
+          other: "翻訳を管理する (既存 %{count} 件)"
         view:
           other: "%{count} 個の翻訳済みロケールを表示"
         modal:
@@ -3625,8 +3782,10 @@ ja:
           confirm_delete: "'%{languageCode}' の翻訳を削除してもよろしいですか？"
         success: "翻訳は正しく更新されました"
         post_language_selector:
+          title: "投稿の言語"
           none: "なし"
         edit_warning:
+          message: "これは翻訳された投稿です。<br><br>元の%{language}の投稿を編集しますか？またはこの特定の翻訳を編集しますか？"
           action_original: "元の投稿を編集する"
           action_translation: "この翻訳を編集する"
       errors:
@@ -3646,6 +3805,7 @@ ja:
         attachment_upload_not_allowed_for_new_user: "新規ユーザーはファイルを添付できません。"
         attachment_download_requires_login: "添付ファイルをダウンロードするには、ログインする必要があります。"
       cancel_composer:
+        confirm: "投稿を破棄しますか？"
         discard: "破棄"
       via_email: "これはメールで投稿されました"
       via_auto_generated_email: "この投稿は自動生成メール経由で届きました"
@@ -3715,6 +3875,7 @@ ja:
         delete_post_notice: "公式通知を削除"
         remove_timer: "タイマーを削除"
         edit_timer: "タイマーを編集"
+        remove_yourself_from_pm: "このメッセージから自分自身を削除してもよろしいですか？このメッセージの閲覧または返信を行えなくなります。"
       actions:
         people:
           like:
@@ -3827,6 +3988,7 @@ ja:
       general: "一般"
       settings: "設定"
       advanced: "高度"
+      show_advanced: "高度な設定"
       topic_template: "テンプレート"
       tags: "タグ"
       localizations: "ローカリゼーション"
@@ -3852,21 +4014,37 @@ ja:
         add: "必須タググループを追加する"
         placeholder: "タググループを選択…"
       topic_featured_link_allowed: "このカテゴリに注目のリンクを許可する"
+      delete: "カテゴリを削除する"
+      create: "新しいカテゴリ"
       create_long: "新しいカテゴリを作成する"
+      save: "カテゴリを保存する"
+      slug: "カテゴリのスラッグ"
+      parent: "親カテゴリ"
       slug_placeholder: "(オプション) URL 用のダッシュ区切りの語"
       creation_error: カテゴリを作成中にエラーが発生しました。
       save_error: カテゴリを保存中にエラーが発生しました。
+      errors:
+        self_lockout: "カテゴリの権限を変更すると、自身のアクセスが失われます。続行してもよろしいですか？"
       validations:
         icon_required: "アイコンを選択する."
+      name: "カテゴリ名"
+      untitled: "無題のカテゴリ"
       description: "説明"
+      logo: "カテゴリのロゴ画像"
+      logo_dark: "カテゴリのダークモード用ロゴ画像"
       logo_description: "推奨アスペクト比は 1:1、最小サイズは 200px です。空白のままにすると、画像は表示されません。"
+      background_image: "カテゴリの背景画像"
+      background_image_dark: "カテゴリのダークモード用背景画像"
       style: "スタイル"
       icon: "アイコン"
       emoji: "絵文字"
+      select_emoji: "絵文字を選択する"
       background_color: "色"
       foreground_color: "テキストの色"
       color_validations:
         cant_be_empty: "空にできません"
+        incorrect_length: "#RRGGBB または #RGB の形式に一致する必要があります"
+        non_hexdecimal: "16 進文字 (0～9、A～F) のみを含む必要があります"
       styles:
         type: "スタイル"
         icon: "アイコン"
@@ -3878,6 +4056,7 @@ ja:
           emoji: "絵文字"
       color_used: "使用中の色"
       predefined_colors: "既定の色オプション"
+      name_placeholder: "1 単語または 2 単語を推奨"
       color_placeholder: "すべてのウェブ色"
       delete_confirm: "このカテゴリを削除してもよろしいですか？"
       delete_error: "カテゴリを削除中にエラーが発生しました。"
@@ -3894,6 +4073,7 @@ ja:
         reply: "返信"
         create: "作成"
         no_groups_selected: "アクセスを許可されたグループはありません。このカテゴリはスタッフにのみ表示されます。"
+        specific_groups_have_access: "このカテゴリは非公開であるため、選択されたグループのみが投稿を表示、返信、および作成できます。"
         toggle_reply: "返信権限の切り替え"
         toggle_full: "作成権限の切り替え"
       uncategorized_security_warning: "このカテゴリは特殊です。カテゴリのないトピックを保存するために用意されているため、セキュリティを設定できません。"
@@ -3912,20 +4092,32 @@ ja:
       all_topics_wiki: "デフォルトで新しいトピックをウィキにする"
       allow_unlimited_owner_edits_on_first_post: "最初の投稿へのオーナーによる無制限の編集を許可する"
       subcategory_list_style: "サブカテゴリのリストのスタイル:"
+      sort_order: "トピックリストの並べ替え基準:"
+      default_view: "デフォルトのトピックリスト:"
+      default_top_period: "トップのデフォルトの期間:"
+      default_list_filter: "リストのデフォルトのフィルタ:"
       allow_badges_label: "このカテゴリでバッジの付与を許可する"
+      edit_permissions: "権限を編集する"
       reviewable_by_group: "このカテゴリのコンテンツはスタッフのほか、次のユーザーもレビューできます:"
       review_group_name: "グループ名"
       require_topic_approval: "すべての新しいトピックにモデレーターの承認を必要とする"
       require_reply_approval: "すべての新しい返信にモデレーターの承認を必要とする"
       this_year: "今年"
       position: "カテゴリページの位置:"
+      default_position: "デフォルトの位置"
       position_disabled: "カテゴリはアクティビティの順に表示されます。リスト内のカテゴリの順を制御するには、<a href='%{url}'>'カテゴリの位置の固定'</a> 設定を有効にしてください。"
       minimum_required_tags: "トピックに必要なタグの最小数:"
+      default_slow_mode: 'このカテゴリの新しいトピックに「低速モード」を有効にします。'
+      subcategory_of: "親カテゴリ..."
       none_subcategory_text: "なし"
+      subcategory_permissions_warning: "非公開カテゴリのサブカテゴリは公開にできません。"
       visibility:
         title: "表示状態"
         public: "公開"
+        all_members: "すべてのメンバー"
         group_restricted: "非公開"
+        who_can_see: "このカテゴリを閲覧できるユーザー"
+        who_can_post: "このカテゴリに投稿できるユーザー"
       num_auto_bump_daily: "毎日自動的にバンプするオープントピックの数:"
       auto_bump_cooldown_days: "同じトピックをもう一度バンプするまでの最低日数:"
       navigate_to_first_post_after_read: "トピックが読まれた後最初の投稿に移動する"
@@ -3947,14 +4139,18 @@ ja:
           title: "ミュート"
           description: "このカテゴリの新しいトピックについて何も通知されません。また最新にも表示されません。"
       search_priority:
+        label: "検索の優先度"
         options:
           normal: "通常"
           ignore: "無視"
+          very_low: "非常に低い"
           low: "低"
           high: "高"
+          very_high: "非常に高い"
       sort_options:
         default: "デフォルト"
         likes: "いいね！"
+        op_likes: "元の投稿の「いいね！」"
         views: "表示"
         posts: "投稿"
         activity: "アクティビティ"
@@ -3975,6 +4171,7 @@ ja:
         email: "メール"
       list_filters:
         all: "すべてのトピック"
+        none: "サブカテゴリなし"
       colors_disabled: "category style が none であるため色を選択できません。"
     anonymous_flagging:
       title: "違法コンテンツの報告"
@@ -4218,10 +4415,15 @@ ja:
     preloader_text: "読み込み中"
     lightbox:
       download: "ダウンロード"
+      open: "元の画像"
+      image_info: "画像の情報"
+      quote: "画像を引用"
       previous: "前へ (左矢印キー)"
       next: "次へ (右矢印キー)"
       counter: "%curr% / %total%"
       close: "閉じる (Esc)"
+      zoom: "拡大縮小 (Z キー)"
+      error: "画像を読み込めません"
       content_load_error: '<a href="%url%">コンテンツ</a>を読み込めませんでした。'
       image_load_error: '<a href="%url%">画像</a>を読み込めませんでした。'
     cannot_render_video: ブラウザがコーデックをサポートしていないため、この動画をレンダリングできません。
@@ -4243,6 +4445,7 @@ ja:
         latest: "%{shortcut} 最新"
         new: "%{shortcut} 新規"
         unread: "%{shortcut} 未読"
+        unseen: "%{shortcut} 未表示"
         categories: "%{shortcut} カテゴリ"
         top: "%{shortcut} トップへ"
         bookmarks: "%{shortcut} ブックマーク"
@@ -4257,10 +4460,12 @@ ja:
         back: "%{shortcut} 戻る"
         up_down: "%{shortcut} 選択を移動 &uarr; &darr;"
         open: "%{shortcut} 選択したトピックを開く"
+        open_new_window: "%{shortcut} 選択したトピックを新しいタブ/ウィンドウで開く"
         next_prev: "%{shortcut} 次/前のセクション"
         go_to_unread_post: "%{shortcut} 最初の未読の投稿に移動"
       application:
         title: "アプリケーション"
+        create: "%{shortcut} 新しいトピックまたは個人メッセージを作成する"
         notifications: "%{shortcut} 通知を開く"
         hamburger_menu: "%{shortcut} ナビゲーションメニューを開く"
         user_profile_menu: "%{shortcut} ユーザーメニューを開く"
@@ -4382,6 +4587,7 @@ ja:
       add_to_calendar: "カレンダーに追加"
       google: "Google カレンダー"
       ics: "ICS"
+      default_title: "スケジュール済みのイベント"
     tagging:
       all_tags: "すべてのタグ"
       other_tags: "他のタグ"
@@ -4394,6 +4600,7 @@ ja:
         other: "少なくとも %{count} 個のタグを選択してください…"
       choose_for_topic_required_group:
         other: "'%{name}' から %{count} 個のタグを選択…"
+      info: "タグ情報を表示"
       default_info: "このタグはどのカテゴリにも制限されておらず、同義語もありません。"
       staff_info: "制限を追加するには、このタグを<a href=%{basePath}/tag_groups>タググループ</a>に追加します。"
       category_restricted: "このタグは、アクセス権限のないカテゴリに制限されています。"
@@ -4419,7 +4626,20 @@ ja:
       delete_confirm_synonyms:
         other: "その %{count} 個の同義語も削除されます。"
       edit_tag: "タグ名と説明を編集する"
-      description: "説明 (最大 1000 文字)"
+      edit: "このタグを編集"
+      description: "説明"
+      settings:
+        title: "設定"
+        general: "一般"
+        localizations: "ローカリゼーション"
+        back: "戻る"
+        name: "名前"
+        slug: "スラッグ"
+        name_placeholder: "タグ名"
+      localization:
+        locale: "ロケール"
+        name: "名前"
+        description: "説明"
       sort_by: "並べ替え:"
       sort_by_count: "件数"
       sort_by_name: "名前"
@@ -4429,7 +4649,13 @@ ja:
       upload_description: "csv ファイルをアップロードしてタグを一括作成します"
       upload_instructions: "1 行に 1 つ、オプションで 'タグ名,タググループ' の形式でタググループを使用します。"
       upload_successful: "タグを正常にアップロードしました"
+      bulk_create_inline_placeholder: "タグを作成 (カンマ区切り)"
       bulk_create_button: "作成"
+      bulk_create_success:
+        other: "%{count} 個のタグを作成しました:"
+      bulk_create_already_exist:
+        other: "%{count} 個のタグがすでに存在します:"
+      bulk_create_some_failed: "一部のタグの作成に失敗しました:"
       delete_unused_confirmation:
         other: "%{count} 個のタグが削除されます: %{tags}"
       delete_unused_confirmation_more_tags:
@@ -4461,13 +4687,18 @@ ja:
           description: "このタグのついた新しいトピックについては何も通知されず、未読タブにも表示されません。"
       groups:
         back_btn: "すべてのタグに戻る"
+        title: "タググループ"
         about_heading: "タググループの選択または新しいタググループの作成"
         about_heading_empty: "まず新しいタググループを作成します"
         about_description: "タググループでは、1 か所で複数のタグの権限を管理できます。"
+        new: "新しいグループ"
+        new_title: "グループの新規作成"
+        edit_title: "タググループの編集"
         tags_label: "このグループのタグ"
         parent_tag_label: "親タグ"
         parent_tag_description: "親タグがある場合、このグループのタグのみを使用できます。"
         one_per_topic_label: "トピック当たりこのグループから 1 つのタグに制限する"
+        new_name: "新しいタググループ"
         name_placeholder: "名前"
         save: "保存"
         delete: "削除"
@@ -4509,6 +4740,7 @@ ja:
     safe_mode:
       enabled: "セーフモードが有効になっています。セーフモードを終了するには、このブラウザウィンドウを閉じてください。"
     theme_preview_notice: "現在、テーマをプレビューしています。通常のサイト構成に戻るには、このブラウザタブまたはウィンドウを閉じてください。"
+    theme_preview_failed: "テーマをプレビューできませんでした。テーマが存在しないか、テーマにアクセスする権限がありません。"
     image_removed: "(画像は削除されました)"
     pause_notifications:
       title: "通知を停止する…"
@@ -4576,6 +4808,7 @@ ja:
       tags_form_modal:
         title: "タグナビゲーションを編集する"
         filter_placeholder: "タグをフィルタする"
+        no_tags: "現在のフィルタに一致するタグはありません。"
         subtitle:
           text: "このサイトの上位タグを自動的に表示します"
       edit_navigation_modal_form:
@@ -4652,6 +4885,9 @@ ja:
           click_to_get_started: "ここをクリックして開始してください。"
           header_link_text: "カテゴリ"
           header_action_title: "サイドバーのカテゴリを編集"
+          header_action_new: "新しいカテゴリ"
+          header_action_edit_sidebar: "サイドバーのカテゴリを編集する"
+          header_action_edit_header_dropdown: "ナビゲーションのカテゴリを編集する"
           configure_defaults: "デフォルトの構成"
         community:
           edit_section:
@@ -4721,6 +4957,8 @@ ja:
           light: "ライト"
           dark: "ダーク"
           auto: "自動"
+          title: "カラーモード"
+          aria_label: "カラーモード、現在 %{mode}"
     welcome_topic_banner:
       title: "ウェルカムトピックを作成しましょう"
       description: "ウェルカムトピックは、新しいメンバーが最初に読むものです。「エレベーターピッチ」や「ミッションステートメント」と考えると良いでしょう。このコミュニティーの対象者、ここで期待できること、最初にしてほしいことを伝えましょう。"
@@ -4892,10 +5130,17 @@ ja:
             bookmarks: "ブックマークしたタグのない %{category} のトピック"
             default: "タグのない %{category} の%{filter}トピック"
         categories: "すべてのカテゴリ"
+    content_localization:
+      toggle_localized:
+        translated: "ページは機械翻訳されています。クリックすると元のページが表示されます。"
+        not_translated: "ページが翻訳されていません。クリックして翻訳してください。"
+    language_switcher:
+      title: "サイト言語の変更"
   admin_js:
     type_to_filter: "入力してフィルタ..."
     settings: "設定"
     reset_filter: "リセット"
+    toggle_filters: "ドロップダウンのフィルタを切り替える"
     admin:
       title: "Discourse の管理者"
       moderator: "モデレーター"
@@ -4908,9 +5153,13 @@ ja:
           never: "削除しない"
       reports:
         title: "使用可能なレポートのリスト"
-        meta_doc: "レポートは、サイトで起きていることを理解するのに役立つ強力なツールです。トレンドの特定、問題の発見、データに基づく決定に役立ちます。"
         sidebar_title: "レポート"
         back: "すべてのレポートに戻る"
+        group_traffic: "トラフィック"
+        group_members: "メンバー"
+        group_moderation: "モデレーション"
+        group_security: "セキュリティ"
+        group_other: "その他"
       config_sections:
         account:
           title: "アカウント"
@@ -4930,28 +5179,66 @@ ja:
           title: "高度"
       upcoming_changes:
         name: "名前"
+        plugin: "プラグイン"
+        metadata: "メタデータ"
         enabled: "有効"
+        enabled_for: "次を対象に有効化..."
+        show_image: "画像を表示"
+        edit_groups: "オプトイングループを編集"
+        groups_updated: "グループが更新されました！"
+        save_groups: "グループを保存"
+        add_groups_to_enable: "この機能を有効にするグループを追加する"
+        no_changes_to_save: "保存する変更はありません"
         select_groups: "グループを選択…"
+        opt_in_groups: "オプトイングループ"
+        opt_in_groups_instructions: "オプトイングループを使用すると、全ユーザーを対象に変更がリリースされる前に特定のユーザーグループがその変更をテストできるようになります。ただし、変更が安定ステータスに進むとこのグループは無効になります。"
+        enabled_for_throttle: "この変更を有効にする対象ユーザーの変更が早すぎます。数秒待ってからもう一度お試しください。"
+        change_enabled_for_success: "この変更を %{enabledFor} に対して有効にしました"
+        change_disabled: "この変更をオプトアウトしました"
+        permanent_notice: "この変更は正式版となったため、まもなく削除されます。今後オプトアウトすることはできません。"
+        permanent_no_group_selection: "利用できません。正式な変更がすべてのグループに適用されます。"
+        no_changes: "現在、次回の変更はありません。"
         preview: "プレビュー"
         enabled_for_options:
+          no_one: "対象者なし"
           everyone: "全員"
-          staff: "スタッフのみ"
+          specific_groups: "特定のグループ"
+          specific_groups_with_group_names:
+            other: "グループ %{groupNames}"
         statuses:
           experimental: "実験的"
+          alpha: "アルファ"
+          beta: "ベータ"
+          stable: "安定"
+          permanent: "正式"
         impact_roles:
           admins: "管理者"
           moderators: "モデレーター"
           staff: "スタッフ"
+          all_members: "すべてのメンバー"
+          developers: "開発者"
         filter:
+          search_placeholder: "名前、説明、またはプラグインでフィルタ..."
+          no_results: "フィルタに一致する次回の変更はありません"
           all: "すべて"
           enabled: "有効"
           disabled: "無効"
+          impact_type_all: "すべての影響タイプ"
           impact_type_feature: "機能"
           impact_type_other: "その他"
+          status_all: "すべてのステータス"
+          status_conceptual: "概念"
           status_experimental: "実験的"
+          status_alpha: "アルファ"
+          status_beta: "ベータ"
+          status_stable: "安定"
+          status_permanent: "正式"
+          impact_role_all: "すべての影響ロール"
           impact_role_admins: "管理者"
           impact_role_moderators: "モデレーター"
           impact_role_staff: "スタッフ"
+          impact_role_all_members: "すべてのメンバー"
+          impact_role_developers: "開発者"
       config:
         about:
           title: "サイトについて"
@@ -4982,17 +5269,31 @@ ja:
           title: "ローカリゼーション"
           header_description: "コミュニティーのインターフェース言語とメンバー向けのその他のローカリゼーションオプションを構成します"
           keywords: "ロケール|言語|タイムゾーン|Unicode|ltr"
+        upcoming_changes:
+          title: "次回の変更"
         login:
           title: "ログインと認証"
           header_description: "ユーザーのログインと認証方法、シークレットと鍵、OAuth2 プロバイダーなどを構成します"
           sub_pages:
             common_settings:
               title: "設定"
+            authenticators:
+              title: "ソーシャルログイン"
+            discourseconnect:
+              title: "Discourse Connect"
             discourse_id:
               title: "Discourse ID"
         discourse_id:
           title: "Discourse ID"
+          stats:
+            total_users: "合計ユーザー数"
+            signups_30_days: "登録 (30 日間)"
+            logins_30_days: "ログイン (30 日間)"
+          regenerate_credentials: "認証情報を再作成する"
+          regenerate_confirm: "Discourse ID の認証情報を再作成してもよろしいですか？これにより、新しいクライアントシークレットが生成されます。通常、認証情報の再作成は必須ではありませんが、セキュリティの強化に役立ちます。"
+          description: "Discourse ID は、1 つのアカウントで複数の Discourse サイトにログインできるようにするシングルサインオンサービスです。Google、Facebook、Apple、GitHub などの一般的なソーシャルログインプロバイダーが追加構成なしでサポートされています。"
           learn_more: "もっと読む"
+          regenerate_success: "認証情報の再作成が完了しました。"
         logo:
           title: "ロゴ"
           header_description: "サイト全体で使用されるロゴとアイコンを構成します"
@@ -5008,7 +5309,6 @@ ja:
               help_text: "推奨サイズは 600 x 80 ピクセルです。"
             large_icon:
               title: "正方形のアイコン"
-              description: "管理の上部に正方形バージョンのロゴの画像が表示されます。モバイル版ホーム画面のアプリロゴでもあります。"
               help_text: "推奨サイズは 512 x 512 ピクセルです。"
             square_icon_dark:
               required: "ダークモードでは別の正方形のアイコンを使用しますか？"
@@ -5079,24 +5379,61 @@ ja:
             modal_yes: "はい"
             modal_no: "いいえ。今後適用する"
         welcome_banner:
+          title: "ウェルカムバナー"
+          header_description: "サイトの訪問者に表示される検索バー付きバナーを構成します。"
+          saved: "ウェルカムバナーの設定が保存されました。"
           form:
+            enabled_themes:
+              label: "テーマで有効化済み..."
+              description: "バナーを表示するテーマを選択します。アクティブなテーマのみが表示されます。"
+              select_label: "テーマを選択する"
+            background_image:
+              label: "背景画像"
+              description: "この画像はバナーテキストの背後に表示されます。"
             text_color:
               label: "テキストの色"
+              description: "上記の背景画像をアップロードした場合、この設定を使用してバナーを読み取りやすいテキストの色に変更してください。空白のままにするか、背景画像をアップロードしなかった場合は、アクティブなテーマによって色が設定されます。"
             page_visibility:
+              label: "ページの表示状態"
+              description: "バナーを表示する場所を選択します。"
               options:
                 top_menu_pages: "トップメニューページ"
+                homepage: "ホームページのみ"
+                discovery: "発見ページ"
                 all_pages: "すべてのページ"
             location:
               label: "場所"
+              description: "バナーを表示するページ内の場所を選択します。"
               options:
                 above_topic_content: "トピックコンテンツの上"
                 below_site_header: "サイトヘッダーの下"
             text_section:
+              title: "カスタマイズ可能なテキスト"
               locale_label: "言語"
+            header_new_members:
+              label: "新しいメンバー向けのヘッダー"
+              description: "利用可能な変数: <code>&percnt;{site_name}</code>、<code>&percnt;{preferred_display_name}</code>"
+              placeholder: "%{preferred_display_name}、ようこそ！"
             header_logged_in:
+              label: "ログイン済みメンバー向けのヘッダー"
+              description: "利用可能な変数: <code>&percnt;{site_name}</code>、<code>&percnt;{preferred_display_name}</code>"
               placeholder: "%{preferred_display_name}、おかえりなさい！"
             header_anonymous:
+              label: "匿名の訪問者向けのヘッダー"
+              description: "利用可能な変数: <code>&percnt;{site_name}</code>"
               placeholder: "%{site_name} へようこそ！"
+            subheader_logged_in:
+              label: "ログイン済みメンバー向けのサブヘッダー"
+              description: "ログイン済みユーザー向けのヘッダーの下に表示されるセカンダリテキスト。"
+              placeholder: "コミュニティーの新機能をご覧ください"
+            subheader_anonymous:
+              label: "匿名の訪問者向けのサブヘッダー"
+              description: "匿名の訪問者向けのヘッダーの下に表示されるセカンダリテキスト。"
+              placeholder: "コミュニティに参加してディスカッションに参加しましょう"
+            search_placeholder:
+              label: "検索プレースホルダー"
+              description: "ウェルカムバナーの検索ボックスのプレースホルダーテキスト。"
+              placeholder: "トピックを検索..."
         navigation:
           title: "ナビゲーション"
           header_description: "サイトのナビゲーションリンクとメニュー項目を構成します。これには、メインのナビゲーションメニュー、ホームページ上部のクイックリンク、および管理者サイドバーの場所と動作が含まれます。"
@@ -5158,7 +5495,7 @@ ja:
           header_description: "レポートは、サイトで起きていることを理解するのに役立つ強力なツールです。トレンドの特定、問題の検出、データに基づく決定に役立ちます。"
           sub_pages:
             settings:
-              title: "ダッシュボードの設定"
+              title: "設定"
         badges:
           title: "バッジ"
           header_description: "コミュニティー内での前向きな行動と取り組みを認識、検証、奨励するために、バッジによってユーザーの活動、貢献、および実績を称えます"
@@ -5299,6 +5636,9 @@ ja:
         select_setting: "サイトの設定を選択して現在のテーマの値を確認してください"
         add: "テーマサイト設定に移動"
         help: "現在使用しているテーマは <a href='%{basePath}/admin/customize/themes/%{currentThemeId}'>%{currentTheme}</a> です。<a href='%{basePath}/admin/customize/themes/%{currentThemeId}'>テーマ構成ページ</a>に移動すると、テーマサイト設定を変更できます。または以下のテーブルでリンクされたテーマをクリックすると、その設定を編集できます。"
+        filter: "設定名、説明、またはテーマ名でテーマサイト設定をフィルタ..."
+        filter_no_results: "フィルタに一致するテーマサイト設定はありません"
+        site_setting_warning: 'この設定は、サイトのデフォルトのテーマ (%{defaultThemeName}) によって管理されています。<a href="%{basePath}/admin/customize/themes/%{defaultThemeId}">テーマの編集ページ</a>で変更できます。'
       search:
         modal_title: "管理者のすべての項目を検索"
         title: "検索"
@@ -5307,17 +5647,6 @@ ja:
         no_results: '「%{filter}」に一致するものは見つかりませんでした。'
         result_count:
           other: '「%{filter}」の %{count} 件の結果'
-        result_types:
-          page:
-            other: "ページ"
-          report:
-            other: "レポート"
-          setting:
-            other: "設定"
-          theme:
-            other: "テーマ"
-          component:
-            other: "コンポーネント"
       new_features:
         title: "新機能"
         check_for_updates: "アップデートを確認"
@@ -5420,6 +5749,7 @@ ja:
           daily: 日間
           monthly: 月間
           weekly: 週間
+          value_so_far: "%{value} (現在まで)"
           dates: "日付 (UTC)"
           groups: "すべてのグループ"
           disabled: "このレポートは無効化されています"
@@ -5430,7 +5760,9 @@ ja:
           trending_search:
             more: '<a href="%{basePath}/admin/logs/search_logs">検索ログ</a>'
             disabled: 'トレンド検索レポートは無効です。データを収集するには、<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">ログ検索クエリ</a>を有効にしてください。'
+          average_chart_label: 合計ではなく平均を表示中
           sort_button: "%{column} で並べ替え"
+          sort_button_current: "%{column} の%{direction}で並べ替え済み"
           sort_ascending: "昇順"
           sort_descending: "降順"
           filters:
@@ -5600,6 +5932,7 @@ ja:
               recover: トピックを復元します。
               read_lists: 人気、新規、最新などのトピックリストを読み取ります。RSS もサポートされています。
               status: "トピックのステータスを更新します。ステータス: 閉鎖、アーカイブ、表示、固定。有効: true、false。category_id をこことリクエストペイロードに指定すると、そのカテゴリのトピックのみのステータスを変更できます。"
+              change_owner: トピック内の投稿の所有権を変更します。
             posts:
               edit: 任意の投稿または特定の投稿を編集します。
               delete: 投稿を削除します。
@@ -5632,6 +5965,7 @@ ja:
               suspend: ユーザーアカウントを凍結します。
               delete: ユーザーのアカウントを削除します。
               list: ユーザーのリストを取得します。
+              create: 新しいユーザーを作成します。
             user_status:
               read: ユーザーステータスを読み取ります。
               update: ユーザーステータスを更新します。
@@ -5735,6 +6069,7 @@ ja:
           user_destroyed: "ユーザーが削除された"
           user_suspended: "ユーザーが凍結された"
           user_unsuspended: "ユーザーが凍結解除された"
+          user_anonymized: "ユーザーは匿名です"
         reviewable_event:
           group_name: "レビュー待ち項目イベント"
           reviewable_created: "レビュー待ち項目がある"
@@ -5964,8 +6299,10 @@ ja:
           install: "インストール"
           theme_site_settings:
             title: "テーマサイト設定"
+            description: "基本サイト設定の小さなサブセットをオーバーラドすることで、テーマがサイト全体のエクスペリエンスをより細かく制御できるようにする設定です。"
           themes:
             title: "テーマ"
+            description: "すべてのユーザーを対象にサイトの外観を変更するサイト全体のテーマです。"
             themes_intro: "新しいテーマをインストールするか、これらのリソースを使用して独自のテーマを新規作成します。"
             new_theme: "新しいテーマ"
             back: "テーマに戻る"
@@ -6030,6 +6367,8 @@ ja:
             title: "色オプション"
             toggle: "ユーザー選択可能"
             toggle_description: "ユーザーが色パレットを選択できます"
+            toggle_default_light_on_theme: "色パレットはデフォルトテーマ (%{themeName}) のデフォルトのライトパレットです"
+            toggle_default_dark_on_theme: "色パレットはデフォルトテーマ (%{themeName}) のデフォルトのダークパレットです"
           colors:
             title: "色"
           save_changes: "変更を保存"
@@ -6120,6 +6459,7 @@ ja:
             confirm: "このバックアップを削除してもよろしいですか？"
           restore:
             is_disabled: "復元は現在無効になっています。有効にするには、<a href='%{url}'>サイト設定</a>にアクセスしてください。"
+            is_disabled_title: "復元は現在無効になっています。有効にするには、サイト設定の「復元を許可」を検索してください。"
             label: "復元"
             title: "バックアップの復元"
             confirm: "バックアップを復元してもよろしいですか？"
@@ -6168,14 +6508,19 @@ ja:
         copy_to_clipboard: "クリップボードにコピー"
         copied_to_clipboard: "クリップボードにコピーしました"
         copy_to_clipboard_error: "データをクリップボードにコピーする際にエラーが発生しました"
+        theme_owner: "オーナー:"
         email_templates:
           title: "メール"
           subject: "件名"
           multiple_subjects: "このメールテンプレートには複数の件名があります。"
+          multiple_bodies: "このメールテンプレートには複数の本文があります。"
           body: "本文"
           revert: "変更を戻す"
           revert_confirm: "変更を戻してよろしいですか？"
+          search_templates: "テンプレート名でフィルタ..."
+          no_templates_found: "フィルタに一致するテンプレートはありません。"
           edit: "編集"
+          back: "テンプレートに戻る"
         component:
           all_filter: "すべて"
           used_filter: "使用中"
@@ -6210,6 +6555,8 @@ ja:
           create_name: "名前"
           save: "保存"
           long_title: "サイトの色、CSS、HTML コンテンツの修正"
+          dark_mode: "%{themeName} ダークモード"
+          light_mode: "%{themeName} ライトモード"
           edit: "編集"
           edit_confirm: "これはリモートのテーマです。CSS/HTML を編集しても、その変更は次にテーマを更新する際に消去されます。"
           update_confirm: "これらのローカルの変更は更新によって消去されます。続行してもよろしいですか？"
@@ -6254,6 +6601,7 @@ ja:
           set_default_success: "デフォルトのテーマは %{theme} に設定されました"
           setting_was_saved: "テーマ設定は保存されました"
           install_success: "%{theme} が正常にインストールされました！"
+          delete_success: "%{theme} は削除されました！"
           inactive_components: "未使用のコンポーネント:"
           selected:
             other: "%{count} 個選択済み"
@@ -6419,10 +6767,13 @@ ja:
           select_base:
             title: "基本色パレットを選択してください"
             description: "基本パレット:"
+          non_default_theme_warning: "あなたが使用するテーマの<a href='%{link}'>個人設定</a>はデフォルトとは異なるため、ここで行った変更はあなたには適用されない可能性がありますが、デフォルト (%{themeName}) を使用するすべてのユーザーに適用されます。"
+          custom_schemes_warning: "%{colorModes} 色パレットのあなたの<a href='%{link}'>個人設定</a>はデフォルトと異なるため、%{colorModes} パレットへの変更はあなたには適用されない可能性がありますが、デフォルトを使用しているすべてのユーザーに適用されます。"
           light: "ライト"
           dark: "ダーク"
           title: "色"
           edit: "編集"
+          view: "表示"
           set_default_light: "デフォルトのテーマのライトパレットとして設定する (%{theme})"
           set_default_dark: "デフォルトのテーマのダークパレットとして設定する (%{theme})"
           set_default_success: "%{schemeName} を %{themeName} のデフォルトのパレットとして設定しました"
@@ -6440,6 +6791,7 @@ ja:
             reset: "フィルタをリセット"
           default_dark_badge:
             text: "デフォルトのダーク"
+            title: "デフォルトのダークの色パレット"
           system_palette: "これは組み込みの色パレットであるため、編集または削除できません。"
           back_to_colors: "色パレットに戻る"
           long_title: "色パレット"
@@ -6759,6 +7111,11 @@ ja:
             tag_group_change: "タググループの変更"
             delete_associated_accounts: "関連アカウントの削除"
             change_theme_site_setting: "テーマサイト設定を変更"
+            stop_impersonating: "代理操作を終了"
+            upcoming_change_toggled: "次回の変更が切り替えられました"
+            upcoming_change_available: "次回の変更を利用できます"
+            change_site_setting_groups: "サイト設定グループを変更する"
+            discourse_id_regenerate_credentials: "Discourse ID の認証情報を再作成する"
         screened_emails:
           title: "スクリーン対象メール"
           description: "誰かが新規アカウントを作成すると、次のメールアドレスがチェックされるか、登録がブロックされるか、ほかの操作が実行されます。"
@@ -6812,6 +7169,7 @@ ja:
         clear_all: すべてクリア
         clear_all_confirm: "%{action}操作のすべてのウォッチ語をクリアしてもよろしいですか？"
         invalid_regex: 'ウォッチ語 "%{word}" は無効な正規表現です。'
+        invalid_regex_multiple: "無効な正規表現:"
         regex_warning: '<a href="%{basePath}/admin/site_settings/category/all_results?filter=watched%20words%20regular%20expressions%20">ウォッチ語は正規表現</a>で、語の境界は自動的に含まれることはありません。全語に一致する正規表現が必要な場合は、正規表現の最初と最後に <code>\b</code> を含めます。'
         actions:
           block: "ブロック"
@@ -6844,6 +7202,7 @@ ja:
           success: "成功"
           exists: "すでに存在します"
           upload: "ファイルから追加"
+          upload_successful: "アップロードが完了しました。語はまもなく処理されます。"
           case_sensitivity_label: "大文字と小文字を区別"
           case_sensitivity_description: "大文字と小文字が一致する語のみ"
           html_label: "HTML"
@@ -6894,6 +7253,7 @@ ja:
           upload: "ファイルをアップロードする"
           multiselect: "複数選択"
           tagchooser: "タググループのセレクター"
+          composer: "Markdown回答"
         validations_modal:
           button_title: "検証"
           modal_title: "検証オプション"
@@ -6935,7 +7295,10 @@ ja:
             second: "オプション 2"
             third: "オプション 3"
         edit_category:
+          toggle_freeform: "フォームテンプレートは無効です"
+          toggle_form_template: "フォームテンプレートは有効です"
           select_template: "フォームテンプレートを選択する"
+          select_template_help: "フォームテンプレートの追加/編集"
         errors:
           multiple_tags_not_allowed: '「%{tag_name}」からこれ以上のタグを選択できません。問題を回避するには、フォームテンプレートを使用してください'
       impersonate:
@@ -6943,6 +7306,7 @@ ja:
         help: "このツールを使用して、デバッグ目的でユーザーアカウントを代理操作します。作業を終了したら、ログアウトしてください。"
         not_found: "ユーザーが見つかりません。"
         invalid: "このユーザーを代理して操作できません。"
+        error: "予期しないエラーが発生しました。"
       users:
         title: "ユーザー"
         description: "ユーザーの表示と管理を行います。"
@@ -7047,6 +7411,14 @@ ja:
         penalty_post_actions: "関連する投稿についてどうしますか？"
         penalty_post_delete: "投稿を削除する"
         penalty_post_delete_replies: "投稿と返信を削除する"
+        penalty_post_delete_all: "ユーザーによるすべてのトピックと返信を削除する"
+        penalty_post_delete_all_confirmation_MF: |
+          <span>これにより、{ TOPICS, plural,
+              other {# 件のトピック}
+          }と
+          { REPLIES, plural,
+              other {# 件の返信}
+          }が削除されます。<b>この操作は元に戻せません！</b>続行してもよろしいですか？</span>
         penalty_post_edit: "投稿を編集する"
         penalty_post_none: "何もしない"
         penalty_count: "ペナルティ数"
@@ -7104,6 +7476,11 @@ ja:
         approve_bulk_success: "成功！選択したすべてのユーザーは承認され、通知が送信されました。"
         time_read: "閲覧時間"
         post_edits_count: "投稿の編集"
+        upcoming_changes:
+          title: "ユーザー向けの次回の変更"
+          description: "グループを変更するか、次回の変更を有効化または無効化するには、<a href='%{basePath}/admin/config/upcoming-changes'>次回の変更の構成ページ</a>にアクセスしてください。"
+          filter_placeholder: "名前または説明で次回の変更をフィルタ"
+          filter_no_results: "次回の変更は見つかりませんでした"
         exports:
           title: ユーザーのエクスポート
           download:
@@ -7127,6 +7504,8 @@ ja:
           button: "すべての投稿を削除する"
           progress:
             title: "投稿の削除状況"
+            description:
+              other: "@%{username} の %{count} 件の投稿を削除中..."
           confirmation:
             title: "@%{username} のすべての投稿を削除"
             description: |
@@ -7138,6 +7517,7 @@ ja:
             text: "@%{username} の投稿を削除する"
             delete: "@%{username} の投稿を削除する"
             cancel: "キャンセル"
+          all_enqueued: "@%{username} のすべての投稿は削除待ちです"
         merge:
           button: "マージ"
           prompt:
@@ -7164,6 +7544,8 @@ ja:
             cancel: "キャンセル"
         merging_user: "ユーザーをマージ中…"
         merge_failed: "ユーザーをマージ中にエラーが発生しました。"
+        delete_forbidden_because_admin: "管理者は削除できません。"
+        delete_posts_forbidden_because_admin: "管理者の投稿をすべて削除することはできません。"
         delete_forbidden:
           other: "投稿が存在するユーザーを削除できません。ユーザーを削除する前にすべての投稿を削除してください。(%{count} 日以上経過した投稿は削除できません)"
         cant_delete_all_posts:
@@ -7305,6 +7687,10 @@ ja:
           title: "ユーザーカードに表示"
           enabled: "ユーザーカードに表示"
           disabled: "ユーザーカードに表示しない"
+        show_on_signup:
+          title: "登録フォームに表示"
+          enabled: "登録フォームに表示"
+          disabled: "登録フォームに非表示"
         searchable:
           title: "検索可能"
           enabled: "検索可能"
@@ -7312,6 +7698,7 @@ ja:
         field_types:
           text: "テキスト"
           textarea: "テキストエリア"
+          date: "日付"
           confirm: "確認"
           dropdown: "ドロップダウン"
           multiselect: "複数選択"
@@ -7375,6 +7762,9 @@ ja:
             label: "アップロード"
             title: "画像のアップロード"
         download_file: "ダウンロード"
+        upload_restrictions:
+          extensions: "利用可能な形式: %{extensions}"
+          max_size: "最大サイズ: %{size}"
         selectable_avatars:
           title: "ユーザーが選択できるアバターのリスト"
         table_column_heading:
@@ -7413,6 +7803,7 @@ ja:
           experimental: "実験的"
         secret_list:
           invalid_input: "入力フィールドを空にしたり、縦棒文字を含めることはできません。"
+          already_exists: "%{key} のエントリはすでに存在します。"
         default_categories:
           modal_description:
             other: "この変更を過去に適用しますか？これにより、既存の %{count} 人のユーザーの設定が変更されます。"
@@ -7436,13 +7827,23 @@ ja:
             prompt: "この設定を変更すると、サイトに広範に適用されるか意図しない結果が生じる可能性があります。続行してもよろしいですか？"
             confirm: "はい"
           min_password_length:
+            prompt: "パスワードポリシーを変更しようとしています。これは、今後すべてのユーザーのパスワード変更に影響します。続行してもよろしいですか？"
             confirm: "はい。パスワードポリシーを更新します"
           min_admin_password_length:
+            prompt: "パスワードポリシーを変更しようとしています。これは、今後すべての管理者のパスワード変更に影響します。続行してもよろしいですか？"
             confirm: "はい。パスワードポリシーを更新します"
           password_unique_charactes:
+            prompt: "パスワードポリシーを変更しようとしています。これは、今後すべてのユーザーのパスワード変更に影響します。続行してもよろしいですか？"
             confirm: "はい。パスワードポリシーを更新します"
           block_common_passwords:
+            prompt: "パスワードポリシーを変更しようとしています。これは、今後すべてのユーザーのパスワード変更に影響します。続行してもよろしいですか？"
             confirm: "はい。パスワードポリシーを更新します"
+          clean_up_inactive_users_after_days:
+            prompt: "この値を 0 以外に設定すると、その日数以上アクティブでないユーザーが完全に削除されます。続行してもよろしいですか？"
+            confirm: "はい。この値を 0 に設定しない限り、非アクティブなユーザーが完全に削除されることを理解しています"
+        job_status:
+          completed: "更新完了"
+          enqueued: "更新中"
       badges:
         status: ステータス
         title: バッジ
@@ -7477,6 +7878,7 @@ ja:
         no_badges: 付与できるバッジがありません。
         none_selected: "開始するにはバッジを選択してください"
         sections:
+          design: デザイン
           query: クエリ
           settings: 設定
         usage_heading: 使用方法
@@ -7576,6 +7978,7 @@ ja:
         category: "カテゴリへ投稿"
         tags: "トピックのタグ"
         post_author: "投稿者"
+        post_author_description: "このホストから埋め込まれたすべてのトピックの作成者。ブログページのメタタグをオーバーライドします。空白にすると、ページの <meta name='discourse-username'> または <meta name='author'> タグの作成者を読み取ります。"
         post_author_with_default: "投稿者 (デフォルトは %{author})"
         add_host: "ホストを追加"
         posts_and_topics: "投稿とトピックの構成"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index b91cc6cc46d12..ab8de9d624c26 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -472,7 +472,6 @@ ko:
         enable_plugins: "플러그인 사용"
       explain:
         why: "이 항목이 대기열에 있는 이유 설명"
-        title: "검토 가능 점수"
         formula: "공식"
         subtotal: "소계"
         total: "합계"
@@ -486,10 +485,8 @@ ko:
           title: "신고가 수락된 경우 신고자에게 보너스가 주어집니다."
         trust_level_bonus:
           name: "회원 레벨"
-          title: "신뢰 레벨이 더 높은 사용자가 만든 검토 가능 항목은 더 높은 점수를 받습니다."
         type_bonus:
           name: "유형 보너스"
-          title: "특정한 검토 유형에는 관리자가 보너스를 할당하여 우선 순위를 높일 수 있습니다."
       revise_and_reject_post:
         title: "수정"
         reason: "이유"
@@ -498,7 +495,6 @@ ko:
         custom_reason: "이유를 명확하게 설명해 주세요."
         other_reason: "기타..."
         optional: "선택 사항"
-      stale_help: "이 검토 가능 항목은 <b>%{username}</b> 님이 해결했습니다."
       claim_help:
         optional: "다른 사용자가 검토하지 못하도록 이 항목을 독점할 수 있습니다."
         required: "항목을 검토하려면 먼저 항목을 독점해야 합니다."
@@ -2363,8 +2359,6 @@ ko:
         max_views:
           placeholder: 최대
           aria_label: 최대 조회수로 필터링
-        additional_options:
-          label: "게시물 수 및 글 조회수로 필터링"
     new_item: "새로운"
     go_back: "뒤로 가기"
     not_logged_in_user: "현재 활동 및 환경설정에 대한 요약이 포함된 사용자 페이지"
@@ -3525,6 +3519,18 @@ ko:
       delete_confirm_synonyms:
         other: "%{count}개의 동의어도 삭제됩니다."
       edit_tag: "태그 이름 및 설명 편집"
+      description: "내용"
+      settings:
+        title: "설정"
+        general: "일반"
+        back: "뒤로"
+        name: "그룹명"
+        slug: "강타"
+        name_placeholder: "태그명"
+        synonyms_subtitle: "다음 태그를 사용하면 %{name} 으로 대체됩니다"
+      localization:
+        name: "그룹명"
+        description: "내용"
       sort_by: "정렬 기준:"
       sort_by_count: "개수"
       sort_by_name: "이름"
@@ -3781,6 +3787,11 @@ ko:
       reports:
         title: "사용 가능한 리포트 목록"
         sidebar_title: "보고서"
+        group_traffic: "트래픽"
+        group_members: "회원"
+        group_moderation: "관리"
+        group_security: "보안"
+        group_other: "기타"
       config_sections:
         account:
           title: "계정"
@@ -3802,7 +3813,6 @@ ko:
         preview: "미리 보기"
         enabled_for_options:
           everyone: "모두"
-          staff: "직원 만"
         impact_roles:
           admins: "관리자"
           moderators: "관리자"
@@ -3890,6 +3900,9 @@ ko:
               title: "로그"
         reports:
           title: "보고서"
+          sub_pages:
+            settings:
+              title: "설정"
         badges:
           title: "배지"
         permalinks:
@@ -3938,17 +3951,6 @@ ko:
         default_value: "기본"
       search:
         title: "검색"
-        result_types:
-          page:
-            other: "페이지"
-          report:
-            other: "보고서"
-          setting:
-            other: "설정"
-          theme:
-            other: "테마"
-          component:
-            other: "구성 요소"
       dashboard:
         title: "대시보드"
         last_updated: "대시보드 업데이트됨:"
@@ -5246,6 +5248,7 @@ ko:
           disabled: "검색할 수 없음"
         field_types:
           text: "텍스트"
+          date: "날짜"
           confirm: "확인"
           dropdown: "드롭다운"
           multiselect: "다중 선택"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 513b06839602b..960b249f600cb 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -607,21 +607,13 @@ lt:
       in_reply_to: "atsakant į"
       filtered_flagged_by: "Pažymėjo"
       unknown:
-        title:
-          one: "Yra laukiančių peržiūrų dėl išjungto papildinio:"
-          few: "Yra laukiančių peržiūrų dėl išjungto papildinio:"
-          many: "Yra laukiančių peržiūrų dėl išjungto papildinio:"
-          other: "Yra laukiančių peržiūrų dėl išjungtų papildinių:"
         instruction: "Jie negalės būti tinkamai rodomi, kol neįgalinsite atitinkamo papildinio. Įjunkite papildinį ir atnaujinkite puslapį. Arba galite jų ignoruoti. <a href='%{url}' target='_blank'>Sužinokite daugiau...</a>"
         reviewable_unknown_source: "%{reviewableType} (nežinomas įskiepis)"
         reviewable_known_source: "%{reviewableType} (iš „%{pluginName}“ įskiepio)"
         ignore_all: "Ignoruoti viską"
         enable_plugins: "Įjungti papildinius"
-        delete_confirm: "Ar tikrai norite ištrinti visas išjungtų papildinių sukurtas apžvalgas?"
-        ignore_success: "Visos išjungtų papildinių sukurtos apžvalgos buvo ištrintos."
       explain:
         why: "paaiškinkite, kodėl šis elementas atsidūrė eilėje"
-        title: "Peržiūrimas balas"
         formula: "Formulė"
         subtotal: "Tarpinė suma"
         total: "Viso"
@@ -635,10 +627,8 @@ lt:
           title: "Naudotojams, kurių vėliavoms istoriškai pritarta, suteikiama premija."
         trust_level_bonus:
           name: "patikimumo lygis"
-          title: "Peržiūrimi elementai, sukurti aukštesnio pasitikėjimo lygio naudotojų, turi didesnį balą."
         type_bonus:
           name: "tipo premija"
-          title: "Tam tikriems peržiūrėtiems tipams darbuotojai gali priskirti premiją, kad jie taptų aukštesniu prioritetu."
       revise_and_reject_post:
         title: "Pataisyti"
         reason: "Priežastis"
@@ -647,7 +637,6 @@ lt:
         custom_reason: "Pateikite aiškų priežasties aprašymą"
         other_reason: "Kiti..."
         optional: "pasirinktinai"
-      stale_help: "Ši peržiūra buvo išspręsta <b>%{username}</b>."
       claim_help:
         optional: "Galite pareikšti teises į šį elementą, kad kiti negalėtų jo peržiūrėti."
         required: "Turite pareikšti teises į elementus, kad galėtumėte juos peržiūrėti."
@@ -2726,8 +2715,6 @@ lt:
         max_views:
           placeholder: maksimalus
           aria_label: filtruoti pagal daugiausia peržiūrų
-        additional_options:
-          label: "Filtruoti pagal įrašų skaičių ir temos peržiūras"
     new_item: "Nauja"
     go_back: "grįžti atgal"
     not_logged_in_user: "Vartotojo puslapis su veiksmų ir nustatymų aprašymu"
@@ -3884,6 +3871,16 @@ lt:
       delete_tag: "Ištrinti žymą"
       delete_confirm_no_topics: "Ar tikrai norite ištrinti šią žymą?"
       edit_tag: "Redaguoti žymos pavadinimą ir aprašymą"
+      description: "Aprašymas"
+      settings:
+        title: "Nustatymai"
+        general: "Bendrieji"
+        back: "Atgal"
+        name: "Vardas"
+        name_placeholder: "Žymos pavadinimas"
+      localization:
+        name: "Vardas"
+        description: "Aprašymas"
       sort_by: "Rūšiuoti pagal:"
       sort_by_count: "skaičių"
       sort_by_name: "vardą"
@@ -4133,6 +4130,11 @@ lt:
       reports:
         title: "Galimų ataskaitų sąrašas"
         sidebar_title: "Pranešimai"
+        group_traffic: "Srautas"
+        group_members: "Nariai"
+        group_moderation: "Moderavimas"
+        group_security: "Apsauga"
+        group_other: "Kiti"
       config_sections:
         account:
           title: "Paskyra"
@@ -4154,7 +4156,6 @@ lt:
         preview: "Peržiūrėti"
         enabled_for_options:
           everyone: "Visi"
-          staff: "Tik personalui"
         impact_roles:
           admins: "Administratoriai"
           moderators: "Moderatoriai"
@@ -4233,6 +4234,9 @@ lt:
               title: "Įrašai"
         reports:
           title: "Pranešimai"
+          sub_pages:
+            settings:
+              title: "Nustatymai"
         badges:
           title: "Trofėjai"
         permalinks:
@@ -4275,17 +4279,6 @@ lt:
         default_value: "Numatytasis"
       search:
         title: "Paieška"
-        result_types:
-          theme:
-            one: "Tema"
-            few: "Temos"
-            many: "Temos"
-            other: "Temos"
-          component:
-            one: "Komponentas"
-            few: "Komponentai"
-            many: "Komponentai"
-            other: "Komponentai"
       dashboard:
         title: "Apžvalga"
         last_updated: "Informacijos suvestinė atnaujinta:"
@@ -5454,6 +5447,7 @@ lt:
           enabled: "Ieškoma"
         field_types:
           text: "Tekstas"
+          date: "Data"
           confirm: "Patvirtinimas"
           dropdown: "Išskleidimas"
           multiselect: "Daugialypis pasirinkimas"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 84aad53a97055..7c182b9af050b 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -353,7 +353,6 @@ lv:
       in_reply_to: "atbildot uz"
       explain:
         why: "paskaidrojiet, kāpēc šis vienums netika apstrādāts"
-        title: "Pārskatāms vērtējums"
         formula: "Formula"
         subtotal: "Starpsumma"
         total: "Kopā"
@@ -367,14 +366,11 @@ lv:
           title: "Lietotājiem, kuru karogi vēsturiski ir saskaņoti, tiek piešķirti bonusi."
         trust_level_bonus:
           name: "uzticības līmenis"
-          title: "Pārskatāmiem vienumiem, ko izveidojuši augstāka uzticamības līmeņa lietotāji, ir augstāks rādītājs."
         type_bonus:
           name: "tipa bonuss"
-          title: "Atsevišķiem pārskatāmiem veidiem darbinieki var piešķirt prēmiju, lai tie būtu augstāka prioritāte."
       revise_and_reject_post:
         reason: "Iemesls"
         optional: "pēc izvēles"
-      stale_help: "Šo pārskatāmo jautājumu ir atrisinājis <b>%{username}</b>."
       claim_help:
         optional: "Jūs varat pieprasīt šo vienumu, lai citi to nevarētu pārskatīt."
         required: "Jums ir jāpieprasa vienumi, pirms jūs varat tos pārskatīt."
@@ -2681,6 +2677,15 @@ lv:
       tags: "Tagi"
       add_synonyms: "Pievienot"
       delete_tag: "Dzēst tagu"
+      description: "Apraksts"
+      settings:
+        title: "Iestatījumi"
+        general: "Vispārīgi"
+        back: "Atpakaļ"
+        name: "Vārds"
+      localization:
+        name: "Vārds"
+        description: "Apraksts"
       sort_by: "Kārtot pēc:"
       sort_by_count: "skaita"
       sort_by_name: "vārda"
@@ -2840,6 +2845,11 @@ lv:
         remove_muted_tags_from_latest:
           always: "vienmēr"
           never: "nekad"
+      reports:
+        group_traffic: "Datu plūsma"
+        group_members: "Dalībnieki"
+        group_security: "Drošība"
+        group_other: "Citi"
       config_sections:
         account:
           title: "Konts"
@@ -2857,7 +2867,6 @@ lv:
         preview: "Priekšskatījums"
         enabled_for_options:
           everyone: "Ikviens"
-          staff: "Tikai darbiniekiem"
         impact_roles:
           admins: "Administratori"
           moderators: "Moderātori"
@@ -2923,6 +2932,10 @@ lv:
           sub_pages:
             logs:
               title: "Žurnāls"
+        reports:
+          sub_pages:
+            settings:
+              title: "Iestatījumi"
         badges:
           title: "Žetoni"
         permalinks:
@@ -2964,11 +2977,6 @@ lv:
         default_value: "Noklusējums"
       search:
         title: "Meklēt"
-        result_types:
-          theme:
-            zero: "Dizaini"
-            one: "Tēma"
-            other: "Dizaini"
       dashboard:
         title: "Administrācijas panelis"
         version: "Versija"
@@ -3741,6 +3749,7 @@ lv:
           title: "Parādīt leitotāja kartē"
         field_types:
           text: "Teksts"
+          date: "Datums"
           confirm: "Apstiprinājums"
           dropdown: "Nolaižams izvēļu saraksts"
       site_text:
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 724d0438bd115..14b218676ab8c 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -495,7 +495,6 @@ nb_NO:
       in_reply_to: "i svar til"
       explain:
         why: "forklar hvorfor dette elementet ble plassert i køen"
-        title: "Trust factor"
         formula: "Formel"
         subtotal: "Delsum"
         total: "Total"
@@ -509,10 +508,8 @@ nb_NO:
           title: "Brukere som historisk gir gode flagg får bonus."
         trust_level_bonus:
           name: "tillitsnivå"
-          title: "Elementer opprettet av brukere med høyere tillitsrangering har høyere score"
         type_bonus:
           name: "type bonus"
-          title: "Visse typer som kan gjennomgås, kan tildeles en bonus av personalet for å gjøre dem til en høyere prioritet."
       revise_and_reject_post:
         title: "Revider"
         reason: "Begrunnelse"
@@ -521,7 +518,6 @@ nb_NO:
         custom_reason: "Gi en tydelig beskrivelse av årsaken"
         other_reason: "Annet..."
         optional: "valgfritt"
-      stale_help: "Denne vurderingen har blitt løst av <b>%{username}</b>."
       claim_help:
         optional: "Du kan gjøre krav på dette elementet for å hindre andre i å gjennomgå det."
         required: "Du må gjøre krav på varer før du kan se gjennom dem."
@@ -2746,8 +2742,6 @@ nb_NO:
         max_views:
           placeholder: maksimum
           aria_label: filtrer etter maksimal antall visninger
-        additional_options:
-          label: "Filtrer etter antall innlegg og emnevisninger"
     new_item: "ny"
     go_back: "gå tilbake"
     not_logged_in_user: "brukerside med oppsummering av nåværende aktivtet og innstillinger"
@@ -4111,6 +4105,17 @@ nb_NO:
       delete_confirm_synonyms:
         one: "Synonymen vil også bli slettet."
         other: "Dets %{count} synonymer vil også bli slettet."
+      description: "Beskrivelse"
+      settings:
+        title: "Innstillinger"
+        general: "Generelt"
+        back: "Forrige"
+        name: "Navn"
+        slug: "Navn i URL"
+        synonyms_subtitle: "Når følgende merkelapper brukes, vil de bli erstattet med %{name}"
+      localization:
+        name: "Navn"
+        description: "Beskrivelse"
       sort_by: "Sorter etter:"
       sort_by_count: "antall"
       sort_by_name: "navn"
@@ -4329,6 +4334,11 @@ nb_NO:
       reports:
         title: "Liste over tilgjengelige rapporter"
         sidebar_title: "Rapporter"
+        group_traffic: "Trafikk"
+        group_members: "Medlemmer"
+        group_moderation: "Moderering"
+        group_security: "Sikkerhet"
+        group_other: "Annet"
       config_sections:
         account:
           title: "Konto"
@@ -4350,7 +4360,6 @@ nb_NO:
         preview: "Forhåndsvis"
         enabled_for_options:
           everyone: "Alle"
-          staff: "Bare ansatte"
         impact_roles:
           admins: "Adminer"
           moderators: "Moderatorer"
@@ -4420,6 +4429,9 @@ nb_NO:
               title: "Logger"
         reports:
           title: "Rapporter"
+          sub_pages:
+            settings:
+              title: "Innstillinger"
         badges:
           title: "Merker"
         permalinks:
@@ -4468,13 +4480,6 @@ nb_NO:
         default_value: "Forvalg"
       search:
         title: "Søk"
-        result_types:
-          theme:
-            one: "Drakt"
-            other: "Drakter"
-          component:
-            one: "Komponent"
-            other: "Komponenter"
       dashboard:
         title: "Dashbord"
         last_updated: "Dashbord oppdatert:"
@@ -5557,6 +5562,7 @@ nb_NO:
           title: "Vis på brukerkort"
         field_types:
           text: "Tekst"
+          date: "Dato"
           confirm: "Bekreftelse"
           dropdown: "Nedtrekk"
       site_text:
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 1ab779e7e15d2..4b41aae643992 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -671,19 +671,13 @@ nl:
       in_reply_to: "in antwoord op"
       filtered_flagged_by: "Gemarkeerd door"
       unknown:
-        title:
-          one: "Je hebt wachtende beoordeelbare items van een uitgeschakelde plug-in:"
-          other: "Je hebt wachtende beoordeelbare items van uitgeschakelde plug-ins:"
         instruction: "Ze kunnen pas correct worden weergegeven nadat je de betreffende plug-in hebt ingeschakeld. Schakel de plug-in in en vernieuw de pagina. Je kunt ze ook negeren. <a href='%{url}' target='_blank'>Meer informatie...</a>"
         reviewable_unknown_source: "%{reviewableType} (onbekende plug-in)"
         reviewable_known_source: "%{reviewableType} (van de plug-in '%{pluginName}' )"
         ignore_all: "Alles negeren"
         enable_plugins: "Plug-ins inschakelen"
-        delete_confirm: "Weet je zeker dat je alle beoordelingen wilt verwijderen die zijn gemaakt door uitgeschakelde plug-ins?"
-        ignore_success: "Alle beoordelingen gemaakt door uitgeschakelde plug-ins zijn verwijderd."
       explain:
         why: "leg uit waarom dit item in de wachtrij is beland"
-        title: "Beoordeelbare scores"
         formula: "Formule"
         subtotal: "Subtotaal"
         total: "Totaal"
@@ -697,10 +691,8 @@ nl:
           title: "Gebruikers waarvan markeringen in het verleden zijn geaccordeerd ontvangen een bonus."
         trust_level_bonus:
           name: "vertrouwensniveau"
-          title: "Beoordeelbare items die door gebruikers met een hoger vertrouwensniveau zijn gemaakt hebben een hogere score."
         type_bonus:
           name: "typebonus"
-          title: "Aan bepaalde beoordeelbare typen kan door medewerkers een bonus worden toegekend om ze hogere prioriteit te geven."
       revise_and_reject_post:
         title: "Herzien"
         reason: "Reden"
@@ -709,7 +701,6 @@ nl:
         custom_reason: "Geef een duidelijke beschrijving van de reden"
         other_reason: "Anders..."
         optional: "optioneel"
-      stale_help: "Dit beoordeelbare item is afgehandeld door <b>%{username}</b>."
       claim_help:
         optional: "Je kunt dit item claimen om te voorkomen dat anderen het beoordelen."
         required: "Je moet items claimen voordat je ze kunt beoordelen."
@@ -3180,8 +3171,6 @@ nl:
         max_views:
           placeholder: maximum
           aria_label: filteren op maximumaantal weergaven
-        additional_options:
-          label: "Filteren op aantal berichten en topicweergaven"
     hamburger_menu: "Navigatiemenu"
     new_item: "nieuw"
     go_back: "terug"
@@ -4737,7 +4726,20 @@ nl:
         one: "Het synoniem wordt ook verwijderd."
         other: "De %{count} synoniemen worden ook verwijderd."
       edit_tag: "Tagnaam en -beschrijving bewerken"
-      description: "Beschrijving (max. 1000 tekens)"
+      description: "Beschrijving"
+      settings:
+        title: "Instellingen"
+        general: "Algemeen"
+        localizations: "Lokalisaties"
+        back: "Terug"
+        name: "Naam"
+        slug: "Slug"
+        name_placeholder: "Tagnaam"
+        synonyms_subtitle: "Wanneer de volgende tags worden gebruikt, worden deze vervangen door %{name}"
+      localization:
+        locale: "Taal"
+        name: "Naam"
+        description: "Beschrijving"
       sort_by: "Sorteren op:"
       sort_by_count: "aantal"
       sort_by_name: "naam"
@@ -5240,9 +5242,13 @@ nl:
           never: "nooit"
       reports:
         title: "Lijst van beschikbare rapporten"
-        meta_doc: "Rapporten zijn een krachtig hulpmiddel om te begrijpen wat er op je site gebeurt. Ze kunnen je helpen trends te identificeren, problemen te signaleren en beslissingen te nemen op basis van gegevens."
         sidebar_title: "Rapporten"
         back: "Terug naar alle rapporten"
+        group_traffic: "Verkeer"
+        group_members: "Leden"
+        group_moderation: "Moderatie"
+        group_security: "Beveiliging"
+        group_other: "Overig"
       config_sections:
         account:
           title: "Account"
@@ -5267,7 +5273,6 @@ nl:
         preview: "Voorbeeld"
         enabled_for_options:
           everyone: "Iedereen"
-          staff: "Alleen medewerkers"
         statuses:
           experimental: "Experimenteel"
         impact_roles:
@@ -5340,7 +5345,6 @@ nl:
               help_text: "De aanbevolen grootte is 600 x 80 pixels."
             large_icon:
               title: "Vierkant pictogram"
-              description: "Een vierkante versie van het logo wordt bovenaan het beheerscherm weergegeven en is ook het logo in het startscherm van de mobiele app."
               help_text: "De aanbevolen grootte is 512 x 512 pixels."
             square_icon_dark:
               required: "Ander vierkant pictogram gebruiken voor de donkere modus?"
@@ -5491,7 +5495,7 @@ nl:
           header_description: "Rapporten zijn een krachtig hulpmiddel om te begrijpen wat er op je site gebeurt. Ze kunnen je helpen trends te identificeren, problemen te signaleren en beslissingen te nemen op basis van gegevens."
           sub_pages:
             settings:
-              title: "Dashboardinstellingen"
+              title: "Instellingen"
         badges:
           title: "Badges"
           header_description: "Badges belonen gebruikers voor hun activiteit, bijdragen en prestaties om positief gedrag en betrokkenheid binnen de community te erkennen, te valideren en aan te moedigen"
@@ -5641,22 +5645,6 @@ nl:
         result_count:
           one: '%{count} resultaat voor "%{filter}"'
           other: '%{count} resultaten voor "%{filter}"'
-        result_types:
-          page:
-            one: "Pagina"
-            other: "Pagina's"
-          report:
-            one: "Rapport"
-            other: "Rapporten"
-          setting:
-            one: "Instelling"
-            other: "Instellingen"
-          theme:
-            one: "Thema"
-            other: "Thema's"
-          component:
-            one: "Onderdeel"
-            other: "Onderdelen"
       new_features:
         title: "Wat is er nieuw?"
         check_for_updates: "Controleren op updates"
@@ -7665,6 +7653,7 @@ nl:
         field_types:
           text: "Tekst"
           textarea: "Tekstgebied"
+          date: "Datum"
           confirm: "Bevestiging"
           dropdown: "Vervolgkeuzelijst"
           multiselect: "Meervoudige selectie"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 5ef116dfbb0e1..8f098a42e5503 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -353,6 +353,7 @@ pl_PL:
     skip_to_top: "Przejdź do góry"
     skip_user_nav: "Przejdź do treści profilu"
     emails_are_disabled: "Wszystkie wychodzące wiadomości e-mail zostały globalnie wyłączone przez administratora. Żadne powiadomienia e-mail nie będą wysyłane."
+    emails_are_disabled_no_smtp: "Wszystkie wiadomości wychodzące są wyłączone, ponieważ nie skonfigurowano serwera SMTP. Nie można wysyłać żadnych wiadomości e-mail."
     emails_are_disabled_non_staff: "Poczta wychodząca została wyłączona dla użytkowników niebędących pracownikami."
     software_update_prompt:
       message: "Zaktualizowaliśmy tę witrynę, <span>odśwież</span>, aby wszystko działało sprawnie."
@@ -718,6 +719,10 @@ pl_PL:
           few: "+%{count} inne szkice"
           many: "+%{count} innych szkiców"
           other: "+%{count} innych szkiców"
+    embed_mode:
+      storage_access_prompt: "Masz już konto %{site_name} ? Zezwól na dostęp do swojej sesji, aby móc komentować jako Ty."
+      allow_access: "Zezwól na dostęp"
+      continue_as_guest: "Kontynuuj jako gość"
     topic_count_all:
       one: "Zobacz %{count} nowy temat"
       few: "Zobacz %{count} nowe tematy"
@@ -796,20 +801,20 @@ pl_PL:
       filtered_flagged_by: "Oflagowany przez"
       unknown:
         title:
-          one: "Masz oczekujące recenzje z wyłączonej wtyczki:"
-          few: "Masz oczekujące recenzje z wyłączonych wtyczek:"
-          many: "Masz oczekujące recenzje z wyłączonych wtyczek:"
-          other: "Masz oczekujące recenzje z wyłączonych wtyczek:"
+          one: "Masz elementy oczekujące na sprawdzenie w kolejce z wyłączonej wtyczki:"
+          few: "Masz elementy oczekujące na sprawdzenie w kolejce z wyłączonych wtyczek:"
+          many: "Masz elementy oczekujące na sprawdzenie w kolejce z wyłączonych wtyczek:"
+          other: "Masz elementy oczekujące na sprawdzenie w kolejce z wyłączonych wtyczek:"
         instruction: "Nie można ich poprawnie wyświetlić, dopóki nie włączysz odpowiedniej wtyczki. Włącz wtyczkę i odśwież stronę. Alternatywnie możesz je zignorować. <a href='%{url}' target='_blank'>Dowiedz się więcej...</a>"
         reviewable_unknown_source: "%{reviewableType} (nieznana wtyczka)"
         reviewable_known_source: "%{reviewableType} (z wtyczki '%{pluginName}')"
         ignore_all: "Ignoruj wszystko"
         enable_plugins: "Włącz wtyczki"
-        delete_confirm: "Czy na pewno chcesz usunąć wszystkie recenzje utworzone przez wyłączone wtyczki?"
-        ignore_success: "Wszystkie recenzje utworzone przez wyłączone wtyczki zostały usunięte."
+        delete_confirm: "Czy na pewno chcesz usunąć wszystkie elementy kolejki recenzji utworzone przez wyłączone wtyczki?"
+        ignore_success: "Wszystkie elementy kolejki recenzji utworzone przez wyłączone wtyczki zostały usunięte."
       explain:
         why: "wyjaśnij, dlaczego ten element znalazł się w kolejce"
-        title: "Przeglądalna ocena"
+        title: "Punktacja elementów kolejki recenzji"
         formula: "Formuła"
         subtotal: "Suma częściowa"
         total: "Łącznie"
@@ -823,10 +828,10 @@ pl_PL:
           title: "Użytkownicy, których flagi były wcześniej uzgodnione, otrzymują bonus."
         trust_level_bonus:
           name: "Poziom zaufania"
-          title: "Przedmioty, które można przeglądać, tworzone przez użytkowników o wyższym poziomie zaufania, mają wyższy wynik."
+          title: "Flagi utworzone przez użytkowników o wyższym poziomie zaufania mają wyższy wynik."
         type_bonus:
           name: "bonus typu"
-          title: "Niektóre rodzaje przeglądalne mogą otrzymać premię od pracowników, aby nadać im wyższy priorytet."
+          title: "Niektórym typom flag personel może przypisać premię, aby nadać im wyższy priorytet."
       revise_and_reject_post:
         title: "Sprawdź"
         reason: "Powód"
@@ -835,7 +840,7 @@ pl_PL:
         custom_reason: "Podaj jasny opis przyczyny"
         other_reason: "Inny..."
         optional: "opcjonalnie"
-      stale_help: "Wiadomość została już zweryfikowana przez <b>%{username}</b>."
+      stale_help: "Ten element został rozwiązany przez <b>%{username}</b>."
       claim_help:
         optional: "Możesz przejąć tę pozycję, aby uniemożliwić innym jego sprawdzenie."
         required: "Musisz przejąć tę pozycję, zanim będziesz mógł/mogła je przejrzeć."
@@ -3222,6 +3227,7 @@ pl_PL:
       upload_description: "tutaj wpisz opis przesłania"
       olist_title: "Lista numerowana"
       ulist_title: "Lista wypunktowana"
+      list_title: "Listy"
       list_item: "Element listy"
       toggle_direction: "Przełącz kierunek"
       apply_wrap_title: "Zastosuj zawijanie"
@@ -3622,8 +3628,6 @@ pl_PL:
         max_views:
           placeholder: maksimum
           aria_label: filtrować według maksymalnych wyświetleń
-        additional_options:
-          label: "Filtruj według liczby wpisów i wyświetleń tematu"
     hamburger_menu: "Menu nawigacyjne"
     new_item: "nowy"
     go_back: "wróć"
@@ -4497,7 +4501,11 @@ pl_PL:
           edit: "Edytuj"
           delete: "Usuń"
         add: "Dodaj nowe tłumaczenie"
-        manage: "Zarządzaj tłumaczeniami (istniejące: %{count})"
+        manage:
+          one: "Zarządzaj tłumaczeniami (istniejące: %{count})"
+          few: "Zarządzaj tłumaczeniami (istniejące: %{count})"
+          many: "Zarządzaj tłumaczeniami (istniejące: %{count})"
+          other: "Zarządzaj tłumaczeniami (istniejące: %{count})"
         view:
           one: "Wyświetl %{count} przetłumaczone ustawienia regionalne"
           few: "Wyświetl %{count} przetłumaczone ustawienia regionalne"
@@ -5439,17 +5447,25 @@ pl_PL:
       category_restricted: "Ten tag jest ograniczony do kategorii, do których nie masz uprawnień dostępu."
       synonyms: "Synonimy"
       synonyms_description: "W przypadku użycia następujących tagów zostaną one zastąpione przez <b>%{base_tag_name}</b>."
+      synonyms_inline: "Synonimy te zostaną zastąpione przez %{base_tag_name}:"
       save: "Zapisz nazwę i opis tagu"
       tag_groups_info:
         one: 'Ten tag należy do grupy "%{tag_groups}”.'
         few: "Ten tag należy do następujących grup: %{tag_groups}."
         many: "Ten tag należy do następujących grup: %{tag_groups}."
         other: "Ten tag należy do następujących grup: %{tag_groups}."
+      tag_groups_info_prefix:
+        one: "Ten tag należy do grupy "
+        few: "Te tagi należą do grupy: "
+        many: "Te tagi należą do grupy: "
+        other: "Te tagi należą do grupy: "
       category_restrictions:
         one: "Można go używać tylko w tej kategorii:"
         few: "Można go używać tylko w tych kategoriach:"
         many: "Można go używać tylko w tych kategoriach:"
         other: "Można go używać tylko w tych kategoriach:"
+      restricted_to: "Ograniczone do"
+      no_synonyms: "Ten tag nie ma synonimów."
       edit_synonyms: "Edytuj synonimy"
       add_synonyms_label: "Dodaj synonimy:"
       add_synonyms: "Dodaj"
@@ -5475,7 +5491,34 @@ pl_PL:
         other: "Jego %{count} synonimów również zostanie usuniętych."
       edit_tag: "Edytuj nazwę tagu i opis"
       edit: "Edytuj ten tag"
-      description: "Opis (maks. 1000 znaków)"
+      description: "Opis"
+      settings:
+        title: "Ustawienia"
+        edit_title: "Edytuj tag: %{name}"
+        edit_tag_prefix: "Edytuj tag:"
+        select_tag: "Wybierz tag do edycji"
+        general: "Ogólne"
+        localizations: "Języki"
+        back: "Wstecz"
+        name: "Nazwa"
+        slug: "Identyfikator tekstowy"
+        name_placeholder: "Nazwa tagu"
+        slug_placeholder: "Identyfikator tekstowy tagu (opcjonalny, generowany automatycznie z nazwy)"
+        saved: "Zapisane ustawienia tagów"
+        no_synonyms: "Dla tego tagu nie zdefiniowano synonimów."
+        add_synonym_placeholder: "Wyszukaj tagi, które chcesz dodać jako synonimy..."
+        synonyms_subtitle: "W przypadku użycia następujących tagów zostaną one zastąpione przez %{name}"
+        save: "Zapisz tag"
+        delete: "Usuń tag"
+        synonyms_hint: "W przypadku użycia powyższych tagów zostaną one zastąpione przez %{baseTagName}."
+        add_synonyms_confirm: "Każde miejsce, w którym obecnie używany jest kod %{synonymNames} , zostanie zmienione na kod %{tagName} . Czy na pewno chcesz wprowadzić tę zmianę?"
+      localization:
+        hint: "Dodaj lokalizacje, aby wyświetlać różne nazwy tagów użytkownikom w różnych językach."
+        locale: "Ustawienia regionalne"
+        name: "Nazwa"
+        description: "Opis"
+        add: "Dodaj lokalizację"
+        remove: "Usuń lokalizację"
       sort_by: "Sortuj po:"
       sort_by_count: "Liczba"
       sort_by_name: "nazwa"
@@ -6039,9 +6082,16 @@ pl_PL:
           never: "nigdy"
       reports:
         title: "Lista dostępnych zgłoszeń"
-        meta_doc: "Raporty to potężne narzędzie, które pomoże Ci zrozumieć, co dzieje się w Twojej witrynie. Mogą pomóc Ci zidentyfikować trendy, zauważyć problemy i podejmować decyzje w oparciu o dane."
         sidebar_title: "Zgłoszenia"
         back: "Powrót do wszystkich raportów"
+        group_engagement: "Zaangażowanie"
+        group_traffic: "Ruch"
+        group_members: "Członkowie"
+        group_content: "Treść i zdrowie"
+        group_moderation: "Moderacja"
+        group_security: "Bezpieczeństwo"
+        group_other: "Inne"
+        legacy_warning: "To jest starszy raport. Wkrótce zostanie wycofany. Jeśli potrzebujesz pomocy w znalezieniu zamiennika, skontaktuj się z pomocą techniczną."
       config_sections:
         account:
           title: "Konto"
@@ -6086,7 +6136,7 @@ pl_PL:
         enabled_for_options:
           no_one: "Nikt"
           everyone: "Wszyscy"
-          staff: "Wyłącznie dla zespołu"
+          staff: "Tylko %{staffGroupName}"
           specific_groups: "Określone grupy"
           specific_groups_with_group_names:
             one: "grupa %{groupNames}"
@@ -6111,7 +6161,7 @@ pl_PL:
           all: "Wszystkie"
           enabled_all: "Wszystkie włączone stany"
           enabled: "Włączona"
-          enabled_for_staff: "Włączone dla personelu"
+          enabled_for_staff: "Włączone dla %{staffGroupName}"
           enabled_for_specific_groups: "Włączone dla określonych grup"
           disabled: "Wyłączone"
           impact_type_all: "Wszystkie rodzaje uderzeń"
@@ -6201,7 +6251,7 @@ pl_PL:
               help_text: "Zalecany rozmiar to 600 x 80 pikseli."
             large_icon:
               title: "Kwadratowa ikona"
-              description: "Kwadratowa wersja obrazu logo jest wyświetlana u góry panelu administracyjnego i stanowi również logo aplikacji na ekranie głównym urządzenia mobilnego."
+              description: "Kwadratowa wersja obrazu logo znajduje się u góry witryny i jest jednocześnie logo aplikacji mobilnej."
               help_text: "Zalecany rozmiar to 512 x 512 pikseli."
             square_icon_dark:
               required: "Użyć innej ikony kwadratowej dla trybu ciemnego?"
@@ -6391,7 +6441,7 @@ pl_PL:
           header_description: "Raporty to potężne narzędzie, które pomoże Ci zrozumieć, co dzieje się w Twojej witrynie. Mogą pomóc Ci zidentyfikować trendy, zauważyć problemy i podejmować decyzje w oparciu o dane."
           sub_pages:
             settings:
-              title: "Ustawienia panelu"
+              title: "Ustawienia"
         badges:
           title: "Odznaki"
           header_description: "Odznaki nagradzają użytkowników za ich aktywność, wkład i osiągnięcia, aby rozpoznawać, potwierdzać i zachęcać do pozytywnych zachowań i zaangażowania w społeczności"
@@ -6549,32 +6599,6 @@ pl_PL:
           few: '%{count} wyniki dla "%{filter}"'
           many: '%{count} wyników dla "%{filter}"'
           other: '%{count} wyników dla "%{filter}"'
-        result_types:
-          page:
-            one: "Strona"
-            few: "Strony"
-            many: "Stron"
-            other: "Stron"
-          report:
-            one: "Zgłoszenie"
-            few: "Zgłoszenia"
-            many: "Zgłoszeń"
-            other: "Zgłoszeń"
-          setting:
-            one: "Ustawienie"
-            few: "Ustawienia"
-            many: "Ustawień"
-            other: "Ustawień"
-          theme:
-            one: "Motyw"
-            few: "Motywy"
-            many: "Motywy"
-            other: "Motywy"
-          component:
-            one: "Komponent"
-            few: "Komponenty"
-            many: "Komponenty"
-            other: "Komponenty"
       new_features:
         title: "Co nowego?"
         check_for_updates: "Sprawdź aktualizacje"
@@ -6598,7 +6622,7 @@ pl_PL:
           title: "Co nowego?"
           subtitle: "Cały czas udostępniamy nowe funkcje i ulepszenia. Ta strona obejmuje najważniejsze z nich, ale możesz kliknąć 'Dowiedz się więcej', aby zobaczyć obszerne informacje o wersji."
           no_new_features_found: "Brak elementów w kanale lub wybrany filtr nie zwrócił żadnych wyników. Poprzednie ogłoszenia o nowych funkcjach można zobaczyć w <a href='%{url}' target='_blank'>społeczności Discourse Meta</a>."
-          no_new_features_error: "Wystąpił błąd podczas ładowania kanału. Poprzednie ogłoszenia o nowych funkcjach można zobaczyć w społeczności Discourse Meta <a href='%{url}' target='_blank'></a>."
+          no_new_features_error: "Wystąpił błąd podczas ładowania kanału. Poprzednie ogłoszenia o nowych funkcjach można zobaczyć w <a href='%{url}' target='_blank'>społeczności Discourse Meta</a>."
           learn_more: "Dowiedz się więcej..."
           experimental: "Eksperymentalne"
           only_experiments: "Pokaż tylko funkcje eksperymentalne"
@@ -8728,6 +8752,7 @@ pl_PL:
         field_types:
           text: "Tekst"
           textarea: "Obszar tekstowy"
+          date: "Data"
           confirm: "Potwierdzenie"
           dropdown: "Lista rozwijana"
           multiselect: "Wielokrotny wybór"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 457443cb7a5ca..5d9afbc578746 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -649,19 +649,13 @@ pt:
       in_reply_to: "Em resposta a"
       filtered_flagged_by: "Sinalizado por"
       unknown:
-        title:
-          one: "Tem revisões pendentes de um plugin desativado:"
-          other: "Tem revisões pendentes de plugins desativados:"
         instruction: "Não podem ser exibidos corretamente até que ative o plugin relevante. Por favor, ative o plugin e atualize a página. Alternativamente, pode ignorá-los. <a href='%{url}' target='_blank'>Saiba mais...</a>"
         reviewable_unknown_source: "%{reviewableType} (plugin desconhecido)"
         reviewable_known_source: "%{reviewableType} (do plugin '%{pluginName}')"
         ignore_all: "Ignora tudo"
         enable_plugins: "Ativar os plugins"
-        delete_confirm: "Tem a certeza de que pretende eliminar todas as avaliações criadas por plugins desativados?"
-        ignore_success: "Todas as avaliações criadas por plugins desativados foram eliminadas."
       explain:
         why: "explique por que este item acabou na fila"
-        title: "Pontuação passível de revisão"
         formula: "Fórmula"
         subtotal: "Subtotal"
         total: "Total"
@@ -675,10 +669,8 @@ pt:
           title: "Os utilizadores com um histórico de sinalizações concordantes obtêm um bónus."
         trust_level_bonus:
           name: "nível de confiança"
-          title: "Os itens para revisão criados por utilizadores de nível de confiança superior têm uma pontuação mais elevada."
         type_bonus:
           name: "tipo de bónus"
-          title: "Determinado tipo de revisões podem receber um bónus por parte da equipa para terem uma prioridade mais elevada."
       revise_and_reject_post:
         title: "Rever"
         reason: "Motivo"
@@ -687,7 +679,6 @@ pt:
         custom_reason: "Dê uma descrição clara do motivo"
         other_reason: "Outro..."
         optional: "opcional"
-      stale_help: "Esta revisão foi resolvida por <b>%{username}</b>."
       claim_help:
         optional: "Pode reivindicar este item para prevenir que outras pessoas o revejam."
         required: "Deve reivindicar items antes de as poder rever."
@@ -3665,7 +3656,9 @@ pt:
           edit: "Editar"
           delete: "Eliminar"
         add: "Adicionar nova tradução"
-        manage: "Gerir traduções (existentes: %{count})"
+        manage:
+          one: "Gerir traduções (existentes: %{count})"
+          other: "Gerir traduções (existentes: %{count})"
         view:
           one: "Ver %{count} idioma traduzido"
           other: "Ver %{count} idiomas traduzidos"
@@ -4306,6 +4299,19 @@ pt:
       delete_confirm_synonyms:
         one: "Seu sinônimo também será excluído."
         other: "Seus %{count} sinônimos também serão excluídos."
+      description: "Descrição"
+      settings:
+        title: "Configurações"
+        general: "Geral"
+        localizations: "Localizações"
+        back: "Anterior"
+        name: "Nome"
+        slug: "Slug"
+        synonyms_subtitle: "Quando as tags seguintes forem usadas, elas serão substituídas por %{name}"
+      localization:
+        locale: "Idioma"
+        name: "Nome"
+        description: "Descrição"
       sort_by: "Ordenar por:"
       sort_by_count: "contagem"
       sort_by_name: "nome"
@@ -4521,6 +4527,11 @@ pt:
         title: "Lista de relatórios disponíveis"
         sidebar_title: "Relatórios"
         back: "Voltar para todos os relatórios"
+        group_traffic: "Tráfego"
+        group_members: "Membros"
+        group_moderation: "Moderação"
+        group_security: "Segurança"
+        group_other: "Outro"
       config_sections:
         account:
           title: "Conta"
@@ -4544,7 +4555,6 @@ pt:
         preview: "Pré-visualização"
         enabled_for_options:
           everyone: "Todos"
-          staff: "Apenas Pessoal"
         statuses:
           experimental: "Experimental"
         impact_roles:
@@ -4664,6 +4674,9 @@ pt:
               title: "Logs"
         reports:
           title: "Relatórios"
+          sub_pages:
+            settings:
+              title: "Configurações"
         badges:
           title: "Crachás"
         permalinks:
@@ -4712,13 +4725,6 @@ pt:
         site_setting_warning: 'Esta definição é gerida pelo tema predefinido para o seu site (%{defaultThemeName}). Pode modificá-la na <a href="%{basePath}/admin/customize/themes/%{defaultThemeId}">página de edição do tema</a>.'
       search:
         title: "Pesquisar"
-        result_types:
-          theme:
-            one: "Tema"
-            other: "Temas"
-          component:
-            one: "Componente"
-            other: "Componentes"
       new_features:
         title: "O que é novo?"
         check_for_updates: "Procurar por atualizações"
@@ -5797,6 +5803,7 @@ pt:
           disabled: "Não apresentado no formulário de registo"
         field_types:
           text: "Texto"
+          date: "Data"
           confirm: "Confirmação"
           dropdown: "Lista pendente"
       site_text:
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 7579c5ab6b128..074a94a55bc28 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -643,19 +643,13 @@ pt_BR:
       in_reply_to: "em resposta a"
       filtered_flagged_by: "Sinalizado(a) por"
       unknown:
-        title:
-          one: "Você tem itens revisáveis pendentes do plugin desativado:"
-          other: "Você tem itens revisáveis pendentes de plugins desativados:"
         instruction: "Eles não podem ser exibidos corretamente até que você ative o plugin relevante. Ative o plugin e atualize a página. Como alternativa, você pode ignorá-los. <a href='%{url}' target='_blank'>Saiba mais...</a>"
         reviewable_unknown_source: "%{reviewableType} (plugin desconhecido)"
         reviewable_known_source: "%{reviewableType} (do plugin '%{pluginName}')"
         ignore_all: "Ignorar tudo"
         enable_plugins: "Ativar plugins"
-        delete_confirm: "Tem certeza de que deseja excluir todas as avaliações criadas por plugins desativados?"
-        ignore_success: "Todas as avaliações criadas por plugins desativados foram excluídas."
       explain:
         why: "explique por que este item foi colocado na fila"
-        title: "Pontuação revisável"
         formula: "Fórmula"
         subtotal: "Subtotal"
         total: "Total"
@@ -669,10 +663,8 @@ pt_BR:
           title: "Os(as) usuários(as) com sinalizadores historicamente acordados recebem um bônus."
         trust_level_bonus:
           name: "nível de confiança"
-          title: "Itens revisáveis criados por usuários(as) com nível de confiança mais alto têm uma pontuação maior."
         type_bonus:
           name: "bônus de tipo"
-          title: "Certos tipos revisáveis podem receber um bônus da equipe para aumentar sua prioridade."
       revise_and_reject_post:
         title: "Revisar"
         reason: "Motivo"
@@ -681,7 +673,6 @@ pt_BR:
         custom_reason: "Forneça uma descrição clara do motivo"
         other_reason: "Outro..."
         optional: "opcional"
-      stale_help: "Este revisável foi encerrado por <b>%{username}</b>."
       claim_help:
         optional: "Você pode reivindicar este item para impedir que outras pessoas o revisem."
         required: "Você precisa reivindicar itens antes de poder revisá-los."
@@ -3166,8 +3157,6 @@ pt_BR:
         max_views:
           placeholder: máximo
           aria_label: filtrar por visualizações máximas
-        additional_options:
-          label: "Filtrar por contagem de postagens e visualizações de tópico"
     hamburger_menu: "Menu de navegação"
     new_item: "novo"
     go_back: "voltar"
@@ -4714,7 +4703,20 @@ pt_BR:
         one: "Seu sinônimo também será excluído."
         other: "Seus %{count} sinônimos também serão excluídos."
       edit_tag: "Edite o nome e descrição da etiqueta"
-      description: "Descrição (máximo de 1000 caracteres)"
+      description: "Descrição"
+      settings:
+        title: "Definições"
+        general: "Geral"
+        localizations: "Localizações"
+        back: "Voltar"
+        name: "Nome"
+        slug: "Slug"
+        name_placeholder: "Nome da etiqueta"
+        synonyms_subtitle: "Quando as seguintes etiquetas forem usadas, serão substituídas por %{name}"
+      localization:
+        locale: "Local"
+        name: "Nome"
+        description: "Descrição"
       sort_by: "Ordenar por"
       sort_by_count: "contagem"
       sort_by_name: "nome"
@@ -5217,9 +5219,13 @@ pt_BR:
           never: "nunca"
       reports:
         title: "Lista de relatórios disponíveis"
-        meta_doc: "Relatórios são uma ferramenta poderosa para ajudar a entender o que acontece no seu site. Ajudam na identificação de tendências, relatam problemas e tomam decisões com base em dados."
         sidebar_title: "Relatórios"
         back: "Voltar para todos os relatórios"
+        group_traffic: "Tráfego"
+        group_members: "Membros"
+        group_moderation: "Moderação"
+        group_security: "Segurança"
+        group_other: "Outras"
       config_sections:
         account:
           title: "Conta"
@@ -5244,7 +5250,6 @@ pt_BR:
         preview: "Pré-visualizar"
         enabled_for_options:
           everyone: "Todos(as)"
-          staff: "Somente equipe"
         statuses:
           experimental: "Experimental"
         impact_roles:
@@ -5315,7 +5320,6 @@ pt_BR:
               help_text: "O tamanho recomendado é 600 x 80 pixels."
             large_icon:
               title: "Ícone quadrado"
-              description: "Uma versão quadrada da imagem do logotipo aparece na parte superior da administração e também é o logotipo do aplicativo na tela inicial do celular."
               help_text: "O tamanho recomendado é 512 x 512 pixels."
             square_icon_dark:
               required: "Usar um ícone quadrado diferente para o modo escuro?"
@@ -5468,7 +5472,7 @@ pt_BR:
           header_description: "Relatórios são uma ferramenta poderosa para ajudar a entender o que acontece no seu site. Ajudam na identificação de tendências, relatam problemas e tomam decisões com base em dados."
           sub_pages:
             settings:
-              title: "Configurações do painel de controle"
+              title: "Definições"
         badges:
           title: "Emblemas"
           header_description: "Os(as) usuários(as) recebem emblemas como recompensa por suas atividades, contribuições e realizações. Isso é uma forma de reconhecer, validar e incentivar comportamentos positivos e o envolvimento na comunidade"
@@ -5618,22 +5622,6 @@ pt_BR:
         result_count:
           one: '%{count} resultado para "%{filter}"'
           other: '%{count} resultados para "%{filter}"'
-        result_types:
-          page:
-            one: "Página"
-            other: "Páginas"
-          report:
-            one: "Relatório"
-            other: "Relatórios"
-          setting:
-            one: "Configuração"
-            other: "Configurações"
-          theme:
-            one: "Tema"
-            other: "Temas"
-          component:
-            one: "Componente"
-            other: "Componentes"
       new_features:
         title: "Novidades?"
         check_for_updates: "Verificar atualizações"
@@ -7642,6 +7630,7 @@ pt_BR:
         field_types:
           text: "Texto"
           textarea: "Área de texto"
+          date: "Data"
           confirm: "Confirmação"
           dropdown: "Menu suspenso"
           multiselect: "Multisseleção"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 71f903e870ed6..e448fb5b6eea3 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -635,11 +635,8 @@ ro:
         reviewable_known_source: "%{reviewableType} (din modulul „%{pluginName}”)"
         ignore_all: "Ignoră tot"
         enable_plugins: "Activează module"
-        delete_confirm: "Sigur vrei să ștergi toate revizuirile create de modulele dezactivate?"
-        ignore_success: "Toate revizuirile create de modulele dezactivate au fost șterse."
       explain:
         why: "explică de ce acest element a ajuns în coada de așteptare"
-        title: "Scor ce poate fi revizuit"
         formula: "Formulă"
         subtotal: "Subtotal"
         total: "Total"
@@ -653,14 +650,11 @@ ro:
           title: "Utilizatorilor ale căror semnalări au fost agreate de-a lungul istoriei li se acordă un bonus."
         trust_level_bonus:
           name: "nivel de încredere"
-          title: "Elementele care pot fi revizuite create de utilizatorii cu nivel mai înalt de încredere au un scor mai mare."
         type_bonus:
           name: "introdu bonus"
-          title: "Anumite tipuri care pot fi revizuite pot primi un bonus de către echipă pentru a le face o prioritate mai mare."
       revise_and_reject_post:
         reason: "Motiv"
         optional: "opțional"
-      stale_help: "Această examinare a fost rezolvată de <b>%{username}</b>."
       claim_help:
         optional: "Poți revendica acest element pentru a împiedica alte persoane să-l revizuiască."
         required: "Trebuie să revendici elementele înainte de a le putea revizui."
@@ -2505,8 +2499,6 @@ ro:
           placeholder: minim
         max_views:
           placeholder: maxim
-        additional_options:
-          label: "Filtrează după numărul de mesaje postate și vizualizări de subiecte"
     hamburger_menu: "Meniu de navigare"
     new_item: "nou"
     go_back: "înapoi"
@@ -3601,7 +3593,17 @@ ro:
         few: "Ești sigur că vrei să ștergi această etichetă și să o scoți din %{count} subiecte care o folosesc?"
         other: "Ești sigur că vrei să ștergi această etichetă și să o scoți din %{count} subiecte care o folosesc?"
       delete_confirm_no_topics: "Ești sigur că vrei să ștergi această etichetă?"
-      description: "Descriere (max. 1 000 de caractere)"
+      description: "Descriere"
+      settings:
+        title: "Setări"
+        general: "General"
+        localizations: "Localizări"
+        back: "Înapoi"
+        name: "Nume"
+      localization:
+        locale: "Locală"
+        name: "Nume"
+        description: "Descriere"
       sort_by: "Sortat după:"
       sort_by_count: "contor"
       sort_by_name: "nume"
@@ -3885,6 +3887,11 @@ ro:
           never: "niciodată"
       reports:
         sidebar_title: "Rapoarte"
+        group_traffic: "Trafic"
+        group_members: "Membri"
+        group_moderation: "Moderare"
+        group_security: "Securitate"
+        group_other: "Altele"
       config_sections:
         account:
           title: "Cont"
@@ -3914,7 +3921,6 @@ ro:
         enabled_for_options:
           no_one: "Nimeni"
           everyone: "Toată lumea"
-          staff: "Doar pentru personal"
           specific_groups: "Grupuri specifice"
           specific_groups_with_group_names:
             one: "grupul %{groupNames}"
@@ -4084,7 +4090,7 @@ ro:
           title: "Rapoarte"
           sub_pages:
             settings:
-              title: "Setări panou de control"
+              title: "Setări"
         badges:
           title: "Insigne"
           header_description: "Insignele recompensează utilizatorii pentru activitățile, contribuțiile și realizările lor pentru a recunoaște, valida și încuraja comportamentul pozitiv și implicarea în cadrul comunității"
@@ -4204,27 +4210,6 @@ ro:
           one: 'Un rezultat pentru „%{filter}”'
           few: '%{count} rezultate pentru „%{filter}”'
           other: '%{count} de rezultate pentru „%{filter}”'
-        result_types:
-          page:
-            one: "Pagină"
-            few: "Pagini"
-            other: "Pagini"
-          report:
-            one: "Raport"
-            few: "Rapoarte"
-            other: "Rapoarte"
-          setting:
-            one: "Setare"
-            few: "Opțiuni"
-            other: "Opțiuni"
-          theme:
-            one: "Temă"
-            few: "Teme"
-            other: "Teme"
-          component:
-            one: "Componentă"
-            few: "Componente"
-            other: "Componente"
       new_features:
         title: "Ce este nou?"
         check_for_updates: "Verifică actualizări"
@@ -5464,6 +5449,7 @@ ro:
         field_types:
           text: "Text"
           textarea: "Zonă text"
+          date: "Dată"
           confirm: "Confirmare"
           dropdown: "Meniu derulant"
       site_text:
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 361eaea4cd089..64e2592cee2df 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -759,21 +759,13 @@ ru:
       in_reply_to: "в ответ на"
       filtered_flagged_by: "Кто пожаловался"
       unknown:
-        title:
-          one: "У вас есть ожидающие проверки элементы из отключенного плагина:"
-          few: "У вас есть ожидающие проверки элементы из отключенных плагинов:"
-          many: "У вас есть ожидающие проверки элементы из отключенных плагинов:"
-          other: "У вас есть ожидающие проверки элементы из отключенных плагинов:"
         instruction: "Они не будут отображаться корректно, пока вы не включите соответствующий плагин. Включите плагин и обновите страницу. Вы также можете игнорировать их. <a href='%{url}' target='_blank'>Подробнее...</a>"
         reviewable_unknown_source: "%{reviewableType} (неизвестный плагин)"
         reviewable_known_source: "%{reviewableType} (из плагина «%{pluginName}»)"
         ignore_all: "Игнорировать все"
         enable_plugins: "Включить плагины"
-        delete_confirm: "Действительно удалить все проверки, созданные отключенными плагинами?"
-        ignore_success: "Удалены все проверки, созданные отключенными плагинами."
       explain:
         why: "объяснить, почему этот элемент оказался в очереди на проверку"
-        title: "Оценка контента"
         formula: "Формула"
         subtotal: "Промежуточный итог"
         total: "Всего"
@@ -787,10 +779,8 @@ ru:
           title: "Пользователи, чьи жалобы были удовлетворены, получают бонус."
         trust_level_bonus:
           name: "уровень доверия"
-          title: "Элементы, проверяемые пользователями с более высоким уровнем доверия, имеют более высокий балл."
         type_bonus:
           name: "тип бонуса"
-          title: "Некоторым проверяемым элементам сотрудник может назначить бонус, чтобы сделать их более приоритетными."
       revise_and_reject_post:
         title: "Исправить"
         reason: "Причина"
@@ -799,7 +789,6 @@ ru:
         custom_reason: "Дайте четкое описание причины"
         other_reason: "Прочее..."
         optional: "необязательно"
-      stale_help: "Проверка уже была выполнена пользователем <b>%{username}</b>."
       claim_help:
         optional: "Вы можете зарезервировать этот контент за собой, чтобы другие не могли заняться его модерацией."
         required: "Вы должны зарезервировать контент за собой, прежде чем заняться его модерацией."
@@ -3465,8 +3454,6 @@ ru:
         max_views:
           placeholder: максимум
           aria_label: Фильтр по максимальному количеству просмотров
-        additional_options:
-          label: "Фильтр по количеству сообщений и просмотров тем"
     hamburger_menu: "Меню навигации"
     new_item: "новый"
     go_back: "вернуться"
@@ -4285,7 +4272,11 @@ ru:
           edit: "Изменить"
           delete: "Удалить"
         add: "Добавить новый перевод"
-        manage: "Управление переводами (%{count} уже существует)"
+        manage:
+          one: "Управление переводами (%{count} уже существует)"
+          few: "Управление переводами (%{count} уже существует)"
+          many: "Управление переводами (%{count} уже существует)"
+          other: "Управление переводами (%{count} уже существует)"
         view:
           one: "Посмотреть %{count} переведенную локаль"
           few: "Посмотреть %{count} переведенные локали"
@@ -5207,7 +5198,20 @@ ru:
         other: "Его %{count} синонима также будут удалены."
       edit_tag: "Изменить имя и описание тега"
       edit: "Редактировать этот тег"
-      description: "Описание (максимум 1000 символов)"
+      description: "Описание"
+      settings:
+        title: "настроек"
+        general: "Основное"
+        localizations: "Локализации"
+        back: "Назад"
+        name: "Название"
+        slug: "Slug (текстовый идентификатор)"
+        name_placeholder: "Имя тега"
+        synonyms_subtitle: "При использовании следующих тегов они будут заменены на %{name}"
+      localization:
+        locale: "Локаль"
+        name: "Название"
+        description: "Описание"
       sort_by: "Сортировка:"
       sort_by_count: "Количество"
       sort_by_name: "Название"
@@ -5742,9 +5746,13 @@ ru:
           never: "Никогда"
       reports:
         title: "Список доступных отчётов"
-        meta_doc: "Отчеты — это мощный инструмент, помогающий понять, что происходит на вашем сайте. Они помогут вам выявить тенденции, обнаружить проблемы и принять решения на основе данных."
         sidebar_title: "Отчеты"
         back: "Назад ко всем отчетам"
+        group_traffic: "Трафик"
+        group_members: "Участники"
+        group_moderation: "Модерация"
+        group_security: "Безопасность"
+        group_other: "Разное"
       config_sections:
         account:
           title: "Аккаунт"
@@ -5773,7 +5781,6 @@ ru:
         preview: "Предпросмотр"
         enabled_for_options:
           everyone: "Все"
-          staff: "Только для персонала"
         statuses:
           experimental: "Экспериментальная функция"
         impact_roles:
@@ -5846,7 +5853,6 @@ ru:
               help_text: "Рекомендуемый размер — 600 x 80 пикселей."
             large_icon:
               title: "Квадратный значок"
-              description: "Квадратная версия изображения логотипа отображается в верхней части панели управления и также является логотипом приложения на главном экране мобильного устройства."
               help_text: "Рекомендуемый размер — 512 x 512 пикселей."
             square_icon_dark:
               required: "Использовать другой квадратный значок для темного режима?"
@@ -6004,7 +6010,7 @@ ru:
           header_description: "Отчеты — это мощный инструмент, помогающий понять, что происходит на вашем сайте. Они помогут вам выявить тенденции, обнаружить проблемы и принять решения на основе данных."
           sub_pages:
             settings:
-              title: "Настройки панели управления"
+              title: "настроек"
         badges:
           title: "Награды"
           header_description: "Награды выдаются пользователям за их действия, вклад и достижения, чтобы признавать, подтверждать и поощрять хорошее поведение и участие в жизни сообщества"
@@ -6152,32 +6158,6 @@ ru:
           few: '%{count} результата по запросу «%{filter}»'
           many: '%{count} результатов по запросу «%{filter}»'
           other: '%{count} результата по запросу «%{filter}»'
-        result_types:
-          page:
-            one: "страница"
-            few: "страницы"
-            many: "страниц"
-            other: "страницы"
-          report:
-            one: "отчет"
-            few: "отчета"
-            many: "отчетов"
-            other: "отчета"
-          setting:
-            one: "настройка"
-            few: "настройки"
-            many: "настроек"
-            other: "настройки"
-          theme:
-            one: "тема"
-            few: "темы"
-            many: "тем"
-            other: "темы"
-          component:
-            one: "компонент"
-            few: "компонента"
-            many: "компонентов"
-            other: "компонента"
       new_features:
         title: "Что нового?"
         check_for_updates: "Проверить обновления"
@@ -8268,6 +8248,7 @@ ru:
         field_types:
           text: "Текст"
           textarea: "Текстовая область"
+          date: "Дата"
           confirm: "Подтверждение"
           dropdown: "Выпадающий список"
           multiselect: "Множественный выбор"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index d8f6d115b0d5a..bfd930a2f2170 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -648,21 +648,13 @@ sk:
       in_reply_to: "v odpovedi na"
       filtered_flagged_by: "Označené používateľom"
       unknown:
-        title:
-          one: "Máte nespracované kontroly zo zakázaného doplnku:"
-          few: "Máte nespracované kontroly zo zakázaných doplnkov:"
-          many: "Máte nespracované kontroly zo zakázaných doplnkov:"
-          other: "Máte nespracované kontroly zo zakázaných doplnkov:"
         instruction: "Nie je možné ich správne zobraziť, kým nepovolíte príslušný zásuvný modul. Povoľte zásuvný modul a obnovte stránku. Prípadne ich môžete ignorovať. <a href='%{url}' target='_blank'>Ďalšie informácie...</a>"
         reviewable_unknown_source: "%{reviewableType} (neznámy doplnok)"
         reviewable_known_source: "%{reviewableType} (z doplnku '%{pluginName}')"
         ignore_all: "Ignorovať všetko"
         enable_plugins: "Povoliť doplnky"
-        delete_confirm: "Ste si istí, že chcete odstrániť všetky recenzie vytvorené vypnutými zásuvnými modulmi?"
-        ignore_success: "Všetky recenzie vytvorené vypnutými zásuvnými modulmi boli odstránené."
       explain:
         why: "vysvetlite, prečo sa táto položka skončila vo fronte"
-        title: "Kontrolovateľné bodovanie"
         formula: "Vzorec"
         subtotal: "Medzisúčet"
         total: "Celkovo"
@@ -676,10 +668,8 @@ sk:
           title: "Používatelia, ktorých vlajky boli historicky dohodnuté, dostanú bonus."
         trust_level_bonus:
           name: "stupne dôvery"
-          title: "Hodnotiteľné položky vytvorené používateľmi s vyššou úrovňou dôvery majú vyššie skóre."
         type_bonus:
           name: "typ bonusu"
-          title: "Určitým kontrolovateľným typom môže personál prideliť bonus, aby mali vyššiu prioritu."
       revise_and_reject_post:
         title: "Revízia"
         reason: "Dôvod"
@@ -688,7 +678,6 @@ sk:
         custom_reason: "Jasne opíšte dôvod"
         other_reason: "Iné..."
         optional: "nepovinné"
-      stale_help: "Toto preskúmateľné bolo vyriešené <b>%{username}</b>."
       claim_help:
         optional: "Túto položku môžete uplatniť, aby ste zabránili ostatným v jej preskúmaní."
         required: "Predtým, ako ich budete môcť skontrolovať, musíte si uplatniť položky."
@@ -3326,8 +3315,6 @@ sk:
         max_views:
           placeholder: maximum
           aria_label: filtrovať podľa maximálneho počtu zobrazení
-        additional_options:
-          label: "Filtrovať podľa počtu príspevkov a zobrazení tém"
     hamburger_menu: "Navigačné menu"
     new_item: "nový"
     go_back: "späť"
@@ -5053,7 +5040,20 @@ sk:
         many: "Jeho %{count} synoným bude tiež vymazaných."
         other: "Jeho %{count} synonymá budú tiež odstránené."
       edit_tag: "Úprava názvu a popisu značky"
-      description: "Popis (max. 1000 znakov)"
+      description: "Popis"
+      settings:
+        title: "Nastavení"
+        general: "Všeobecné"
+        localizations: "Lokalizácie"
+        back: "Späť"
+        name: "Meno"
+        slug: "Slug"
+        name_placeholder: "Názov značky"
+        synonyms_subtitle: "Ak sa použijú nasledujúce značky, nahradia sa týmito značkami %{name}"
+      localization:
+        locale: "Miestne nastavenie"
+        name: "Meno"
+        description: "Popis"
       sort_by: "Zoradiť podľa:"
       sort_by_count: "počtu"
       sort_by_name: "mena"
@@ -5584,9 +5584,13 @@ sk:
           never: "nikdy"
       reports:
         title: "Zoznam dostupných prehľadov"
-        meta_doc: "Správy sú účinným nástrojom, ktorý vám pomôže pochopiť, čo sa deje na vašom webe. Pomôžu vám identifikovať trendy, odhaliť problémy a prijímať rozhodnutia na základe údajov."
         sidebar_title: "Hlásenia"
         back: "Späť na všetky správy"
+        group_traffic: "Vyťaženie"
+        group_members: "Členovia"
+        group_moderation: "Moderovanie"
+        group_security: "Bezpečnosť"
+        group_other: "Ostatné"
       config_sections:
         account:
           title: "Účet"
@@ -5611,7 +5615,6 @@ sk:
         preview: "Náhľad"
         enabled_for_options:
           everyone: "Každý"
-          staff: "Len pre zamestnancov"
         statuses:
           experimental: "Experimentálne"
         impact_roles:
@@ -5684,7 +5687,6 @@ sk:
               help_text: "Odporúčaná veľkosť je 600 x 80 pixelov."
             large_icon:
               title: "Štvorcová ikona"
-              description: "V hornej časti administrácie sa zobrazuje štvorcová verzia loga, ktorá je zároveň logom aplikácie na domovskej obrazovke mobilného telefónu."
               help_text: "Odporúčaná veľkosť je 512 x 512 pixelov."
             square_icon_dark:
               required: "Používanie inej štvorcovej ikony pre tmavý režim?"
@@ -5833,7 +5835,7 @@ sk:
           header_description: "Správy sú účinným nástrojom, ktorý vám pomôže pochopiť, čo sa deje na vašom webe. Pomôžu vám identifikovať trendy, odhaliť problémy a prijímať rozhodnutia na základe údajov."
           sub_pages:
             settings:
-              title: "Nastavenia palubnej dosky"
+              title: "Nastavení"
         badges:
           title: "Odznaky"
           header_description: "Odznaky odmeňujú používateľov za ich aktivity, príspevky a úspechy s cieľom uznať, potvrdiť a podporiť pozitívne správanie a angažovanosť v rámci komunity"
@@ -5985,32 +5987,6 @@ sk:
           few: '%{count} výsledokov pre "%{filter}"'
           many: '%{count} výsledokov pre "%{filter}"'
           other: '%{count} výsledky pre "%{filter}"'
-        result_types:
-          page:
-            one: "Stránka"
-            few: "Stránok"
-            many: "Stránok"
-            other: "Stránky"
-          report:
-            one: "Hlásenie"
-            few: "Hlásení"
-            many: "Hlásení"
-            other: "Hlásenia"
-          setting:
-            one: "Nastavenie"
-            few: "Nastavení"
-            many: "Nastavení"
-            other: "Nastavenia"
-          theme:
-            one: "Téma"
-            few: "Témy"
-            many: "Témy"
-            other: "Témy"
-          component:
-            one: "Komponent"
-            few: "Komponenty"
-            many: "Komponenty"
-            other: "Komponenty"
       new_features:
         title: "Čo je nové?"
         check_for_updates: "Kontrola aktualizácií"
@@ -8073,6 +8049,7 @@ sk:
           disabled: "Nedá sa vyhľadať"
         field_types:
           text: "Text"
+          date: "Dátum"
           confirm: "Potvrdenie"
           dropdown: "Zoznam"
           multiselect: "Viacnásobný výber"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index e43e505c6d97c..d9d1f7abecedf 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -3470,7 +3470,16 @@ sl:
         two: "Izbrisani bosta tudi njeni %{count} sopomenki."
         few: "Izbrisane bodo tudi njene %{count} sopomenke."
         other: "Izbrisanih bo tudi njenih %{count} sopomenk."
-      description: "Opis (največ 1000 znakov)"
+      description: "Opis"
+      settings:
+        title: "Nastavitve"
+        general: "Splošno"
+        back: "Nazaj"
+        name: "Ime"
+        synonyms_subtitle: "Ko bodo uporabljene naslednje oznake, bodo nadomeščene z %{name}"
+      localization:
+        name: "Ime"
+        description: "Opis"
       sort_by: "Uredi po:"
       sort_by_count: "številu"
       sort_by_name: "imenu"
@@ -3719,6 +3728,11 @@ sl:
       reports:
         title: "Seznam poročil"
         sidebar_title: "Poročila"
+        group_traffic: "Promet"
+        group_members: "Člani"
+        group_moderation: "Moderiranje"
+        group_security: "Varnost"
+        group_other: "Drugo"
       config_sections:
         account:
           title: "Račun"
@@ -3741,7 +3755,6 @@ sl:
         preview: "Predogled"
         enabled_for_options:
           everyone: "Vsi"
-          staff: "Samo osebje"
         impact_roles:
           admins: "Administratorji"
           moderators: "Moderatorji"
@@ -3813,6 +3826,9 @@ sl:
               title: "Dnevniki"
         reports:
           title: "Poročila"
+          sub_pages:
+            settings:
+              title: "Nastavitve"
         badges:
           title: "Značke"
         permalinks:
@@ -3850,12 +3866,6 @@ sl:
         default_value: "Privzeto"
       search:
         title: "Išči"
-        result_types:
-          theme:
-            one: "Videz"
-            two: "Videzi"
-            few: "Videzi"
-            other: "Videzi"
       dashboard:
         title: "Nadzorna plošča"
         last_updated: "Nadzorna plošča posodobljena:"
@@ -4708,6 +4718,7 @@ sl:
           title: "Prikaži na uporabnikovi izkaznici"
         field_types:
           text: "Besedilo"
+          date: "Datum"
           confirm: "Potrditev"
           dropdown: "Spustni meni"
       site_text:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 85af8b17d361e..21654ced949ea 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -524,7 +524,6 @@ sq:
       filtered_flagged_by: "Shënuar nga"
       explain:
         why: "shpjegoni pse ky artikull përfundoi në radhë"
-        title: "Vlerësimi i rishikueshëm"
         formula: "Formula"
         subtotal: "Nëntotali"
         total: "Total"
@@ -538,17 +537,14 @@ sq:
           title: "Përdoruesve me shënimet e të cilëve janë rënë dakord historikisht u jepet një bonus."
         trust_level_bonus:
           name: "niveli i besimit"
-          title: "Artikujt e rishikueshëm të krijuar nga përdoruesit e nivelit më të lartë të besimit kanë një rezultat më të lartë."
         type_bonus:
           name: "lloji i bonusit"
-          title: "Disa lloje të rishikueshme mund t'u caktohen një bonus nga stafi për t'i bërë ato një prioritet më të lartë."
       revise_and_reject_post:
         title: "Rishikoni"
         reason: "Arsye"
         send_pm: "Dërgo PM"
         feedback: "Reagime"
         optional: "opsionale"
-      stale_help: "Ky artikull i rishikueshëm është zgjidhur nga <b>%{username}</b>."
       claim_help:
         optional: "Ju mund ta përvetësoni këtë artikull për të parandaluar të tjerët ta shqyrtojnë atë."
         required: "Ju duhet të përvetësoni artikuj para se t'i rishikoni ato."
@@ -2829,8 +2825,6 @@ sq:
         max_views:
           placeholder: maksimale
           aria_label: Filtro sipas shikimeve maksimale
-        additional_options:
-          label: "Filtro sipas numrit të postimeve dhe shikimeve të temës"
     new_item: "e re"
     go_back: "kthehu mbrapa"
     not_logged_in_user: "faqja e përdoruesit me një përmbledhje të aktivitetit dhe preferencave"
@@ -3799,6 +3793,15 @@ sq:
       tags: "Etiketat"
       add_synonyms: "Shto"
       delete_tag: "Fshi etiketën"
+      description: "Përshkrimi"
+      settings:
+        title: "Rregullimet"
+        general: "Karakteristika të përgjithshme"
+        back: "Kthehu mbrapa"
+        name: "Emri"
+      localization:
+        name: "Emri"
+        description: "Përshkrimi"
       sort_by: "Rendit sipas:"
       sort_by_count: "numri"
       sort_by_name: "emër"
@@ -3950,6 +3953,11 @@ sq:
         remove_muted_tags_from_latest:
           always: "gjithmonë"
           never: "asnjëherë"
+      reports:
+        group_traffic: "Trafik"
+        group_members: "Anëtarë"
+        group_security: "Siguria"
+        group_other: "Të tjerë"
       config_sections:
         account:
           title: "Llogaria"
@@ -4034,6 +4042,10 @@ sq:
           sub_pages:
             logs:
               title: "Ditari"
+        reports:
+          sub_pages:
+            settings:
+              title: "Rregullimet"
         badges:
           title: "Stemat"
         permalinks:
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index d3a033143c343..8ddf702709142 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -574,18 +574,11 @@ sr:
       in_reply_to: "odgovor na"
       filtered_flagged_by: "Markirano od"
       unknown:
-        title:
-          one: "Imate na čekanju stvari za pregled od isključenog dodatka:"
-          few: "Imate stvari na čekanju za pregled od isključenih dodataka:"
-          other: "Imate stvari na čekanju za pregled od isključenih dodataka:"
         instruction: "Ne mogu se pravilno prikazati dok se ne uključi relevantni dodatak. Molimo da uključite dodatak i osvežite stranu. Alternativno, možete ih ignorisati. <a href='%{url}' target='_blank'>Saznajte više...</a>"
         ignore_all: "Ignoriši sve"
         enable_plugins: "Uključi dodatke"
-        delete_confirm: "Да ли сте сигурни да желите да избришете све рецензије направљене од стране онемогућених додатака?"
-        ignore_success: "Све рецензије направљене од стране isključenih додатака су избрисане."
       explain:
         why: "objasnite žašto je ova stavka završila u redu čekanja"
-        title: "Pregledno bodovanje"
         formula: "Formula"
         subtotal: "Međuzbir"
         total: "Ukupno"
@@ -599,10 +592,8 @@ sr:
           title: "Korisnici čiji markeri su bili prihvatani ranije dobijaju bonus."
         trust_level_bonus:
           name: "nivo poverenja"
-          title: "Stakve koje su kreirali korisnici sa visokim nivoom poverenja imaju viši rezultat."
         type_bonus:
           name: "Bonus za tip"
-          title: "Određenim tipovima stvari koji se proveravaju može se dodati bonus od osoblja da bi imale veći prioritet."
       revise_and_reject_post:
         title: "Promeniti"
         reason: "Razlog"
@@ -611,7 +602,6 @@ sr:
         custom_reason: "Dajte jasan opis razloga"
         other_reason: "Ostalo..."
         optional: "opciono"
-      stale_help: "Ovu proveru je uradio <b>%{username}</b>."
       claim_help:
         optional: "Možete tražiti prava da sprečite ostale da ga pregledaju"
         required: "Morate prihvatiti stavke pre nego što ih možete pregledati."
@@ -2449,6 +2439,15 @@ sr:
       selector_remove_filter: "uklonite filter"
       choose_for_topic: "opcione oznake"
       add_synonyms: "Dodaj"
+      description: "Opis"
+      settings:
+        title: "Podešavanje"
+        general: "Opšti"
+        back: "Nazad"
+        name: "Ime foruma"
+      localization:
+        name: "Ime foruma"
+        description: "Opis"
       sort_by_count: "broj"
       sort_by_name: "ime foruma"
       upload_instructions: "Jedan po liniji, opciono sa oznakom grupe u formatu 'tag_name, tag_group'."
@@ -2602,6 +2601,10 @@ sr:
         remove_muted_tags_from_latest:
           always: "uvek"
           never: "nikada"
+      reports:
+        group_members: "Članovi"
+        group_security: "Sigurnost"
+        group_other: "Ostalo"
       config_sections:
         community:
           title: "Zajednica"
@@ -2616,7 +2619,6 @@ sr:
         enabled: "Omogućeno"
         enabled_for_options:
           everyone: "Svi"
-          staff: "Samo članovi osoblja"
         impact_roles:
           admins: "Admini"
           moderators: "Moderatori"
@@ -2679,6 +2681,10 @@ sr:
           sub_pages:
             logs:
               title: "Logovi"
+        reports:
+          sub_pages:
+            settings:
+              title: "Podešavanje"
         badges:
           title: "Značke"
         emoji:
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index ca588df08018d..818a4bffd54c0 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -462,7 +462,6 @@ sv:
       in_reply_to: "som svar till"
       explain:
         why: "förklara varför detta föremål hamnade i kön"
-        title: "Granskningsvärdering"
         formula: "Formel"
         subtotal: "Delsumma"
         total: "Totalt"
@@ -476,10 +475,8 @@ sv:
           title: "Användare vars flaggor historiskt har fått medhåll ges en bonus."
         trust_level_bonus:
           name: "förtroendenivå"
-          title: "Granskade objekt skapade av användare med högre förtroendenivå har en högre poäng."
         type_bonus:
           name: "typ bonus"
-          title: "Vissa granskningsärenden kan tilldelas en bonus av personal för att ge dem en högre prioritet."
       revise_and_reject_post:
         title: "Revidera"
         reason: "Anledning"
@@ -488,7 +485,6 @@ sv:
         custom_reason: "Ge en tydlig beskrivning av orsaken"
         other_reason: "Annan..."
         optional: "valfritt"
-      stale_help: "Detta granskningsbara objekt har lösts av <b>%{username}</b>."
       claim_help:
         optional: "Du kan göra anspråk på detta för att förhindra andra från att granska det."
         required: "Du måste göra anspråk innan du kan granska dem."
@@ -2578,8 +2574,6 @@ sv:
         max_views:
           placeholder: maximalt
           aria_label: filtrera efter största antal visningar
-        additional_options:
-          label: "Filtrera efter inläggsantal och ämnesvisningar"
     new_item: "ny"
     go_back: "gå tillbaka"
     not_logged_in_user: "användarsida med sammanställning av aktuell aktivitet och inställningar"
@@ -3960,7 +3954,18 @@ sv:
         one: "Dess synonym kommer också att raderas."
         other: "Dess %{count} synonymer kommer också att raderas."
       edit_tag: "Redigera taggnamn och beskrivning"
-      description: "Beskrivning (max. 1000 tecken)"
+      description: "Beskrivning"
+      settings:
+        title: "Inställningar"
+        general: "Allmänt"
+        back: "Tillbaka"
+        name: "Namn"
+        slug: "Slug"
+        name_placeholder: "Namn på tagg"
+        synonyms_subtitle: "När följande taggar används, kommer de att ersättas med %{name}"
+      localization:
+        name: "Namn"
+        description: "Beskrivning"
       sort_by: "Sortera efter:"
       sort_by_count: "summa"
       sort_by_name: "namn"
@@ -4360,6 +4365,11 @@ sv:
       reports:
         title: "Lista över tillgängliga rapporter"
         sidebar_title: "Rapporter"
+        group_traffic: "Trafik"
+        group_members: "Medlemmar"
+        group_moderation: "Moderering"
+        group_security: "Säkerhet"
+        group_other: "Övrigt"
       config_sections:
         account:
           title: "Konto"
@@ -4384,7 +4394,6 @@ sv:
         preview: "Förhandsgranska"
         enabled_for_options:
           everyone: "Alla"
-          staff: "Endast personal"
         impact_roles:
           admins: "Administratörer"
           moderators: "Moderatorer"
@@ -4466,6 +4475,9 @@ sv:
               title: "Loggar"
         reports:
           title: "Rapporter"
+          sub_pages:
+            settings:
+              title: "Inställningar"
         badges:
           title: "Utmärkelser"
         permalinks:
@@ -4515,13 +4527,6 @@ sv:
         default_value: "Standard"
       search:
         title: "Sök"
-        result_types:
-          theme:
-            one: "Tema"
-            other: "Teman"
-          component:
-            one: "Komponent"
-            other: "Komponenter"
       dashboard:
         title: "Översiktspanel"
         last_updated: "Översiktspanelen uppdaterad:"
@@ -6060,6 +6065,7 @@ sv:
           enabled: "Sökbart"
         field_types:
           text: "Text"
+          date: "Datum"
           confirm: "Bekräftelse"
           dropdown: "Rullgardinsmeny"
           multiselect: "Multival"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index 0027d5ebaee03..d478354bdc27f 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -2235,6 +2235,15 @@ sw:
       add_synonyms: "Ongeza"
       delete_tag: "futa lebo"
       delete_confirm_no_topics: "Una uhakika unataka kufuta lebo hii?"
+      description: "Maelezo"
+      settings:
+        title: "Mipangilio"
+        general: "Jumla"
+        back: "Iliyopita"
+        name: "Jina"
+      localization:
+        name: "Jina"
+        description: "Maelezo"
       sort_by: "Pangilia kwa:"
       sort_by_count: "hesabu"
       sort_by_name: "jina"
@@ -2395,6 +2404,10 @@ sw:
           never: "kamwe"
       reports:
         title: "Orodha ya ripoti zilizopo"
+        group_traffic: "Utembeleaji"
+        group_members: "Wanachama"
+        group_security: "Ulinzi"
+        group_other: "Nyingine"
       config_sections:
         account:
           title: "Akaunti"
@@ -2477,6 +2490,10 @@ sw:
           sub_pages:
             logs:
               title: "Batli"
+        reports:
+          sub_pages:
+            settings:
+              title: "Mipangilio"
         badges:
           title: "Beji"
         permalinks:
@@ -2516,10 +2533,6 @@ sw:
         default_value: "Halisi"
       search:
         title: "Tafuta"
-        result_types:
-          theme:
-            one: "Mandhari"
-            other: "Mandhari"
       dashboard:
         title: "Ubao"
         version: "Toleo"
@@ -3389,6 +3402,7 @@ sw:
           title: "Onyesha kwenye kadi ya mtumiaji"
         field_types:
           text: "Neno"
+          date: "Tarehe"
           confirm: "Uhakikisho"
           dropdown: "Shusha Chini"
       site_text:
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index 7b53384d7058c..bc972a7c269ea 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -448,7 +448,6 @@ te:
       in_reply_to: "సమాధానముగా"
       explain:
         why: "ఈ అంశం క్యూలో ఎందుకు నిలిచిందో వివరించండి"
-        title: "సమీక్షించదగిన స్కోరింగ్"
         formula: "ఫార్ములా"
         subtotal: "ఉపమొత్తం"
         total: "మొత్తం"
@@ -462,10 +461,8 @@ te:
           title: "ఫిర్యాదులు చారిత్రాత్మకంగా అంగీకరించబడిన సభ్యులకు బోనస్ ఇవ్వబడుతుంది."
         trust_level_bonus:
           name: "విశ్వసనీయ స్థాయి"
-          title: "అధిక విశ్వసనీయ స్థాయి సభ్యులు సృష్టించిన సమీక్షించదగిన అంశాలు అధిక స్కోర్‌ను కలిగి ఉంటాయి."
         type_bonus:
           name: "టైప్ బోనస్"
-          title: "కొన్ని సమీక్షించదగిన రకాలను వారికి అధిక ప్రాధాన్యతనిచ్చేలా సిబ్బంది బోనస్ను కేటాయించవచ్చు."
       revise_and_reject_post:
         title: "సవరించండి"
         reason: "కారణం"
@@ -474,7 +471,6 @@ te:
         custom_reason: "కారణం గురించి స్పష్టమైన వివరణ ఇవ్వండి"
         other_reason: "ఇతర..."
         optional: "ఐచ్ఛికం"
-      stale_help: "ఈ సమీక్షించదగినది <b>%{username}</b> ద్వారా పరిష్కరించబడింది."
       claim_help:
         optional: "ఇతరులు దీన్ని సమీక్షించకుండా నిరోధించడానికి మీరు ఈ అంశాన్ని దావా చేయవచ్చు."
         required: "మీరు అంశాలను సమీక్షించే ముందు వాటిని తప్పనిసరిగా దావా చేయాలి."
@@ -2546,8 +2542,6 @@ te:
         max_views:
           placeholder: గరిష్ట
           aria_label: గరిష్ట వీక్షణల ద్వారా ఫిల్టర్ చేయండి
-        additional_options:
-          label: "పోస్ట్ కౌంట్ మరియు విషయం వీక్షణల వారీగా ఫిల్టర్ చేయండి"
     new_item: "కొత్త"
     go_back: "వెనక్కు మరలు"
     not_logged_in_user: "సభ్యుని ప్రస్తుత కలాపాల మరియు అభిరూపాల సారాంశ పుట"
@@ -3939,7 +3933,17 @@ te:
         one: "దీని పర్యాయపదం కూడా తొలగించబడుతుంది."
         other: "దీని %{count} పర్యాయపదాలు కూడా తొలగించబడతాయి."
       edit_tag: "ట్యాగ్ పేరు మరియు వివరణను సవరించండి"
-      description: "వివరణ (గరిష్టంగా 1000 అక్షరాలు)"
+      description: "వివరణ"
+      settings:
+        title: "అమరికలు"
+        general: "సాధారణ"
+        back: "వెనుకకు"
+        name: "పేరు"
+        slug: "స్లగ్"
+        name_placeholder: "ట్యాగ్ పేరు"
+      localization:
+        name: "పేరు"
+        description: "వివరణ"
       sort_by: "క్రమబద్ధీకరించండి:"
       sort_by_count: "గణన ద్వారా"
       sort_by_name: "పేరు"
@@ -4338,6 +4342,11 @@ te:
       reports:
         title: "అందుబాటులో ఉన్న నివేదికల జాబితా"
         sidebar_title: "నివేదికలు"
+        group_traffic: "ట్రాఫిక్"
+        group_members: "సభ్యులు"
+        group_moderation: "మోడరేషన్"
+        group_security: "సెక్యూరిటీ"
+        group_other: "ఇతర"
       config_sections:
         account:
           title: "ఖాతా"
@@ -4440,6 +4449,9 @@ te:
               title: "లాగులు"
         reports:
           title: "నివేదికలు"
+          sub_pages:
+            settings:
+              title: "అమరికలు"
         badges:
           title: "బ్యాడ్జీలు"
         permalinks:
@@ -4482,13 +4494,6 @@ te:
         default_value: "అప్రమేయ"
       search:
         title: "వెతుకు"
-        result_types:
-          theme:
-            one: "థీమ్"
-            other: "థీమ్స్"
-          component:
-            one: "భాగం"
-            other: "భాగాలు"
       dashboard:
         title: "ప్రధాన పేజీ"
         last_updated: "డాష్‌బోర్డ్ నవీకరించబడింది:"
@@ -6028,6 +6033,7 @@ te:
           enabled: "శోధించదగినది"
         field_types:
           text: "వచనం"
+          date: "తేదీ"
           confirm: "ఖాయము"
           dropdown: "డ్రాప్డౌన్"
           multiselect: "బహుళ ఎంపిక"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index 5cbda6d5253a6..fcd3185fbd566 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -2388,6 +2388,16 @@ th:
       add_synonyms: "เพิ่ม"
       delete_tag: "ลบแท็ก"
       delete_confirm_no_topics: "คุณแน่ใจหรือว่าต้องการลบแท็กนี้"
+      description: "รายละเอียด"
+      settings:
+        title: "การตั้งค่า"
+        general: "ทั่วไป"
+        back: "กลับ"
+        name: "ชื่อ"
+        name_placeholder: "ชื่อแท็ก"
+      localization:
+        name: "ชื่อ"
+        description: "รายละเอียด"
       sort_by: "เรียงโดย:"
       sort_by_count: "นับ"
       sort_by_name: "ชื่อ"
@@ -2542,6 +2552,11 @@ th:
         remove_muted_tags_from_latest:
           always: "เสมอ"
           never: "ไม่เลย"
+      reports:
+        group_traffic: "การจราจร"
+        group_members: "สมาชิก"
+        group_security: "ความปลอดภัย"
+        group_other: "อื่นๆ"
       config_sections:
         account:
           title: "บัญชี"
@@ -2615,6 +2630,10 @@ th:
           title: "กลุ่ม"
         backups:
           title: "สำรอง"
+        reports:
+          sub_pages:
+            settings:
+              title: "การตั้งค่า"
         badges:
           title: "เหรียญ"
         permalinks:
@@ -2643,11 +2662,6 @@ th:
         default_value: "ค่าเริ่มต้น"
       search:
         title: "ค้นหา"
-        result_types:
-          setting:
-            other: "การตั้งค่า"
-          theme:
-            other: "ธีม"
       dashboard:
         title: "แดชบอร์ด"
         version: "เวอร์ชัน"
@@ -3300,6 +3314,7 @@ th:
           title: "แสดงในข้อมูลสาธารณะ"
         field_types:
           text: "ข้อความ"
+          date: "วันที่"
           confirm: "การยืนยัน"
           dropdown: "ดร็อปดาวน์"
       site_text:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index bff0d4a75bc9d..5cc3e854c09e6 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -636,19 +636,13 @@ tr_TR:
       in_reply_to: "şuna yanıt olarak"
       filtered_flagged_by: "Bayrak ekleyen kişi:"
       unknown:
-        title:
-          one: "Devre dışı bırakılmış eklentiden bekleyen incelenebilir dosyalarınız var:"
-          other: "Devre dışı bırakılmış eklentilerden bekleyen incelenebilir dosyalarınız var:"
         instruction: "İlgili eklentiyi etkinleştirmediğiniz sürece düzgün görüntülenemezler. Lütfen eklentiyi etkinleştirin ve sayfayı yenileyin. Alternatif olarak, bunları görmezden gelebilirsiniz. <a href='%{url}' target='_blank'>Daha fazlasını öğrenin...</a>"
         reviewable_unknown_source: "%{reviewableType} (bilinmeyen eklenti)"
         reviewable_known_source: "%{reviewableType} (\"%{pluginName}\" eklentisinden)"
         ignore_all: "Tümünü yok say"
         enable_plugins: "Eklentileri etkinleştir"
-        delete_confirm: "Devre dışı bırakılan eklentiler tarafından oluşturulan tüm incelemeleri silmek istediğinizden emin misiniz?"
-        ignore_success: "Devre dışı bırakılan eklentiler tarafından oluşturulan tüm incelemeler silindi."
       explain:
         why: "bu ögenin neden kuyruğa girdiğini açıklayın"
-        title: "İncelenebilir Puanlama"
         formula: "Formül"
         subtotal: "Ara toplam"
         total: "Toplam"
@@ -662,10 +656,8 @@ tr_TR:
           title: "Bayrakları tarihsel olarak kabul edilen kullanıcılara bonus verilir."
         trust_level_bonus:
           name: "güven seviyesi"
-          title: "Güven seviyesi yüksek kullanıcılar tarafından oluşturulan, incelenebilir ögeler daha yüksek bir puana sahiptir."
         type_bonus:
           name: "tür bonusu"
-          title: "Bazı incelenebilir türlere daha yüksek öncelikli olmaları için personel tarafından bonus atanabilir."
       revise_and_reject_post:
         title: "Gözden geçir"
         reason: "Sebep"
@@ -674,7 +666,6 @@ tr_TR:
         custom_reason: "Sebebi net bir şekilde açıklayın"
         other_reason: "Diğer..."
         optional: "i̇steğe bağlı"
-      stale_help: "Bu incelenebilir, <b>%{username}</b> tarafından çözüldü."
       claim_help:
         optional: "Başkalarının incelemesini engellemek için bu ögeyi talep edebilirsiniz."
         required: "Ögeleri inceleyebilmek için önce talepte bulunmalısınız."
@@ -3123,8 +3114,6 @@ tr_TR:
         max_views:
           placeholder: en fazla
           aria_label: en fazla görüntülemeye göre filtrele
-        additional_options:
-          label: "Gönderi sayısına ve konu görüntülemelerine göre filtrele"
     hamburger_menu: "Navigasyon menüsü"
     new_item: "yeni"
     go_back: "geri dön"
@@ -4671,7 +4660,20 @@ tr_TR:
         one: "Eş anlamlısı da silinecek."
         other: "%{count} eş anlamlısı da silinecek."
       edit_tag: "Etiket adını ve açıklamasını düzenle"
-      description: "Açıklama (en fazla 1000 karakter)"
+      description: "Açıklama"
+      settings:
+        title: "Ayarlar"
+        general: "Genel"
+        localizations: "Yerelleştirmeler"
+        back: "Geri"
+        name: "Ad"
+        slug: "Kısa ad"
+        name_placeholder: "Etiket adı"
+        synonyms_subtitle: "Aşağıdaki etiketler kullanıldığında %{name}ile değiştirilir"
+      localization:
+        locale: "Yerel Ayar"
+        name: "Ad"
+        description: "Açıklama"
       sort_by: "Sıralama ölçütü:"
       sort_by_count: "sayı"
       sort_by_name: "ad"
@@ -5174,9 +5176,13 @@ tr_TR:
           never: "asla"
       reports:
         title: "Mevcut raporlar listesi"
-        meta_doc: "Raporlar, sitenizde neler olup bittiğini anlamanıza yardımcı olacak güçlü bir araçtır. Eğilimleri belirlemenize, sorunları tespit etmenize ve verilere dayalı kararlar almanıza yardımcı olabilirler."
         sidebar_title: "Raporlar"
         back: "Tüm raporlara geri dön"
+        group_traffic: "Trafik"
+        group_members: "Üyeler"
+        group_moderation: "Moderasyon"
+        group_security: "Güvenlik"
+        group_other: "Diğer"
       config_sections:
         account:
           title: "Hesap"
@@ -5201,7 +5207,6 @@ tr_TR:
         preview: "Ön izle"
         enabled_for_options:
           everyone: "Herkes"
-          staff: "Sadece personel"
         statuses:
           experimental: "Deneysel"
         impact_roles:
@@ -5274,7 +5279,6 @@ tr_TR:
               help_text: "Önerilen boyut 600 x 80 pikseldir."
             large_icon:
               title: "Kare simge"
-              description: "Logo görüntüsünün kare bir versiyonu, yönetimin üst kısmında görünür ve aynı zamanda mobil ana ekran uygulaması logosudur."
               help_text: "Önerilen boyut 512 x 512 pikseldir."
             square_icon_dark:
               required: "Koyu mod için farklı bir kare simge kullanılsın mı?"
@@ -5425,7 +5429,7 @@ tr_TR:
           header_description: "Raporlar, sitenizde neler olup bittiğini anlamanıza yardımcı olacak güçlü bir araçtır. Eğilimleri belirlemenize, sorunları tespit etmenize ve verilere dayalı kararlar almanıza yardımcı olabilirler."
           sub_pages:
             settings:
-              title: "Pano ayarları"
+              title: "Ayarlar"
         badges:
           title: "Rozetler"
           header_description: "Rozetler, topluluk içindeki olumlu davranışları ve katılımı tanımak, doğrulamak ve teşvik etmek için kullanıcıları aktiviteleri, katkıları ve başarıları için ödüllendirir"
@@ -5575,22 +5579,6 @@ tr_TR:
         result_count:
           one: '"%{filter}" için %{count} sonuç'
           other: '"%{filter}" için %{count} sonuç'
-        result_types:
-          page:
-            one: "Sayfa"
-            other: "Sayfa"
-          report:
-            one: "Rapor"
-            other: "Rapor"
-          setting:
-            one: "Ayar"
-            other: "Ayarlar"
-          theme:
-            one: "Tema"
-            other: "Temalar"
-          component:
-            one: "Bileşen"
-            other: "Bileşenler"
       new_features:
         title: "Yenilikler"
         check_for_updates: "Güncellemeleri kontrol et"
@@ -7599,6 +7587,7 @@ tr_TR:
         field_types:
           text: "Metin"
           textarea: "Metin alanı"
+          date: "Tarih"
           confirm: "Onayla"
           dropdown: "Açılır Menü"
           multiselect: "Çoklu seçim"
diff --git a/config/locales/client.ug.yml b/config/locales/client.ug.yml
index 7e97fd9bbb41a..82f749da480d7 100644
--- a/config/locales/client.ug.yml
+++ b/config/locales/client.ug.yml
@@ -657,19 +657,13 @@ ug:
       in_reply_to: "جاۋاب"
       filtered_flagged_by: "پاش قىلغۇچى"
       unknown:
-        title:
-          one: "چەكلىگەن قىستۇرمىنىڭ كېچىكتۈرۈلگەن تەكشۈرۈشچان ئىنكاسى بار:"
-          other: "چەكلىگەن قىستۇرمىنىڭ كېچىكتۈرۈلگەن تەكشۈرۈشچان ئىنكاسى بار:"
         instruction: "سىز مۇناسىپ قىستۇرمىنى قوزغاتمىغۇچە ئۇلار نورمال كۆرۈنمەيدۇ. قىستۇرمىنى قوزغىتىپ بەتنى يېڭىلاڭ. ياكى، ئۇلارغا پەرۋا قىلمىسىڭىزمۇ بولىدۇ. <a href='%{url}' target='_blank'>مول بىلىم…</a>"
         reviewable_unknown_source: "%{reviewableType} (يوچۇن قىستۇرما)"
         reviewable_known_source: "%{reviewableType} («%{pluginName}» قىستۇرمىدىن)"
         ignore_all: "ھەممىگە پەرۋا قىلما"
         enable_plugins: "قىستۇرما قوزغات"
-        delete_confirm: "چەكلەنگەن قىستۇرما قۇرغان بارلىق باھالاشلارنىڭ ھەممىسىنى ئۆچۈرەمدۇ؟"
-        ignore_success: "چەكلەنگەن قىستۇرما قۇرغان بارلىق باھالاش ئۆچۈرۈلدى."
       explain:
         why: "بۇ تۈرنىڭ نېمە ئۈچۈن ئاخىرىدا ئۆچرەتكە كىرگەنلىكىنى چۈشەندۈرۈڭ"
-        title: "تەكشۈرگىلى بولىدىغان نومۇر"
         formula: "فورمۇلا"
         subtotal: "تارماق جەمئىي"
         total: "جەمئىي"
@@ -683,10 +677,8 @@ ug:
           title: "پاش قىلىشى ئىلگىرى ماقۇللانغان ئىشلەتكۈچى تارتۇقلىنىدۇ."
         trust_level_bonus:
           name: "ئىشەنچ دەرىجىسى"
-          title: "ئىشەنچ دەرىجىسى يۇقىرى ئىشلەتكۈچى قۇرغان تەكشۈرۈشچان تۈرنىڭ نومۇرى تېخىمۇ يۇقىرى بولىدۇ."
         type_bonus:
           name: "تۈر مۇكاپاتى"
-          title: "باشقۇرغۇچى بەزى تەكشۈرۈشچان تۈرگە نومۇر قوشۇپ، ئۇنى تېخىمۇ ئالدىنلىققا ئىگە قىلالايدۇ."
       revise_and_reject_post:
         title: "تۈزىتىش"
         reason: "سەۋەبى"
@@ -695,7 +687,6 @@ ug:
         custom_reason: "سەۋەبىنى ئېنىق چۈشەندۈرۈڭ"
         other_reason: "باشقا…"
         optional: "تاللاشچان"
-      stale_help: "بۇ تەكشۈرۈشچان تۈرنى <b>%{username}</b> ھەل قىلدى."
       claim_help:
         optional: "سىز باشقىلارنىڭ تەكشۈرۈشىنىڭ ئالدىنى ئېلىش ئۈچۈن بۇ تۈرنى تەلەپ قىلسىڭىز بولىدۇ."
         required: "ئاۋال تۈرنى تەلەپ قىلىپ ئاندىن ئۇلارنى تەكشۈرۈپ تەستىقلىيالايسىز."
@@ -3246,8 +3237,6 @@ ug:
         max_views:
           placeholder: ئەڭ كۆپ
           aria_label: ئەڭ كۆپ كۆرۈلۈشى بويىچە سۈزىدۇ
-        additional_options:
-          label: "يازما سانى ۋە تېما كۆرۈلۈشى بويىچە سۈزىدۇ"
     hamburger_menu: "يولباشچى تىزىملىك"
     new_item: "يېڭى"
     go_back: "قايت"
@@ -3981,7 +3970,9 @@ ug:
           edit: "تەھرىر"
           delete: "ئۆچۈر"
         add: "يېڭى تەرجىمە قوش"
-        manage: "تەرجىمە باشقۇرۇش (%{count} مەۋجۇت)"
+        manage:
+          one: "تەرجىمە باشقۇرۇش (%{count} مەۋجۇت)"
+          other: "تەرجىمە باشقۇرۇش (%{count} مەۋجۇت)"
         view:
           one: "%{count} تەرجىمە قىلىنغان يەرلىك تىلنى كۆرسىتىدۇ"
           other: "%{count} تەرجىمە قىلىنغان يەرلىك تىلنى كۆرسىتىدۇ"
@@ -4866,7 +4857,20 @@ ug:
         other: "ئۇنىڭ %{count} مەنىداش سۆزىمۇ ئۆچۈرۈلىدۇ"
       edit_tag: "بەلگە ئىسمى ۋە چۈشەندۈرۈشىنى تەھرىرلەيدۇ"
       edit: "بۇ بەلگىنى تەھرىرلە"
-      description: "چۈشەندۈرۈش (ئەڭ كۆپ بولغاندا 1000 ھەرپ)"
+      description: "چۈشەندۈرۈش"
+      settings:
+        title: "تەڭشەك"
+        general: "ئادەتتىكى"
+        localizations: "يەرلىكلەشتۈرۈش"
+        back: "كەينى"
+        name: "ئىسمى"
+        slug: "قىسقارتما"
+        name_placeholder: "بەلگە ئىسمى"
+        synonyms_subtitle: "تۆۋەندىكى بەلگە ئىشلىتىلگەندە، ئۇلار %{name} غا ئالماشتۇرۇلىدۇ"
+      localization:
+        locale: "يەرلىك"
+        name: "ئىسمى"
+        description: "چۈشەندۈرۈش"
       sort_by: "تەرتىپى:"
       sort_by_count: "ساناق"
       sort_by_name: "ئىسمى"
@@ -5383,9 +5387,13 @@ ug:
           never: "ھەرگىز"
       reports:
         title: "مەۋجۇت دوكلات تىزىمى"
-        meta_doc: "دوكلات تور بېكىتىڭىزدە نېمە ئىش يۈز بەرگەنلىكىنى بىلىشىڭىزگە ياردەم بېرىدىغان كۈچلۈك قورال. ئۇلار سىزنىڭ ۋەزىيەتنى بىلىش، مەسىلە بايقاش ۋە سانلىق مەلۇماتقا ئاساسەن قارار چىقىرىشىڭىزغا ياردەم بېرىدۇ."
         sidebar_title: "دوكلات"
         back: "ھەممە دوكلاتقا قايت"
+        group_traffic: "ئېقىم"
+        group_members: "ئەزا"
+        group_moderation: "رىياسەتچىلىك"
+        group_security: "بىخەتەرلىك"
+        group_other: "باشقا"
       config_sections:
         account:
           title: "ھېسابات"
@@ -5424,7 +5432,6 @@ ug:
         enabled_for_options:
           no_one: "ھېچكىم"
           everyone: "ھەممەيلەن"
-          staff: "خىزمەتچىلەرلا"
           specific_groups: "مۇئەييەن گۇرۇپپا"
           specific_groups_with_group_names:
             one: "گۇرۇپپا %{groupNames}"
@@ -5524,7 +5531,6 @@ ug:
               help_text: "تەۋسىيە قىلىنغان چوڭلۇقى 600x80 پىكسېل."
             large_icon:
               title: "چاسا سىنبەلگە"
-              description: "تۇغنىڭ چاسا شەكلىدىكى سۈرىتى باشقۇرۇشنىڭ چوققىسىدا كۆرۈنىدۇ، شۇنداقلا كۆچمە باش ئېكراندىكى ئەپنىڭمۇ سىنبەلگىسى."
               help_text: "تەۋسىيە قىلىنغان چوڭلۇقى 512x512 پىكسېل."
             square_icon_dark:
               required: "قاراڭغۇ ھالەتتە پەرقلىق چاسا تۇغ ئىشلىتەمدۇ؟"
@@ -5688,7 +5694,7 @@ ug:
           header_description: "دوكلات تور بېكىتىڭىزدە نېمە ئىش يۈز بەرگەنلىكىنى بىلىشىڭىزگە ياردەم بېرىدىغان كۈچلۈك قورال. ئۇلار سىزنىڭ ۋەزىيەتنى بىلىش، مەسىلە بايقاش ۋە سانلىق مەلۇماتقا ئاساسەن قارار چىقىرىشىڭىزغا ياردەم بېرىدۇ."
           sub_pages:
             settings:
-              title: "باشقۇرۇش تاختا تەڭشىكى"
+              title: "تەڭشەك"
         badges:
           title: "تارتۇق"
           header_description: "تارتۇق جامائەت ئىچىدىكى ئىشلەتكۈچىلەرنىڭ پائالىيىتى، تۆھبىسى ۋە نەتىجىلىرىنى مۇئەييەنلەشتۈرۈش، دەلىللەش ھەمدە ئاكتىپ مەشغۇلات ۋە ئىشقا ئاشۇرغان ۋەدىسى ئۈچۈن بېرىلىدۇ"
@@ -5834,22 +5840,6 @@ ug:
         result_count:
           one: '«%{filter}» نىڭ %{count} نەتىجىسى'
           other: '«%{filter}» نىڭ %{count} نەتىجىسى'
-        result_types:
-          page:
-            one: "بەت"
-            other: "بەت"
-          report:
-            one: "دوكلات"
-            other: "دوكلات"
-          setting:
-            one: "تەڭشەك"
-            other: "تەڭشەك"
-          theme:
-            one: "ئۆرنەك"
-            other: "ئۆرنەك"
-          component:
-            one: "بۆلەك"
-            other: "بۆلەك"
       new_features:
         title: "يېڭىلىق?"
         check_for_updates: "يېڭىلانمىنى تەكشۈر"
@@ -7893,6 +7883,7 @@ ug:
         field_types:
           text: "تېكىست"
           textarea: "تېكىست رايونى"
+          date: "چېسلا"
           confirm: "جەزملەش"
           dropdown: "تارتما تىزىملىك"
           multiselect: "كۆپ تاللاش"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index d5ea2ee7801f6..ef9279da5cf31 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -722,6 +722,10 @@ uk:
           few: "+%{count} інші чернетки"
           many: "+%{count} інших чернеток"
           other: "+%{count} інших чернеток"
+    embed_mode:
+      storage_access_prompt: "Вже маєте обліковий запис %{site_name} ? Дозвольте доступ до своєї сесії, щоб коментувати від свого імені."
+      allow_access: "Дозволити доступ"
+      continue_as_guest: "Продовжити як гість"
     topic_count_all:
       one: "Переглянути %{count} нову тему"
       few: "Переглянути %{count} нові теми"
@@ -800,20 +804,20 @@ uk:
       filtered_flagged_by: "Позначено"
       unknown:
         title:
-          one: "У вас є запит, які очікують на розгляд через вимкнений плагін:"
-          few: "У вас є запити, які очікують на розгляд через вимкнений плагін:"
-          many: "У вас є запити, які очікують на розгляд через вимкнений плагін:"
-          other: "У вас є запити, які очікують на розгляд від вимкнених плагінів:"
+          one: "У вас є елементи в черзі на рецензування від вимкненого плагіна:"
+          few: "У вас є елементи в черзі на рецензування від вимкнених плагінів:"
+          many: "У вас є елементи в черзі на рецензування від вимкнених плагінів:"
+          other: "У вас є елементи в черзі на рецензування від вимкнених плагінів:"
         instruction: "Вони не можуть бути належним чином відображені, доки ви не ввімкнете відповідний плагін. Увімкніть плагін і оновіть сторінку. Крім того, ви можете ігнорувати їх. <a href='%{url}' target='_blank'>Дізнайтеся більше...</a>"
         reviewable_unknown_source: "%{reviewableType} (невідомий плагін)"
         reviewable_known_source: "%{reviewableType} (з плагіна '%{pluginName}')"
         ignore_all: "Ігнорувати все"
         enable_plugins: "Увімкнути плагіни"
-        delete_confirm: "Ви дійсно бажаєте видалити всі відгуки, створені вимкненими плагінами?"
-        ignore_success: "Усі відгуки, створені вимкненими плагінами, видалено."
+        delete_confirm: "Ви впевнені, що хочете видалити всі елементи черги рецензій, створені вимкненими плагінами?"
+        ignore_success: "Усі елементи черги рецензування, створені вимкненими плагінами, було видалено."
       explain:
         why: "пояснити, чому цей елемент потрапив у чергу"
-        title: "Оцінка"
+        title: "Оцінювання елементів черги на перегляд"
         formula: "Формула"
         subtotal: "Проміжний підсумок"
         total: "Всього"
@@ -827,10 +831,10 @@ uk:
           title: "Користувачі, чиї звернення були історично узгоджені, отримують бонус."
         trust_level_bonus:
           name: "рівень довіри"
-          title: "Елементи, які переглядаються, можуть оцінюватися вище, якщо вони створені користувачами з вищим рівнем довіри."
+          title: "Прапорці, створені користувачами з вищим рівнем довіри, мають вищий бал."
         type_bonus:
           name: "тип бонуса"
-          title: "Деяким типам повідомлень, які переглядаються, учасники команди обслуговування можуть призначити бонуси, щоб зробити їх більш пріоритетними."
+          title: "Певним типам прапорів співробітники можуть присвоювати бонуси, щоб зробити їх більш пріоритетними."
       revise_and_reject_post:
         title: "Переглянути"
         reason: "Причина"
@@ -839,7 +843,7 @@ uk:
         custom_reason: "Дайте чіткий опис причини"
         other_reason: "Інше..."
         optional: "опціонально"
-      stale_help: "<b>%{username}</b> розглянув це."
+      stale_help: "Цей пункт вирішено користувачем <b>%{username}</b>."
       claim_help:
         optional: "Ви можете заявити права на цей елемент, щоб інші не могли його розглядати."
         required: "Ви повинні заявити права на елементи, перш ніж ви зможете розглядати їх."
@@ -3627,8 +3631,6 @@ uk:
         max_views:
           placeholder: максимум
           aria_label: фільтрувати за максимальною кількістю переглядів
-        additional_options:
-          label: "Фільтруйте за кількістю дописів і переглядами тем"
     hamburger_menu: "Меню навігації"
     new_item: "новий"
     go_back: "повернутися назад"
@@ -4502,7 +4504,11 @@ uk:
           edit: "Редагувати"
           delete: "Видалити"
         add: "Додати новий переклад"
-        manage: "Керування перекладами (%{count} існуючих)"
+        manage:
+          one: "Керування перекладами (%{count} існуючих)"
+          few: "Керування перекладами (%{count} існуючих)"
+          many: "Керування перекладами (%{count} існуючих)"
+          other: "Керування перекладами (%{count} існуючих)"
         view:
           one: "Переглянути %{count} переклад"
           few: "Переглянути %{count} переклади"
@@ -5446,17 +5452,25 @@ uk:
       category_restricted: "Цей теґ обмежено розділами, до яких ви не маєте доступу."
       synonyms: "Синоніми"
       synonyms_description: "Коли будуть використані наступні теґи, вони будуть замінені на <b>%{base_tag_name}</b> ."
+      synonyms_inline: "Ці синоніми будуть замінені на %{base_tag_name}:"
       save: "Збережіть назву та опис теґа"
       tag_groups_info:
         one: 'Цей теґ належить до групи &quot;%{tag_groups}&quot;.'
         few: "Цей теґ належить до цих груп: %{tag_groups}."
         many: "Цей теґ належить до цих груп: %{tag_groups}."
         other: "Цей теґ належить до цих груп: %{tag_groups}."
+      tag_groups_info_prefix:
+        one: "Цей тег належить до групи "
+        few: "Цей тег належить до груп "
+        many: "Цей тег належить до груп "
+        other: "Цей тег належить до груп "
       category_restrictions:
         one: "Його можна використовувати лише в цьому розділі:"
         few: "Його можна використовувати лише в таких розділах:"
         many: "Його можна використовувати лише в таких розділах:"
         other: "Його можна використовувати лише в таких розділах:"
+      restricted_to: "Обмежено для"
+      no_synonyms: "Цей тег не має синонімів."
       edit_synonyms: "Редагувати синоніми"
       add_synonyms_label: "Додайте синоніми:"
       add_synonyms: "Додати"
@@ -5482,7 +5496,34 @@ uk:
         other: "Синоніми %{count} також будуть видалені."
       edit_tag: "Редагувати назву та опис теґу"
       edit: "Редагувати цей тег"
-      description: "Опис (максимум 1000 символів)"
+      description: "Опис"
+      settings:
+        title: "Налаштування"
+        edit_title: "Редагувати тег: %{name}"
+        edit_tag_prefix: "Редагувати тег:"
+        select_tag: "Виберіть тег для редагування"
+        general: "Основний"
+        localizations: "Локалізації"
+        back: "Назад"
+        name: "Імʼя"
+        slug: "Мітка"
+        name_placeholder: "Назва теґу"
+        slug_placeholder: "Тег slug (необов'язковий, автоматично генерується з назви)"
+        saved: "Налаштування тегу збережено"
+        no_synonyms: "Для цього тегу не визначено синонімів."
+        add_synonym_placeholder: "Пошук тегів для додавання в якості синонімів..."
+        synonyms_subtitle: "Коли використовуються наступні теги, вони будуть замінені на %{name}"
+        save: "Зберегти тег"
+        delete: "Видалити тег"
+        synonyms_hint: "Коли використовуються вищезазначені теги, вони будуть замінені на %{baseTagName}."
+        add_synonyms_confirm: "Будь-яке місце, де зараз використовується %{synonymNames} , буде змінено на %{tagName} . Ви впевнені, що хочете внести цю зміну?"
+      localization:
+        hint: "Додайте локалізації, щоб відображати різні назви тегів для користувачів різними мовами."
+        locale: "Локаль"
+        name: "Імʼя"
+        description: "Опис"
+        add: "Додати локалізацію"
+        remove: "Видалити локалізацію"
       sort_by: "Сортувати за:"
       sort_by_count: "Кількість"
       sort_by_name: "ім'я"
@@ -6046,9 +6087,13 @@ uk:
           never: "ніколи"
       reports:
         title: "Список доступних звітів"
-        meta_doc: "Звіти – це потужний інструмент, який допоможе вам зрозуміти, що відбувається на вашому сайті. Вони можуть допомогти вам визначити тенденції, виявити проблеми та прийняти рішення на основі даних."
         sidebar_title: "Звіти"
         back: "Назад до всіх звітів"
+        group_traffic: "Трафік"
+        group_members: "Учасники"
+        group_moderation: "Модерація"
+        group_security: "Безпека"
+        group_other: "Інше"
       config_sections:
         account:
           title: "Обліковий запис"
@@ -6093,7 +6138,6 @@ uk:
         enabled_for_options:
           no_one: "Ніхто"
           everyone: "Усі"
-          staff: "Для команди обслуговування"
           specific_groups: "Конкретна(і) група(и)"
           specific_groups_with_group_names:
             one: "група %{groupNames}"
@@ -6118,7 +6162,6 @@ uk:
           all: "Всі"
           enabled_all: "Усі увімкнені стани"
           enabled: "Включено"
-          enabled_for_staff: "Увімкнено для персоналу"
           enabled_for_specific_groups: "Увімкнено для певних груп"
           disabled: "Вимкнено"
           impact_type_all: "Всі види впливу"
@@ -6208,7 +6251,6 @@ uk:
               help_text: "Рекомендований розмір - 600 x 80 пікселів."
             large_icon:
               title: "Квадратна іконка"
-              description: "Квадратна версія логотипу з'являється у верхній частині адмінки, а також є логотипом мобільного додатку на головному екрані."
               help_text: "Рекомендований розмір становить 512 х 512 пікселів."
             square_icon_dark:
               required: "Використовувати інший квадратний значок для темного режиму?"
@@ -6398,7 +6440,7 @@ uk:
           header_description: "Звіти – це потужний інструмент, який допоможе вам зрозуміти, що відбувається на вашому сайті. Вони можуть допомогти вам визначити тенденції, виявити проблеми та прийняти рішення на основі даних."
           sub_pages:
             settings:
-              title: "Налаштування панелі"
+              title: "Налаштування"
         badges:
           title: "Нагороди"
           header_description: "Знаки винагороджують користувачів за свої діяльність, внески та досягнення для визнання, затвердження, а також заохочують позитивну поведінку та участь у громаді"
@@ -6556,32 +6598,6 @@ uk:
           few: '%{count} результати для "%{filter}»'
           many: '%{count} результатів для "%{filter}»'
           other: '%{count} результатів для "%{filter} "'
-        result_types:
-          page:
-            one: "Сторінка"
-            few: "Сторінки"
-            many: "Сторінки"
-            other: "Сторінки"
-          report:
-            one: "Звіт"
-            few: "Звіти"
-            many: "Звіти"
-            other: "Звіти"
-          setting:
-            one: "Налаштування"
-            few: "Налаштування"
-            many: "Налаштування"
-            other: "Налаштування"
-          theme:
-            one: "Кольорова схема"
-            few: "Стилі"
-            many: "Стилі"
-            other: "Стилі"
-          component:
-            one: "Компонент"
-            few: "Компоненти"
-            many: "Компоненти"
-            other: "Компоненти"
       new_features:
         title: "Що нового?"
         check_for_updates: "Перевірте наявність оновлень"
@@ -8735,6 +8751,7 @@ uk:
         field_types:
           text: "Текст"
           textarea: "Текстове поле"
+          date: "Дата"
           confirm: "Підтвердження"
           dropdown: "Випадаючий список"
           multiselect: "Множинний вибір"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 2bda37db36cf7..c00af417ecf07 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -657,19 +657,13 @@ ur:
       in_reply_to: "کے جواب میں"
       filtered_flagged_by: "نے فلَیگ کیا"
       unknown:
-        title:
-          one: "آپ کے پاس غیر فعال اضافی سہولتوں سے قابل جائزہ زیر التواء ہیں:"
-          other: "آپ کے پاس غیر فعال اضافی سہولتوں سے قابل جائزہ زیر التواء ہیں:"
         instruction: "جب تک آپ متعلقہ اضافی سہولت کو فعال نہیں کرتے ہیں تب تک وہ صحیح طریقے سے ظاہر نہیں ہو سکتی۔ براہ کرم اضافی سہولت کو فعال کریں اور صفحہ کو ریفریش کریں۔ متبادل کے طور پر، آپ ان کو نظر انداز کر سکتے ہیں۔ <a href='%{url}' target='_blank'>مزید جانیں...</a>"
         reviewable_unknown_source: "%{reviewableType} (نامعلوم اضافی سہولت)"
         reviewable_known_source: "%{reviewableType} ('%{pluginName}' اضافی سہولت سے)"
         ignore_all: "سب کو نظر انداز کریں"
         enable_plugins: "اضافی سہولتوں کو فعال کریں"
-        delete_confirm: "کیا آپ واقعی غیر فعال اضافی سہولتوں کے ذریعے بنائے گئے تمام جائزوں کو حذف کرنا چاہتے ہیں؟"
-        ignore_success: "غیر فعال اضافی سہولتوں کے ذریعہ بنائے گئے تمام جائزے حذف کردیئے گئے۔"
       explain:
         why: "وضاحت کریں کہ یہ شے آخر میں قطار میں کیوں داخل ہو گئی"
-        title: "قابل تجدید اسکورنگ"
         formula: "فارمولا"
         subtotal: "جزوی میزان"
         total: "حاصل جمع"
@@ -683,10 +677,8 @@ ur:
           title: "جن اراکین کے فلَیگز کے ساتھ تاریخی طور پر اتفاق کیا گیا ہو انہیں بَونَس دیا جاتا ہے۔"
         trust_level_bonus:
           name: "اعتماد کی سطح"
-          title: "اعلیٰ فعالیت کا درجہ رکھنے والے اراکین کے ذریعہ تخلیق کردہ قابلِ جائزہ متن کا اسکور زیادہ ہوتا ہے۔"
         type_bonus:
           name: "قِسم بَونَس"
-          title: "سٹاف کی طرف سے کچھ قابل تجدید اقسام کو بَونَس تفویض کیا جاسکتا ہے تاکہ ان کو اعلیٰ ترجیح بنایا جاسکے۔"
       revise_and_reject_post:
         title: "نظر ثانی"
         reason: "وجہ"
@@ -695,7 +687,6 @@ ur:
         custom_reason: "وجہ واضح طور پر بیان کریں"
         other_reason: "دیگر..."
         optional: "اختیاری"
-      stale_help: "اس نظر ثانی کا حل <b>%{username}</b>نے کیا ہے۔"
       claim_help:
         optional: "آپ اس چیز کو کََلیم کرسکتے ہیں کہ دوسروں کو اِسکا جائزہ لینے سے روکا جا سکے۔"
         required: "اشیاء کا جائزہ لینے سے پہلے آپ کا اُن کو کََلیم کرنا ضروری ہے۔"
@@ -3263,8 +3254,6 @@ ur:
         max_views:
           placeholder: زیادہ سے زیادہ
           aria_label: زیادہ سے زیادہ آراء سے فلٹر
-        additional_options:
-          label: "دھاگے کی گنتی اور موضوع کے ملاحظات کے لحاظ سے فلٹر"
     hamburger_menu: "نیویگیشن مینو"
     new_item: "نیا"
     go_back: "واپس جائیں"
@@ -3576,6 +3565,8 @@ ur:
           12_hours: "12 گھنٹے"
           24_hours: "24 گھنٹے"
           custom: "اپنی مرضی کے مطابق مدت"
+      slow_mode_notice:
+        duration: "براہ کرم اس عنوان پر اپنی پوسٹس کے درمیان %{duration} کا انتظار کریں"
       topic_status_update:
         title: "موضوع ٹائمر"
         save: "ٹائمر مقرر کریں"
@@ -3605,6 +3596,8 @@ ur:
         title: "آخری دھاگہ کے بعد موضوع از خود بند ہونے والا ہے"
       auto_delete:
         title: "موضوع خودبخود حذف کریں"
+      auto_delete_after_last_post:
+        title: "آخری دھاگہ کے بعد موضوع از خود حذف ہونے والا ہے"
       auto_bump:
         title: "خود کار طریقے سے موضوع دھکا لگائیں"
       reminder:
@@ -3616,6 +3609,7 @@ ur:
         auto_close: "یہ موضوع خود کار طریقے سے بند کر دیا جائے گا %{timeLeft}۔"
         auto_publish_to_category: "یہ موضوع <a href=%{categoryUrl}>#%{categoryName}</a> میں شائع کر دیا جائے گا %{timeLeft}۔"
         auto_close_after_last_post: "یہ موضوع آخری جواب کے %{duration} بعد بند ہو جائے گا۔"
+        auto_delete_after_last_post: "یہ موضوع آخری جواب کے %{duration} بعد حذف ہو جائے گا۔"
         auto_delete: "یہ موضوع خودبخود مٹادیا جائے گا %{timeLeft}۔"
         auto_bump: "اس موضوع کو خود کار طریقے سے دھکا لگایا جائے گا %{timeLeft}۔"
         auto_reminder: "آپ کو اس موضوع کے بارے میں یاد دہانی کرائی جائے گی %{timeLeft}۔"
@@ -3711,6 +3705,8 @@ ur:
       reply:
         title: "جواب"
         help: "اس ٹاپک کا جواب لکھنا شروع کریں"
+      footer_buttons:
+        region_label: "موضوع کے ایکشنز"
       share:
         title: "موضوع کا اشتراک کریں"
         extended_title: "رابطہ شیئر کریں"
@@ -3890,6 +3886,12 @@ ur:
           one: آپ نے <b>%{count}</b> دھاگہ منتخب کیا۔
           other: "آپ نے <b>%{count}</b> دھاگے منتخب کیے۔"
       deleted_by_author_simple: "(موضوع مصنف نے مٹایا)"
+      localizations:
+        title_edit_warning:
+          message: "یہ ترجمہ شدہ موضوعاتی عنوان ہے۔<br><br>کیا آپ اس %{language} میں <b>اصل</b> زمرہ، ٹیگز، اور ٹائٹل کو حذف کرنا چاہتے ہیں یا خصوصی <b>ترجمہ</b>میں ترمیم کرنا چاہتے ہیں؟"
+          action_original: "اصل میں ترمیم کریں"
+          action_translation: "ترجمہ شدہ موضوعاتی عنوان میں ترمیم کریں"
+        editing_translation: "%{language} ترجمہ میں ترمیم کرتے ہوئے"
     post_list:
       title: "تازہ ترین پوسٹس"
       empty: "کوئی پوسٹس نہیں"
@@ -3897,7 +3899,9 @@ ur:
       bulk:
         select_all: "سبھی منتخب کریں"
         clear_all: "سبھی ہٹا دیں"
+        actions: "حجمی عوامل"
     post:
+      accessible_heading: "پوسٹ منجانب %{username} %{date}"
       confirm_delete: "کیا آپ واقعی اس پوسٹ کو حذف کرنا چاہتے ہیں؟"
       quote_reply: "اقتباس کریں"
       quote_reply_shortcut: "اقتباس (یا q دبائیں)"
@@ -3977,7 +3981,9 @@ ur:
           edit: "ترمیم کریں"
           delete: "مٹائیں"
         add: "نیا ترجمہ شامل"
-        manage: "ترجمے کا انتظام کریں (%{count} موجودہ)"
+        manage:
+          one: "ترجمے کا انتظام کریں (%{count} موجودہ)"
+          other: "ترجمے کا انتظام کریں (%{count} موجودہ)"
         view:
           one: "ملاحظہ کریں %{count} مقامی ترجمہ شدہ"
           other: "ملاحظہ کریں %{count} مقامی ترجمہ شدہ"
@@ -4817,7 +4823,19 @@ ur:
         other: "اس کے %{count} مترادفات بھی مٹا دیے جائیں گے۔"
       edit_tag: "ٹیگ نام اور تفصیل میں ترمیم کریں"
       edit: "ٹیگ میں ترمیم کریں"
-      description: "تفصیل (زیادہ سے زیادہ 1000 حروف)"
+      description: "تفصیل"
+      settings:
+        title: "سیٹِنگ"
+        general: "عام"
+        localizations: "لوکلائزیشنز"
+        back: "واپس"
+        name: "نام"
+        slug: "سلگ"
+        name_placeholder: "ٹیگ کا نام"
+      localization:
+        locale: "لوکیل"
+        name: "نام"
+        description: "تفصیل"
       sort_by: "ترتیب بہ:"
       sort_by_count: "شمار"
       sort_by_name: "نام"
@@ -5324,9 +5342,13 @@ ur:
           never: "کبھی نہیں"
       reports:
         title: "دستیاب رپورٹوں کی فہرست"
-        meta_doc: "رپورٹس ایک طاقتور ہتھیار ہیں جو آپ کو یہ سمجھنے میں مدد کرتی ہیں کہ آپ کی سائٹ پر کیا ہو رہا ہے۔ وہ آپ کو رجحانات، مسائل کی نشاندہی کرنے اور ڈیٹا کی بنیاد پر فیصلے کرنے میں مدد کر سکتی ہیں۔"
         sidebar_title: "رپورٹیں"
         back: "تمام رپورٹس پر واپس"
+        group_traffic: "ٹریفک"
+        group_members: "ممبران"
+        group_moderation: "ماڈریٹر کا کام"
+        group_security: "سیکورٹی"
+        group_other: "دیگر"
       config_sections:
         account:
           title: "اکاؤنٹ"
@@ -5351,7 +5373,6 @@ ur:
         preview: "جھلک دیکھیں"
         enabled_for_options:
           everyone: "ہر کوئی"
-          staff: "صرف سٹاف کیلئے"
         statuses:
           experimental: "تجرباتی"
         impact_roles:
@@ -5423,7 +5444,6 @@ ur:
               help_text: "تجویز کردہ سائز 600 x 80 پکسلز ہے۔"
             large_icon:
               title: "مربع آئیکن"
-              description: "لوگو کی تصویر کا مربع ورژن انتظامیہ کے اوپر ظاہر ہوتا ہے اور یہ موبائل ہوم اسکرین ایپ کا لوگو بھی ہے۔"
               help_text: "تجویز کردہ سائز 512 x 512 پکسلز ہے۔"
             square_icon_dark:
               required: "ڈارک موڈ کے لیے ایک مختلف مربع آئیکن استعمال کریں؟"
@@ -5576,7 +5596,7 @@ ur:
           header_description: "رپورٹس ایک طاقتور ٹول ہیں جو آپ کو یہ سمجھنے میں مدد کرتی ہیں کہ آپ کی سائٹ پر کیا ہو رہا ہے۔ وہ آپ کو رجحانات کی نشاندہی کرنے، مسائل کی نشاندہی کرنے اور ڈیٹا کی بنیاد پر فیصلے کرنے میں مدد کر سکتے ہیں۔"
           sub_pages:
             settings:
-              title: "ڈیش بورڈ کی ترتیبات"
+              title: "سیٹِنگ"
         badges:
           title: "تمغات"
           header_description: "تمغات اراکین کو ان کی سرگرمیوں، شراکتوں اور کامیابیوں کو پہچاننے، توثیق کرنے اور کمیونٹی کے اندر مثبت رویے اور مشغولیت کی حوصلہ افزائی کے لیے انعام دیتے ہیں۔"
@@ -5729,22 +5749,6 @@ ur:
         result_count:
           one: '%{count} نتیجہ برائے "%{filter}"'
           other: '%{count} نتائج برائے "%{filter}"'
-        result_types:
-          page:
-            one: "صفحه"
-            other: "صفحات"
-          report:
-            one: "گزارش"
-            other: "گزارشات"
-          setting:
-            one: "ترتیب"
-            other: "ترتیبات"
-          theme:
-            one: "تھیم"
-            other: "تِھیمز"
-          component:
-            one: "جزو"
-            other: "اجزاء"
       new_features:
         title: "نیا کیا ہے؟"
         check_for_updates: "اپ ڈیٹس کے لیے چیک کریں۔"
@@ -7445,6 +7449,7 @@ ur:
             title: "اختیاری"
         field_types:
           text: "ٹیکسٹ"
+          date: "تاریخ"
           confirm: "تصدیق"
           dropdown: "ڈراپ ڈاؤن"
           multiselect: "کثیر الانتخاب"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 815af740dbfc2..1b65f91d73d10 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -599,18 +599,13 @@ vi:
       in_reply_to: "trong trả lời tới"
       filtered_flagged_by: "Gắn cờ bởi"
       unknown:
-        title:
-          other: "Bạn có các yêu cầu cần xem xét từ các plugin đã bị vô hiệu hóa:"
         instruction: "Chúng sẽ không hiển thị đúng cách cho đến khi bạn kích hoạt plugin liên quan. Vui lòng kích hoạt plugin và làm mới trang. Hoặc bạn có thể bỏ qua chúng. <a href='%{url}' target='_blank'>Tìm hiểu thêm...</a>"
         reviewable_unknown_source: "%{reviewableType} (plugin không xác định)"
         reviewable_known_source: "%{reviewableType} (từ plugin '%{pluginName}')"
         ignore_all: "Bỏ qua tất cả"
         enable_plugins: "Kích hoạt các plugin"
-        delete_confirm: "Bạn có chắc muốn xóa tất cả đánh giá được tạo bởi các plugin đã bị vô hiệu hóa?"
-        ignore_success: "Tất cả đánh giá được tạo bởi các plugin đã bị vô hiệu hóa đều đã bị xóa."
       explain:
         why: "giải thích lý do tại sao mặt hàng này kết thúc trong hàng đợi"
-        title: "Chấm điểm"
         formula: "Công thức"
         subtotal: "Tổng phụ"
         total: "Tổng số"
@@ -624,10 +619,8 @@ vi:
           title: "Người dùng có cờ đã được đồng ý trong lịch sử được tặng tiền thưởng."
         trust_level_bonus:
           name: "độ tin cậy"
-          title: "Các mục có thể xem lại được tạo bởi người dùng có độ tin cậy cao hơn có điểm cao hơn."
         type_bonus:
           name: "loại tiền thưởng"
-          title: "Một số loại có thể xem lại có thể được nhân viên chỉ định một phần thưởng để làm cho chúng có mức độ ưu tiên cao hơn."
       revise_and_reject_post:
         title: "Xem lại"
         reason: "Lý do"
@@ -636,7 +629,6 @@ vi:
         custom_reason: "Hãy giải thích rõ lý do"
         other_reason: "Khác…"
         optional: "tùy chọn"
-      stale_help: "Có thể bản xem lại này đã được giải quyết bởi <b>%{username}</b>."
       claim_help:
         optional: "Bạn có thể phàn nàn mục này để tránh những người khác đánh giá nó."
         required: "Bạn phải yêu cầu các mục trước khi bạn có thể xem xét chúng."
@@ -3099,8 +3091,6 @@ vi:
         max_views:
           placeholder: Tối đa
           aria_label: lọc theo lượt xem tối đa
-        additional_options:
-          label: "Lọc số lượng tút và lượt xem chủ đề"
     hamburger_menu: "Menu điều hướng"
     new_item: "mới"
     go_back: "quay trở lại"
@@ -3786,7 +3776,8 @@ vi:
           edit: "Sửa"
           delete: "Xóa"
         add: "Thêm bản dịch mới"
-        manage: "Quản lý bản dịch (hiện có %{count})"
+        manage:
+          other: "Quản lý bản dịch (hiện có %{count})"
         view:
           other: "Xem %{count} ngôn ngữ đã dịch"
         modal:
@@ -4643,7 +4634,20 @@ vi:
         other: "%{count} từ đồng nghĩa của nó cũng sẽ bị xóa."
       edit_tag: "Chỉnh sửa tên thẻ và mô tả"
       edit: "Sửa thẻ này"
-      description: "Mô tả (tối đa 1000 ký tự)"
+      description: "Mô tả"
+      settings:
+        title: "Cài đặt"
+        general: "Chung"
+        localizations: "Bản địa hóa"
+        back: "Quay lại"
+        name: "Tên"
+        slug: "tên đường dẫn"
+        name_placeholder: "Tên thẻ"
+        synonyms_subtitle: "Khi các thẻ sau được sử dụng, chúng sẽ được thay thế bằng %{name}"
+      localization:
+        locale: "Ngôn ngữ"
+        name: "Tên"
+        description: "Mô tả"
       sort_by: "Xếp theo:"
       sort_by_count: "Số lượng"
       sort_by_name: "Tên"
@@ -5157,9 +5161,13 @@ vi:
           never: "không bao giờ"
       reports:
         title: "Danh sách các báo cáo có sẵn"
-        meta_doc: "Báo cáo là công cụ mạnh mẽ giúp bạn hiểu rõ những gì đang diễn ra trên trang web của mình. Chúng có thể giúp bạn nhận diện xu hướng, phát hiện vấn đề và đưa ra quyết định dựa trên dữ liệu."
         sidebar_title: "Báo cáo"
         back: "Quay lại tất cả báo cáo"
+        group_traffic: "Băng thông"
+        group_members: "Thành viên kênh"
+        group_moderation: "Người kiểm duyệt"
+        group_security: "Bảo mật"
+        group_other: "Khác"
       config_sections:
         account:
           title: "Tài khoản"
@@ -5203,7 +5211,6 @@ vi:
         enabled_for_options:
           no_one: "Không ai"
           everyone: "Mọi người"
-          staff: "Chỉ nhân viên"
           specific_groups: "Các nhóm cụ thể"
           specific_groups_with_group_names:
             other: "Các nhóm %{groupNames}"
@@ -5225,7 +5232,6 @@ vi:
           all: "Tất cả"
           enabled_all: "Tất cả trạng thái được kích hoạt"
           enabled: "Đã bật"
-          enabled_for_staff: "Đã kích hoạt cho nhân viên"
           enabled_for_specific_groups: "Đã kích hoạt cho các nhóm cụ thể"
           disabled: "Vô hiệu hóa"
           impact_type_all: "Tất cả loại tác động"
@@ -5314,7 +5320,6 @@ vi:
               help_text: "Kích thước đề xuất là 600x80 pixel."
             large_icon:
               title: "Biểu tượng hình vuông"
-              description: "Phiên bản hình vuông của logo xuất hiện ở đầu trang quản trị và cũng là logo ứng dụng trên màn hình chính của thiết bị di động."
               help_text: "Kích thước đề xuất là 512x512 pixel."
             square_icon_dark:
               required: "Sử dụng logo vuông khác cho chế độ tối?"
@@ -5501,7 +5506,7 @@ vi:
           header_description: "Báo cáo là công cụ mạnh mẽ giúp bạn hiểu rõ những gì đang diễn ra trên trang web của mình. Chúng có thể giúp bạn nhận diện xu hướng, phát hiện vấn đề và đưa ra quyết định dựa trên dữ liệu."
           sub_pages:
             settings:
-              title: "Cài đặt bảng điều khiển"
+              title: "Cài đặt"
         badges:
           title: "Huy hiệu"
           header_description: "Huy hiệu là phần thưởng dành cho thành viên vì các hoạt động, đóng góp và thành tích của họ, nhằm ghi nhận, xác thực và khuyến khích hành vi tích cực và sự tham gia trong cộng đồng"
@@ -5653,17 +5658,6 @@ vi:
         no_results: 'Chúng tôi không tìm thấy bất kỳ kết quả nào khớp với "%{filter}".'
         result_count:
           other: '%{count} kết quả cho "%{filter}"'
-        result_types:
-          page:
-            other: "Trang"
-          report:
-            other: "Báo cáo"
-          setting:
-            other: "Cài đặt"
-          theme:
-            other: "Themes"
-          component:
-            other: "Các thành phần"
       new_features:
         title: "Có gì mới?"
         check_for_updates: "Kiểm tra cập nhật"
@@ -7721,6 +7715,7 @@ vi:
         field_types:
           text: "Văn bản"
           textarea: "Vùng nhập văn bản"
+          date: "Ngày"
           confirm: "Xác nhận"
           dropdown: "Xổ xuống"
           multiselect: "Chọn nhiều"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 8f8fc1a4dd74a..619991582e5ad 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -263,8 +263,8 @@ zh_CN:
     skip_to_main_content: "跳到主要内容"
     skip_links_label: "跳过导航链接"
     skip_to_post: "跳至帖子 %{post_number}"
-    skip_to_where_you_left_off: "跳转到您离开的地方 (post %{post_number})"
-    skip_to_where_you_left_off_last: "跳转到您离开的地方（最后一个回复，帖子 %{post_number})"
+    skip_to_where_you_left_off: "跳转到您离开的地方（帖子 %{post_number}）"
+    skip_to_where_you_left_off_last: "跳转到您离开的地方（最后一条回复，帖子 %{post_number}）"
     skip_to_last_reply: "跳转到最后一条回复"
     skip_to_top: "跳转到顶部"
     skip_user_nav: "跳到个人资料内容"
@@ -278,7 +278,7 @@ zh_CN:
     back_button: "返回"
     welcome_banner:
       header:
-        new_members: "欢迎， %{preferred_display_name}！"
+        new_members: "欢迎，%{preferred_display_name}！"
         logged_in_members: "欢迎回来，%{preferred_display_name}！"
         anonymous_members: "欢迎来到 %{site_name}！"
       search_placeholder: "搜索"
@@ -556,10 +556,10 @@ zh_CN:
       resume: "恢复"
       remove: "移除"
       remove_confirmation: "确定要删除此草稿吗？"
-      bulk_delete: "删除选中内容"
+      bulk_delete: "删除所选"
       bulk_delete_confirmation: "删除草稿"
       bulk_delete_message:
-        other: "您确定要删除 %{count} 个草稿吗？"
+        other: "确定要删除 %{count} 个草稿吗？"
       new_topic: "新话题草稿"
       new_private_message: "新个人消息草稿"
       edit_topic: "编辑话题草稿"
@@ -569,6 +569,10 @@ zh_CN:
         view_all: "查看所有草稿"
         other_drafts:
           other: "+其他 %{count} 个草稿"
+    embed_mode:
+      storage_access_prompt: "已有 %{site_name} 账户？允许访问你的会话，以你的身份发表评论。"
+      allow_access: "允许访问"
+      continue_as_guest: "以访客身份继续"
     topic_count_all:
       other: "查看 %{count} 个新话题"
     topic_count_categories:
@@ -629,17 +633,15 @@ zh_CN:
       filtered_flagged_by: "举报者"
       unknown:
         title:
-          other: "您有来自已禁用插件的待审核内容："
+          other: "您有来自已禁用插件的待审核队列项目："
         instruction: "除非您启用相关插件，否则它们无法正确显示。请启用插件并刷新页面。或者，您可以忽略它们。<a href='%{url}' target='_blank'>了解详情…</a>"
         reviewable_unknown_source: "%{reviewableType}（未知插件）"
         reviewable_known_source: "%{reviewableType}（来自 '%{pluginName}' 插件）"
         ignore_all: "全部忽略"
         enable_plugins: "启用插件"
-        delete_confirm: "确定要删除所有由禁用插件创建的审核吗？"
-        ignore_success: "所有由禁用插件创建的审核已被删除。"
+        delete_confirm: "确定要删除所有由禁用插件创建的审核队列项目吗？"
       explain:
         why: "解释为什么此条目最终进入队列"
-        title: "可审核话题的评分"
         formula: "公式"
         subtotal: "小计"
         total: "总计"
@@ -653,10 +655,8 @@ zh_CN:
           title: "所提交的举报一直都获得同意的用户将获得加分。"
         trust_level_bonus:
           name: "信任级别"
-          title: "由较高信任级别的用户创建的可审核条目具有较高的分数。"
         type_bonus:
           name: "奖励加分"
-          title: "某些可审核类型可以由管理人员分配加分，以使其具有更高的优先级。"
       revise_and_reject_post:
         title: "修订"
         reason: "原因"
@@ -665,7 +665,6 @@ zh_CN:
         custom_reason: "清楚地描述原因"
         other_reason: "其他…"
         optional: "可选"
-      stale_help: "此可审核条目已被 <b>%{username}</b> 解决。"
       claim_help:
         optional: "您可以认领此条目以避免被他人审核。"
         required: "您必须先认领条目才能进行审核。"
@@ -673,9 +672,9 @@ zh_CN:
         claimed_by_other: "此条目仅可以由 <b>%{username}</b> 审核。"
         automatically_claimed_by: "此条目目前正在由 <b>%{username}</b>审核。"
       claim:
-        title: "认领该话题"
+        title: "认领此话题"
       unclaim:
-        help: "移除认领"
+        help: "移除此认领"
       awaiting_approval: "需要审批"
       delete: "删除"
       settings:
@@ -696,7 +695,7 @@ zh_CN:
       filtered_topic: "您已筛选到一个话题下的可审核内容。"
       filtered_user: "被举报用户"
       filtered_reviewed_by: "审核人"
-      filtered_claimed_by: "举报被认领"
+      filtered_claimed_by: "举报申领人"
       show_all_topics: "显示所有话题"
       deleted_post: "（帖子已删除）"
       deleted_user: "（用户已删除）"
@@ -767,7 +766,7 @@ zh_CN:
           low: "低"
           medium: "中"
           high: "高"
-        active_filters: "启用筛选器："
+        active_filters: "有效筛选器："
         clear_filter: "移除 %{filter}"
       conversation:
         view_full: "查看完整对话"
@@ -811,10 +810,10 @@ zh_CN:
         is_this_post: "此%{reviewable_type}是否%{reviewable_human_score_types}？"
         delimiter: "或者"
         something_else_wrong: "此%{reviewable_type}有什么问题吗？"
-        approve_user: "批准该用户？"
-        suspect_user: "这个用户是垃圾用户吗？"
-        approve_post: "批准该帖子？"
-        approve_topic: "批准该话题？"
+        approve_user: "批准此用户？"
+        suspect_user: "此用户是垃圾用户吗？"
+        approve_post: "是否批准此帖子？"
+        approve_topic: "是否批准此话题？"
       types:
         reviewable_flagged_post:
           title: "被举报的帖子"
@@ -833,18 +832,18 @@ zh_CN:
           title: "帖子"
           noun: "帖子"
         reviewable_ai_chat_message:
-          title: "被 AI 举报的聊天消息"
+          title: "AI 标记的聊天消息"
           noun: "聊天消息"
         reviewable_ai_post:
-          title: "被 AI 举报的帖子"
+          title: "AI 标记的帖子"
           noun: "帖子"
         reviewable_post_voting_comment:
           title: "被举报的评论"
           noun: "评论"
       flagged_as: "被标记为"
       post_flagged_as: "帖子被标记为"
-      chat_flagged_as: "对话被标记为"
-      queued_post_label: "队列中的帖子"
+      chat_flagged_as: "聊天被标记为"
+      queued_post_label: "已加入队列的帖子"
       queued_topic_label: "已加入队列的话题"
       user_label: "用户"
       assigned_to: "帖子被指定给"
@@ -854,22 +853,22 @@ zh_CN:
         target_created: "帖子已创建"
         target_created_by: "帖子由 %{username} 创建 · %{relativeDate}"
         target_deleted: "帖子已删除"
-        target_deleted_by: "帖子已被 %{username} · %{relativeDate} 删除"
+        target_deleted_by: "帖子已被 %{username} 删除 · %{relativeDate}"
         flagged: "被举报"
         flagged_as_by: "被 %{username} 举报为%{flagReason} · %{relativeDate}"
         claimed: "已申领"
         claimed_by: "由 %{username} 申领 · %{relativeDate}"
-        unclaimed_by: "%{username} 已取消认领 · %{relativeDate}"
+        unclaimed_by: "已被 %{username} 取消认领 · %{relativeDate}"
         reviewed: "已审核"
-        approved_by: "由 %{username} · %{relativeDate} 审核"
-        rejected_by: "被 %{username} · %{relativeDate} 拒绝"
-        ignored_by: "被 %{username} · %{relativeDate} 忽略"
+        approved_by: "由 %{username} 批准 · %{relativeDate}"
+        rejected_by: "被 %{username} 拒绝 · %{relativeDate}"
+        ignored_by: "被 %{username} 忽略 · %{relativeDate}"
         view_conversation: "查看私信"
         note_added: "版主注释"
         note_added_by: "%{username} 的版主注释 · %{relativeDate}"
         no_events: "没有可显示的时间线事件"
       notes:
-        add_note_description: "添加一个注释以向其他版主提供背景信息。"
+        add_note_description: "添加注释以向其他版主提供背景信息。"
         add_note_button: "添加注释"
         placeholder: "在这里写下您的注释…"
         chars_remaining: "剩余 %{count} 个字符"
@@ -882,7 +881,7 @@ zh_CN:
       review_user: "用户"
       need_help: "需要帮助？"
       copy_link: "复制链接"
-      copy_permalink_title: "将此可评论项目的链接复制到剪贴板"
+      copy_permalink_title: "将此可评论条目的链接复制到剪贴板"
       copy_link_feedback: "链接已复制"
       view_source: "查看来源"
       insights:
@@ -890,26 +889,26 @@ zh_CN:
         flag_volume: "举报量"
         flagged_by_users:
           other: "由 %{count} 位唯一身份用户举报"
-        similar_posts: "过去的违规行为"
+        similar_posts: "过去的违规"
         flagged_in_timeframe:
           other: "%{count} 个已确认举报"
         user_activity: "用户信息"
         activities:
-          joined_on: "加入：%{joinDate}"
+          joined_on: "加入日期：%{joinDate}"
           trust_level: "信任级别：%{trustLevelName}"
           posts:
             other: "%{count} 个帖子"
         moderation_history:
-          label: "管理操作记录"
+          label: "审核历史记录"
           silenced: "被禁言：%{count} 次"
           suspended: "被封禁：%{count} 次"
           rejected_posts: "帖子被拒绝：%{count} 次"
         solution_marked: "被标记为解决方案"
         topic_has_solution: "此话题有解决方案"
         visibility: "公开范围"
-        topic_unlisted: "该话题未公开，只能通过直接链接访问。"
+        topic_unlisted: "此话题未公开，只能通过直接链接访问。"
       help:
-        community_moderation_guide: "本社区的版主指南"
+        community_moderation_guide: "本社区的审核指南"
         moderation_guide: "Discourse 审核指南"
         flag_priorities: "管理用户声誉和举报优先级"
         spam_detection: "垃圾信息检测"
@@ -1051,7 +1050,7 @@ zh_CN:
           title: 互动
           posting: 发帖
           notification: 通知
-          self_lockout: "如果改变此群组的公开范围，您将丢失自己的访问权限，确定要继续吗？"
+          self_lockout: "您即将更改群组公开范围，这将移除您自己的访问权限。确定要继续吗？"
         email:
           title: "电子邮件"
           enable_smtp: "启用 SMTP"
@@ -1064,7 +1063,7 @@ zh_CN:
           smtp_title: "SMTP"
           smtp_instructions: "当您为群组启用 SMTP 时，从群组收件箱发送的所有出站电子邮件都将通过此处指定的 SMTP 设置，而不是为您的论坛发送的其他电子邮件配置的邮件服务器发送。"
           additional_settings: "附加设置"
-          smtp_disable_confirm: "如果禁用 SMTP，所有 SMTP 设置都将被重置，相关功能也将失效。您确定要继续吗？"
+          smtp_disable_confirm: "如果您禁用 SMTP，所有 SMTP 设置都将被重置，相关功能也将被禁用。确定要继续吗？"
           prefill:
             title: "使用设置预填充："
             gmail: "Gmail"
@@ -1182,8 +1181,8 @@ zh_CN:
         make_owner_description: "将 <b>%{username}</b> 设为此群组的所有者"
         remove_owner: "移除所有者身份"
         remove_owner_description: "将 <b>%{username}</b> 从此群组的所有者中移除"
-        remove_member_self_lockout: "将自己从该群组中移除将撤消您的管理权限。您确定要继续吗？"
-        remove_owner_self_lockout: "取消自己的所有者身份将撤消您管理该群组的权限。您确定要继续吗？"
+        remove_member_self_lockout: "将您自己从此群组中移除将撤销您的管理权限。确定要继续吗？"
+        remove_owner_self_lockout: "移除您自己的所有者身份将撤销您管理此群组的权限。确定要继续吗？"
         make_primary: "设为主要群组"
         make_primary_description: "将此群组设为 <b>%{username}</b> 的主要群组"
         remove_primary: "移除主要群组状态"
@@ -1311,7 +1310,7 @@ zh_CN:
       phone: 电话
       other_accounts: "使用此 IP 地址的其他帐户："
       other_accounts_with_ip:
-        other: "%{count} 个使用此 IP 地址的其他账户"
+        other: "%{count} 个使用此 IP 地址的其他帐户"
       delete_other_accounts:
         other: "删除 %{count} 个"
       username: "用户名"
@@ -1348,14 +1347,14 @@ zh_CN:
       upcoming_changes:
         title: "即将推出的更改"
         for_user:
-          upcoming_change: "即将推出的变化"
+          upcoming_change: "即将推出的更改"
           enabled: "已启用？"
           why: "为什么？"
         why_reasons:
           not_in_specific_groups: "该用户不属于此次更改所需的特定群组"
           in_specific_groups: "用户属于此更改所需的特定群组"
           enabled_for_everyone: "此更改已对所有成员启用"
-          enabled_for_no_one: "此更改对所有成员均未启用"
+          enabled_for_no_one: "此更改已对所有成员禁用"
       user_notifications:
         filters:
           filter_by: "筛选依据"
@@ -1677,7 +1676,7 @@ zh_CN:
         verify_identity: "要继续，请验证您的身份。"
         title: "密码重置"
         remove: "移除密码"
-        remove_disabled: "在删除密码之前，该账户至少需要一种其他登录方法（例如密钥或关联的外部账户）。"
+        remove_disabled: "在移除密码之前，该帐户至少需要一种其他登录方法（例如，通行密钥或关联的外部帐户）。"
         remove_detail: "除非您重置密码，否则您将无法再使用密码访问您的帐户。"
       second_factor_backup:
         title: "双重备份代码"
@@ -1941,7 +1940,7 @@ zh_CN:
         first_time_and_daily: "每日帖子第一次被赞"
         first_time: "帖子第一次被赞"
         never: "从不"
-      notify_on_linked_posts: "当有人分享我的帖子链接时发出通知"
+      notify_on_linked_posts: "当有人分享我的帖子链接时通知我"
       email_previous_replies:
         title: "在电子邮件底部包含以前的回复"
         unless_emailed: "除非之前发送过"
@@ -2001,7 +2000,7 @@ zh_CN:
         redeemed_tab_with_count: "已确认 (%{count})"
         invited_via: "邀请"
         invited_via_link: "链接 %{key}（已确认 %{count}/%{max}）"
-        generating_link: "正在生成链接..."
+        generating_link: "正在生成链接…"
         groups: "群组"
         topic: "话题"
         sent: "创建/上次发送日期"
@@ -2254,7 +2253,7 @@ zh_CN:
       label: "选择选项"
     d_otp:
       screen_reader:
-        other: 输入 %{count} 个数值
+        other: 输入 %{count} 个数字
     form_kit:
       reset: 重置
       optional: 可选
@@ -2459,7 +2458,7 @@ zh_CN:
       admin_not_allowed_from_ip_address: "您无法从该 IP 地址以管理员身份登录。"
       resend_activation_email: "点击此处重新发送激活电子邮件。"
       omniauth_disallow_totp: "您的帐户已启用双重身份验证。请使用您的密码登录。"
-      works_with: "适用于"
+      works_with: "支持"
       activate_account: "激活帐户"
       resend_title: "重新发送激活电子邮件"
       change_email: "更改电子邮件地址"
@@ -2576,7 +2575,7 @@ zh_CN:
       topic_count:
         other: "此类别下有 %{count} 个话题"
       read_only: "只读"
-      read_only_description: "此类别是只读的，您无法为把话题发布到此类别"
+      read_only_description: "此类别为只读类别，因此您无法将其作为此话题的类别"
     timezone_input:
       ambiguous_ist: "IST 不明确，请选择特定时区（例如：亚洲/加尔各答）"
     select_kit:
@@ -2661,9 +2660,9 @@ zh_CN:
         save: "保存翻译"
         original_content: "原帖"
         translation_preview: "预览翻译"
-        original: "翻译前"
+        original: "原文"
         translation: "翻译"
-        no_translation_yet: "输入翻译后即可预览…"
+        no_translation_yet: "开始输入以查看翻译预览…"
         placeholder: "在此处输入帖子的翻译…"
         show_raw_markdown: "以原格式显示"
       group_mentioned_limit:
@@ -2768,17 +2767,17 @@ zh_CN:
       ulist_title: "项目符号列表"
       list_item: "列表条目"
       toggle_direction: "切换方向"
-      apply_wrap_title: "应用包装"
+      apply_wrap_title: "应用换行"
       wrap_modal:
-        title: "编辑包装"
-        name_label: "包装名称"
+        title: "编辑换行"
+        name_label: "将名称换行"
         attributes_label: "属性"
         add_attribute: "添加属性"
         remove_attribute: "移除属性"
         apply: "应用"
-        unwrap: "卸载包装"
-        no_attributes: "未添加任何属性。"
-      wrap_text: "包装内容"
+        unwrap: "取消换行"
+        no_attributes: "尚未添加任何属性。"
+      wrap_text: "将内容换行"
       help: "Markdown 编辑帮助"
       collapse: "最小化编辑器面板"
       open: "打开编辑器面板"
@@ -2788,7 +2787,7 @@ zh_CN:
       exit_fullscreen_prompt: "按 <kbd>ESC</kbd> 退出全屏"
       show_toolbar: "显示编辑器工具栏"
       hide_toolbar: "隐藏编辑器工具栏"
-      peek_mode_toggle: "切换预览模式"
+      peek_mode_toggle: "切换速览模式"
       modal_ok: "确定"
       cant_send_pm: "抱歉，您无法向 %{username} 发送消息。"
       create_message_error: "抱歉，创建该消息时出错。请重试。"
@@ -2822,7 +2821,7 @@ zh_CN:
           label: 切换密语
           desc: 密语仅对管理人员可见
         create_topic:
-          label: "新话题"
+          label: "新建话题"
           desc: 创建新话题
         create_personal_message:
           label: "新建消息"
@@ -2835,7 +2834,7 @@ zh_CN:
           desc: "回复但不更改最新回复日期"
         toggle_unlisted:
           label: 切换取消公开
-          desc: "未列出的主题只能通过直接链接访问"
+          desc: "不公开的话题只能通过直接链接访问"
       reload: "重新加载"
       ignore: "忽略"
       image_alt_text:
@@ -2863,7 +2862,7 @@ zh_CN:
         remove: "移除链接"
         visit: "在外部标签页中打开链接"
         link_copied: "链接已复制！"
-      unsupported_token: "富文本编辑器不支持此帖子中使用的所有功能；将您切换到 Markdown 编辑器。"
+      unsupported_token: "富文本编辑器不支持此帖子中使用的所有功能；会将您切换到 Markdown 编辑器。"
     notifications:
       tooltip:
         regular:
@@ -2982,10 +2981,10 @@ zh_CN:
         membership_request_consolidated: "新成员资格请求"
         reaction: "新回应"
         votes_released: "投票额度已释放"
-        new_features: "已发布新的 Discourse 功能！"
+        new_features: "新的 Discourse 功能已发布"
         admin_problems: "网站信息中心有新建议"
-        upcoming_change_available: "即将到来的新变化 '%{changeName}' 已可用"
-        upcoming_change_automatically_promoted: "即将到来的变化 '%{changeName}' 已自动启用"
+        upcoming_change_available: "即将发生的新变化 '%{changeName}' 已可用"
+        upcoming_change_automatically_promoted: "即将推出的更改 '%{changeName}' 已自动启用"
     upload_selector:
       change: "更改"
       delete: "删除"
@@ -3075,7 +3074,7 @@ zh_CN:
           aria_label: 使用标签筛选
         filters:
           label: 仅回访话题/帖子…
-          all: 导入消息
+          all: 包含消息
           title: 仅在标题中匹配
           likes: 我赞过
           posted: 我发过帖
@@ -3121,8 +3120,6 @@ zh_CN:
         max_views:
           placeholder: 最大值
           aria_label: 按最大浏览量筛选
-        additional_options:
-          label: "按帖子数量和话题浏览量筛选"
     hamburger_menu: "导航菜单"
     new_item: "新"
     go_back: "返回"
@@ -3238,7 +3235,7 @@ zh_CN:
           other: "所有标签将从 <b>%{count}</b> 个话题中移除。确定吗？"
         progress:
           other: "进度：<strong>%{count}</strong> 个话题"
-        notify: "将此更新通知用户"
+        notify: "将此更改通知用户。"
         performing: "正在执行批量操作，请稍候…"
         completed: "批量操作成功完成！"
         completed_count:
@@ -3266,7 +3263,7 @@ zh_CN:
           unread: "没有未读内容… 太棒了！"
           new_new: "目前没有新内容… 稍后再查看！"
           new: "目前没有新内容… 稍后再查看！"
-          generic: "这没什么好看的......一会再回来看看！"
+          generic: "这里没什么可看的… 稍后回来看看！"
     topic_bulk_actions:
       dismiss:
         name: "忽略"
@@ -3387,7 +3384,7 @@ zh_CN:
       bumped_at: "最新：%{date}"
       browse_latest_topics: "浏览最新话题"
       browse_new_replies: "浏览新回复"
-      browse_new_topics: "显示新话题"
+      browse_new_topics: "浏览新话题"
       suggest_create_topic: 准备好<a href>开始新对话</a>了吗？
       jump_reply: "跳到帖子的原始位置"
       jump_reply_aria: "跳到 @%{username} 的帖子的原始位置"
@@ -3417,7 +3414,7 @@ zh_CN:
           24_hours: "24 小时"
           custom: "自定义持续时间"
       slow_mode_notice:
-        duration: "请在本话题的两次发帖之间等待 %{duration}"
+        duration: "请在此话题的两次发帖之间等待 %{duration}"
       topic_status_update:
         title: "话题计时器"
         save: "设置计时器"
@@ -3448,7 +3445,7 @@ zh_CN:
       auto_delete:
         title: "自动删除话题"
       auto_delete_after_last_post:
-        title: "最后回复后自动删除主题"
+        title: "最后回复后自动删除话题"
       auto_bump:
         title: "自动顶帖话题"
       reminder:
@@ -3460,7 +3457,7 @@ zh_CN:
         auto_close: "此话题将在 %{timeLeft}后自动关闭。"
         auto_publish_to_category: "此话题将在 %{timeLeft}后发布到<a href=%{categoryUrl}>#%{categoryName}</a>。"
         auto_close_after_last_post: "此话题将在最后一个回复的%{duration}后关闭。"
-        auto_delete_after_last_post: "本主题将在最后一次回复后删除 %{duration}。"
+        auto_delete_after_last_post: "此话题将在最后回复后 %{duration}删除。"
         auto_delete: "此话题将在 %{timeLeft}后自动删除。"
         auto_bump: "此话题将在 %{timeLeft}后被自动顶帖。"
         auto_reminder: "您将在 %{timeLeft}后收到此话题的提醒。"
@@ -3555,7 +3552,7 @@ zh_CN:
         title: "回复"
         help: "开始撰写此话题的回复"
       footer_buttons:
-        region_label: "话题行动"
+        region_label: "话题操作"
       share:
         title: "分享话题"
         extended_title: "分享链接"
@@ -3725,10 +3722,10 @@ zh_CN:
       deleted_by_author_simple: "（话题已被作者删除）"
       localizations:
         title_edit_warning:
-          message: "这是一个翻译后的主题标题。<br><br>您想编辑 <b>原始</b> 类别、标签和标题 %{language} ，还是编辑此特定 <b>翻译</b>？"
+          message: "这是一个翻译的话题标题。<br><br>您想编辑<b>原始</b>%{language}类别、标签和标题，还是编辑此特定<b>翻译</b>？"
           action_original: "编辑原文"
-          action_translation: "编辑翻译后的话题标题"
-        editing_translation: "编辑 %{language} 翻译"
+          action_translation: "编辑翻译的话题标题"
+        editing_translation: "编辑%{language}翻译"
     post_list:
       title: "最新帖子"
       empty: "没有帖子"
@@ -3740,7 +3737,7 @@ zh_CN:
         clear_all: "全部清除"
         actions: "批量操作"
     post:
-      accessible_heading: "由 %{username} 发布于 %{date}"
+      accessible_heading: "由 %{username} 于 %{date} 发布"
       heading_anchor: "标题链接"
       confirm_delete: "确定要删除此帖子吗？"
       quote_reply: "引用"
@@ -3765,12 +3762,12 @@ zh_CN:
       deleted_by_author_simple: "（帖子已被作者删除）"
       collapse: "收起"
       load_more_replies: "加载更多回复"
-      load_more_posts_above: "加载上方更多的帖子"
-      load_more_posts_below: "加载下方更多的帖子"
+      load_more_posts_above: "加载上方更多帖子"
+      load_more_posts_below: "加载下方更多帖子"
       sr_collapse_replies: "收起嵌入式回复"
       sr_load_more_replies: "加载更多嵌入式回复"
-      loading_more_posts_above: "正在加载上方更多的帖子……"
-      loading_more_posts_below: "正在加载下方更多的帖子……"
+      loading_more_posts_above: "正在加载上方更多帖子…"
+      loading_more_posts_below: "正在加载下方更多帖子…"
       loading_complete: "加载完成"
       sr_date: "发布日期"
       sr_expand_replies:
@@ -3816,7 +3813,8 @@ zh_CN:
           edit: "编辑"
           delete: "删除"
         add: "添加新翻译"
-        manage: "管理翻译（现有 %{count} 种翻译）"
+        manage:
+          other: "管理翻译（现有 %{count} 种翻译）"
         view:
           other: "查看 %{count} 种已翻译的语言区域"
         modal:
@@ -3827,7 +3825,7 @@ zh_CN:
           title: "帖子语言"
           none: "无"
         edit_warning:
-          message: "这是一篇翻译的帖子。<br><br>您想编辑 %{language} 原帖还是编辑此特定翻译？"
+          message: "这是一篇翻译的帖子。<br><br>您想编辑%{language}原帖，还是编辑此特定翻译？"
           action_original: "编辑原帖"
           action_translation: "编辑此翻译"
       errors:
@@ -3847,7 +3845,7 @@ zh_CN:
         attachment_upload_not_allowed_for_new_user: "抱歉，新用户无法上传附件。"
         attachment_download_requires_login: "抱歉，您需要登录才能下载附件。"
       cancel_composer:
-        confirm: "你想放弃你的帖子吗？"
+        confirm: "是否要放弃您的帖子？"
         discard: "舍弃"
       via_email: "此帖子通过电子邮件送达"
       via_auto_generated_email: "此帖子通过自动生成的电子邮件送达"
@@ -3917,7 +3915,7 @@ zh_CN:
         delete_post_notice: "删除官方通知"
         remove_timer: "移除计时器"
         edit_timer: "编辑计时器"
-        remove_yourself_from_pm: "您确定要从这条消息中删除自己吗？您将无法再看到或回复它。"
+        remove_yourself_from_pm: "确定要从此消息中移除自己吗？您将无法再看到或回复它。"
       actions:
         people:
           like:
@@ -4066,7 +4064,7 @@ zh_CN:
       creation_error: 创建类别时出错。
       save_error: 保存类别时出错。
       errors:
-        self_lockout: "如果改变此类别权限，您将丢失自己的访问权限，确定要继续吗？"
+        self_lockout: "您即将更改类别权限，这将移除您自己的访问权限。确定要继续吗？"
       validations:
         emoji_required: "选择一个表情符号。"
         icon_required: "选择一个图标."
@@ -4081,12 +4079,12 @@ zh_CN:
       style: "样式"
       icon: "图标"
       emoji: "表情符号"
-      select_emoji: "选择 emoji"
+      select_emoji: "选择表情符号"
       background_color: "颜色"
       foreground_color: "文本颜色"
       color_validations:
         cant_be_empty: "不能为空"
-        incorrect_length: "必须匹配格式#RRGGBB 或#RGB"
+        incorrect_length: "必须匹配格式 #RRGGBB 或 #RGB"
         non_hexdecimal: "必须仅包含十六进制字符（0-9、AF）"
       styles:
         type: "样式"
@@ -4119,7 +4117,7 @@ zh_CN:
         everyone_full_access: '此类别是公开的，任何人都可以查看、回复和创建帖子。要限制权限，请移除授予 "%{everyone_group}" 组的一个或多个权限。'
         everyone_reply_access: '此分类为公开分类，所有人都可以查看和回复主题。如需限制权限，请移除 "%{everyone_group}" 组。'
         everyone_see_access: '此分类为公开分类，所有人都可以查看帖子。如需限制权限，请移除 "%{everyone_group}" 分组。'
-        specific_groups_have_access: "此类别是私密的，只有选定的组才能看见、回复和创建帖子。"
+        specific_groups_have_access: "此类别为不公开类别，只有所选群组可以查看、回复和创建帖子。"
         all_parent_groups_used: "父类别下的所有分组已添加。要添加更多分组，请先将其添加到父类别。"
         toggle_reply: "切换回复权限"
         toggle_full: "切换创建权限"
@@ -4157,9 +4155,9 @@ zh_CN:
       position_disabled: "类别将按活动顺序显示。要控制列表中类别的顺序，请启用<a href='%{url}'>固定类别位置</a>设置。"
       minimum_required_tags: "话题中所需的最少标签数："
       default_slow_mode: '为此类别中的新话题启用“慢速模式”。'
-      subcategory_of: "是……的子类别"
+      subcategory_of: "所属类别…"
       none_subcategory_text: "无"
-      subcategory_permissions_warning: "私有类别的子类别不能公开。"
+      subcategory_permissions_warning: "不公开类别的子类别不能公开。"
       visibility:
         title: "公开范围"
         public: "公开"
@@ -4475,7 +4473,7 @@ zh_CN:
       counter: "%curr%/%total%"
       close: "关闭 (Esc)"
       zoom: "缩放（Z 键）"
-      error: "图像无法加载"
+      error: "图片无法加载"
       content_load_error: '<a href="%url%">内容</a>无法加载。'
       image_load_error: '<a href="%url%">图片</a>无法加载。'
     cannot_render_video: 无法呈现此视频，因为您的浏览器不支持编解码器。
@@ -4517,7 +4515,7 @@ zh_CN:
         go_to_unread_post: "%{shortcut} 转到第一个未读帖子"
       application:
         title: "应用程序"
-        create: "%{shortcut} 创建新话题或私信"
+        create: "%{shortcut} 创建新话题或个人消息"
         notifications: "%{shortcut} 打开通知"
         hamburger_menu: "%{shortcut} 打开导航菜单"
         user_profile_menu: "%{shortcut} 打开用户菜单"
@@ -4639,7 +4637,7 @@ zh_CN:
       add_to_calendar: "添加到日历"
       google: "Google 日历"
       ics: "ICS"
-      default_title: "预定活动"
+      default_title: "定时活动"
     tagging:
       all_tags: "所有标签"
       other_tags: "其他标签"
@@ -4658,11 +4656,16 @@ zh_CN:
       category_restricted: "此标签仅限于您无权访问的类别。"
       synonyms: "同义词"
       synonyms_description: "使用以下标签时，它们将被替换为 <b>%{base_tag_name}</b>。"
+      synonyms_inline: "这些同义词将被替换为 %{base_tag_name}："
       save: "保存标签的名称和描述"
       tag_groups_info:
         other: "此标签属于以下组：%{tag_groups}。"
+      tag_groups_info_prefix:
+        other: "此标签属于以下分组： "
       category_restrictions:
         other: "它只能用于以下类别："
+      restricted_to: "仅限于"
+      no_synonyms: "此标签没有同义词。"
       edit_synonyms: "编辑同义词"
       add_synonyms_label: "添加同义词："
       add_synonyms: "添加"
@@ -4679,7 +4682,31 @@ zh_CN:
         other: "其 %{count} 个同义词也将被删除。"
       edit_tag: "编辑标签名称和描述"
       edit: "编辑此标签"
-      description: "描述（最多 1000 个字符）"
+      description: "描述"
+      settings:
+        title: "设置"
+        edit_title: "编辑标签： %{name}"
+        edit_tag_prefix: "编辑标签："
+        select_tag: "选择要编辑的标签"
+        general: "常规"
+        localizations: "本地化"
+        back: "返回"
+        name: "名称"
+        slug: "缩略名"
+        name_placeholder: "标签名称"
+        slug_placeholder: "标签别名（可选，根据名称自动生成）"
+        saved: "标签设置已保存"
+        no_synonyms: "没有为此标签定义同义词。"
+        add_synonym_placeholder: "搜索可添加为同义词的标签..."
+        synonyms_subtitle: "使用以下标签时，它们将被替换为 %{name}。"
+        save: "保存标签"
+        delete: "删除标签"
+        synonyms_hint: "使用上述标签时，它们将被替换为 %{baseTagName}。"
+        add_synonyms_confirm: "当前使用 %{synonymNames} 的地方都将更改为使用 %{tagName} 。您确定要进行此更改吗？"
+      localization:
+        locale: "语言区域"
+        name: "名称"
+        description: "描述"
       sort_by: "排序依据："
       sort_by_count: "计数"
       sort_by_name: "名称"
@@ -4727,18 +4754,18 @@ zh_CN:
           description: "您不会收到有关带有此标签的新话题的任何通知，它们也不会出现在您的未读标签页上。"
       groups:
         back_btn: "返回到所有标签"
-        title: "标签组"
+        title: "标签群组"
         about_heading: "选择一个标签组或创建一个新的标签组"
         about_heading_empty: "创建一个新的标签组以开始"
         about_description: "标签组可帮助您在一个地方管理多个标签的权限。"
-        new: "新标签组"
-        new_title: "创建标签组"
-        edit_title: "编辑标签组"
+        new: "新建标签群组"
+        new_title: "创建标签群组"
+        edit_title: "编辑标签群组"
         tags_label: "此组中的标签"
         parent_tag_label: "上级标签"
         parent_tag_description: "只有存在上级标签时，才能使用来自此组的标签。"
         one_per_topic_label: "此组中每个话题限制一个标签"
-        new_name: "新标签组"
+        new_name: "新建标签群组"
         name_placeholder: "名称"
         save: "保存"
         delete: "删除"
@@ -4848,7 +4875,7 @@ zh_CN:
       tags_form_modal:
         title: "编辑标签导航"
         filter_placeholder: "筛选标签"
-        no_tags: "没有匹配当前过滤器的标签。"
+        no_tags: "没有与当前筛选条件匹配的标签。"
         subtitle:
           text: "我们将自动显示此网站的热门标签"
       edit_navigation_modal_form:
@@ -4926,7 +4953,7 @@ zh_CN:
           header_link_text: "类别"
           header_action_title: "编辑边栏类别"
           header_action_new: "新建类别"
-          header_action_edit_sidebar: "编辑侧边栏类别"
+          header_action_edit_sidebar: "编辑边栏类别"
           header_action_edit_header_dropdown: "编辑导航类别"
           configure_defaults: "配置默认值"
         community:
@@ -5177,7 +5204,7 @@ zh_CN:
         translations_enabled: "已启用翻译"
         translations_disabled: "已禁用翻译"
     language_switcher:
-      title: "改变站点语言"
+      title: "更改站点语言"
   admin_js:
     type_to_filter: "输入以筛选…"
     settings: "设置"
@@ -5195,9 +5222,13 @@ zh_CN:
           never: "从不"
       reports:
         title: "可用报告列表"
-        meta_doc: "报告是帮助您了解网站上所发生事情的有力工具。它们可以帮助您了解趋势、发现问题并根据数据做出决策。"
         sidebar_title: "报告"
         back: "返回到所有报告"
+        group_traffic: "流量"
+        group_members: "成员"
+        group_moderation: "审核"
+        group_security: "安全性"
+        group_other: "其他"
       config_sections:
         account:
           title: "帐户"
@@ -5220,29 +5251,28 @@ zh_CN:
         plugin: "插件"
         metadata: "元数据"
         enabled: "已启用"
-        enabled_for: "已启用……"
+        enabled_for: "已启用…"
         show_image: "显示图片"
         edit_groups: "编辑选择加入的群组"
-        groups_updated: "群组已更新"
+        groups_updated: "群组已更新！"
         save_groups: "保存群组"
         add_groups_to_enable: "添加群组以启用此功能"
         no_changes_to_save: "没有要保存的更改"
         select_groups: "选择群组…"
         opt_in_groups: "选择加入的群组"
         show_related_settings: "显示相关设置..."
-        opt_in_groups_instructions: "“选择加入的群组”可以用于让特定用户在正式变更发布前进行测试。请注意，当变更进入稳定状态后，所有用户都会适用于变更。"
-        enabled_for_throttle: "您太频繁地修改该功能对哪些用户启用了，请等待几秒后重试。"
+        opt_in_groups_instructions: "选择加入的群组可以用于让特定用户群组在向所有人发布更改前进行测试。请注意，当更改进入稳定状态后，这些群组将不再适用。"
+        enabled_for_throttle: "您修改此更改启用对象的速度过快。请稍等片刻后再试。"
         change_enabled_for_success: "您已为 %{enabledFor} 启用此更改"
-        change_disabled: "您已选择不加入此变更"
-        permanent_notice: "这项变更已永久生效，并将很快被移除。您不能选择退出。"
+        change_disabled: "您已选择不加入此更改"
+        permanent_notice: "此更改现已永久生效，并将很快被移除。您无法再选择退出。"
         permanent_soon_notice: "这一变化将很快永久生效。您将无法再选择退出。"
-        permanent_no_group_selection: "不适用，永久性变更适用于所有群组。"
-        no_changes: "目前暂无变更计划"
+        permanent_no_group_selection: "不适用，永久更改适用于所有群组。"
+        no_changes: "目前暂无即将推出的更改"
         preview: "预览"
         enabled_for_options:
           no_one: "没有人"
           everyone: "所有人"
-          staff: "仅管理人员"
           specific_groups: "特定群组"
           specific_groups_with_group_names:
             other: "群组 %{groupNames}"
@@ -5259,25 +5289,24 @@ zh_CN:
           all_members: "所有成员"
           developers: "开发者"
         filter:
-          search_placeholder: "按名称、描述或插件筛选……"
-          no_results: "没有符合您筛选条件的更改"
+          search_placeholder: "按名称、描述或插件筛选…"
+          no_results: "没有与您的筛选条件匹配的即将推出的更改"
           all: "所有"
           enabled_all: "所有已启用的状态"
           enabled: "已启用"
-          enabled_for_staff: "为管理人员启用"
           enabled_for_specific_groups: "为特定群组启用"
           disabled: "已禁用"
-          impact_type_all: "影响类型"
+          impact_type_all: "所有影响类型"
           impact_type_feature: "功能"
           impact_type_other: "其他"
           status_all: "所有状态"
-          status_conceptual: "概念阶段"
+          status_conceptual: "概念性"
           status_experimental: "实验性"
           status_alpha: "Alpha"
           status_beta: "Beta"
           status_stable: "稳定"
           status_permanent: "永久"
-          impact_role_all: "所有影响的角色"
+          impact_role_all: "所有影响角色"
           impact_role_admins: "管理员"
           impact_role_moderators: "版主"
           impact_role_staff: "管理人员"
@@ -5318,12 +5347,12 @@ zh_CN:
           header_description: "即将到来的 Discourse 更新列表，可能会影响您的站点，以及您可以选择加入的实验性功能。您可以按影响程度、更改类型和状态进行筛选。\n\n选择加入组可用于让特定用户组在更新发布给所有人之前进行测试，不过一旦更新进入稳定状态，这些组就不再相关。"
         login:
           title: "登录与身份验证"
-          header_description: "配置用户登录和验证方式、机密和密钥、OAuth2 提供商等。"
+          header_description: "配置用户登录和验证身份的方式、机密与密钥、OAuth2 提供商等。"
           sub_pages:
             common_settings:
               title: "设置"
             authenticators:
-              title: "第三方登录"
+              title: "社交登录"
             discourseconnect:
               title: "Discourse Connect"
             discourse_id:
@@ -5331,14 +5360,14 @@ zh_CN:
         discourse_id:
           title: "Discourse ID"
           stats:
-            total_users: "用户数量"
-            signups_30_days: "注册数量（30天内）"
-            logins_30_days: "登录数量（30天内）"
+            total_users: "用户总数"
+            signups_30_days: "注册数量（30 天）"
+            logins_30_days: "登录次数（30 天）"
           regenerate_credentials: "重新生成凭据"
-          regenerate_confirm: "您确定要重新生成您的 Discourse ID 凭据吗？这将生成新的客户端机密。 通常不需要重新生成凭据，但可能有助于增强安全性。"
-          description: "Discourse ID 是一种单点登录服务，允许用户使用一个账户登录多个 Discourse 网站。它支持常见的社交登录提供商，如 Google、Facebook、Apple 和 Github，无需额外配置。"
+          regenerate_confirm: "确定要重新生成您的 Discourse ID 凭据吗？这将生成新的客户端机密。通常不需要重新生成凭据，但这可能有助于增强安全性。"
+          description: "Discourse ID 是一种单点登录服务，允许用户使用一个帐户登录多个 Discourse 站点。无需额外配置即可支持 Google、Facebook、Apple 和 Github 等常见社交登录提供商。"
           learn_more: "了解详情"
-          regenerate_success: "凭证已成功重新生成。"
+          regenerate_success: "凭据已成功重新生成。"
         logo:
           title: "徽标"
           header_description: "配置整个站点使用的徽标和图标"
@@ -5354,7 +5383,6 @@ zh_CN:
               help_text: "建议尺寸为 600 x 80 像素。"
             large_icon:
               title: "方形图标"
-              description: "徽标图片的方形版本出现在管理的顶部，也是移动主屏幕应用徽标。"
               help_text: "建议尺寸为 512 x 512 像素。"
             square_icon_dark:
               required: "为深色模式使用不同的方形图标？"
@@ -5426,30 +5454,30 @@ zh_CN:
             modal_no: "否，只适用于未来"
         welcome_banner:
           title: "欢迎横幅"
-          header_description: "配置向网站访客显示的包含搜索栏的横幅。"
+          header_description: "配置向站点访客显示的包含搜索栏的横幅。"
           saved: "欢迎横幅设置已成功保存。"
           form:
             enabled_themes:
-              label: "已在主题中启用……"
-              description: "选择显示在横幅的主题，此处仅显示已启用的主题。"
+              label: "已在主题中启用…"
+              description: "选择应显示在横幅的主题。仅显示有效主题。"
               select_label: "选择主题"
             background_image:
               label: "背景图片"
-              description: "该图像将显示在横幅文本后。"
+              description: "此图片将显示在横幅文本后。"
             text_color:
               label: "文本颜色"
-              description: "上传上方“背景图片”后，请使用此设置更改横幅文字颜色，以确保其清晰可读。如果留空或未上传背景图片，则颜色由当前主题控制。"
+              description: "上传上方“背景图片”后，请使用此设置更改横幅文本颜色，以确保其清晰可读。如果留空或未上传背景图片，有效主题将控制颜色。"
             page_visibility:
-              label: "页面可见性"
-              description: "选择横幅显示的位置"
+              label: "页面公开范围"
+              description: "选择显示横幅的位置"
               options:
                 top_menu_pages: "顶部菜单页面"
-                homepage: "仅限主页"
+                homepage: "仅首页"
                 discovery: "发现页"
                 all_pages: "所有页面"
             location:
-              label: "地点"
-              description: "选择横幅在页面上显示的位置"
+              label: "位置"
+              description: "选择横幅在页面上显示的位置。"
               options:
                 above_topic_content: "话题内容上方"
                 below_site_header: "站点标题下方"
@@ -5457,21 +5485,21 @@ zh_CN:
               title: "自定义文本"
               locale_label: "语言"
             header_new_members:
-              label: "新成员标题"
-              description: "可用变量： <code>&percnt;{site_name}</code>, <code>&percnt;{preferred_display_name}</code>"
-              placeholder: "欢迎， %{preferred_display_name}！"
+              label: "新成员的标题"
+              description: "可用变量：<code>&percnt;{site_name}</code>、<code>&percnt;{preferred_display_name}</code>"
+              placeholder: "欢迎，%{preferred_display_name}！"
             header_logged_in:
               label: "已登录成员的标题"
-              description: "可用变量： <code>&percnt;{site_name}</code>, <code>&percnt;{preferred_display_name}</code>"
+              description: "可用变量：<code>&percnt;{site_name}</code>、<code>&percnt;{preferred_display_name}</code>"
               placeholder: "欢迎回来，%{preferred_display_name}！"
             header_anonymous:
-              label: "匿名访客标题"
-              description: "可用变量： <code>&percnt;{site_name}</code>"
+              label: "匿名访客的标题"
+              description: "可用变量：<code>&percnt;{site_name}</code>"
               placeholder: "欢迎来到 %{site_name}！"
             subheader_logged_in:
-              label: "已登录成员的子标题"
+              label: "已登录成员的副标题"
               description: "显示在已登录用户标题下方的辅助文本。"
-              placeholder: "看看社区里有哪些新内容"
+              placeholder: "查看社区中的最新动态"
             subheader_anonymous:
               label: "匿名访客的副标题"
               description: "显示在匿名访问者标题下方的辅助文本。"
@@ -5479,7 +5507,7 @@ zh_CN:
             search_placeholder:
               label: "搜索占位符"
               description: "欢迎横幅中搜索框的占位符文本。"
-              placeholder: "搜索主题……"
+              placeholder: "搜索话题…"
         navigation:
           title: "导航"
           header_description: "配置网站的导航链接与菜单项。这包括主导航菜单、首页顶部快速链接以及管理边栏的位置和行为"
@@ -5541,7 +5569,7 @@ zh_CN:
           header_description: "报告是帮助您了解站点上所发生事情的强大工具。它们可以帮助您了解趋势、发现问题并根据数据做出决策。"
           sub_pages:
             settings:
-              title: "信息中心设置"
+              title: "设置"
         badges:
           title: "徽章"
           header_description: "徽章奖励用户的活动、贡献和成就，以表彰、认可和鼓励用户在社区中的积极行为和参与。"
@@ -5687,7 +5715,7 @@ zh_CN:
         help: "您当前使用的主题为 <a href='%{basePath}/admin/customize/themes/%{currentThemeId}'>%{currentTheme}</a>。请转到<a href='%{basePath}/admin/customize/themes/%{currentThemeId}'>主题配置页面</a>更改主题站点设置，或点击下表中链接的主题，编辑其设置。"
         filter: "按设置名称、描述或主题名称筛选主题站点设置…"
         filter_no_results: "没有符合您的筛选条件的主题站点设置"
-        site_setting_warning: '此设置由您网站的默认主题接管（%{defaultThemeName}）。您可以在 <a href="%{basePath}/admin/customize/themes/%{defaultThemeId}">主题编辑页面</a> 进行修改。'
+        site_setting_warning: '此设置由您的站点的默认主题 (%{defaultThemeName}) 管理。您可以在<a href="%{basePath}/admin/customize/themes/%{defaultThemeId}">主题编辑页面</a>中进行修改。'
       search:
         modal_title: "在管理页面中搜索所有内容"
         title: "搜索"
@@ -5696,17 +5724,6 @@ zh_CN:
         no_results: '我们找不到任何与“%{filter}”匹配的内容。'
         result_count:
           other: '“%{filter}”有 %{count} 个结果'
-        result_types:
-          page:
-            other: "页面"
-          report:
-            other: "报告"
-          setting:
-            other: "设置"
-          theme:
-            other: "主题"
-          component:
-            other: "组件"
       new_features:
         title: "最新变化"
         check_for_updates: "检查更新"
@@ -5810,7 +5827,7 @@ zh_CN:
           daily: 每天
           monthly: 每月
           weekly: 每周
-          value_so_far: "%{value} （目前为止）"
+          value_so_far: "%{value}（目前为止）"
           dates: "日期 (UTC)"
           groups: "所有群组"
           disabled: "此报告已禁用"
@@ -5823,7 +5840,7 @@ zh_CN:
             disabled: '趋势搜索报告已禁用。启用<a href="%{basePath}/admin/site_settings/category/all_results?filter=log%20search%20queries">记录搜索查询</a>以收集数据。'
           average_chart_label: 显示平均数，而不是总数
           sort_button: "按%{column}排序"
-          sort_button_current: "按 %{column}, %{direction} 排序"
+          sort_button_current: "按%{column}排序，%{direction}"
           sort_ascending: "升序"
           sort_descending: "降序"
           filters:
@@ -5993,7 +6010,7 @@ zh_CN:
               recover: 恢复一个话题。
               read_lists: 阅读诸如热门、新、最新等话题列表。也支持 RSS。
               status: "更新话题的状态。状态：已关闭、归档、可见已置顶。启用：true、false。在此处和请求负载中指定 category_id，以仅允许该类别中话题的状态更改。"
-              change_owner: 更改主题中帖子的所有权。
+              change_owner: 更改话题中帖子的所有权。
             posts:
               edit: 编辑任意帖子或特定帖子。
               delete: 删除帖子。
@@ -6130,7 +6147,7 @@ zh_CN:
           user_destroyed: "用户被删除"
           user_suspended: "用户被封禁"
           user_unsuspended: "用户被解除封禁"
-          user_anonymized: "用户已被匿名化"
+          user_anonymized: "用户已进行匿名化处理"
         reviewable_event:
           group_name: "可审核的事件"
           reviewable_created: "可审核的条目已就绪"
@@ -6428,8 +6445,8 @@ zh_CN:
             title: "颜色选项"
             toggle: "可由用户选择"
             toggle_description: "用户可以选择调色板"
-            toggle_default_light_on_theme: "调色板是默认主题上的默认浅色调色板（%{themeName}）"
-            toggle_default_dark_on_theme: "调色板是默认主题上的默认深色调色板（%{themeName}）"
+            toggle_default_light_on_theme: "调色板是默认主题 (%{themeName}) 上的默认浅色调色板"
+            toggle_default_dark_on_theme: "调色板是默认主题 (%{themeName}) 上的默认深色调色板"
           colors:
             title: "颜色"
           save_changes: "保存更改"
@@ -6520,7 +6537,7 @@ zh_CN:
             confirm: "确定要删除此备份吗？"
           restore:
             is_disabled: "恢复功能目前已禁用。要启用此功能，请访问<a href='%{url}'>网站设置</a>。"
-            is_disabled_title: "恢复功能已禁用。如需启用，请在站点设置中搜索“允许恢复”。"
+            is_disabled_title: "恢复功能已禁用。如需启用，请在站点设置中搜索 'allow restore'。"
             label: "恢复"
             title: "恢复该备份"
             confirm: "确定要恢复此备份吗？"
@@ -6580,8 +6597,8 @@ zh_CN:
           body: "正文"
           revert: "还原变更"
           revert_confirm: "确定要还原您的变更吗？"
-          search_templates: "按模板名称筛选..."
-          no_templates_found: "没有符合您筛选条件的模板。"
+          search_templates: "按模板名称筛选…"
+          no_templates_found: "没有与您的筛选条件匹配的模板。"
           edit: "编辑"
           back: "返回模板"
         component:
@@ -7175,10 +7192,10 @@ zh_CN:
             delete_associated_accounts: "删除关联帐户"
             change_theme_site_setting: "更改主题站点设置"
             stop_impersonating: "停止模拟"
-            upcoming_change_toggled: "切换即将到来的更新"
+            upcoming_change_toggled: "已切换即将推出的更改"
             upcoming_change_available: "即将推出的更改已可用"
-            change_site_setting_groups: "更改站点设置组"
-            discourse_id_regenerate_credentials: "重新生成 Discourse ID 凭证"
+            change_site_setting_groups: "更改站点设置群组"
+            discourse_id_regenerate_credentials: "重新生成 Discourse ID 凭据"
         screened_emails:
           title: "已屏蔽的电子邮件地址"
           description: "当有人尝试创建新帐户时，将检查以下电子邮件地址并禁止注册，或执行某些其他操作。"
@@ -7369,7 +7386,7 @@ zh_CN:
         help: "使用此工具模拟用户帐户以进行调试。完成后，您必须退出。"
         not_found: "无法找到该用户。"
         invalid: "抱歉，您不能模拟该用户。"
-        error: "哎呀。发生意外错误。"
+        error: "糟糕。发生意外错误。"
       users:
         title: "用户"
         description: "查看和管理用户。"
@@ -7475,16 +7492,7 @@ zh_CN:
         penalty_post_delete: "删除帖子"
         penalty_post_delete_replies: "删除帖子 + 任何回复"
         penalty_post_delete_all: "删除用户发布的所有话题和回复"
-        penalty_post_delete_all_confirmation_MF: |
-          <span>这将删除
-          { TOPICS, plural,
-              one {# 个主题}
-              other {# 个主题}
-          } 和
-          { REPLIES, plural,
-              one {# 个回复}
-              other {# 个回复}
-          }。<b>该操作无法撤销！</b>您确定要这样做吗？</span>
+        penalty_post_delete_all_confirmation_MF: "<span>这将删除 \n{ TOPICS, plural,\n    other {# 个话题}\n}和 \n{ REPLIES, plural,\n    other {# 条回复}\n}。<b>此操作无法撤消</b>！确定要执行此操作吗？</span>\n"
         penalty_post_edit: "编辑帖子"
         penalty_post_none: "无操作"
         penalty_count: "处罚计数"
@@ -7543,10 +7551,10 @@ zh_CN:
         time_read: "阅读时间"
         post_edits_count: "帖子编辑"
         upcoming_changes:
-          title: "用户即将推出的变化"
-          description: "要修改群组或启用或禁用即将推出的更改，请访问 <a href='%{basePath}/admin/config/upcoming-changes'>即将推出的更改配置页面</a>。"
+          title: "用户即将推出的更改"
+          description: "要修改群组或者启用或禁用即将推出的更改，请访问<a href='%{basePath}/admin/config/upcoming-changes'>即将推出的更改配置页面</a>。"
           filter_placeholder: "按名称或描述筛选即将推出的更改"
-          filter_no_results: "未发现即将推出的更改"
+          filter_no_results: "找不到即将推出的更改"
         exports:
           title: 用户导出
           download:
@@ -7571,7 +7579,7 @@ zh_CN:
           progress:
             title: "删除帖子的进度"
             description:
-              other: "正在删除 @%{username} 的 %{count} 个帖子"
+              other: "正在删除 @%{username} 的 %{count} 个帖子…"
           confirmation:
             title: "删除 @%{username} 发布的所有帖子"
             description: |
@@ -7754,7 +7762,7 @@ zh_CN:
           enabled: "在用户卡片上显示"
           disabled: "不在用户卡片上显示"
         show_on_signup:
-          title: "显示到注册表单"
+          title: "在注册表单上显示"
           enabled: "在注册表单上显示"
           disabled: "在注册表单上隐藏"
         searchable:
@@ -7764,6 +7772,7 @@ zh_CN:
         field_types:
           text: "文本"
           textarea: "文本区域"
+          date: "日期"
           confirm: "确认"
           dropdown: "下拉菜单"
           multiselect: "多选"
@@ -7829,7 +7838,7 @@ zh_CN:
         download_file: "下载"
         upload_restrictions:
           extensions: "已接受：%{extensions}"
-          max_size: "最大： %{size}"
+          max_size: "最大：%{size}"
         selectable_avatars:
           title: "用户可以选择的头像列表"
         table_column_heading:
@@ -7868,7 +7877,7 @@ zh_CN:
           experimental: "实验性"
         secret_list:
           invalid_input: "输入字段不能为空或包含竖线字符。"
-          already_exists: "条目 %{key} 已存在。"
+          already_exists: "%{key} 的条目已存在。"
         default_categories:
           modal_description:
             other: "要回溯应用此变更吗？这将更改 %{count} 位现有用户的偏好设置。"
@@ -7904,7 +7913,7 @@ zh_CN:
             prompt: "您即将修改密码策略。这将影响所有从现在起更改密码的用户。确定要继续吗？"
             confirm: "是，更新密码策略"
           clean_up_inactive_users_after_days:
-            prompt: "将此值设置为 0 以外的任何值，都会导致在该天数内不再活跃的用户被永久删除。您确定要继续吗？"
+            prompt: "将此值设置为 0 以外的任何值都会导致在该天数内不再活跃的用户被永久删除。确定要继续吗？"
             confirm: "是的，我明白除非我将此值设置为 0，否则不活跃用户将被永久删除。"
         job_status:
           completed: "更新完成"
@@ -8045,7 +8054,7 @@ zh_CN:
         category: "发布到类别"
         tags: "话题标签"
         post_author: "帖子作者"
-        post_author_description: "为本主机所有嵌入主题设置的作者，覆盖博客页面元标签。留空则从页面的 <meta name='discourse-username'> 或 <meta name='author'> 标签读取作者信息。"
+        post_author_description: "为此主机所有嵌入主题设置的作者，覆盖博客页面元标签。留空则从页面的 <meta name='discourse-username'> 或 <meta name='author'> 标签读取作者信息。"
         post_author_with_default: "帖子作者（默认为 %{author}）"
         add_host: "添加主机"
         posts_and_topics: "帖子和话题配置"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 37a6250b67779..ffcf309cd18ee 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -579,18 +579,13 @@ zh_TW:
       in_reply_to: "回覆給"
       filtered_flagged_by: "檢舉者"
       unknown:
-        title:
-          other: "您有停用外掛程式的待審核項目："
         instruction: "在您啟用相關外掛程式之前，它們無法正常顯示。請啟用外掛程式並刷新頁面。或者，您也可以忽略它們。<a href='%{url}' target='_blank'>瞭解更多...</a>"
         reviewable_unknown_source: "%{reviewableType} (未知外掛程式)"
         reviewable_known_source: "%{reviewableType} (來自 '%{pluginName}' 外掛程式)"
         ignore_all: "忽略全部"
         enable_plugins: "啟用外掛程式"
-        delete_confirm: "您確定要刪除所有由禁用外掛程式建立的評論嗎？"
-        ignore_success: "所有由禁用外掛程式建立的評論已被刪除。"
       explain:
         why: "解釋為什麼這個項目結束在隊列"
-        title: "可審閱的評分"
         formula: "公式"
         subtotal: "小計"
         total: "總計"
@@ -604,10 +599,8 @@ zh_TW:
           title: "紀錄上已經同意的標誌的用戶將獲得獎勵。"
         trust_level_bonus:
           name: "信任等級"
-          title: "由信任等級較高的使用者建立的可審閱項目的分數較高。"
         type_bonus:
           name: "類型獎金"
-          title: "某些可審查類型可由工作人員指定加分，使其具有較高的優先順序。"
       revise_and_reject_post:
         title: "修訂"
         reason: "原因"
@@ -616,7 +609,6 @@ zh_TW:
         custom_reason: "清楚說明原因"
         other_reason: "其他..."
         optional: "選擇性"
-      stale_help: "此可審查問題已由 <b>%{username}</b>解決。"
       claim_help:
         optional: "您可以聲明此項目以防止其他人審核。"
         required: "您必須先審核項目才能查看它們。"
@@ -2825,8 +2817,6 @@ zh_TW:
         max_views:
           placeholder: 最大值
           aria_label: 按最大瀏覽量過濾
-        additional_options:
-          label: "依發表次數和主題瀏覽次數篩選"
     new_item: "新增"
     go_back: "返回"
     not_logged_in_user: "使用者頁面（包含目前活動及喜好的摘要）"
@@ -4223,7 +4213,17 @@ zh_TW:
       delete_confirm_synonyms:
         other: "其 %{count} 同義詞也將被刪除。"
       edit_tag: "編輯標記名稱和描述"
-      description: "說明（最多 1000 個字元）"
+      description: "描述"
+      settings:
+        title: "設定"
+        general: "一般"
+        back: "上一步"
+        name: "名稱"
+        slug: "縮寫"
+        name_placeholder: "標記名稱"
+      localization:
+        name: "名稱"
+        description: "描述"
       sort_by: "排序方式："
       sort_by_count: "總數"
       sort_by_name: "名稱"
@@ -4639,9 +4639,13 @@ zh_TW:
           never: "永不"
       reports:
         title: "可見報告列表"
-        meta_doc: "報告是幫助您了解網站上所發生事情的有力工具。它們可以幫助您了解趨勢、發現問題並根據數據做出決策。"
         sidebar_title: "報告"
         back: "返回到所有報告"
+        group_traffic: "流量"
+        group_members: "成員"
+        group_moderation: "管理"
+        group_security: "安全性"
+        group_other: "其他"
       config_sections:
         account:
           title: "帳號"
@@ -4666,7 +4670,6 @@ zh_TW:
         preview: "預覽"
         enabled_for_options:
           everyone: "所有使用者"
-          staff: "只限工作人員"
         statuses:
           experimental: "實驗性"
         impact_roles:
@@ -4729,7 +4732,6 @@ zh_TW:
               help_text: "建議尺寸為 600 x 80 像素。"
             large_icon:
               title: "方形圖示"
-              description: "方形版本的標誌圖片會出現在管理頂端，同時也是行動首頁應用程式的標誌。"
               help_text: "建議尺寸為 512 x 512 像素。"
             square_icon_dark:
               required: "暗黑模式下使用不同的方形圖示嗎？"
@@ -4850,6 +4852,9 @@ zh_TW:
         reports:
           title: "報告"
           header_description: "報告是幫助您了解網站上所發生事情的有力工具。它們可以幫助您了解趨勢、發現問題並根據數據做出決策。"
+          sub_pages:
+            settings:
+              title: "設定"
         badges:
           title: "徽章"
           header_description: "徽章可獎勵使用者的活動、貢獻和成就，以表揚、確認和鼓勵社群內的正面行為和參與。"
@@ -4946,17 +4951,6 @@ zh_TW:
         default_value: "預設"
       search:
         title: "搜索"
-        result_types:
-          page:
-            other: "頁面"
-          report:
-            other: "報告"
-          setting:
-            other: "設定"
-          theme:
-            other: "佈景主題"
-          component:
-            other: "元件"
       new_features:
         title: "有什麼最新消息？"
         check_for_updates: "檢查更新"
@@ -6827,6 +6821,7 @@ zh_TW:
           disabled: "不可搜尋"
         field_types:
           text: "文字"
+          date: "日期"
           confirm: "確認"
           dropdown: "下拉"
           multiselect: "多選"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index b742cf68af3d3..66b24703b5213 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -60,8 +60,6 @@ ar:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} بواسطة %{username}"
-    too_many_urls: "لا يمكن عرض لوحة معاينة لأكثر من 10 روابط في طلب واحد."
-    concurrency_not_allowed: "طلبات الإدراج المتزامنة (inline-oneboxing) غير مسموح بها. يُرجى إرسال طلب واحد فقط في كل مرة."
   components:
     enabled_filter: "مفعَّلة"
     disabled_filter: "متوقفة"
@@ -156,6 +154,8 @@ ar:
         invalid_type: "%{type} ليس نوعًا صالحًا"
         humanize_not_valid_string_value: "يجب أن تكون الخاصية في JSON Pointer '%{property_json_pointer}' سلسلة نصية."
         not_valid_string_value: "يجب أن تكون سلسلة نصية"
+        humanize_not_valid_datetime_value: "يجب أن تكون الخاصية الموجودة عند مؤشر JSON '%{property_json_pointer}' تاريخًا ووقتًا صالحًا."
+        not_valid_datetime_value: "يجب أن يكون تاريخًا ووقتًا صالحًا"
         humanize_not_valid_integer_value: "يجب أن تكون الخاصية في JSON Pointer '%{property_json_pointer}' عددًا صحيحًا."
         not_valid_integer_value: "يجب أن تكون عددًا صحيحًا"
         humanize_not_valid_float_value: "يجب أن تكون الخاصية في JSON Pointer '%{property_json_pointer}' عددًا عشريًا."
@@ -361,6 +361,7 @@ ar:
       greater_than: يجب أن تكون أكبر من %{count}
       greater_than_or_equal_to: يجب أن تكون أكبر من أو تساوي %{count}
       has_already_been_used: "تم استخدامها بالفعل"
+      in: يجب أن يكون ضمن %{count}
       inclusion: غير متضمَّنة في القائمة
       invalid: غير صالحة
       is_invalid: "تبدو غير واضحة، هل هذه الجملة كاملة؟"
@@ -452,7 +453,6 @@ ar:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "يجب ألا يقل طول وكلاء المستخدمين عن 3 أحرف لتجنُّب تقييد معدل المستخدمين القانونيين من غير قصد."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "لا يمكنك إضافة أيٍّ من القيم التالية إلى الإعداد: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "لا يمكنك إيقاف إزالة البيانات الوصفية للصورة إذا كان 'composer media optimization image enabled' مفعلًا. أوقف 'composer media optimization image enabled' قبل إيقاف إزالة البيانات الوصفية للصورة."
-      x_summary_large_image_no_svg: "لا يمكن أن تكون صور ملخص Twitter المُستخدَمة في البيانات الوصفية لـ twitter:image بتنسيق svg."
       tl0_and_anonymous_flag: "يجب إدخال 'site contact email' أو 'email address to report illegal content' للمستخدمين المجهولين."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "يشترط هذا الإعداد تفعيل خيار \"السماح بوضع المستخدم المجهول\" مسبقًا."
     conflicting_google_user_id: 'تم تغيير معرِّف حساب Google لهذا الحساب؛ مطلوب تدخُّل فريق العمل لأسباب أمنية. يُرجى التواصل مع فريق العمل وتوجيهه إلى <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -510,6 +510,7 @@ ar:
     redemption_count_less_than_max: "ينبغي أن يكون أقل من %{max_redemptions_allowed}."
     email_xor_domain: "غير مسموح بحقول البريد الإلكتروني والنطاق في الوقت نفسه"
     existing_user_success: "تم استخدام الدعوة بنجاح"
+    email_invites_disabled: "إرسال رسائل الدعوة عبر البريد الإلكتروني معطَّل"
   bulk_invite:
     file_should_be_csv: "يجب أن يكون الملف الذي تم تحميله بتنسيق CSV."
     max_rows: "تم إرسال أول %{max_bulk_invites} دعوة. حاول تقسيم الملف إلى أجزاء أصغر."
@@ -780,6 +781,7 @@ ar:
         other: "يمكن حساب %{count} نطاق بريد إلكتروني بحد أقصى في المرة الواحدة."
       no_invites_with_discourse_connect: "يمكنك دعوة المستخدمين المسجَّلين فقط عند تفعيل DiscourseConnect"
       no_invites_without_local_logins: "يمكنك دعوة المستخدمين المسجَّلين فقط عند إيقاف عمليات تسجيل الدخول المحلية"
+      update_existing_users_required: "يؤثر هذا التغيير على %{count} من أعضاء المجموعة الحاليين. يجب تحديد المعامل update_existing_users (بقيمة true أو false) لتحديد ما إذا كان سيتم تطبيق الإعدادات الافتراضية الجديدة للإشعارات على الأعضاء الحاليين."
     default_names:
       everyone: "الجميع"
       admins: "المسؤولون"
@@ -990,6 +992,13 @@ ar:
       email_already_used_in_group: "'%{email}' مُستخدَم بالفعل بواسطة المجموعه '%{group_name}'."
       email_already_used_in_category: "'%{email}' مُستخدَم بالفعل بواسطة الفئة '%{category_name}'."
       description_incomplete: "يجب أن يتضمَّن منشور وصف الفئة فقرة واحدة على الأقل."
+      description_too_long:
+        zero: "الوصف طويل جدًا (الحد الأقصى هو %{count} حرف)."
+        one: "الوصف طويل جدًا (الحد الأقصى هو حرف واحد)."
+        two: "الوصف طويل جدًا (الحد الأقصى هو حرفين)."
+        few: "الوصف طويل جدًا (الحد الأقصى هو %{count} أحرف)."
+        many: "الوصف طويل جدًا (الحد الأقصى هو %{count} حرفًا)."
+        other: "الوصف طويل جدًا (الحد الأقصى هو %{count} حرف)."
       permission_conflict: "يجب أيضًا السماح لأي مجموعة مسموح لها بالوصول إلى فئة فرعية بالوصول إلى الفئة الرئيسية. المجموعات التالية لديها إذن بالوصول إلى إحدى الفئات الفرعية، ولكن ليس لديها  إذن بالوصول إلى الفئة الرئيسية: %{group_names}."
       disallowed_topic_tags: "يتضمَّن هذا الموضوع وسومًا لا تسمح بها هذه الفئة: \"%{tags}\""
       disallowed_tags_generic: "يتضمَّن الموضوع وسومًا غير مسموح بها."
@@ -1333,6 +1342,7 @@ ar:
     too_many_drafts:
       title: "عدد كبير جدًا من المسودات"
       description: "لقد وصلت إلى الحد الأقصى لعدد المسودات المسموح به. يُرجى حذف بعض [مسوداتك](%{base_url}/my/activity/drafts) ثم إعادة المحاولة."
+    bulk_destroy_limit: "يمكنك حذف ما يصل إلى %{limit} مسودات في المرة الواحدة."
   draft_backup:
     pm_title: "المسودات الاحتياطية من الموضوعات الجارية"
     pm_body: "موضوع يحتوي على مسودات احتياطية"
@@ -1431,10 +1441,14 @@ ar:
       every_month: "كل شهر"
       every_six_months: "كل ستة اشهر"
   user_api_key:
+    title: 'تفويض "%{application_name}"'
     authorize: "السماح"
-    deny: "ألغِ"
+    deny: "إلغاء"
     read: "قراءة"
     read_write: "قراءة/كتابة"
+    logged_in_as: "تم تسجيل الدخول باسم"
+    permissions_header: 'سيسمح هذا لـ "%{application_name}" بما يلي:'
+    redirect_warning: "سيؤدي التفويض إلى إعادة توجيهك إلى"
     instructions: 'لقد أنشأنا للتو مفتاح API جديد للمستخدم لتستخدمه مع "%{application_name}"، يُرجى لصق المفتاح التالي في تطبيقك:'
     otp_description: 'هل ترغب في السماح للتطبيق "%{application_name}" بالوصول إلى هذا الموقع؟'
     otp_confirmation:
@@ -1559,6 +1573,8 @@ ar:
       yaxis: "اليوم"
       description: "طلبات API لمفاتيح API العادية ومفاتيح API للمستخدم."
     consolidated_page_views_browser_detection:
+      title: "المشاهدات المجمَّعة للصفحة مع اكتشاف المتصفح (موصى به)"
+      title_legacy: "المشاهدات المجمَّعة للصفحة مع اكتشاف المتصفح (موصى به)"
       xaxis:
         page_view_anon_browser: "متصفح مجهول"
         page_view_logged_in_browser: "متصفح مسجِّل الدخول"
@@ -1866,11 +1882,15 @@ ar:
       labels:
         provider: مقدِّم خدمة تسجيل الدخول
         no_accounts: "لا توجد حسابات مرتبطة"
+        discourse_connect: "تسجيل الدخول الموحد (SSO) عبر Discourse Connect"
+        no_sso_accounts: "حسابات بدون سجل تسجيل دخول موحد (SSO)"
+        total_users: "إجمالي حسابات المستخدمين النشطة"
       description: "عرض عدد الحسابات المرتبطة مصنفة حسب مقدِّم خدمة تسجيل الدخول. ينطبق فقط عند تفعيل طرق تسجيل الدخول بحساب تواصل اجتماعي."
   dashboard:
     problem:
       twitter_login: 'يبدو أن تسجيل الدخول إلى Twitter لا يعمل في الوقت الحالي. تحقق من بيانات الاعتماد في <a href="%{base_path}/admin/site_settings/category/login?filter=twitter">إعدادات الموقع</a>.'
       group_email_credentials: 'حدثت مشكلة في بيانات اعتماد البريد الإلكتروني للمجموعة <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>. لن يتم إرسال أي رسائل بريد إلكتروني من صندوق الوارد للمجموعة حتى تتم معالجة هذه المشكلة. %{error}'
+      upcoming_change_stable_opted_out: 'لقد اختار موقعك عدم الانضمام إلى التغيير القادم "%{upcoming_change}". لقد وصل هذا التغيير الآن إلى حالة "المستقرة" وقد يتم إزالته قريبًا أو تثبيته بشكل دائم. تفضل بزيارة <a href="%{base_path}/admin/config/upcoming-changes">صفحة التغييرات القادمة</a> لمراجعة التفاصيل المتعلقة بهذا التغيير.'
       rails_env: "الخادم يعمل في وضع %{env}."
       host_names: "يستخدم ملف config/database.yml اسم المضيف الافتراضي localhost. حدِّثه لاستخدام اسم مضيف موقعك."
       sidekiq: 'Sidekiq لا يعمل. يتم تنفيذ العديد من المهام، مثل إرسال رسائل البريد الإلكتروني، بشكلٍ غير متزامن بواسطة Sidekiq. يُرجى التأكَّدمن تشغيل عملية Sidekiq واحدة على الأقل. <a href="https://github.com/mperham/sidekiq" target="_blank">تعرف على Sidekiq هنا</a>.'
@@ -1906,6 +1926,7 @@ ar:
       category_style_deprecated: "يستخدم Discourse الخاص بك حاليًا نمط فئة قديم ستتم إزالته قبل الإصدار التجريبي النهائي من Discourse 3.2. يُرجى الرجوع إلى <a href='https://meta.discourse.org/t/282441'>الانتقال إلى إعداد موقع نمط فئة واحدة</a> للحصول على إرشادات حول كيفية الاحتفاظ بنمط الفئة المحدَّد."
       maxmind_db_configuration: 'تم إعداد الخادم لاستخدام قواعد بيانات MaxMind للبحث العكسي عن عناوين IP ولكن لم يتم إعداد معرِّف حساب MaxMind صالح مما قد يؤدي إلى فشل تنزيل قواعد بيانات MaxMind في المستقبل. <a href="https://meta.discourse.org/t/configure-maxmind-for-reverse-ip-lookups/173941" target="_blank">راجع هذا الدليل لمعرفة المزيد</a>.'
       admin_sidebar_deprecation: "تم إلغاء التخطيط القديم للمسؤول لصالح <a href='https://meta.discourse.org/t/-/289281'>تخطيط الشريط الجانبي</a> الجديد، وستتم إزالته في الإصدار التالي. يمكنك <a href='%{base_path}/admin/config/navigation?filter=admin%20sidebar'>تكوين</a> تخطيط الشريط الجانبي الجديد الآن للاشتراك قبل ذلك."
+      starttls_disabled: "تم تعطيل بروتوكول STARTTLS في إعدادات البريد الصادر. عادةً ما لا يكون هذا ضروريًا. يُنصح بإزالة <pre>DISCOURSE_SMTP_ENABLE_START_TLS=false</pre> من بيئة النظام لديك. لمزيد من التفاصيل، يرجى الرجوع إلى <a href='https://meta.discourse.org/t/387286'>هذا الموضوع</a>."
     back_from_logster_text: "العودة إلى الموقع"
   site_settings:
     allow_bulk_invite: "السماح بالدعوات الجماعية عن طريق تحميل ملف CSV"
@@ -1950,6 +1971,7 @@ ar:
     allow_duplicate_topic_titles_category: "اسمح بالموضوعات ذات العناوين المتطابقة والمتكررة إذا كانت الفئة مختلفة. يجب أن تكون القيمة allow_duplicate_topic_titles مضبوطة على False."
     unique_posts_mins: "عدد الدقائق قبل أن يتمكن العضو من إنشاء منشور يتضمَّن المحتوى نفسه مجددًا"
     educate_until_posts: "إظهار اللوحة التعليمية المنبثقة للمستخدمين الجدُد عندما يبدأ العضو في كتابة منشوراته الأولى (n)"
+    title: "اسم هذا الموقع. يظهر لجميع الزوار، بما فيهم المستخدمون المجهولون. يُرجى العلم أن تغيير هذا الاسم قد يُرسل إشعارًا لمستخدمي تطبيق الويب التقدمي (PWA) يطلب منهم تحديث التطبيق أو إلغاء تثبيته."
     site_description: "صِف هذا الموقع بجملة واحدة. مرئي لجميع الزوار، بما في ذلك المستخدمون المجهولون."
     short_site_description: "وصف قصير من بضع كلمات. مرئي لجميع الزوار، بما في ذلك المستخدمون المجهولون."
     contact_email: "عنوان البريد الإلكتروني لجهة الاتصال الرئيسية المسؤولة عن هذا الموقع. يتم استخدامه للإشعارات المهمة ويتم عرضه أيضًا على صفحة <a href='%{base_path}/about' target='_blank'>/about</a>. مرئي للمستخدمين المجهولين على المواقع العامة."
@@ -1957,6 +1979,7 @@ ar:
     crawl_images: "استعادة الصور من عناوين URL البعيدة لإدراج الأبعاد الصحيحة للطول والعرض"
     download_remote_images_to_local: "يمكنك تحويل الصور البعيدة (المرتبطة برابط ساخن) عن طريق تنزيلها؛ يحفظ ذلك المحتوى حتى إذا تمت إزالة الصور من الموقع البعيد في المستقبل."
     download_remote_images_threshold: "الحد الأدنى من مساحة القرص اللازمة لتنزيل الصور البعيدة محليًا (بالنسبة المئوية)"
+    disabled_image_download_domains: "لن يتم تنزيل الصور البعيدة من هذه النطاقات أبدًا."
     block_hotlinked_media: "امنع المستخدمين من وضع وسائط بعيدة (مرتبطة برابط ساخن) في منشوراتهم. سيتم استبدال الوسائط البعيدة التي لا يتم تنزيلها عبر 'download_remote_images_to_local' برابط لعنصر نائب."
     block_hotlinked_media_exceptions: "قائمة بعناوين URL الأساسية المستثناة من إعداد block_hotlinked_media. قم بتضمين البروتوكول (مثل https://example.com)."
     editing_grace_period: "لن يؤدي التعديل إلى إنشاء نسخة جديدة في سجل المنشورات لمدة (n) ثانية بعد النشر."
@@ -1995,6 +2018,7 @@ ar:
     logo: "صورة الشعار في الجزء العلوي الأيمن من موقعك. استخدم صورة مستطيلة عريضة بارتفاع 120 ونسبة عرض إلى ارتفاع أكبر من 3:1. وإذا تركتها فارغة، فسيتم عرض نص عنوان الموقع."
     logo_small: "صورة الشعار الصغيرة في الجزء العلوي الأيمن من موقعك، وتظهر عند التمرير لأسفل. استخدم صورة مربعة بمقاس 120 × 120. وإذا تركتها فارغة، فسيتم عرض صورة رمزية لمنزل."
     digest_logo: "الشعار البديل المُستخدَم أعلى ملخص البريد الإلكتروني لموقعك. استخدم صورة مستطيلية عريضة. لا تستخدم صورة SVG. وإذا تركتها فارغة، فسيتم استخدام الصورة من إعداد `logo`."
+    mobile_logo: "الشعار المستخدم في النسخة المحمولة من موقعك. نوصي باستخدام أيقونة مربعة لتجنب ازدحام رأس الصفحة، لكن يمكنك استخدام صورة مستطيلة عريضة بارتفاع 120 بكسل ونسبة عرض إلى ارتفاع أكبر من 3:1. إذا تُرك هذا الحقل فارغًا، سيتم استخدام الصورة المحددة في إعداد الشعار."
     logo_dark: "بديل الألوان الداكنة لإعداد الموقع `logo`"
     logo_small_dark: "بديل الألوان الداكنة لإعداد الموقع `logo small`"
     mobile_logo_dark: "بديل الألوان الداكنة لإعداد الموقع `mobile logo`"
@@ -2005,8 +2029,11 @@ ar:
     opengraph_image: "صورة opengraph افتراضية، يتم استخدامها عندما لا تحتوي الصفحة على صورة أخرى مناسبة. وإذا تركتها فارغة، فسيتم استخدام large_icon."
     x_summary_large_image: "بطاقة Twitter من نوع \"summary large image\" (يجب أن تكون على الأقل بعرض 280 بكسل وارتفاع 150 بكسل، ولا يمكن أن تكون بصيغة .svg). إذا تُرك هذا الحقل فارغًا، يتم إنشاء البيانات الوصفية التقليدية باستخدام opengraph_image بشرط ألا تكون أيضًا بصيغة .svg"
     notification_email: "عنوان البريد الإلكتروني المُستخدَم في حقل \"من:\" عند إرسال جميع رسائل النظام الأساسية. يجب تعيين سجلات SPF وDKIM وreverse PTR للنطاق المحدَّد هنا بشكلٍٍ صحيح لتصل الرسالة الإلكترونية."
+    email_custom_headers: "قائمة برؤوس البريد الإلكتروني المخصصة"
     email_subject: "صيغة الموضوع القابلة للتخصيص للبريد الإلكتروني القياسي. راجع <a href='https://meta.discourse.org/t/customizing-specific-system-email-templates/88323' target='_blank'>https://meta.discourse.org/t/customizing-specific-system-email-templates/88323</a>"
     detailed_404: "يوفِّر مزيدًا من التفاصيل للمستخدمين بشأن سبب عدم تمكُّنهم من الوصول إلى موضوع معيَّن. ملاحظة: هذا الإعداد أقل أمانًا لأن المستخدمين سيعرفون إذا كان عنوان URL مرتبطًا بموضوع صالح."
+    enforce_second_factor: "مطالبة المستخدمين بتفعيل المصادقة الثنائية (2FA) قبل أن يتمكنوا من الوصول إلى واجهة مستخدم Discourse. لا يؤثر هذا الإعداد على المصادقة عبر واجهة برمجة التطبيقات (API) أو مقدمي المصادقة من نوع \"DiscourseConnect\". إذا تم تفعيل الخيار enforce_second_factor_on_external_auth، فلن يتمكن المستخدمون من تسجيل الدخول باستخدام مقدمي المصادقة الخارجيين بعد إعداد المصادقة الثنائية."
+    enforce_second_factor_on_external_auth: "مطالبة المستخدمين باستخدام المصادقة الثنائية (2FA) في جميع الأوقات. عند تفعيل هذا الإعداد، سيتم منع المستخدمين من تسجيل الدخول عبر طرق المصادقة الخارجية مثل تسجيل الدخول بحساب تواصل اجتماعي إذا تم تفعيل المصادقة الثنائية لديهم. عند تعطيله، سيحتاج المستخدمون فقط لتأكيد المصادقة الثنائية عند تسجيل الدخول باستخدام اسم المستخدم وكلمة المرور. راجع أيضًا إعداد enforce_second_factor."
     force_https: "فرض استخدام HTTPS فقط على الموقع. تحذير: لا تقم بتفعيل هذا الإعداد إلا بعد التأكد من أن HTTPS مُعد بالكامل ويعمل فى جميع أنحاء الموقع! هل تحقَّقت من شبكة توصيل المحتوى (CDN)، وعمليات تسجيل الدخول على جميع شبكات التواصل الاجتماعى، وأي شعارات أو تبعيات خارجية للتأكد من أنها جميعًا متوافقه مع HTTPS؟"
     summary_score_threshold: "الحد الأدنى من النقاط المطلوبة لتضمين منشور في \"تلخيص هذا الموضوع\""
     summary_posts_required: "الحد الأدنى من عدد المنشورات في الموضوع قبل تفعيل \"تلخيص هذا الموضوع\". سيتم تطبيق التغييرات على هذا الإعداد بأثر رجعي في غضون أسبوع."
@@ -2064,7 +2091,10 @@ ar:
     ga_universal_domain_name: "اسم نطاق Google Universal Analytics، على سبيل المثال: eg: mysite.com؛ راجع <a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a>"
     ga_universal_auto_link_domains: "تفعيل تتبُّع Google Universal Analytics عبر النطاقات. ستتم إضافة معرِّف العميل إلى الروابط الصادرة إلى هذه النطاقات. راجع <a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>دليل التتبُّع عبر النطاقات من Google.</a>"
     gtm_container_id: "معرِّف حاوية Google Tag Manager. على سبيل المثال: GTM-ABCD12E. <br/>ملاحظة: لاستخدام GTM عند تفعيل سياسة أمان المحتوى (CSP)، راجع الوثائق الموجودة على التعريف: <a href='https://meta.discourse.org/t/use-nonces-in-google-tag-manager-scripts/188296' target='_blank'>استخدام الحروف غير المميَّزة في البرامج النصية في Google Tag Manager</a>."
+    google_site_verification_token: رمز التحقق من Google Search Console. سيتم تضمينه كوسم تعريفي في رأس صفحة HTML.
     enable_escaped_fragments: "ارجع إلى واجهة برمجة تطبيقات Ajax-Crawling من Google إذا لم يتم اكتشاف زاحف ويب. راجع <a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a>"
+    moderators_manage_categories: "السماح للمشرفين بإنشاء الفئات وإدارتها"
+    moderators_manage_groups: "السماح للمشرفين بإنشاء المجموعات وإدارتها"
     moderators_change_post_ownership: "السماح للمشرفين بتغيير ملكية المنشور"
     cors_origins: "الأصول المسموح بها لطلبات الموارد متعددة المصادر (CORS). بجب أن يتضمَّن كل مصدر http:// أو https://. ويجب تعيين متغير البيئة للقيمة DISCOURSE_ENABLE_CORS على True لتفعيل CORS."
     use_admin_ip_allowlist: "لا يمكن للمسؤولين تسجيل الدخول إلا إذا كانوا على عنوان IP محدَّد في قائمة عناوين IP الخاضعة للمراقبة (المسؤول > السجلات > عناوين IP الخاضعة للمراقبة)."
@@ -2076,9 +2106,9 @@ ar:
     blocked_crawler_user_agents: "الكلمة الفريدة غير حساسة لحالة الأحرف في سلسلة وكيل المستخدم والتي تحدِّد متتبعات ارتباطات الويب التي لا ينبغي السماح لها بالوصول إلى الموقع. لا تنطبق إذا تم تعريف قائمة السماح."
     slow_down_crawler_user_agents: 'وكلاء المستخدم لبرامج زحف الويب التي يجب أن يكون معدَّلها محدودًا كما تم إعداده في "slow down crawler rate". يجب أن تتكون كل قيمة من 3 أحرف على الأقل.'
     slow_down_crawler_rate: "إذا تم تحديد slow_down_crawler_user_agents، فسيتم تطبيق هذا المعدَّل على جميع متتبعات ارتباطات الويب (عدد ثواني التأخير بين الطلبات)"
+    llms_txt: "حمل ملفًا نصيًا ليتم تقديمه على المسار /llms.txt لزواحف النماذج اللغوية الكبيرة (LLM). لمزيد من المعلومات، راجع <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a>."
     content_security_policy: "تفعيل سياسة أمان المحتوى (CSP). وهي طبقة أمان إضافية تساعد في منع أنواع معيَّنة من الهجمات، بما في ذلك البرمجة العابرة للمواقع (XSS) وحقن البيانات."
     content_security_policy_report_only: "تفعيل Content-Security-Policy-Report-Only (CSP)"
-    content_security_policy_collect_reports: "تفعيل جمع تقارير انتهاك سياسة أمان المحتوى في /csp_reports"
     content_security_policy_frame_ancestors: "تقييد من يمكنه تضمين هذا الموقع في iframes عبر سياسة أمان المحتوى. يمكن التحكُّم في المضيفات المسموح بها في <a href='%{base_path}/admin/customize/embedding'>التضمين</a>"
     content_security_policy_script_src: "مصادر البرامج النصية المسموح بها الإضافية. يتم تضمين المضيف الحالي وCDN بشكلٍ افتراضي. راجع <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>تخفيف هجمات XSS باستخدام سياسة أمان المحتوى.</a> (CSP). يتم تجاهل مصادر المضيف الأخرى عند تفعيل strict-dynamic."
     invalidate_inactive_admin_email_after_days: "ستحتاج حسابات المسؤولين الذين لم يزوروا الموقع في هذا العدد من الأيام إلى إعادة التحقُّق من صحة عنوان بريدهم الإلكتروني قبل تسجيل الدخول. اضبط القيمة على 0 للإيقاف."
@@ -2106,6 +2136,7 @@ ar:
     top_page_default_timeframe: "الفترة الزمنية الافتراضية للصفحة العليا للمستخدمين المجهولين (يتم ضبطها تلقائيًا للمستخدمين الذين سجَّلوا الدخول بناءً على زيارتهم الأخيرة)."
     moderators_view_emails: "السماح للمشرفين بعرض عناوين البريد الإلكتروني للمستخدمين."
     moderators_view_ips: "السماح للمشرفين بعرض عناوين IP للمستخدمين."
+    moderators_change_trust_levels: "السماح للمشرفين بتغيير مستويات الثقة للمستخدمين."
     prioritize_username_in_ux: "إظهار اسم المستخدم أولًا على صفحة المستخدم وبطاقة المستخدم والمنشورات (عند إظهار الاسم المتوقف أولًا)"
     enable_rich_text_paste: "تفعيل التحويل التلقائي من HTML إلى Markdown عند لصق نص في أداة الإنشاء"
     send_old_credential_reminder_days: "التذكير ببيانات الاعتماد القديمة بعد عدد الأيام"
@@ -2116,6 +2147,8 @@ ar:
     whispers_allowed_groups: "السماح بالاتصالات الخاصة داخل الموضوعات لأعضاء المجموعات المحدَّدة."
     hidden_post_visible_groups: "السماح لأعضاء تلك المجموعات بعرض المنشورات المخفية. يمكن دائمًا للمستخدمين من فريق العمل عرض المنشورات المخفية."
     allow_index_in_robots_txt: "حدِّد في robots.txt أن هذا الموقع مسموح بفهرسته في محركات بحث الويب. يمكنك <a href='%{base_path}/admin/customize/robots'>تجاوز robots.txt الخاص بك هنا.</a> <b>تحذير</b>: يمكن أن تحول القواعد التي لم يتم تكوينها بشكلٍ صحيح دون تتبع ارتباطات موقعك كما هو متوقَّع."
+    blocked_email_domains: "قائمة بنطاقات البريد الإلكتروني التي لا يُسمح للمستخدمين بتسجيل حسابات باستخدامها. يتم التعامل تلقائيًا مع النطاقات الفرعية للنطاقات المحددة. لا يتم دعم رموز البدل * و?. مثال: mailinator.com"
+    allowed_email_domains: "قائمة بنطاقات البريد الإلكتروني التي يجب على المستخدمين تسجيل حساباتهم من خلالها. يتم التعامل تلقائيًا مع النطاقات الفرعية للنطاقات المحددة. لا يتم دعم رموز البدل * و?. تحذير: لن يُسمح للمستخدمين الذين يمتلكون نطاقات بريد إلكتروني غير المدرجة بالتسجيل!"
     normalize_emails: "تحقَّق مما إذا كان البريد الإلكتروني الذي تم تطبيعه فريدًا. يزيل البريد الإلكتروني الذي تم تطبيعه جميع النقاط من اسم المستخدم وكل شيء بين الرمزين + و@."
     auto_approve_email_domains: "ستتم الموافقة تلقائيًا على المستخدمين ذوي عناوين البريد الإلكتروني التابعة للنطاقات المُدرَجة في هذه القائمة. رمزا البدل * و؟ غير مدعومَين."
     hide_email_address_taken: "عدم إعلام المستخدمين بوجود حساب بعنوان بريد إلكتروني معيَّن في أثناء التسجيل أو في أثناء عملية \"نسيت كلمة المرور\". طلب البريد الإلكتروني الكامل لطلبات \"نسيت كلمة المرور\"."
@@ -2149,6 +2182,7 @@ ar:
     auth_overrides_email: "يستبدل عنوان البريد الإلكتروني المحلي بعنوان بريد إلكتروني خارجي للموقع عند كل عملية تسجيل دخول، ويمنع التغييرات المحلية. ينطبق هذا الإعداد على جميع موفِّري المصادقة. (تحذير: يمكن أن تحدث تضاربات بسبب تطبيع عناوين البريد الإلكتروني المحلية)"
     auth_overrides_username: "يستبدل اسم المستخدم المحلي باسم مستخدم خارجي للموقع عند كل عملية تسجيل دخول، ويمنع التغييرات المحلية. ينطبق هذا الإعداد على جميع موفِّري المصادقة. (تحذير: يمكن أن تحدث تضاربات بسبب الاختلافات في طول/متطلبات اسم المستخدم)"
     auth_overrides_name: "يستبدل الاسم الكامل المحلي باسم كامل خارجي للموقع عند كل عملية تسجيل دخول، ويمنع التغييرات المحلية. ينطبق هذا الإعداد على جميع موفِّري المصادقة."
+    auth_overrides_avatar: "يستبدل الصورة الرمزية المحلية بالصورة الرمزية الخاصة بالموقع الخارجي عند كل تسجيل دخول، ويمنع أي تغييرات محلية. ينطبق هذا على جميع مقدمي المصادقة."
     discourse_connect_overrides_avatar: "يستبدل الصورة الرمزية للمستخدم بالصورة الرمزية للموقع الخارجي من حمولة DiscourseConnect. في حالة التفعيل، لن يتم السماح للمستخدمين بتحميل الصور الرمزية على Discourse."
     discourse_connect_overrides_location: "يستبدل موقع المستخدم بموقع خارجي من حمولة DiscourseConnect ويمنع التغييرات المحلية."
     discourse_connect_overrides_website: "يستبدل الموقع الإلكتروني للمستخدم بموقع خارجي من حمولة DiscourseConnect ويمنع التغييرات المحلية."
@@ -2228,6 +2262,7 @@ ar:
     invite_link_max_redemptions_limit_users: "لا يمكن أن يتجاوز الحد الأقصى لعمليات الاسترداد المسموح بها لروابط الدعوة التي تم إنشاؤها بواسطة مستخدمين منتظمين هذه القيمة."
     alert_admins_if_errors_per_minute: "عدد الأخطاء في الدقيقة لظهور تنبيه للمسؤول. تعطِّل القيمة \"0\" هذه الميزة. ملاحظة: تتطلَّب إعادة التشغيل."
     alert_admins_if_errors_per_hour: "عدد الأخطاء في الساعة لتشغيل تنبيه المسؤول. يؤدي تعيين القيمة على 0 إلى إيقاف هذه الميزة. ملاحظة: يتطلَّب إعادة التشغيل."
+    categories_topics: "عدد الموضوعات المراد عرضها في صفحة /categories. إذا تم ضبط القيمة على 0، فسيتم تعيين قيمة تلقائيًا للحفاظ على تماثل العمودين. ينطبق هذا فقط على أنماط صفحة الفئات \n<a href=\"%{base_path}/admin/site_settings/category/all_results?filter=category style\">\"الفئات وأحدث/أفضل الموضوعات\"</a>."
     suggested_topics: "عدد الموضوعات المقترحة التي تظهر أسفل الموضوع"
     limit_suggested_to_category: "عرض الموضوعات من الفئة الحالية فقط في الموضوعات المقترحة"
     suggested_topics_max_days_old: "يجب ألا يزيد عمر الموضوعات المقترحة عن n من الأيام."
@@ -2254,6 +2289,7 @@ ar:
     selectable_avatars_mode: "اسمح للمستخدمين بتحديد صورة رمزية من قائمة selectable_avatars وقصر عمليات تحميل الصور الرمزية المخصَّصة على مستوى الثقة المحدَّد."
     selectable_avatars: "تحديد مجموعة من الصور الرمزية التي يمكن للمستخدمين تحديد صورة ملفهم الشخصي منها. سيظهر الاختيار أثناء إنشاء ملف تعريف المستخدم أو عند تحديث صورة ملف التعريف."
     allow_all_attachments_for_group_messages: "السماح بجميع مرفقات البريد الإلكتروني لرسائل المجموعات"
+    image_quality: "حدد مستوى جودة الصور التي يتم تحميلها على موقعك. كلما كانت الجودة أقل، كانت أحجام الملفات أصغر."
     png_to_jpg_quality: "جودة ملف JPG المحوَّل (1 هي أقل جودة، و99 هي أفضل جودة، و100 للإيقاف)"
     recompress_original_jpg_quality: "جودة ملفات الصور المحمَّلة (1 هي أقل جودة، و99 هي أفضل جودة، و100 للإيقاف)"
     image_preview_jpg_quality: "جودة ملفات الصورة التي تم تغيير حجمها (1 هي أقل جودة، و99 هي أفضل جودة، و100 للإيقاف)"
@@ -2267,6 +2303,7 @@ ar:
     video_conversion_enabled: "تفعيل ميزة تحويل مقاطع الفيديو للملفات المحملة. يُمكّن هذا من تحويل الفيديوهات إلى صيغ متوافقة مع متصفحات الويب."
     video_conversion_service: "خدمة تحويل الفيديو التي ستُستخدم لمعالجة مقاطع الفيديو المحملة."
     mediaconvert_role_arn: "ARN الخاص بدور IAM في AWS لخدمة MediaConvert. مطلوب عند استخدام AWS MediaConvert لتحويل مقاطع الفيديو."
+    mediaconvert_output_subdirectory: "الدليل الفرعي داخل حاوية S3 الذي يُكتب فيه مقاطع الفيديو المحوّلة مؤقتًا بواسطة MediaConvert قبل نقلها إلى الموقع النهائي للتحميل."
     min_ratio_to_crop: "النسبة المُستخدَمة لاقتصاص الصور الطويلة. أدخل نتيجة العرض/الارتفاع."
     simultaneous_uploads: "أقصى عدد من الملفات التي يمكن سحبها وإسقاطها في أداة الإنشاء"
     default_invitee_trust_level: "مستوى الثقة الافتراضي (0-4) للمستخدمين المدعوين"
@@ -2382,6 +2419,7 @@ ar:
     auto_silence_fast_typers_on_first_post: "كتم المستخدمين تلقائيًا عندما لا يستوفون `fast typing threshold`"
     auto_silence_fast_typers_max_trust_level: "الحد الأقصى لمستوى الثقة المطلوب لكتم أصحاب الطباعة السريعة تلقائيًا"
     auto_silence_first_post_regex: "التعبير العادي غير الحساس لحالة الأحرف الذي إذا تم تمريره سيؤدي إلى كتم أول منشور بواسطة المستخدم وإرساله إلى قائمة انتظار الموافقة. مثال: ستؤدي كتابة raging|a[bc]a إلى كتم جميع المنشورات التي تتضمَّن raging أو aba أو aca في البداية. ينطبق ذلك على أول منشور فقط. تم إيقافه: استخدم \"كتم الكلمات المُراقَبة\" بدلًا منه."
+    moderator_guide_topic: "الموضوع الذي يوضح طريقة إدارة مجتمعك. سيكون الرابط مرئيًا في قائمة انتظار المراجعة للمشرفين والمسؤولين."
     reviewable_claiming: "هل يجب المطالبة بالمحتوى القابل للمراجعة قبل اتخاذ إجراء بشأنه؟"
     reviewable_default_topics: "عرض المحتوى القابل للمراجعة مُجمَّعًا حسب الموضوع بشكلٍٍ افتراضي"
     reviewable_default_visibility: "عدم عرض العناصر القابلة للمراجعة ما لم تستوفي هذه الأولوية"
@@ -2390,12 +2428,13 @@ ar:
     allow_all_users_to_flag_illegal_content: "سيشاهد المستخدمون المجهولون رسالة تفيد بضرورة إرسال بريد إلكتروني إلى المسؤولين للإبلاغ عن المحتوى غير القانوني. هذا الإعداد له الأولوية على خيار \"المجموعات المسموح لها بالإبلاغ عن المنشورات\"."
     email_address_to_report_illegal_content: "إذا تم ترك الحقل فارغًا، فسيتم استخدام البريد الإلكتروني الافتراضي لمسؤول الموقع."
     cooldown_hours_until_reflag: "الوقت الذي يجب على المستخدمين انتظاره قبل أن يتمكنوا من إعادة الإبلاغ عن منشور"
+    slow_mode_prevents_editing: "هل يمنع وضع \"الوضع البطيء\" التعديل بعد انتهاء \"فترة السماح بالتعديل\"؟"
     reply_by_email_enabled: "تنشيط الميزة التي تسمح للمستخدمين بالرد على الموضوعات عبر البريد الإلكتروني مباشرةً، بدلًا من مطالبتهم بتسجيل الدخول إلى الموقع. راجع <a href='https://meta.discourse.org/t/set-up-reply-by-email-with-pop3-polling/14003' target='_blank'>الدليل على Meta</a> للمزيد من المعلومات."
     reply_by_email_address: "نموذج لعنوان البريد الإلكتروني الوارد عند الرد عبر البريد الإلكتروني، مثلًا: %%{reply_key}@reply.example.com أو replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "قائمة النماذج البديلة للرد عبر البريد الإلكتروني على عناوين البريد الإلكتروني الوارد. مثال: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "استخدام HTML بدلًا من النص للرسائل الإلكترونية الواردة"
     strip_incoming_email_lines: "إزالة المسافات السابقة واللاحقة من كل سطر من الرسائل الإلكترونية الواردة"
-    disable_emails: "منع Discourse من إرسال أي نوع من الرسائل الإلكترونية. حدِّد \"نعم\" لإيقاف الرسائل الإلكترونية إلى جميع المستخدمين. حدِّد \"غير فريق العمل\" لإيقاف الرسائل الإلكترونية للمستخدمين من غير فريق العمل فقط."
+    allow_email_invites: "عند تعطيله، لن يتمكن المستخدمون من إرسال رسائل الدعوة عبر Discourse"
     strip_images_from_short_emails: "إزالة الصور من الرسائل الإلكترونية التي يقل حجمها عن 2800 بايت"
     short_email_length: "تحديد الحد الأقصى للطول، بالبايت، ليتم تصنيف البريد الإلكتروني على أنه \"قصير\" وإزالة الصور. إذا لم يتجاوز حجم الرسالة الإلكترونية هذا الإعداد، فستتم إزالة أي صور (مثل الصور الرمزية والرموز التعبيرية) ضمن الرسالة الإلكترونية."
     display_name_on_email_from: "عرض الأسماء الكاملة في حقول \"من:\" في الرسائل الإلكترونية"
@@ -2455,6 +2494,7 @@ ar:
     relative_date_duration: "عدد الأيام بعد النشر التي سيتم بعدها عرض تواريخ النشر بشكلٍٍ نسبي (7 أيام) بدلًا من عرضها بشكلٍٍ مطلق (20 فبراير)"
     delete_user_max_post_age: "عدم السماح بحذف المستخدمين الذين مضى على منشورهم الأول أكثر من (x) يوم"
     delete_all_posts_max: "الحد الأقصى لعدد المنشورات التي يمكن حذفها دفعة واحدة باستخدام الزر \"حذف جميع المنشورات\". إذا كان لدى المستخدم أكثر من هذا العدد من المنشورات، فلا يمكن حذف جميع المنشورات دفعة واحدة ولا يمكن حذف المستخدم."
+    delete_all_posts_background_threshold: "الحد الأقصى لعدد المنشورات التي يمكن حذفها دفعة واحدة باستخدام زر \"حذف جميع المنشورات\" قبل أن تتم معالجة الحذف في الخلفية."
     delete_user_self_max_post_count: "الحد الأقصى لعدد المنشورات التي يمكن للمستخدم إنشاؤها مع السماح بالحذف الذاتي للحساب. قم بالتعيين إلى -1 لإيقاف الحذف الذاتي للحساب."
     username_change_period: "الحد الأقصى لعدد الأيام بعد التسجيل التي يمكن للحسابات فيها تغيير اسم المستخدم (0 لعدم السماح بتغيير اسم المستخدم)"
     email_editable: "السماح للمستخدمين بتغيير عنوان بريدهم الإلكتروني بعد التسجيل"
@@ -2483,6 +2523,8 @@ ar:
     enable_category_group_moderation: "السماح للمجموعات بالإشراف على المحتوى في فئات معيَّنة"
     group_in_subject: "لتعيين %%{optional_pm} في موضوع الرسالة الإلكترونية على اسم المجموعة الأولى في رسالة خاصة، راجع: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>تخصيص تنسيق الموضوع للرسائل الإلكترونية القياسية</a>"
     allow_anonymous_mode: "يُفعّل هذا الخيار إمكانية انتقال الأعضاء إلى الوضع المجهول عند النشر. عند تفعيله، يمكن للمستخدمين اختيار إخفاء هويتهم عند إنشاء منشورات أو موضوعات في جميع أنحاء الموقع. انظر أيضًا `allow anonymous likes`."
+    allow_likes_in_anonymous_mode: "فعّل هذا الإعداد للسماح للمستخدمين الذين يتصفحون موقعك بشكل مجهول بالإعجاب بالمنشورات. عند التفعيل، يمكن للمستخدمين اختيار إخفاء هويتهم عند الإعجاب بالمنشورات أو الموضوعات في جميع أنحاء الموقع. يتطلب هذا الإعداد تفعيل خيار \"السماح بالوضع المجهول\" (allow anonymous mode)."
+    anonymous_posting_allowed_groups: "المجموعات المسموح لها بتفعيل خاصية النشر المجهول. يتطلب هذا الإعداد تفعيل خيار \"السماح بالوضع المجهول\"."
     anonymous_account_duration_minutes: "لحماية إخفاء الهوية، أنشئ حسابًا مجهولًا جديدًا كل N دقيقة لكل مستخدم. مثال: إذا تم التعيين إلى 600، سيتم إنشاء حساب مجهول جديد بمجرد مرور 600 دقيقة على آخر منشور وتحوُّل المستخدم إلى مجهول."
     hide_user_profiles_from_public: "إيقاف بطاقات المستخدمين والملفات الشخصية لهم ودليل المستخدم للمستخدمين المجهولين"
     hide_new_user_profiles: "إخفاء الملفات الشخصية من مستوى الثقة 1 أو أقل عن العامة أو المستخدمين من مستوى الثقة 1 حتى ينشروا لأول مرة. يتم إيقاف هذه الميزة بشكلٍ غير مشروط على المواقع التي تتطلب موافقة المستخدمين (must_approve_users) والمواقع التي تتطلب دعوة فقط (invite_only)."
@@ -2498,6 +2540,7 @@ ar:
     clean_up_unused_staged_users_after_days: "عدد الأيام قبل إزالة مستخدم مؤقت غير مُستخدَم (مستوى الثقة 0 بلا أي منشورات). اضبط القيمة على 0 لإيقاف التنظيف."
     user_selected_primary_groups: "السماح للمستخدمين بتعيين مجموعتهم الأساسية"
     max_notifications_per_user: "الحد الأقصى من الإشعارات لكل مستخدم، سيتم حذف الإشعارات القديمة إذا تم تجاوز هذا الرقم. يتم فرض هذا الإعداد أسبوعيًا. اضبط القيمة على 0 للإيقاف."
+    allowed_user_website_domains: "سيتم التحقُّق من الموقع الإلكتروني للمستخدم مقابل هذه النطاقات."
     allow_profile_backgrounds: "السماح للمستخدمين بتحميل خلفيات للملفات الشخصية"
     get_a_room_threshold: "عدد المنشورات التي يجب على المستخدم إنشاؤها للشخص نفسه في الموضوع نفسه قبل أن يتم تحذيره"
     dont_feed_the_trolls_threshold: "عدد البلاغات من المستخدمين الآخرين قبل تحذير المستخدم"
@@ -2576,6 +2619,7 @@ ar:
     disable_watched_word_checking_in_user_fields: "إيقاف فحص الكلمات المراقبة في حقول المستخدم"
     watched_words_regular_expressions: "يسمح باستخدام التعبيرات العادية لتصفية الكلمات. إذا تم تفعيلها، فإن هذه الميزة تعمل على تجميع الكلمات الحساسة حسب حساسيتها لحالة الأحرف. ثم تقوم بتجميع جميع الكلمات المحددة في تعبير عادي واحد، وإضافة حدود الكلمات للكلمات المراقبة العادية. وبالتالي، تضيف طريقة التصفية القائمة على التعبيرات العادية طبقة إضافية من التحكم في تعديل المحتوى من خلال دعم أنماط الكلمات الأكثر تعقيدًا. يسمح الإعداد أيضًا باستبدال النص الأصلي بسهولة بالنص البديل الذي تختاره."
     enable_fast_edit: "يضيف زرًا إلى قائمة اختيار المنشور لتحرير اختيار صغير مضمنًا."
+    old_post_notice_days: "عدد الأيام التي ستختفي بعدها إشعارات المنشورات الخاصة بالمستخدمين الجدد والراجعين، بينما ستظل إشعارات المنشورات الرسمية مرئية دائمًا."
     new_user_notice_tl: "الحد الأدنى لمستوى الثقة المطلوب لرؤية الإشعارات بشأن منشور مستخدم جديد"
     returning_user_notice_tl: "الحد الأدنى من مستوى الثقة المطلوب لرؤية الإشعارات بشأن منشور مستخدم عائد"
     returning_users_days: "عدد الأيام التي يجب أن تمر قبل اعتبار المستخدم عائدًا"
@@ -2657,6 +2701,7 @@ ar:
     force_lowercase_tags: "فرض استخدام الحروف الصغيرة فقط في جميع الوسوم الجديدة"
     create_post_for_category_and_tag_changes: "إنشاء منشور همس عندما تتغير فئة الموضوع أو وسومه، يتطلب تفعيل منشورات الهمس."
     automatically_clean_unused_tags: "حذف الوسوم تلقائيًا ما لم يتم استخدامها في أي موضوعات أو رسائل شخصية على أساس يومي."
+    default_watched_precedence_over_muted: "إشعار المستخدمين بالموضوعات الموجودة في الفئات أو الوسوم التي يتابعونها، والتي تنتمي أيضًا إلى فئة أو وسم قاموا بكتمه"
     company_name: "اسم شركتك أو مؤسستك. إذا تركته فارغًا، فلن يتم توفير شروط الخدمة أو إشعار الخصوصية النموذجي."
     governing_law: "تحديد الولاية القضائية التي تحكم الجوانب القانونية للموقع، بما في ذلك شروط الخدمة وسياسة الخصوصية. عادةً ما تكون هذه هي الدولة أو الولاية التي تم تسجيل الشركة التي تدير الموقع فيها أو تدير أعمالها."
     city_for_disputes: "تحديد المدينة التي سيتم استخدامها كولاية قضائية لحل أي نزاعات تتعلق باستخدام هذا المنتدى. عادةً ما يتم تضمين هذه المعلومات في المستندات القانونية مثل شروط خدمة المنتدى."
@@ -2672,10 +2717,10 @@ ar:
     sitemap_page_size: "عدد عناوين URL المراد تضمينها في كل صفحة من خريطة الموقع. الحد الأقصى: 50.000"
     enable_user_status: "السماح للمستخدمين بتحديد رسالة حالة مخصَّصة (رمز تعبيري + وصف)"
     enable_user_tips: "تفعيل نصائح المستخدم الجديدة التي توضِّح الميزات الرئيسية للمستخدمين"
+    short_title: "سيُستخدم العنوان المختصر على الشاشة الرئيسية للمستخدم، أو في مشغّل التطبيقات، أو في أماكن أخرى قد تكون المساحة فيها محدودة. يجب أن يقتصر العنوان على 12 حرفًا. يرجى ملاحظة أن تغيير هذا العنوان قد يؤدي إلى ظهور رسالة لمستخدمي تطبيق الويب التقدمي (PWA) تطلب منهم تحديث التطبيق أو إلغاء تثبيته."
     dashboard_hidden_reports: "السماح بإخفاء التقارير المحدَّدة من لوحة المعلومات"
     dashboard_visible_tabs: "اختيار علامات التبويب المرئية في لوحة المعلومات"
     dashboard_general_tab_activity_metrics: "اختيار التقارير التي سيتم عرضها كمقاييس للنشاط في علامة التبويب \"عام\""
-    gravatar_enabled: "تفعيل خدمة <a href='https://gravatar.com/'>Gravatar</a> لصور الحسابات الشخصية للمستخدمين. يمنع هذا الإجراء المستخدمين من تغيير صورهم إلى Gravatar، ولكنه لن يؤثر في من يستخدمها بالفعل."
     gravatar_name: "تحديد اسم مقدِّم خدمة Gravatar. يُستخدَم هذا الاسم عادةً لتحديد المصدر الذي يوفر صور Gravatar الرمزية للموقع."
     gravatar_base_url: "تحديد عنوان URL للوصول إلى واجهة برمجة تطبيقات مقدِّم خدمة Gravatar. يُعد هذا الإعداد بالغ الأهمية لتحويل عناوين البريد الإلكتروني إلى عناوين URL لـ Gravatar حيث يتم تخزين صور الرمزية."
     gravatar_login_url: "عنوان URL نسبة إلى `gravatar_base_url`، والذي يوفر للمستخدم تسجيل الدخول إلى خدمة Gravatar."
@@ -2692,6 +2737,7 @@ ar:
     welcome_banner_image: "تحديد صورة لتُعرض في خلفية بانر الترحيب."
     welcome_banner_location: "يحدد مكان ظهور بانر الترحيب على الصفحة."
     welcome_banner_page_visibility: "يحدد الصفحات التي سيظهر فيها بانر الترحيب."
+    welcome_banner_text_color: "عند ضبط إعداد \"صورة بانر الترحيب\"، استخدم هذا الإعداد لتغيير لون نص البانر لضمان وضوح قراءته. إذا تُرك الحقل فارغًا أو لم يتم تحميل أي صورة، تتحكم السمة النشطة في تحديد اللون."
     splash_screen: "يعرض شاشة تحميل مؤقتة أثناء تحميل أصول الموقع"
     navigation_menu: "تحديد القائمة المنسدلة للشريط الجانبي أو الرأس كقائمة التنقل الرئيسية لموقعك. يوصى بالشريط الجانبي."
     default_navigation_menu_categories: "سيتم عرض الفئات المحدَّدة ضمن قسم فئات قائمة التنقل بشكلٍٍ افتراضي."
@@ -2700,6 +2746,7 @@ ar:
     show_preview_for_form_templates: "تفعيل ميزة معاينة قوالب النماذج"
     lazy_load_categories_groups: "التحميل البطيء لمعلومات الفئة لمستخدمي هذه المجموعات فقط. يؤدي هذا إلى تحسين الأداء على المواقع ذات الفئات المتعددة."
     enable_auto_grid_images: "يُغلف النظام تلقائيًا الصور ضمن وسوم [grid] عند تحميل 3 صور أو أكثر في أداة الإنشاء."
+    experimental_impersonation_time_limit_minutes: "المدة الزمنية قبل إنهاء جلسة انتحال الشخصية تلقائيًا."
     page_loading_indicator: "إعداد مؤشر التحميل الذي يظهر في أثناء التنقل في الصفحة داخل Discourse. يكون 'Spinner' مؤشرًا لصفحة كاملة، بينما يعرض 'Slider' شريطًا ضيقًا أعلى الشاشة."
     show_user_menu_avatars: "إظهار الصور الرمزية للمستخدم في قائمة المستخدم"
     about_page_hidden_groups: "عدم إظهار أعضاء المجموعات المحدَّدة في صفحة /about"
@@ -2712,14 +2759,26 @@ ar:
     rich_editor: "تفعيل المحرر المنسق في نافذة أداة الإنشاء، ليتمكن جميع المستخدمين من التبديل بين وضع Markdown الحالي ومحرر النصوص المنسقة الجديد، ما يتيح تجربة كتابة أكثر سهولة وملاءمة."
     default_composition_mode: "اضبط الوضع الافتراضي لأداة الإنشاء في مجتمعك. يوفر وضع النص المنسق تجربة كتابة حديثة ومألوفة لمعظم المستخدمين، بينما قد يكون وضع Markdown مناسبًا للمستخدمين ذوي الخلفية التقنية. يمكن للأعضاء التبديل بين الوضعين باستخدام زر التبديل في شريط أدوات الإنشاء."
     reviewable_ui_refresh: "المجموعات التي يمكنها استخدام واجهة المستخدم الجديدة التجريبية في قائمة انتظار المراجعة."
+    viewport_based_mobile_mode: "استخدام عرض نافذة العرض لتحديد أوضاع الهاتف المحمول أو سطح المكتب. سيتم إزالة هذا الإعداد قريبًا. إذا وجدت ضرورة لتعطيله، يرجى إعلامنا <a href='https://meta.discourse.org/t/384280'>على Meta</a>."
     content_localization_enabled: "يعرض المحتوى المترجم للمستخدمين بناءً على إعدادات لغة المتصفح أو تفضيلات اللغة الخاصة بهم. قد يشمل هذا المحتوى الفئات، والوسوم، والمنشورات، والموضوعات. اللغات المدعومة محددة في إعداد 'اللغات المدعومة لتوطين المحتوى'."
+    content_localization_supported_locales: "قائمة باللغات المدعومة التي يمكن ترجمة محتوى المستخدم إليها. يتم دائمًا تضمين اللغة الافتراضية للموقع. يتطلب هذا تفعيل خيار \"تمكين توطين المحتوى\"."
     content_localization_allowed_groups: "المجموعات المسموح لها بتحديث المحتوى المترجم. يتطلب تفعيل إعداد \"توطين المحتوى\"."
+    content_localization_language_switcher: "عرض أداة لتغيير اللغة في الرأس، ما يتيح للزوار التبديل بين النسخ المترجمة من Discourse والمحتوى المساهم به المستخدمون. يتم استخدام اللغات المعرفة في إعداد \"اللغات المدعومة لتوطين المحتوى\"."
+    content_localization_crawler_param: "تقديم المحتوى المترجم لزواحف الويب عند تفعيل خيار \"تمكين توطين المحتوى\" وخيار \"تعيين اللغة من المعامل\". يتم تحديد قائمة اللغات المدعومة في إعداد \"اللغات المدعومة لتوطين المحتوى\"."
+    content_localization_use_default_locale_when_unsupported: "تقديم المحتوى المترجم بلغة الموقع الافتراضية للمستخدمين الذين لا توجد لغتهم المفضلة ضمن \"اللغات المدعومة لتوطين المحتوى\"."
+    content_localization_allow_author_localization: "السماح للمؤلفين بتحديث الترجمات المحلية لموضوعاتهم ومنشوراتهم الخاصة عبر قائمة المنشور."
+    enable_upcoming_changes: "تمكين التغييرات القادمة"
+    fake_upcoming_change: "هذا التغيير الوهمي مزيف ويُستخدم لأغراض الاختبار فقط. لا داعي لترجمة هذه العبارة."
+    floating_dismiss_topics_on_mobile: "يعرض زرًا عائمًا باسم \"رفض...\" في نسخة الهاتف المحمول لقائمة الموضوعات، ما يسهل الوصول إليه ويحرر مساحة في الجزء العلوي من قائمة الموضوعات."
+    enable_simplified_category_creation: "يُفعّل هذا الإعداد إنشاء الفئات بطريقة مبسطة مع تقليل عدد الخيارات وتوفير واجهة أكثر نظافة ووضوحًا."
     errors:
       invalid_css_color: "لون غير صالح. أدخِل اسم لون أو قيمة سداسية عشرية."
+      invalid_datetime: "تنسيق التاريخ والوقت غير صالح. يرجى التأكد من إدخال تاريخ ووقت صحيحين."
       invalid_email: "عنوان البريد الإلكتروني غير صالح."
       invalid_username: "لا يوجد مستخدم باسم المستخدم هذا."
       valid_username: "يوجد مستخدم باسم المستخدم هذا."
       invalid_group: "لا توجد مجموعة بهذا الاسم."
+      invalid_topic: "لا يمكن العثور على أي موضوع مرتبط بهذا المعرف."
       invalid_integer_min_max: "يجب أن تكون القيمة بين %{min} و%{max}."
       invalid_integer_min: "يجب أن تكون القيمة %{min} أو أكبر."
       invalid_integer_max: "لا يمكن أن تكون القيمة أكبر من %{max}."
@@ -2764,12 +2823,6 @@ ar:
       reply_by_email_disabled: "يجب عليك تفعيل `reply by email` أولًا قبل تفعيل هذا الإعداد."
       discourse_connect_url_is_empty: "يجب عليك تعيين `discourse connect url` قبل تفعيل هذا الإعداد."
       enable_local_logins_disabled: "يجب عليك تفعيل `enable local logins` أولًا قبل تفعيل هذا الإعداد."
-      min_username_length_exists: "لا يمكنك تعيين الحد الأدنى لطول اسم المستخدم على قيمة أطول من أقصر اسم مستخدم (%{username})."
-      min_group_name_length_exists: "لا يمكنك تحديد الحد الأدنى لطول اسم المستخدم ليكون أكبر من أقصر اسم مجموعة (%{group_name})."
-      min_username_length_range: "لا يمكنك تعيين الحد الأدنى ليكون أكبر من الحد الأقصى."
-      max_username_length_exists: "لا يمكنك تعيين الحد الأقصى لطول اسم المستخدم على قيمة أقصر من أطول اسم مستخدم (%{username})."
-      max_group_name_length_exists: "لا يمكنك تحديد الحد الأقصى لطول اسم المستخدم ليكون أقل من أطول اسم مجموعة (%{group_name})."
-      max_username_length_range: "لا يمكنك تعيين الحد الأدنى ليكون أقل من الحد الأقصى."
       invalid_hex_value: "يجب أن تكون قيم اللون عبارة عن رموز سداسية عشرية مكوَّنة من 6 أرقام."
       empty_selectable_avatars: "يجب عليك تحميل صورتَين رمزيَّتَين قابلتَين للتحديد على الأقل قبل تفعيل هذا الإعداد."
       category_search_priority:
@@ -2788,6 +2841,7 @@ ar:
         other: "يجب أن تحتوي القائمة على %{count} قيمة بالضبط."
       markdown_linkify_tlds: "لا يمكنك تضمين قيمة '*'."
       google_oauth2_hd_groups: "يجب عليك تعيين جميع إعدادات 'google oauth2 hd' قبل تفعيل هذا الإعداد."
+      discourse_id_registration: "تعذر التسجيل تلقائيًا عبر معرف Discourse. قد يعود السبب إلى مشكلات في الاتصال بالشبكة، أو قيود جدار الحماية، أو تعذر الوصول إلى خدمة معرف Discourse. يُرجى الاطلاع على سجلات الخادم لمزيد من التفاصيل أو التواصل مع الدعم الفني."
       linkedin_oidc_credentials: "يتعيَّن عليك إعداد بيانات اعتماد LinkedIn OIDC ('linkedin_oidc_client_id' و'linkedin_oidc_client_secret') قبل تقعيل هذا الإعداد."
       search_tokenize_chinese_enabled: "يجب عليك إيقاف `email editable` قبل تفعيل هذا الإعداد."
       search_tokenize_japanese_enabled: "يجب عليك إيقاف 'search_tokenize_japanese' قبل تفعيل هذا الإعداد."
@@ -2796,7 +2850,9 @@ ar:
       invalid_uncategorized_category_setting: 'لا يمكن تحديد الفئة "غير المصنَّفة" إذا لم يتم تفعيل ''allow uncategorized topics''.'
       invalid_search_ranking_weights: "القيمة غير صالحة لإعداد الموقع search_ranking_weights. مثال: '{0.1,0.2,0.3,1.0}'. لاحظ أن الحد الأقصى لقيمة كل وزن هو 1.0."
       content_localization_locale_limit: "لا يمكن أن يتجاوز عدد اللغات المحلية المدعومة %{max}."
+      content_localization_language_switcher_requirements: "يتطلب مفتاح تغيير اللغة تفعيل إعدادات الموقع \"تعيين اللغة من ملف تعريف الارتباط\" و\"السماح باختيار لغة المستخدم\"، كما يجب أن تحتوي قائمة \"اللغات المدعومة لتوطين المحتوى\" على لغة واحدة على الأقل."
       mediaconvert_role_arn_required: "مطلوب تحديد معرف الدور (ARN) في AWS IAM عند استخدام خدمة AWS MediaConvert لتحويل مقاطع الفيديو."
+      mediaconvert_output_subdirectory_required: "يُشترط تحديد الدليل الفرعي لمخرجات MediaConvert."
       s3_credentials_required_for_video_conversion: "تتطلب عملية تحويل الفيديو بيانات اعتماد S3. يرجى إعداد مفاتيح الوصول إلى S3 أو تفعيل ملف تعريف IAM."
     keywords:
       clean_up_inactive_users_after_days: "تم إلغاء تنشيطه|غير نشط|لم يتم تنشيطه"
@@ -2820,6 +2876,7 @@ ar:
   filter:
     description:
       status: "تصفية الموضوعات حسب حالتها"
+      in: "تصفية الموضوعات في القوائم الشخصية"
       order: "فرز الموضوعات حسب مجال محدد"
       category: "عرض الموضوعات التابعة لفئة محددة"
       category_any: "عرض الموضوعات الموجودة في أي من الفئات المحددة (مفصولة بفواصل)"
@@ -2832,13 +2889,15 @@ ar:
       exclude_tag: "استبعاد الموضوعات التي تحتوي على وسم محدد"
       exclude_tags_any: "استبعاد الموضوعات التي تحتوي على أي من الوسوم المحددة (مفصولة بفواصل)"
       exclude_tags_all: "استبعاد الموضوعات التي تحتوي على جميع الوسوم المحددة (مفصولة بعلامة الجمع)"
-      tags_alias: "اسم مستعار لمرشح 'الوسم:'"
       tag_group: "عرض الموضوعات التي تحمل وسومًا من مجموعة وسوم محددة"
       exclude_tag_group: "استبعاد الموضوعات التي تحمل وسومًا من مجموعة وسوم محددة"
       activity_before: "عرض الموضوعات التي وقع آخر نشاط فيها قبل تاريخ محدد (YYYY-MM-DD أو قبل أيام)"
       activity_after: "عرض الموضوعات التي وقع آخر نشاط فيها بعد تاريخ محدد (YYYY-MM-DD أو قبل أيام)"
       created_before: "عرض الموضوعات التي تم إنشاؤها قبل تاريخ محدد (YYYY-MM-DD أو قبل أيام)"
       created_after: "عرض الموضوعات التي تم إنشاؤها بعد تاريخ محدد (YYYY-MM-DD أو قبل أيام)"
+      created_by: "عرض الموضوعات التي أنشأها مستخدم أو مجموعة محددة"
+      created_by_user: "عرض الموضوعات التي أنشأها اسم المستخدم أو المجموعة (بدون استخدام @)"
+      created_by_multiple: "عرض الموضوعات التي أنشأها أي من المستخدمين أو المجموعات المحددة (مفصولة بفواصل)"
       latest_post_before: "عرض الموضوعات التي تحتوي على آخر منشور قبل تاريخ محدد (YYYY-MM-DD أو قبل أيام)"
       latest_post_after: "عرض الموضوعات التي تحتوي على آخر منشور بعد تاريخ محدد (YYYY-MM-DD أو قبل أيام)"
       likes_min: "عرض الموضوعات التي يبلغ عدد تسجيلات الإعجاب فيها هذا الحد الأدنى أو يزيد عنه"
@@ -2868,6 +2927,7 @@ ar:
       in_new: "عرض الموضوعات الجديدة أو التي تحتوي على ردود جديدة"
       in_new_replies: "عرض الموضوعات التي عليها ردود جديدة"
       in_new_topics: "عرض الموضوعات الجديدة"
+      in_unseen: "عرض الموضوعات التي لم تشاهدها بعد"
       order_activity: "فرز حسب آخر نشاط (الأحدث أولًا)"
       order_activity_asc: "فرز حسب آخر نشاط (الأقدم أولًا)"
       order_category: "فرز حسب اسم الفئة (ترتيب أبجدي تنازلي)"
@@ -2888,6 +2948,18 @@ ar:
       order_views_asc: "فرز حسب عدد المشاهدات (الأقل أولًا)"
       order_read: "فرز حسب آخر مرة قرأت فيها (الأحدث أولًا)"
       order_read_asc: "فرز حسب آخر مرة قرأت فيها (الأقدم أولًا)"
+      order_hot: "الفرز حسب مؤشر النشاط (الأعلى أولًا)"
+      order_hot_asc: "الفرز حسب مؤشر النشاط (الأدنى أولًا)"
+      users: "تصفية الموضوعات حسب المشاركين"
+      users_any: "عرض الموضوعات التي شارك فيها أي من المستخدمين المحددين (مفصولة بفواصل)"
+      users_all: "عرض الموضوعات التي يشارك فيها جميع المستخدمين المحددين (مفصولة بعلامة +)"
+      exclude_users: "استبعاد الموضوعات التي يشارك فيها مستخدمون محددون"
+      group: "تصفية الموضوعات حسب المجموعات"
+      groups_any: "عرض الموضوعات التي تضم أيًا من المجموعات المحددة (مفصولة بفواصل)"
+      groups_all: "عرض الموضوعات التي تضم جميع المجموعات المحددة (مفصولة بعلامة +)"
+      locale: "تصفية الموضوعات حسب اللغة الأصلية"
+      locale_any: "عرض الموضوعات المكتوبة أصلاً بأي من اللغات المحددة (مفصولة بفواصل)"
+      exclude_locale: "استبعاد الموضوعات المكتوبة أصلاً بلغة محددة"
   discourse_connect:
     login_error: "خطأ في تسجيل الدخول"
     not_found: "تعذَّر العثور على حسابك. يُرجى التواصل مع مسؤول الموقع."
@@ -3146,6 +3218,7 @@ ar:
         updating_user_ids: "جارٍ تحديث معرِّفات المستخدمين…"
         deleting_source_user: "جارٍ حذف ‏‏المستخدم المصدر…"
   user:
+    anonymized: "[تمت إزالته بسبب إخفاء هوية المستخدم]"
     deactivated: "تم إلغاء التنشيط بسبب ارتداد عدد كبير جدًا من الرسائل الإلكترونية إلى \"%{email}\"."
     deactivated_by_staff: "تم إلغاء التنشيط بواسطة فريق العمل"
     deactivated_by_inactivity:
@@ -3364,11 +3437,13 @@ ar:
     illegal: "تم وضع علامة على منشورك باعتباره **غير قانوني**: يعتقد المجتمع أنه قد يكون مخالفًا للقانون‎."
     spam: "تم الإبلاغ عن منشورك على أنه **غير مرغوب فيه**: يشعر المجتمع بأنه إعلان، أو ذو طبيعة ترويجية بشكلٍٍ زائد بدلًا من أن يكون مفيدًا أو ذا صلة بالموضوع كما هو متوقَّع."
     notify_moderators: "تم الإبلاغ عن منشورك على أنه **يستدعي انتباه المشرفين**: يشعر المجتمع بأن المنشور يتطلَّب تدخلًا يدويًا بواسطة أحد أعضاء فريق العمل."
+    needs_approval: "تم وضع علامة على منشورك **للموافقة عليه**: تمت إضافته تلقائيًا إلى قائمة الانتظار للمراجعة من قبل أحد أعضاء طاقم العمل للتأكد من أنه يفي [بإرشادات مجتمعنا] (%{base_path}/الإرشادات)."
     responder:
       off_topic: "تم الإبلاغ عن المنشور على أنه **خارج الموضوع**: يشعر المجتمع بأنه غير مناسب للموضوع، كما هو محدَّد حاليًا في العنوان وأول منشور."
       inappropriate: "تم الإبلاغ عن المنشور على أنه **غير لائق**: يشعر المجتمع بأنه هجومي أو مسيء أو يتضمَّن سلوكًا ينمُّ عن كراهية أو ينتهك [إرشادات مجتمعنا](%{base_path}/guidelines)."
       spam: "تم الإبلاغ عن المنشور على أنه **غير مرغوب فيه**: يشعر المجتمع بأنه إعلان، أو ذو طبيعة ترويجية بشكلٍٍ زائد بدلًا من أن يكون مفيدًا أو ذا صلة بالموضوع كما هو متوقَّع."
       notify_moderators: "تم الإبلاغ عن المنشور على أنه **يستدعي انتباه المشرفين**: يشعر المجتمع بأن المنشور يتطلَّب تدخلًا يدويًا بواسطة أحد أعضاء فريق العمل."
+      needs_approval: "تم وضع علامة على المنشور **للموافقة عليه**: تمت إضافته تلقائيًا إلى قائمة الانتظار للمراجعة من قبل أحد أعضاء طاقم العمل للتأكد من أنه يفي [بإرشادات مجتمعنا] (%{base_path}/الإرشادات)."
   flags_dispositions:
     agreed: "نشكرك على إعلامنا. نتفق على وجود مشكلة ونبحث في الأمر."
     agreed_and_deleted: "نشكرك على إعلامنا. نتفق على وجود مشكلة وقد أزلنا المنشور."
@@ -3396,6 +3471,7 @@ ar:
     contents_hidden: "يُرجى زيارة هذا المنشور لرؤية محتوياته."
     post_hidden:
       title: "تم إخفاء المنشور"
+      preview: "تم إخفاء هذا المنشور نتيجة الإبلاغ عنه من قبل أعضاء المجتمع."
       subject_template: "تم إخفاء المنشور بسبب بلاغات المجتمع"
       text_body_template: |
         مرحبًا،
@@ -3457,6 +3533,7 @@ ar:
         مشرفو %{site_name}
     post_hidden_again:
       title: "تم إخفاء المنشور مرة أخرى"
+      preview: "تم إخفاء المنشور مرة أخرى بواسطة أعضاء المجتمع."
       subject_template: "تم إخفاء المنشور بسبب بلاغات المجتمع، وتم إرسال إشعار إلى فريق العمل"
       text_body_template: |
         مرحبًا،
@@ -3932,6 +4009,7 @@ ar:
         للحصول على إرشادات إضافية، يُرجى الرجوع إلى [إرشادات المجتمع](%{base_url}/guidelines).
     too_many_spam_flags:
       title: "لقد تلقيت الكثير من بلاغات الرسائل غير المرغوب فيها"
+      preview: "تم إخفاء هذه المنشورات مؤقتًا نتيجة الإبلاغ عنها كرسائل عشوائية."
       subject_template: "تم تعليق الحساب الجديد"
       text_body_template: |
         مرحبًا،
@@ -3954,6 +4032,7 @@ ar:
         للحصول على إرشادات إضافية، يُرجى الرجوع إلى [إرشادات المجتمع](%{base_url}/guidelines).
     silenced_by_staff:
       title: "تم كتمك بواسطة فريق العمل"
+      preview: "تم تعليق الحساب مؤقتًا."
       subject_template: "تم تعليق الحساب مؤقتًا"
       text_body_template: |
         مرحبًا،
@@ -3966,9 +4045,27 @@ ar:
     user_automatically_silenced:
       title: "تم كتم المستخدم تلقائيًا"
       subject_template: "تم كتم المستخدم الجديد %{username} بسبب بلاغات المجتمع"
+      text_body_template: |
+        هذه رسالة تلقائية.
+
+        تم كتم المستخدم الجديد [%{username}](%{user_url}) تلقائيًا.
+
+        يُرجى [مراجعة البلاغات](%{base_url}/المراجعة). إذا تم كتم %{username} عن النشر بالخطأ، انقر على زر إلغاء الكتم في [صفحة المسؤول لهذا المستخدم](%{user_url}).
+
+        يمكن تغيير هذا الحد من خلال إعدادات الموقع `silence_new_user`.
     user_automatically_silenced_with_reason:
       title: "تم كتم المستخدم تلقائيًا"
       subject_template: "تم كتم المستخدم الجديد %{username} بسبب بلاغات المجتمع"
+      text_body_template: |
+        هذه رسالة تلقائية.
+
+        تم كتم المستخدم الجديد [%{username}](%{user_url}) تلقائيًا.
+
+        السبب - %{reason}
+
+        يُرجى [مراجعة البلاغات](%{base_url}/المراجعة). إذا تم كتم %{username} عن النشر بالخطأ، انقر على زر إلغاء الكتم في [صفحة المسؤول لهذا المستخدم](%{user_url}).
+
+        يمكن تغيير هذا الحد من خلال إعدادات الموقع `silence_new_user`.
     spam_post_blocked:
       title: "تم حظر المنشور غير المرغوب فيه"
       subject_template: "تم حظر منشورات المستخدم الجديد %{username} بسبب الروابط المتكررة"
@@ -4029,6 +4126,16 @@ ar:
         مرحبًا،
 
         تم تعليق المنشورات من المستخدمين الجُدد لتخضع للإشراف وهي في انتظار المراجعة حاليًا. [يمكنك الموافقة عليها أو رفضها من هنا](%{base_url}/review?type=ReviewableQueuedPost).
+    user_posts_deleted:
+      title: "تم حذف منشورات المستخدم"
+      subject_template: "تم حذف جميع منشورات %{user}"
+      text_body_template:
+        zero: "حذف @%{staff_user} منشور من @%{user}."
+        one: "حذف @%{staff_user} منشور من @%{user}."
+        two: "حذف @%{staff_user} منشورين من @%{user}."
+        few: "حذف @%{staff_user} %{count} منشورات من @%{user}."
+        many: "حذف @%{staff_user} %{count} منشورًا من @%{user}."
+        other: "حذف @%{staff_user} %{count} منشور من @%{user}."
   unsubscribe_link: |
     لإلغاء الاشتراك في هذه الرسائل الإلكترونية، [انقر هنا](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |
@@ -4150,6 +4257,7 @@ ar:
         %{respond_instructions}
     user_replied:
       title: "ردَّ مستخدم عليك"
+      preview: "لقد رد أحد المستخدمين على منشورك."
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -4172,6 +4280,7 @@ ar:
         %{respond_instructions}
     user_quoted:
       title: "اقتبس مستخدم منك"
+      preview: "لقد اقتبس أحد المستخدمين كلامك في منشور."
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -4183,6 +4292,7 @@ ar:
         %{respond_instructions}
     user_linked:
       title: "وضع مستخدم رابطًا إلى موضوعك"
+      preview: "تم ربط هذا المنشور بموضوع آخر."
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -4194,6 +4304,7 @@ ar:
         %{respond_instructions}
     user_mentioned:
       title: "أشار مستخدم إليك"
+      preview: "لقد ذكرك أحد المستخدمين في منشور."
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -4249,6 +4360,7 @@ ar:
         %{respond_instructions}
     user_posted:
       title: "نشر مستخدم في موضوعك"
+      preview: "لقد رد أحد المستخدمين على موضوع تتابعه."
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -4282,6 +4394,7 @@ ar:
         %{respond_instructions}
     user_posted_pm:
       title: "نشر مستخدم موضوعك في رسالة خاصة"
+      preview: "لقد أرسل لك أحد المستخدمين رسالة خاصة."
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -4350,6 +4463,12 @@ ar:
     account_second_factor_disabled:
       title: "تم إيقاف المصادقة الثنائية"
       subject_template: "[%{email_prefix}] تم إيقاف المصادقة الثنائية"
+      text_body_template: |
+        تم تعطيل المصادقة الثنائية على حسابك في %{site_name}. يمكنك الآن تسجيل الدخول باستخدام كلمة مرورك فقط؛ لم يعُد رمز المصادقة الإضافي مطلوبًا.
+
+        إذا لم تختر تعطيل المصادقة الثنائية (2FA)، فربما يكون هناك شخص ما قد اخترق حسابك.
+
+        إذا كانت لديك أي أسئلة، [تواصل مع فريق العمل](%{base_url}/حول).
     digest:
       why: "ملخص موجز لـ‎ %{site_link} ‎منذ‎ %{since}"
       since_last_visit: "منذ زيارتك الأخيرة"
@@ -4370,6 +4489,7 @@ ar:
       preheader: "ملخص موجز منذ‎ %{since}"
     forgot_password:
       title: "نسيت كلمة المرور"
+      preview: "إعادة تعيين كلمة المرور."
       subject_template: "[%{email_prefix}] إعادة تعيين كلمة المرور"
       text_body_template: |
         طلب شخص ما إعادة تعيين كلمة مرورك على [%{site_name}](%{base_url}).
@@ -4391,6 +4511,7 @@ ar:
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "تعيين كلمة المرور"
+      preview: "تعيين كلمة المرور الخاصة بالحساب"
       subject_template: "[%{email_prefix}] تعيين كلمة المرور"
       text_body_template: |
         طلب شخص ما إضافة كلمة مرور إلى حسابك على [%{site_name}](%{base_url}). بدلًا من ذلك، يمكنك تسجيل الدخول باستخدام أي خدمة مدعومة عبر الإنترنت (Google ،Facebook، إلى آخره) مرتبطة بعنوان البريد الإلكتروني الذي تم التحقُّق منه.
@@ -4401,6 +4522,7 @@ ar:
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "تسجيل دخول المسؤول"
+      preview: "تم تقديم طلب لتسجيل دخول المسؤول."
       subject_template: "[%{email_prefix}] تسجيل الدخول"
       text_body_template: |
         طلب شخص ما تسجيل الدخول إلى حسابك على [%{site_name}](%{base_url}).
@@ -4411,6 +4533,7 @@ ar:
         %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "تم إنشاء الحساب"
+      preview: "تم إنشاء حساب جديد لك."
       subject_template: "[%{email_prefix}] حسابك الجديد"
       text_body_template: |
         تم إنشاء حساب جديد لك على %{site_name}
@@ -4452,6 +4575,7 @@ ar:
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "إرسال إشعار بشأن عنوان البريد الإلكتروني القديم"
+      preview: "تم تحديث عنوان البريد الإلكتروني."
       subject_template: "[%{email_prefix}] تم تغيير عنوان بريدك الإلكتروني"
       text_body_template: |
         هذه رسالة تلقائية لإعلامك بأنه قد تم تغيير عنوان بريدك الإلكتروني للموقع
@@ -4474,6 +4598,7 @@ ar:
         %{new_email}
     signup_after_approval:
       title: "الاشتراك بعد الموافقة"
+      preview: "تمت الموافقة على الحساب الجديد."
       subject_template: "لقد تمت الموافقة عليك في %{site_name}!"
       text_body_template: |
         مرحبًا بك في %{site_name}!
@@ -4499,6 +4624,7 @@ ar:
         %{reject_reason}
     signup:
       title: "الاشتراك"
+      preview: "يرجى تأكيد حسابك."
       subject_template: "[%{email_prefix}] تأكيد حسابك الجديد"
       text_body_template: |
         مرحبًا بك في %{site_name}!
@@ -4521,6 +4647,7 @@ ar:
         إذا كان الرابط أعلاه غير قابل للنقر، فحاول نسخه ولصقه في شريط العنوان في متصفح الويب.
     suspicious_login:
       title: "تنبيه بعملية تسجيل دخول جديدة"
+      preview: "تحقق من جهازك."
       subject_template: "[%{site_name}] عملية تسجيل دخول جديدة من %{location}"
       text_body_template: "مرحبًا،\n\nلاحظنا عملية تسجيل دخول من جهاز أو موقع لا تستخدمه عادةً. هل كان هذا أنت؟\n\n - الموقع: %{location} (%{client_ip}) \n - المتصفح: %{browser}\n - الجهاز: %{device} - %{os}\n\nإذا كان هذا أنت، رائع! لا يوجد شيء آخر عليك القيام به.\n\nإذا لم يكن هذا أنت، يُرجى [مراجعة جلساتك الحالية](%{base_url}/my/preferences/security) والتفكير في تغيير كلمة مرورك.\n"
     post_approved:
@@ -4536,8 +4663,14 @@ ar:
   page_not_found:
     page_title: "الصفحة غير موجودة"
     title: "عذرًا! هذه الصفحة غير موجودة أو خاصة."
+    subtitle: "بحثنا في كل مكان، لكن لم نتمكن من العثور على الصفحة التي تبحث عنها."
+    popular_topics: "الموضوعات الرائجة"
+    recent_topics: "الموضوعات الحديثة"
     see_more: "المزيد"
+    search_title: "لماذا لا تحاول البحث بدلاً من ذلك؟"
     search_button: "البحث"
+    home: "الانتقال إلى الصفحة الرئيسية"
+    placeholder: "البحث عن الموضوعات باستخدام العنوان أو الكلمات الرئيسية…"
   offline:
     title: "لا يمكن تحميل التطبيق"
     offline_page_message: "يبدو أنك غير متصل! يُرجى التحقُّق من اتصال الشبكة وإعادة المحاولة."
@@ -4546,6 +4679,7 @@ ar:
   upload:
     edit_reason: "تم تنزيل نسخ محلية من الصور"
     unauthorized: "عذرًا، الملف الذي تحاول تحميله غير مسموح به (الامتدادات المسموح بها: %{authorized_extensions})."
+    images_only: "عذرًا، لا يمكن تحميل سوى الصور في هذا الإعداد."
     pasted_image_filename: "الصورة الملصقة"
     store_failure: "فشل تخزين التحميل #%{upload_id} للمستخدم #%{user_id}."
     file_missing: "عذرًا، يجب عليك تقديم ملف للتحميل."
@@ -4633,6 +4767,8 @@ ar:
     latte_theme_name: "اللاتيه"
     summer_theme_name: "الصيف"
     dark_rose_theme_name: "الوردي الداكن"
+    errors:
+      cannot_edit_remote_copies: "لا يُسمح بإجراء تعديلات على النسخ البعيدة من لوحات الألوان."
   edit_this_page: "تعديل هذه الصفحة"
   csv_export:
     boolean_yes: "نعم"
@@ -5089,12 +5225,18 @@ ar:
     nice_share:
       name: مشاركة لطيفة
       description: شارك منشورًا مع 25 زائرًا فريدًا
+      long_description: |
+        تُمنح هذه الشارة عند مشاركة رابط تم النقر عليه من قبل 25 زائرًا فريدًا من خارج المنتدى. نشكرك على المساهمة في نشر محتوى مناقشاتنا وتعزيز هذا المجتمع.
     good_share:
       name: مشاركة جيدة
       description: نشرت منشورًا مع 300 زائر فريد
+      long_description: |
+        تُمنح هذه الشارة عند مشاركة رابط تم النقر عليه من قبل 300 زائر فريد من خارج المنتدى. أحسنت! لقد أبرزت نقاشًا قيّمًا أمام جمهور جديد، وساعدت في دعم نمو هذا المجتمع.
     great_share:
       name: مشاركة رائعة
       description: نشرت منشورًا مع 1000 زائر فريد
+      long_description: |
+        تُمنح هذه الشارة عند مشاركة رابط تم النقر عليه من قبل 1000 زائر فريد من خارج المنتدى. إنجاز مميز! لقد أبرزت نقاشًا شيّقًا أمام شريحة كبيرة من المستخدمين الجدد، وساعدت بصورة ملحوظة في توسّع مجتمعنا.
     first_like:
       name: أول مرة إعجاب
       description: سجَّلت إعجابك بمشاركة
@@ -5266,6 +5408,23 @@ ar:
       many: "يجب تحديد %{count} وسمًا على الأقل."
       other: "يجب تحديد %{count} وسم على الأقل."
     upload_row_too_long: "يجب أن يحتوي ملف CSV على وسم واحد في كل سطر. واختياريًا، يمكن اتباع الوسم بفاصلة، ثم اسم مجموعة الوسوم."
+    bulk_create:
+      invalid_params: "المعلمات غير صالحة. يرجى تقديم مصفوفة بأسماء الوسوم."
+      invalid_name: "اسم الوسم غير صالح."
+      tag_too_long:
+        zero: "الوسم طويل جدًا (الحد الأقصى %{count} حرف)."
+        one: "الوسم طويل جدًا (الحد الأقصى حرف واحد)."
+        two: "الوسم طويل جدًا (الحد الأقصى حرفان)."
+        few: "الوسم طويل جدًا (الحد الأقصى %{count} أحرف)."
+        many: "الوسم طويل جدًا (الحد الأقصى %{count} حرفًا)."
+        other: "الوسم طويل جدًا (الحد الأقصى %{count} حرف)."
+      too_many_tags:
+        zero: "عدد الوسوم كبير جدًا. يمكنك إنشاء ما يصل إلى %{count} وسم في المرة الواحدة. لاستيراد كميات أكبر، استخدم ميزة تحميل ملف CSV."
+        one: "عدد الوسوم كبير جدًا. يمكنك إنشاء وسم واحد في المرة الواحدة. لاستيراد كميات أكبر، استخدم ميزة تحميل ملف CSV."
+        two: "عدد الوسوم كبير جدًا. يمكنك إنشاء ما يصل إلى وسمين في المرة الواحدة. لاستيراد كميات أكبر، استخدم ميزة تحميل ملف CSV."
+        few: "عدد الوسوم كبير جدًا. يمكنك إنشاء ما يصل إلى %{count} وسوم في المرة الواحدة. لاستيراد كميات أكبر، استخدم ميزة تحميل ملف CSV."
+        many: "عدد الوسوم كبير جدًا. يمكنك إنشاء ما يصل إلى %{count} وسمًا في المرة الواحدة. لاستيراد كميات أكبر، استخدم ميزة تحميل ملف CSV."
+        other: "عدد الوسوم كبير جدًا. يمكنك إنشاء ما يصل إلى %{count} وسم في المرة الواحدة. لاستيراد كميات أكبر، استخدم ميزة تحميل ملف CSV."
     forbidden:
       invalid:
         zero: "لا يمكن استخدام أي من الوسوم التي حدَّدتها"
@@ -5312,6 +5471,9 @@ ar:
   rss_by_tag: "الموضوعات التي تم وضع وسم عليها %{tag}"
   finish_installation:
     congratulations: "تهانينا، لقد ثبَّت Discourse!"
+    login_with_discourse_id: "تسجيل الدخول باستخدام معرّف Discourse"
+    discourse_id_help: "يرجى تسجيل الدخول باستخدام معرف Discourse عبر الزر أدناه. <br/><br/>تأكد من استخدام حساب Discourse ID يحتوي على بريد إلكتروني أساسي يطابق متغير البيئة `DISCOURSE_DEVELOPER_EMAILS`."
+    discourse_id_error_help: "لقد اخترتَ تخطي إعداد البريد الإلكتروني في الوقت الحالي. للأسف، نظرًا لرسالة الخطأ المذكورة أعلاه، لا يمكن متابعة عملية الإعداد. يُرجى الإبلاغ عن هذه المشكلة على <a href='https://meta.discourse.org/'>meta.discourse.org</a>."
     register:
       button: "التسجيل"
       title: "تسجيل حساب المسؤول"
@@ -5323,6 +5485,10 @@ ar:
     resend_email:
       title: "إعادة إرسال الرسالة الإلكترونية للتفعيل"
       message: "<p> لقد أعدنا إرسال الرسالة الإلكترونية للتنشيط إلى <b>%{email}</b>"
+    discourse_id:
+      help: "جارٍ إعداد معرف Discourse لحسابك."
+      no_allowed_emails: "لا توجد عناوين بريد إلكتروني مسموح بها مُكوَّنة في DISCOURSE_DEVELOPER_EMAILS. لا يمكن متابعة إعداد الموقع."
+      global_notice: "لم يتم تسجيل دخول أي مسؤول بعد. يرجى تسجيل الدخول باستخدام حساب Discourse ID يحتوي على بريد إلكتروني يطابق متغير البيئة DISCOURSE_DEVELOPER_EMAILS لإكمال عملية التثبيت."
   safe_mode:
     title: "الدخول إلى الوضع الآمن"
     description: "يسمح لك الوضع الآمن باختبار موقعك دون تحميل السمات أو تخصيصات المكوِّنات الإضافية من جانب العميل. تظل تخصيصات المكوِّنات الإضافية من جانب الخادم مفعَّلة."
@@ -5334,15 +5500,18 @@ ar:
     enter: "الدخول إلى الوضع الآمن"
     must_select: "يجب عليك تحديد خيار واحد على الأقل للدخول إلى الوضع الآمن."
   dev_mode:
-    enter: "مفتاح Enter"
+    title: "وضع المطور"
+    enable_rack_mini_profiler: "تفعيل Rack Mini Profiler بحيث يظل فعالًا عبر تغييرات الجلسة لمدة ساعة واحدة."
   wizard:
     title: "إعداد Discourse"
     step:
       setup:
         title: "خطوات البدء"
+        description: "هيا نبدأ بإعداد العناصر الأساسية لمجتمعك. يمكنك تغيير هذه الإعدادات في أي وقت لاحقًا."
         fields:
           title:
             label: "اسم المجتمع"
+            placeholder: "ملتقى جين"
           default_locale:
             label: "اللغة"
           login_required:
@@ -5390,9 +5559,20 @@ ar:
       review_by: "روجع من قِبل"
       pr_summary: "أدت %{commits} من عمليات التضمين إلى ‎تغيير ‎ %{changed_files}‎ من الملفات بإجراء %{additions} من الإضافات و%{deletions} من الحذوفات"
       no_description: "المساهمة في تطوير‎ %{repo} ‎من خلال إنشاء حساب على‎ GitHub."
+      pr_title:
+        default: "طلب سحب"
+        draft: "طلب سحب مسودة"
+        open: "طلب سحب مفتوح"
+        approved: "طلب سحب مُوافق عليه"
+        changes_requested: "التغييرات مطلوبة"
+        merged: "طلب سحب مُدمج"
+        closed: "طلب سحب مغلق"
       status_date:
         open: "مفتوحة"
+        draft: "تم إنشاؤه كمسودة"
         approved: "تمت الموافقة عليها"
+        changes_requested: "التغييرات مطلوبة"
+        merged: "تم دمجه"
         closed: "مغلقة"
   discourse_push_notifications:
     popup:
@@ -5408,9 +5588,12 @@ ar:
       confirm_body: "تم بنجاح! تم تفعيل الإشعارات."
       custom: "إشعار من %{username} على %{site_title}"
   staff_action_logs:
+    redacted: "[المحتوى غير مرئي]"
     json_too_long: "القيم غير مسجَّلة لأنها تتجاوز حدود طول العمود"
     not_found: "غير موجود"
     unknown: "غير معروف"
+    site_setting:
+      update_existing_users: "هل تريد تحديث المستخدمين الحاليين؟ %{value}"
     user_merged: "تم دمج %{username} في هذا الحساب"
     user_delete_self: "تم الحذف بواسطتي من %{url}"
     webhook_deactivation_reason: "تم إلغاء تنشيط خطاف الويب الخاص بك تلقائيًا. لقد تلقينا عدة استجابات لفشل حالة HTTP \"%{status}\"."
@@ -5439,9 +5622,14 @@ ar:
     auto_deleted_hidden_posts: "تمت إزالة المنشورات المخفية تلقائيًا"
     seed_data_topic_updated: "تم تحديث موضوع بيانات التهيئة الأولية"
     seed_data_topic_deleted: "تم حذف موضوع بيانات التهيئة الأولية"
+    upcoming_changes:
+      log_manually_toggled: "تم التبديل يدويًا بواسطة المستخدم"
+      log_promoted: >
+        وصل هذا التغيير القادم إلى حالة '%{change_status}'، لذلك تم تفعيله تلقائيًا على موقعك. راجع <a href="%{base_path}/admin/config/upcoming-changes">صفحة التغييرات القادمة</a> لمزيد من التفاصيل.
   reviewables:
     already_handled: "شكرًا، لكننا راجعنا هذا المنشور بالفعل وقررنا أنه لا يلزم الإبلاغ عنه مرة أخرى."
     already_handled_and_user_not_exist: "شكرًا، لكن شخصًا ما راجعه بالفعل ولم يعُد هذا المستخدم موجودًا."
+    post_restored_by_author: "تم استعادة المنشور بواسطة المؤلف"
     priorities:
       low: "منخفضة"
       medium: "متوسطة"
@@ -5511,14 +5699,19 @@ ar:
         description: "الموافقة على البلاغ وإخفاء هذا المنشور + إرسال رسالة إلى المستخدم تلقائيًا تحثه فيها على تعديله."
         complete: "تم إخفاء المنشور، وتم إشعار المستخدم."
       agree_and_edit:
+        title: "تعديل المنشور"
         description: "الموافقة مع البلاغ وفتح نافذة أداة الإنشاء لتعديل المنشور‎."
         complete: "تم التعرف على البلاغ، يمكنك الآن تعديل المنشور."
       delete:
         title: "حذف"
         complete: "تم حذف المنشور."
       delete_and_ignore:
+        title: "حذف المنشور وتجاهل البلاغ"
+        description: "احذف المنشور وتجاهل البلاغ عن طريق إزالته من قائمة الانتظار؛ وإذا كان هذا المنشور الأول، فاحذف الموضوع أيضًا. "
         complete: "تم حذف المنشور."
       delete_and_ignore_replies:
+        title: "حذف المنشور والردود، وتجاهل البلاغ"
+        description: "احذف المنشور وكافة الردود المرتبطة به، ثم تجاهل البلاغ عن طريق إزالته من قائمة الانتظار؛ وإذا كان هذا المنشور الأول، فاحذف الموضوع أيضًا"
         confirm: "هل تريد بالتأكيد حذف الردود على المنشور أيضًا؟"
         complete: "تم حذف المنشور وردوده."
       delete_and_agree:
@@ -5532,19 +5725,23 @@ ar:
         complete: "تم حذف المنشور وردوده."
       disagree_and_restore:
         title: "استعادة المنشور"
+        description: "رفض البلاغ واستعادة المنشور"
         complete: "تم استعادة المنشور."
       disagree_bundle:
         title: "لا"
       disagree:
         title: "إبقاء المنشور"
+        description: "رفض البلاغ"
         complete: "تم تجاهل البلاغ."
       discard_post:
         title: "تجاهل المنشور"
         complete: "تم تجاهل المنشور."
       revise_and_reject_post:
+        title: "طلب مراجعة.."
         complete: "تم رفض المنشور في انتظار المراجعة."
       ignore:
         title: "تجاهل"
+        description: "إزالته من قائمة الانتظار دون اتخاذ أي إجراء."
         complete: "تم تجاهل البلاغ."
       ignore_and_do_nothing:
         title: "عدم اتخاذ أي إجراء"
@@ -5572,6 +5769,7 @@ ar:
         title: "لا"
         delete:
           title: "حذف المستخدم"
+          description: "حذف المستخدم دون حظره"
           complete: "تم حذف المستخدم."
         block:
           title: "الحذف وحظر المستخدم"
@@ -5581,6 +5779,7 @@ ar:
         title: "نعم"
       not_spam:
         title: "لا"
+        description: "ليس بريدًا عشوائيًا، وافق على المستخدم"
       reject:
         title: "رفض"
         bundle_title: "رفض…"
@@ -5593,9 +5792,13 @@ ar:
       reject_and_delete:
         title: "الرفض وحذف المنشور"
         complete: "تم رفض المنشور وحذفه."
+      reject_and_delete_standalone:
+        title: "لا، احذف المنشور"
       reject_and_keep_deleted:
         title: "إبقاء المنشور محذوفًا"
         complete: "تم رفض المنشور والإبقاء على حذفه."
+      reject_and_keep_deleted_standalone:
+        title: "لا، احتفظ بالمنشور محذوفًا"
       scrub:
         title: تنقية السجل
       approve_and_restore:
@@ -5604,31 +5807,52 @@ ar:
       approve_and_unhide:
         title: "نعم"
         complete: "تمت الموافقة على المنشور وإظهاره"
-      no_action_post:
-        title: "التي لم يتم اتخاذ إجراء بشأنها"
+      post_actions:
+        bundle_title: "ماذا تريد أن تفعل بالمنشور؟"
       delete_post:
         title: "حذف المنشور"
+        description: "حذف هذا المنشور"
         complete: "تم حذف المنشور"
       hide_post:
         title: "إخفاء المنشور"
+        description: "إخفاء هذا المنشور عن العامة"
+        complete: "تم إخفاء المنشور"
+      unhide_post:
+        title: "إظهار المنشور"
+        description: "اجعل هذا المنشور مرئيًا لجميع المستخدمين"
+        complete: "تم إظهار المنشور"
       restore_post:
         title: "استعادة المنشور"
-        complete: "تم استعادة المنشور"
-      no_action_user:
-        title: "التي لم يتم اتخاذ إجراء بشأنها"
+        description: "استعادة هذا المنشور المحذوف"
+        complete: "تمت استعادة المنشور"
+      edit_post:
+        title: "تعديل المنشور"
+        description: "تعديل محتوى هذا المنشور"
+        complete: "تم تعديل المنشور"
+      user_actions:
+        bundle_title: "ماذا تريد أن تفعل بهذا المستخدم؟"
       silence_user:
         title: "كتم المستخدم"
+        description: "منع المستخدم من النشر"
         complete: "تم كتم صوت المستخدم"
+        reason: "تم كتم المستخدم عبر قائمة انتظار المراجعة"
       suspend_user:
         title: "تعليق المستخدم"
+        description: "تعليق حساب المستخدم"
         complete: "تم تعليق المستخدم"
+        reason: "تم تعليق حساب المستخدم عبر قائمة انتظار المراجعة"
       delete_user:
         title: "حذف المستخدم"
+        description: "احذف هذا المستخدم من المنتدى"
         complete: "تم حذف المستخدم"
         reason: "تم الحذف من خلال قائمة انتظار المراجعة"
       delete_and_block_user:
+        title: "حذف وحظر"
+        description: "احذف المستخدم واحظر عنوان IP/ البريد الإلكتروني"
         complete: "تم حذف المستخدم وحظره"
       delete_user_block:
+        title: "حذف وحظر"
+        description: "احذف المستخدم واحظر عنوان IP/ البريد الإلكتروني"
         complete: "تم حذف المستخدم وحظره"
   email_style:
     html_missing_placeholder: "يجب أن يشتمل قالب html على %{placeholder}"
@@ -5677,6 +5901,11 @@ ar:
       reserved_id: "يحتوي على كلمة مفتاحية محجوزة كمعرف: %{id}"
       unsafe_description: "يحتوي على وصف HTML غير آمن"
       invalid_tag_group: "مجموعة الوسوم غير صالحة: %{tag_group_name}"
+  discourse_id:
+    already_registered: "هذا الموقع مسجل بالفعل في معرّف Discourse"
+    errors:
+      not_configured: "لم يتم إعداد معرّف Discourse. يرجى تفعيل معرّف Discourse أولاً."
+      regenerate_failed: "فشل في إعادة إنشاء بيانات الاعتماد. يرجى المحاولة مرة أخرى لاحقًا."
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.be.yml b/config/locales/server.be.yml
index 6da3b14919946..2f2fac28862df 100644
--- a/config/locales/server.be.yml
+++ b/config/locales/server.be.yml
@@ -956,7 +956,6 @@ be:
     blocked_ip_blocks: "Спіс прыватных IP-блокаў, якія ніколі не павінны сканіравацца дыскурсе"
     allowed_internal_hosts: "Спіс ўнутраных хастоў, дыскурс можа бяспечна паўзці для oneboxing і іншых мэтаў"
     slow_down_crawler_rate: "Калі slow_down_crawler_user_agents паказаны гэтая стаўка будзе прымяняцца да ўсіх сканэра (колькасць секунд затрымкі паміж запытамі)"
-    content_security_policy_collect_reports: "Ўключыць CSP збор справаздач парушэнні ў"
     invalidate_inactive_admin_email_after_days: "Адміністратар рахункаў, якія не наведвалі сайт у гэтым колькасць дзён трэба будзе паўторна праверыць іх адрасы электроннай пошты перад уваходам у сістэму. Усталюйце 0, каб адключыць."
     share_links: "Вызначце, якія элементы адлюстроўваюцца ў дыялогу акцый, і ў якім парадку."
     site_contact_username: "Сапраўднае імя карыстальніка персанал для адпраўкі ўсіх аўтаматычных паведамленняў з. Калі пакінуць пустым, будзе выкарыстоўвацца па змаўчанні сістэмы уліковы запіс."
@@ -1224,8 +1223,6 @@ be:
       staged_users_disabled: "Вы павінны спачатку ўключыць «паставілі карыстальнік» перад уключэннем гэтага параметру."
       reply_by_email_disabled: "Вы павінны спачатку ўключыць «адказ па электроннай пошце», перад тым як уключыць гэтую наладу."
       enable_local_logins_disabled: "Вы павінны спачатку ўключыць «каб мясцовыя лагіны» перад уключэннем гэтага параметру."
-      min_username_length_range: "Вы не можаце ўсталяваць мінімум вышэй максімуму."
-      max_username_length_range: "Вы не можаце ўсталяваць максімум ніжэй мінімуму."
       invalid_hex_value: "Значэння колеру павінны быць 6-значныя шаснаццаткавыя коды."
       allowed_unicode_usernames:
         leading_trailing_slash: "Рэгулярны выраз не павінна пачынацца і заканчвацца касой рысай."
@@ -2333,10 +2330,6 @@ be:
         title: "Так"
       approve_and_unhide:
         title: "Так"
-      no_action_post:
-        title: "Ніякіх дзеянняў"
-      no_action_user:
-        title: "Ніякіх дзеянняў"
       delete_user:
         reason: "Выдаляецца з дапамогай чарзе на разгляд"
   fallback_username: "карыстальнік"
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 94a23c9149487..83cc3bba20c1d 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -1572,8 +1572,6 @@ bg:
     description: "Безопасният режим ви позволява да тествате сайта си, без да зареждате теми или персонализации на плъгини от страна на клиента. Персонализирането на плъгини от страна на сървъра остава активирано."
     no_unofficial_plugins: "Деактивирайте неофициалните персонализации на приставки от страна на клиента"
     no_plugins: "Деактивирайте всички персонализации на приставки от страна на клиента"
-  dev_mode:
-    enter: "Въведете"
   wizard:
     step:
       setup:
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index 285cb88e96c8e..4048b5fc722d3 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -1006,8 +1006,6 @@ bs_BA:
       button: "Registriraj"
     resend_email:
       title: "Pošalji ponovo email aktivacije"
-  dev_mode:
-    enter: "Naprijed"
   wizard:
     step:
       setup:
diff --git a/config/locales/server.ca.yml b/config/locales/server.ca.yml
index d1006c64b1b9b..4c32c5871bf16 100644
--- a/config/locales/server.ca.yml
+++ b/config/locales/server.ca.yml
@@ -1195,7 +1195,6 @@ ca:
     allowed_internal_hosts: "Llista d'amfitrions interns que Discourse pot rastrejar de manera segura per a onebox i altres finalitats."
     allowed_crawler_user_agents: "Agents d'usuari dels rastrejadors web als quals es permet accedir al lloc web. ATENCIÓ! ESTABLIR AIXÒ IMPEDIRÀ ACTUAR A TOTS ELS RASTREJADORS NO LLISTATS AQUÍ!"
     slow_down_crawler_rate: "Si s'especifica slow_down_crawler_user_agents, aquesta ràtio s'aplicarà a tots els rastrejadors (nombre de segons de retard entre les sol·licituds)."
-    content_security_policy_collect_reports: "Habilita la recol·lecció de reports de violació de CSP en /csp_reports"
     invalidate_inactive_admin_email_after_days: "Els comptes d'administrador que no hagin visitat el lloc web en aquest nombre de dies hauran de tornar a validar la seva adreça de correu abans d'iniciar la sessió. 0 per a desactivar-ho."
     share_links: "Determina quins elements apareixen en el diàleg de compartir i en qui ordre."
     site_contact_username: "Nom d'usuari vàlid de l'equip responsable des del qual s'envien tots els missatges automàtics. Si es deixa buit, es farà servir el compte per defecte del sistema."
@@ -1371,7 +1370,6 @@ ca:
     alternative_reply_by_email_addresses: "Llista de plantilles alternatives per a les adreces de resposta per correu. Per exemple: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Utilitza HTML en comptes de text per al correu electrònic entrant."
     strip_incoming_email_lines: "Elimina els espais en blanc al principi i al final de cada línia de correu electrònic entrant."
-    disable_emails: "Evita que Discourse enviï cap mena de correu electrònic. Seleccioneu \"sí\" per a inhabilitar els correus per a tots els usuaris. Seleccioneu \"no equip responsable\" per a inhabilitar els correus sols per a usuaris fora de l'equip responsable."
     strip_images_from_short_emails: "Elimina imatges de correus amb una mida inferior a 2800 bytes"
     display_name_on_email_from: "Mostra noms complets en els camps de remitent dels correus"
     unsubscribe_via_email: "Permet als usuaris cancel·lar la subscripció enviant un correu amb 'unsubscribe' en el tema o en el cos del missatge."
@@ -1542,10 +1540,6 @@ ca:
       staged_users_disabled: "Cal activar 'usuaris ficticis' abans d'activar aquest paràmetre."
       reply_by_email_disabled: "Cal habilitar primer 'resposta per correu' abans d'habilitar aquesta opció."
       enable_local_logins_disabled: "Primer cal habilitar \"habilita els inicis de sessió locals\" abans d'habilitar aquesta opció."
-      min_username_length_exists: "No podeu establir la longitud mínima del nom d'usuari per damunt del nom d'usuari més curt (%{username})."
-      min_username_length_range: "No podeu definir el mínim per damunt del màxim."
-      max_username_length_exists: "No podeu establir la longitud màxima del nom d'usuari per sota del nom d'usuari més llarg (%{username})."
-      max_username_length_range: "No podeu definir el màxim per sota del mínim."
       invalid_hex_value: "Els valors de color han de ser codis hexadecimals de 6 dígits."
       allowed_unicode_usernames:
         regex_invalid: "L'expressió regular no és vàlida: %{error}"
@@ -2731,8 +2725,6 @@ ca:
     title: "Entra en mode segur"
     enter: "Entra en mode segur"
     must_select: "Cal seleccionar almenys una opció per a entrar en mode segur."
-  dev_mode:
-    enter: "Retorn"
   wizard:
     title: "Instal·lació de Discourse"
     step:
@@ -2850,12 +2842,8 @@ ca:
         title: "Sí"
       approve_and_unhide:
         title: "Sí"
-      no_action_post:
-        title: "Cap acció"
       delete_post:
         complete: "Publicació suprimida"
-      no_action_user:
-        title: "Cap acció"
       delete_user:
         complete: "Usuari suprimit"
         reason: "Suprimit mitjançant cua de revisió"
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index df42c1f1a58fe..c3e95c2cd8e2e 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -60,8 +60,6 @@ cs:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} od %{username}"
-    too_many_urls: "Do jednoho požadavku nelze vložit více než 10 adres URL."
-    concurrency_not_allowed: "Souběžné požadavky na inline-oneboxing nejsou povoleny. Odešlete prosím vždy jednu žádost."
   components:
     enabled_filter: "Zapnuto"
     disabled_filter: "Vypnuto"
@@ -399,7 +397,6 @@ cs:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "'User agents' musí mít alespoň 3 znaky, aby nedošlo k náhodnému omezení rychlosti legitimních uživatelů."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "K nastavení nemůžete přidat žádnou z následujících hodnot: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Odstranění metadat odstranění obrázků nelze zakázat, pokud je povolena možnost 'composer media optimization image enabled'. Před vypnutím odstraňování metadat obrázků zakažte možnost 'composer media optimization image enabled'."
-      x_summary_large_image_no_svg: "Obrázky na Twitter shrnutí používané pro twitter:image metadata nemohou být obrázky .svg."
       tl0_and_anonymous_flag: "Pro anonymní uživatele musí být nastaven buď 'site contact email' nebo 'email address to report illegal content'."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Toto nastavení vyžaduje, aby bylo nejprve povoleno nastavení 'allow anonymous mode'."
     conflicting_google_user_id: 'ID účtu Google pro tento účet se změnilo; z bezpečnostních důvodů je nutný zásah redakce. Kontaktujte prosím redakci a odkažte je na <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1944,7 +1941,6 @@ cs:
     slow_down_crawler_rate: "Pokud je zadána hodnota slow_down_crawler_user_agents,použije se tato hodnota na všechny crawlery (počet sekund prodlevy mezi požadavky)."
     content_security_policy: "Povolte zásady zabezpečení obsahu (CSP). CSP je další vrstva zabezpečení, která pomáhá předcházet určitým typům útoků, včetně Cross Site Scripting (XSS) a data injection."
     content_security_policy_report_only: "Povolit Content-Security-Policy-Report-Only (CSP)"
-    content_security_policy_collect_reports: "Povolit shromažďování zpráv o porušení CSP na /csp_reports"
     content_security_policy_frame_ancestors: "Omezit, kdo může zabudovat tento web do iframů přes CSP. Nastavte povolené hostitele v <a href='%{base_path}/admin/customize/embedding'>Zabudování</a>"
     content_security_policy_script_src: "Další zdroje skriptů na seznamu povolených. Aktuální hostitel a CDN jsou zahrnuty ve výchozím nastavení. Viz <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Zmírnění útoků XSS pomocí zásad zabezpečení obsahu.</a> (CSP). Ostatní zdroje hostitelů jsou ignorovány, protože je povoleno nastavení strict-dynamic."
     invalidate_inactive_admin_email_after_days: "Administrátorské účty, které web v tomto počtu dní nenavštívily, budou muset před přihlášením znovu ověřit svou e-mailovou adresu. Pro deaktivaci nastavte hodnotu 0."
@@ -2030,7 +2026,6 @@ cs:
     enable_local_logins_via_email: "Umožnit uživatelům požádat o přihlášení odesláním odkazu pro přihlášení jedním kliknutím prostřednictvím e-mailu."
     allow_new_registrations: "Povolit registraci nových uživatelů. Zrušte zaškrtnutí této možnosti, pokud chcete zabránit komukoli ve vytváření nového účtu."
     enable_signup_cta: "Zobrazit vracejícím se anonymním uživatelům oznámení s výzvou k registraci účtu."
-    enable_discourse_id: "Povolit ověření pomocí Discourse ID, jednotné přihlašovací služby, která umožňuje uživatelům přihlásit se na více stránkách Discourse pomocí jediného účtu. Běžní poskytovatelé sociálních přihlášení jako Google, Facebook, Apple, Github jsou podporováni bez další konfigurace. Více informací naleznete na <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a>."
     enable_google_oauth2_logins: "Povolit ověřování Google Oauth2. Toto je metoda ověřování, kterou Google aktuálně podporuje. Vyžaduje klíč a tajný kód. Viz <a href='https://meta.discourse.org/t/15858' target='_blank'>Konfigurace přihlášení Google pro Discourse</a>."
     google_oauth2_client_id: "Jedinečné ID klienta poskytnuté vaší aplikací Google, používané pro proces ověřování."
     google_oauth2_client_secret: "Client secret vaší Google aplikace."
@@ -2334,8 +2329,6 @@ cs:
         many: "Musí mít alespoň %{count} znaků."
         other: "Musí mít alespoň %{count} znaků."
       staged_users_disabled: "Než toto nastavení povolíte, musíte nejprve povolit „předběžně založené uživatele“."
-      min_username_length_range: "Nemůžete nastavit minimum nad maximum."
-      max_username_length_range: "Nemůžete nastavit maximum pod minimum."
       delete_rejected_email_after_days: "Toto nastavení nemůže být nižší než nastavení delete_email_logs_after_days nebo vyšší než %{max}."
     keywords:
       navigation_menu: "postranní panel|rozbalovací nabídka v záhlaví"
@@ -2362,7 +2355,6 @@ cs:
       exclude_tag: "Vyloučit témata s konkrétním štítkem"
       exclude_tags_any: "Vyloučit témata s kterýmkoli ze zadaných štítků (oddělenými čárkou)"
       exclude_tags_all: "Vyloučit témata se všemi zadanými štítky (oddělenými plusem)"
-      tags_alias: "Alias pro filtr 'tag:'"
       tag_group: "Zobrazit témata se štítky z konkrétní skupiny štítků"
       exclude_tag_group: "Vyloučit témata se štítky z konkrétní skupiny štítků"
       activity_before: "Zobrazit témata s poslední činností před datem (RRRR-MM-DD nebo před x dny)"
@@ -4441,8 +4433,6 @@ cs:
     deprecation_error_label: Umožnit, aby zastaralé Javascripty vyvolaly chybu
     enter: "Vstoupit do bezpečného režimu"
     must_select: "Chcete-li vstoupit do bezpečného režimu, musíte vybrat alespoň jednu možnost."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Nastavení Discourse"
     step:
@@ -4677,10 +4667,6 @@ cs:
         complete: "Příspěvek schválen a zviditelněn"
       post_actions:
         bundle_title: "Co chcete s příspěvkem udělat?"
-      no_action_post:
-        title: "Bez akce"
-        description: "S příspěvkem nepodniknout žádnou akci"
-        complete: "S příspěvkem nebyla provedena žádná akce"
       delete_post:
         title: "Odstranit příspěvek"
         description: "Smazat příspěvek"
@@ -4701,16 +4687,8 @@ cs:
         title: "Upravit příspěvek"
         description: "Upravit obsah tohoto příspěvku"
         complete: "Příspěvek upraven"
-      convert_to_pm:
-        title: "Převést na SZ"
-        description: "Převést tento příspěvek na soukromou zprávu"
-        complete: "Příspěvek převeden na soukromou zprávu"
       user_actions:
         bundle_title: "Co chcete udělat s tímto uživatelem?"
-      no_action_user:
-        title: "Bez akce"
-        description: "Proti tomuto uživateli nepodniknout žádná opatření"
-        complete: "Proti uživateli nebyla podniknuta žádná opatření"
       silence_user:
         title: "Ztišit uživatele"
         description: "Zabránit uživateli v publikování příspěvků"
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index b0a6a130212dc..3df1706af7a88 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -1345,7 +1345,6 @@ da:
     allowed_crawler_user_agents: "Brugeragenter for webcrawlere, der skal have adgang til webstedet. ADVARSEL! INDSTILLES DETTE VIL ALLE CRAWLERE, DER IKKE ER ANGIVET HER BLIVE NÆGTET!"
     blocked_crawler_user_agents: "Entydigt store og små bogstaver i brugeragentstrengen, der identificerer webcrawlere, der ikke skal have adgang til webstedet. Gælder ikke, hvis tilladelsesliste er defineret."
     slow_down_crawler_rate: "Hvis der er angivet slow_down_crawler_user_agents, gælder denne sats for alle crawlere (antal sekunders forsinkelse mellem anmodninger)"
-    content_security_policy_collect_reports: "Aktivér CSP-overtrædelsesrapportindsamling på /csp_reports"
     invalidate_inactive_admin_email_after_days: "Administratorkonti, der ikke har besøgt webstedet i dette antal dage, skal validere deres e-mailadresse igen, før de logger ind. Indstil til til 0 for at deaktivere."
     share_links: "Angiv hvilke elementer der skal vises i “del“-dialogboksen og i hvilken rækkefølge."
     site_contact_username: "Et gyldigt personale-brugernavn, som alle automatiske meddelelser skal sendes fra. Hvis den er tom, bruges standard systemkontoen."
@@ -1472,7 +1471,6 @@ da:
     cooldown_hours_until_reflag: "Hvor lang tid brugerne skal vente, indtil de kan genanmelde et indlæg"
     reply_by_email_address: "Skabelon for e-mail-adressen i formularen, for eksempel: %%{reply_key}@reply.myforum.com."
     incoming_email_prefer_html: "Brug HTML i stedet for tekst til indgående e-mail."
-    disable_emails: "Forhindre Discourse i at sende nogen form for e-mails. Vælg 'ja' for at deaktivere e-mails for alle brugere. Vælg 'ikke-personale' for at deaktivere e-mails for ikke-personale brugere."
     strip_images_from_short_emails: "Undlad at inkludere billeder fra emails som fylder mindre end 2800 Bytes"
     display_name_on_email_from: "Vis fulde navne på emails fra felter"
     unsubscribe_via_email: "Tillad brugere at afmelde sig fra emails ved at sende en email med \"unsubscribe\" i emne eller indholdsfeltet"
@@ -1582,8 +1580,6 @@ da:
       invalid_alternative_reply_by_email_addresses: "Alle værdier skal indeholde '%{reply_key}' og være forskellige fra notifikations e-mail."
       pop3_polling_authentication_failed: "POP3 godkendelse mislykkedes. Kontroller venligst dine pop3 legitimationsoplysninger."
       reply_by_email_address_is_empty: "Du skal angive en 'svar via email-adresse', før du aktiverer svar via e-mail."
-      min_username_length_range: "Du kan ikke sætte minimum til mere end maksimum."
-      max_username_length_range: "Du kan ikke sætte maksimum til mindre end minimum."
       invalid_hex_value: "Farveværdier skal være 6-cifrede hexadecimale koder."
       empty_selectable_avatars: "Du skal først overføre mindst to valgbare avatarer før du aktiverer denne indstilling."
     placeholder:
@@ -3098,8 +3094,6 @@ da:
     title: "Gå ind i fejlsikret tilstand"
     enter: "Gå ind i fejlsikret tilstand"
     must_select: "Du skal vælge mindst én mulighed for at gå i fejlsikret tilstand."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Discourse Opsætning"
     step:
@@ -3230,13 +3224,9 @@ da:
         title: "Ja"
       approve_and_unhide:
         title: "Ja"
-      no_action_post:
-        title: "Ingen handling"
       delete_post:
         title: "Slet indlæg"
         complete: "Indlæg slettet"
-      no_action_user:
-        title: "Ingen handling"
       delete_user:
         title: "Slet bruger"
         complete: "Bruger slettet"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index b175e4779d4fd..51c6060a65d3b 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -19,7 +19,7 @@ de:
       calendar_ics: "%Y%m%dT%H%M%SZ"
   date:
     month_names:
-    -
+    - null
     - Januar
     - Februar
     - März
@@ -60,8 +60,8 @@ de:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} von %{username}"
-    too_many_urls: "Onebox kann nicht mehr als 10 URLs in einer einzigen Anfrage einbinden."
-    concurrency_not_allowed: "Gleichzeitige Inline-Oneboxing-Anfragen sind nicht erlaubt. Bitte sende nur eine Anfrage auf einmal."
+    too_many_urls: "Es können nicht mehr als 10 URLs in einer einzigen Anfrage in Inline-Oneboxen umgewandelt werden."
+    concurrency_not_allowed: "Gleichzeitige Anfragen zur Umwandlung von URLs in Inline-Oneboxen sind nicht erlaubt. Bitte sende nur eine Anfrage auf einmal."
   components:
     enabled_filter: "Aktiviert"
     disabled_filter: "Deaktiviert"
@@ -347,7 +347,7 @@ de:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Browserkennungen müssen mindestens 3 Zeichen lang sein, um zu verhindern, dass legitime Benutzer versehentlich einer Durchsatzratenbegrenzung unterworfen werden."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Du kannst keinen der folgenden Werte zu der Einstellung hinzufügen: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Du kannst das Entfernen der Bild-Metadaten nicht deaktivieren, wenn „composer media optimization image enabled“ aktiviert ist. Deaktiviere „composer media optimization image enabled“, bevor du das Entfernen der Bild-Metadaten deaktivierst."
-      x_summary_large_image_no_svg: "Twitter-Zusammenfassungsbilder, die für twitter:image-Metadaten verwendet werden, können keine .svg-Bilder sein."
+      x_summary_large_image_no_svg: "X-Zusammenfassungsbilder, die für twitter:image-Metadaten verwendet werden, können keine .svg-Bilder sein."
       tl0_and_anonymous_flag: "Für anonyme Benutzer muss entweder „site contact email“ oder „email address to report illegal content“ angegeben werden."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Für diese Einstellung muss zuerst die Einstellung „allow anonymous mode“ aktiviert werden."
     conflicting_google_user_id: 'Die Google-Konto-ID für dieses Konto hat sich geändert; das Einschreiten des Teams ist aus Sicherheitsgründen erforderlich. Bitte kontaktiere das Team und verweise es auf <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1589,7 +1589,7 @@ de:
     problem:
       twitter_login: 'Die Anmeldung über Twitter scheint im Moment nicht zu funktionieren. Überprüfe die Anmeldedaten in <a href="%{base_path}/admin/site_settings/category/login?filter=twitter">den Website-Einstellungen</a>.'
       group_email_credentials: 'Es gab ein Problem mit den E-Mail-Anmeldedaten für die Gruppe <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>. Bis dieses Problem behoben ist, werden keine E-Mails aus dem Posteingang der Gruppe versendet. %{error}'
-      upcoming_change_stable_opted_out: 'Deine Website hat die bevorstehende Änderung "%{upcoming_change}" deaktiviert. Diese Änderung hat jetzt den Status „dauerhaft“ erreicht und wird bald entfernt. Besuche <a href="%{base_path}/admin/config/upcoming-changes">die Seite mit den bevorstehenden Änderungen</a>, um mehr über diese Änderung zu erfahren.'
+      upcoming_change_stable_opted_out: 'Deine Website hat die bevorstehende Änderung „%{upcoming_change}“ deaktiviert. Diese Änderung hat jetzt den Status „stabil“ erreicht und wird bald entfernt. Besuche <a href="%{base_path}/admin/config/upcoming-changes">die Seite mit den bevorstehenden Änderungen</a>, um mehr über diese Änderung zu erfahren.'
       rails_env: "Dein Server läuft im %{env}-Modus."
       host_names: "Deine config/database.yml-Datei verwendet den Standard-Hostnamen localhost. Trage hier den Hostnamen deiner Website ein."
       sidekiq: 'Sidekiq läuft nicht. Viele Aufgaben – wie zum Beispiel das Versenden von E-Mails – werden asynchron durch Sidekiq ausgeführt. Bitte stell sicher, dass mindestens ein Sidekiq-Prozess läuft. <a href="https://github.com/mperham/sidekiq" target="_blank">Mehr über Sidekiq erfährst du hier</a>.'
@@ -1638,7 +1638,7 @@ de:
     support_mixed_text_direction: "Unterstütze die Vermischung von rechtsläufigem und linksläufigem Text"
     min_post_length: "Minimal zulässige Beitragslänge in Zeichen (ohne persönliche Nachrichten)"
     min_first_post_length: "Zulässige Mindestlänge des ersten Beitrags (Thementext) (ohne persönliche Nachrichten)"
-    prevent_uploads_only_posts: "Markdown-Code von Uploads bei der Prüfung der Mindestlänge des Beitrags (festgelegt mit der \"min post lenght\" Einstellung) nicht berücksichtigen"
+    prevent_uploads_only_posts: "Markdown-Code von Uploads bei der Prüfung der Mindestlänge des Beitrags (festgelegt mit der Einstellung „min post length“) nicht berücksichtigen"
     min_personal_message_post_length: "Minimal zulässige Beitragslänge in Zeichen für Nachrichten (sowohl erster Beitrag als auch Antworten)"
     max_post_length: "Maximal zulässige Beitragslänge in Zeichen."
     topic_featured_link_enabled: "Ermöglicht es Benutzern, ihren Themen einen Feature-Link zuzuweisen. Wenn diese Funktion aktiviert ist, können Themen mit einem hervorgehobenen Link versehen werden, der öffentlich sichtbar ist und bearbeitet werden kann, wenn der Benutzer über ausreichende Berechtigungen verfügt. Der Feature-Link kann die Verständlichkeit eines Themas verbessern, indem er zusätzliche Inhalte bereitstellt."
@@ -1714,7 +1714,7 @@ de:
     logo: "Das Logo oben links auf deiner Website. Verwende ein breites rechteckiges Bild mit einer Höhe von 120 Pixeln und einem Seitenverhältnis von mindestens 3:1. Wenn leer, wird die Website-Überschrift angezeigt."
     logo_small: "Kleine Logo-Grafik oben links auf der Website, die beim Herunterscrollen angezeigt wird. Verwende ein quadratisches Bild (120 × 120). Falls leer, wird ein „Home“-Zeichen angezeigt."
     digest_logo: "Das alternative Logo oben in den E-Mail-Zusammenfassungen deiner Website. Verwende ein breites rechteckiges Bild. Verwende kein SVG-Bild. Wenn leer, wird das Bild aus der `logo`-Einstellung verwendet."
-    mobile_logo: "Das Logo auf der mobilen Ausgabe deiner Website. Wir empehlen ein quartatisches Bild zu verwenden, damit die Kopfzeile nicht zu voll wird. Aber du kannst auch ein breites rechteckiges Bild mit einer Höhe von 120 Pixeln und einem Seitenverhältnis von mindestens 3:1 verwenden. Wenn leer, wird das Bild aus der `logo`-Einstellung verwendet."
+    mobile_logo: "Das Logo auf der mobilen Ausgabe deiner Website. Wir empfehlen ein quadratisches Bild zu verwenden, damit die Kopfzeile nicht zu voll wird. Aber du kannst auch ein breites rechteckiges Bild mit einer Höhe von 120 Pixeln und einem Seitenverhältnis von mindestens 3:1 verwenden. Wenn leer, wird das Bild aus der `logo`-Einstellung verwendet."
     logo_dark: "Alternative für dunkles Schema betreffend die Website-Einstellung „logo“."
     logo_small_dark: "Alternative für dunkles Schema betreffend die Website-Einstellung „logo small“."
     mobile_logo_dark: "Alternative für dunkles Schema betreffend die Website-Einstellung „mobile logo“."
@@ -1806,7 +1806,6 @@ de:
     llms_txt: "Lade eine Textdatei hoch, die unter /llms.txt für LLM-Crawler bereitgestellt wird. Siehe <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a> für weitere Informationen."
     content_security_policy: "Aktiviere die Content-Security-Policy (CSP). CSP ist eine zusätzliche Sicherheitsebene, die hilft, bestimmte Arten von Angriffen zu verhindern, z. B. Cross Site Scripting (XSS) und Data Injection."
     content_security_policy_report_only: "Content-Security-Policy-Report-Only (CSP) aktivieren"
-    content_security_policy_collect_reports: "Aktiviere die Sammlung von Berichten zu CSP-Verstößen unter /csp_reports"
     content_security_policy_frame_ancestors: "Schränke ein, wer diese Website in iframes über CSP einbetten kann. Kontrolliere erlaubte Hosts unter <a href='%{base_path}/admin/customize/embedding'>Einbettung</a>"
     content_security_policy_script_src: "Zusätzliche Skript-Quellen auf der Erlaubnisliste. Der aktuelle Host und das CDN sind standardmäßig enthalten. Siehe <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Minderung von XSS-Angriffen mit Content Security Policy</a> (CSP). Host-Quellen werden ignoriert, wenn content_security_policy_strict_dynamic aktiviert ist."
     invalidate_inactive_admin_email_after_days: "Administrator-Konten, die die Website in dieser Anzahl von Tagen nicht besucht haben, müssen ihre E-Mail-Adresse erneut bestätigen, bevor sie sich anmelden können. 0 zum Deaktivieren."
@@ -1961,7 +1960,7 @@ de:
     invite_link_max_redemptions_limit_users: "Die maximal zulässigen Einlösungen für Einladungslinks, die von regulären Benutzern erstellt wurden, dürfen diesen Wert nicht überschreiten."
     alert_admins_if_errors_per_minute: "Anzahl der Fehler pro Minute, bei der ein Administrator benachrichtigt werden soll. Ein Wert von 0 deaktiviert diese Funktion. HINWEIS: Erfordert einen Neustart."
     alert_admins_if_errors_per_hour: "Anzahl der Fehler pro Stunde, bei der ein Administrator benachrichtigt werden soll. Ein Wert von 0 deaktiviert diese Funktion. HINWEIS: Erfordert einen Neustart."
-    categories_topics: 'Anzahl der Themen, die auf der Seite /categories angezeigt werden. Bei 0 wird automatisch ein Wert gewählt, um die beiden Spalten (Kategorien und Themen) symmetrisch zu halten. Nur relevant für „Kategorien und aktuelle/ angesagte Themen“ <a href="%{base_path}/admin/site_settings/category/all_results?filter=category style">category page style Einstellungen</a>.'
+    categories_topics: 'Anzahl der Themen, die auf der Seite /categories angezeigt werden. Bei 0 wird automatisch ein Wert gewählt, um die beiden Spalten (Kategorien und Themen) symmetrisch zu halten. Nur relevant für die <a href="%{base_path}/admin/site_settings/category/all_results?filter=category style">Kategorien-Seitenstile</a> „Kategorien und aktuelle/angesagte Themen“.'
     suggested_topics: "Anzahl der empfohlenen Themen am Ende eines Themas."
     limit_suggested_to_category: "Zeige nur Themen der aktuellen Kategorie in vorgeschlagenen Themen."
     suggested_topics_max_days_old: "Vorgeschlagene Themen sollten nicht älter als n Tage sein."
@@ -2115,6 +2114,8 @@ de:
     num_flaggers_to_close_topic: "Mindestzahl unabhängiger Mitglieder, die ein Thema melden, damit es automatisch für eine Prüfung pausiert wird."
     num_hours_to_close_topic: "Anzahl der Stunden, um ein Thema für eine Intervention zu pausieren."
     auto_respond_to_flag_actions: "Automatische Antwort auf abgearbeitete Meldungen aktivieren."
+    min_first_post_typing_time: "Zeit, die ein Benutzer mindestens aufwenden muss, um seinen ersten Beitrag zu schreiben. Wenn diese Zeit unterschritten wird, wird der Beitrag automatisch in die Warteschlange für freizuschaltende Beiträge verschoben. Setze diesen Wert auf 0, um dieses Verhalten zu deaktivieren (nicht empfohlen)."
+    fast_typing_threshold: "Zeit, die ein Benutzer mindestens aufwenden muss, um seinen ersten Beitrag zu schreiben. Wenn diese Zeit unterschritten wird, wird der Beitrag automatisch in die Warteschlange für freizuschaltende Beiträge verschoben. „Low“ ist 1 Sekunde, „standard“ sind 3 Sekunden, „high“ sind 5 Sekunden."
     auto_silence_fast_typers_on_first_post: "Automatisches Stummschalten von Benutzern, die `fast typing threshold` nicht erreichen"
     auto_silence_fast_typers_max_trust_level: "Maximale Vertrauensstufe, um „Schnelltipper“ stummzuschalten."
     auto_silence_first_post_regex: "Regex ohne Berücksichtigung der Groß-/Kleinschreibung, die bei Erfolg dazu führt, dass der erste Beitrag des Benutzers stummgeschaltet und an die Genehmigungswarteschlange gesendet wird. Beispiel: wüten|a[bc]a wird dazu führen, dass alle Beiträge, die „wüten“ oder „aba“ oder „aca“ enthalten, stummgeschaltet werden. Gilt nur für den ersten Beitrag. VERALTET: Verwende stattdessen „Beobachtete Wörter stummschalten“."
@@ -2133,7 +2134,7 @@ de:
     alternative_reply_by_email_addresses: "Liste der alternativen Vorlagen für die Beantwortung per E-Mail (eingehende E-Mail-Adressen). Beispiel: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Verwende HTML statt Text für eingehende E-Mails."
     strip_incoming_email_lines: "Entferne führende und folgende Leerzeichen von jeder Zeile eingehender E-Mails."
-    disable_emails: "Discourse daran hindern, jegliche E-Mails zu versenden. Wähle „yes“, um E-Mails für alle Benutzer zu deaktivieren. Wähle „non-staff“, um E-Mails für alle Benutzer außer den Team-Mitgliedern zu deaktivieren."
+    disable_emails: "Discourse daran hindern, jegliche E-Mails zu versenden. Wähle „yes“, um ausgehende E-Mails für alle Benutzer zu deaktivieren. Wähle „non-staff“, um E-Mails für alle Benutzer außer den Team-Mitgliedern zu deaktivieren."
     allow_email_invites: "Wenn diese Funktion deaktiviert ist, können Benutzer keine Einladungs-E-Mails mehr über Discourse versenden."
     strip_images_from_short_emails: "Entferne Bilder aus E-Mails kleiner als 2800 Bytes."
     short_email_length: "Lege die maximale Länge einer E-Mail in Bytes fest, damit sie als „kurz“ in Bezug auf die Bildunterdrückung eingestuft wird. Wenn die Größe einer E-Mail diese Einstellung nicht überschreitet, werden alle Bilder (wie Avatare und Emojis) aus der E-Mail entfernt."
@@ -2442,17 +2443,17 @@ de:
     welcome_banner_image: "Lege ein Bild fest, das im Hintergrund des Willkommensbanners angezeigt werden soll."
     welcome_banner_location: "Legt fest, wo auf der Seite das Willkommensbanner erscheinen soll."
     welcome_banner_page_visibility: "Legt fest, auf welchen Seiten das Willkommensbanner erscheinen soll."
-    welcome_banner_text_color: "Wenn du die „Welcome banner image“ Einstellung konfiguriert hast, kannst du mit dieser Einstellung die Textfarbe des Banners ändern, um sicherzustellen, dass er lesbar bleibt. Wenn du keine Farbe wählst oder kein Hintergrundbild hochgeladen hast, wird die Farbe vom aktiven Theme bestimmt."
+    welcome_banner_text_color: "Wenn du die Einstellung „Welcome banner image“ konfiguriert hast, kannst du mit dieser Einstellung die Textfarbe des Banners ändern, um sicherzustellen, dass er lesbar bleibt. Wenn du keine Farbe wählst oder kein Hintergrundbild hochgeladen hast, wird die Farbe vom aktiven Theme bestimmt."
     splash_screen: "Zeigt einen temporären Ladebildschirm an, während Website-Assets geladen werden"
     splash_screen_image: "Ein SVG-Bild, das auf dem Bildschirm angezeigt wird, während die Website geladen wird. Animierte SVGs sollten nur CSS-Transformations oder - Deckkraftanimationen verwenden. Verwende eindeutige Namen für die Css-Klassen und Keyframes. Du kannst var(--primary), var(--secondary) und var(--tertiary) verwenden, um auf die Farben des Themes zu verweisen."
     navigation_menu: "Lege die Seitenleiste oder das Kopfzeilen-Drop-down als Hauptnavigationsmenü für deine Website fest. Die Seitenleiste wird empfohlen."
     default_navigation_menu_categories: "Ausgewählte Kategorien werden standardmäßig im Abschnitt „Kategorien“ des Navigationsmenüs angezeigt."
     default_navigation_menu_tags: "Ausgewählte Schlagwörter werden standardmäßig im Abschnitt „Schlagwörter“ des Navigationsmenüs angezeigt."
     experimental_new_new_view_groups: 'Eine neue Themenliste aktivieren, die ungelesene und neue Themen kombiniert, und den Link „Alles“ in der Seitenleiste entsprechend verknüpfen.'
-    enable_form_templates: "Aktivieren die Formularvorlagen-Funktion. Damit kannst du ein strukturiertes Formular mit Datenvalidierung im Rahmen der Themenerstellung erzwingen."
+    enable_form_templates: "Aktiviere die Formularvorlagen-Funktion. Damit kannst du ein strukturiertes Formular mit Datenvalidierung im Rahmen der Themenerstellung erzwingen."
     show_preview_for_form_templates: "Aktiviere die Vorschau für Formularvorlagen"
     lazy_load_categories_groups: "Lazy Loading von Kategorieinformationen nur für Benutzer dieser Gruppen. Dies verbessert die Leistung auf Websites mit vielen Kategorien."
-    enable_auto_grid_images: "Wickelt Bilder automatisch in [grid]-Tags ein, wenn 3 oder mehr Bilder im Composer hochgeladen werden."
+    enable_auto_grid_images: "Schließt Bilder automatisch in [grid]-Tags ein, wenn 3 oder mehr Bilder im Editor hochgeladen werden."
     impersonate_without_logout: "Erlaube Administratoren in die Rolle eines anderen Benutzers zu schlüpfen, ohne sich von ihrem Administratorkonto abmelden zu müssen."
     experimental_impersonation_time_limit_minutes: "Nach welcher Zeitspanne das Schlüpfen in die Rolle eines Benutzers automatisch beendet wird."
     page_loading_indicator: "Die Ladeanzeige konfigurieren, die bei der Seitennavigation in Discourse erscheint. „Spinner“ ist ein ganzseitiger Indikator. „Slider“ zeigt einen schmalen Balken am oberen Rand des Bildschirms an."
@@ -2477,11 +2478,13 @@ de:
     content_localization_allow_author_localization: "Ermögliche es Autoren, die Lokalisierungen ihrer eigenen Themen und Beiträge über das Beitragsmenü zu aktualisieren."
     enable_upcoming_changes: "Aktiviere bevorstehende Änderungen"
     fake_upcoming_change: "Dies ist keine echte bevorstehende Änderung. Sie dient zu Testzwecken und muss nicht übersetzt werden."
-    floating_dismiss_topics_on_mobile: "Zeigt auf dem Handy über der Themenliste eine schwebende \"Verwerfen...\"-Schaltfläche, um den Zugriff zu erleichtern und Platz im oberen Bereich der Themenliste freizugeben"
+    floating_dismiss_topics_on_mobile: "Zeigt auf dem Handy über der Themenliste eine schwebende „Verwerfen …“-Schaltfläche, um den Zugriff zu erleichtern und Platz im oberen Bereich der Themenliste freizugeben"
     rename_faq_to_guidelines: "Diese Änderung benennt die FAQ-Seite in „Richtlinien“ um. Die FAQ-Seite ist weiterhin unter /faq erreichbar. Die Einstellung „faq url“ funktioniert wie bisher."
+    experimental_tag_settings_page: "Aktiviere eine eigene Einstellungsseite für Schlagwörter unter /tag/:slug/:id/edit."
     enable_simplified_category_creation: "Ermöglicht eine vereinfachte Kategorienerstellung mit weniger Optionen und einer übersichtlicheren Oberfläche."
     enable_custom_splash_screen: "Ermöglicht die Anpassung des Ladebildschirms mit einem eigenen SVG-Bild. Lade ein Bild über die Einstellung \"Splash Screen Image\" hoch. Achtung! Dies kann sich negativ auf die LCP-Bewertung und die Google-Indexierung auswirken."
     modernize_foundation_theme: "Diese Änderung führt Design-Änderungen am Foundation-Theme in Discourse ein."
+    reporting_improvements: "Verbesserungen der Navigation, des Designs und der Benutzerfreundlichkeit für die Admin-Berichte in Discourse."
     errors:
       invalid_css_color: "Ungültige Farbe. Gib einen Farbnamen oder einen Hexadezimalwert ein."
       invalid_datetime: "Ungültiges Datums-/Uhrzeitformat. Bitte stelle sicher, dass du ein gültiges Datum und eine gültige Uhrzeit eingegeben hast."
@@ -2489,6 +2492,8 @@ de:
       invalid_username: "Es gibt keinen Benutzer mit diesem Benutzernamen."
       valid_username: "Es gibt einen Benutzer mit diesem Benutzernamen."
       invalid_group: "Es gibt keine Gruppe mit diesem Namen."
+      invalid_svg: "Das SVG-Bild ist ungültig. Es muss ein SVG-Element enthalten und darf keine Skripte oder Event-Handler enthalten."
+      invalid_upload: "Der Upload ist ungültig oder existiert nicht."
       invalid_topic: "Es gibt kein Thema mit dieser ID."
       invalid_integer_min_max: "Der Wert muss zwischen %{min} und %{max} liegen."
       invalid_integer_min: "Der Wert muss %{min} oder größer sein."
@@ -2526,12 +2531,12 @@ de:
       reply_by_email_disabled: "Du musst erst „reply by email“ aktivieren, bevor du diese Einstellung aktivierst."
       discourse_connect_url_is_empty: "Du musst eine „discourse connect url'“ festlegen, bevor du diese Einstellung aktivierst."
       enable_local_logins_disabled: "Du musst erst „enable local logins“ aktivieren, bevor du diese Einstellung aktivierst."
-      min_username_length_exists: "Du kannst die Mindestlänge von Benutzernamen nicht über den kürzesten Benutzernamen (%{username}) setzen."
-      min_group_name_length_exists: "Du kannst die minimale Länge von Benutzernamen nicht länger als den kürzesten Gruppennamen (%{group_name}) setzen."
-      min_username_length_range: "Du kannst das Minimum nicht über das Maximum setzen."
-      max_username_length_exists: "Du kannst die maximale Länge von Benutzernamen nicht unter den längsten Benutzernamen (%{username}) setzen."
-      max_group_name_length_exists: "Du kannst die maximale Länge von Benutzernamen nicht kürzer als längsten Gruppennamen (%{group_name}) setzen."
-      max_username_length_range: "Du kannst das Maximum nicht unter das Minimum setzen."
+      min_username_length_exists: "Du kannst die „min username length“ Einstellung nicht größer als den kürzesten Benutzernamen (%{username}) konfigurieren."
+      min_group_name_length_exists: "Du kannst die „min username length“ Einstellung nicht größer als den kürzesten Gruppennamen (%{group_name}) konfigurieren."
+      min_username_length_range: "Du kannst die „min username length“ Einstellung nicht größer als die „max username length“ Einstellung konfigurieren."
+      max_username_length_exists: "Du kannst die „max username length“ Einstellung nicht kleiner als den längsten Benutzernamen (%{username}) konfigurieren."
+      max_group_name_length_exists: "Du kannst die „max username length“ Einstellung nicht kleiner als den längsten Gruppennamen (%{group_name}) konfigurieren."
+      max_username_length_range: "Du kannst die „max username length“ Einstellung nicht kleiner als die „min username length“ Einstellung konfigurieren."
       invalid_hex_value: "Farbwerte müssen als 6-stellige Hexadezimalcodes angegeben werden."
       empty_selectable_avatars: "Du musst zunächst mindestens zwei auswählbare Avatare hochladen, bevor du diese Einstellung aktivieren kannst."
       category_search_priority:
@@ -2594,7 +2599,6 @@ de:
       exclude_tag: "Themen mit einem bestimmten Schlagwort ausschließen"
       exclude_tags_any: "Themen mit einem der angegebenen Schlagwörter ausschließen (durch Kommas getrennt)"
       exclude_tags_all: "Themen mit allen angegebenen Schlagwörtern ausschließen (durch Kommas getrennt)"
-      tags_alias: "Alias für den Filter 'Schlagwort:'"
       tag_group: "Themen mit Schlagwörtern aus einer bestimmten Schlagwortgruppe anzeigen"
       exclude_tag_group: "Themen mit Schlagwörtern aus einer bestimmten Schlagwortgruppe ausschließen"
       activity_before: "Themen mit letzter Aktivität vor einem Datum anzeigen (JJJJ-MM-TT oder vor Tagen)"
@@ -2632,7 +2636,7 @@ de:
       in_watching_first_post: "Themen anzeigen, bei denen du den ersten Beitrag beobachtest"
       in_new: "Themen anzeigen, die neu sind oder neue Antworten haben"
       in_new_replies: "Themen mit neuen Antworten anzeigen"
-      in_new_topics: "Zeige neue Themen"
+      in_new_topics: "Neue Themen anzeigen"
       in_unseen: "Themen anzeigen, die du noch nicht gesehen hast"
       order_activity: "Nach letzter Aktivität sortieren (die neuesten zuerst)"
       order_activity_asc: "Nach letzter Aktivität sortieren (die ältesten zuerst)"
@@ -2795,6 +2799,7 @@ de:
       csrf_detected: "Die Autorisierung ist leider abgelaufen oder du hast den Browser gewechselt. Bitte versuche es erneut."
       request_error: "Beim Start der Autorisierung ist leider ein Fehler aufgetreten. Bitte versuche es erneut."
       invalid_iat: "Das Autorisierungstoken kann wegen unterschiedlicher Server-Uhrzeiten leider nicht geprüft werden. Bitte versuche es erneut."
+      unauthorized: "Leider wurde deine Anfrage vom Anmeldeanbieter nicht autorisiert. Bitte versuche es erneut oder kontaktiere einen Administrator."
     omniauth_error_unknown: "Bei der Verarbeitung deiner Anmeldung ist etwas schiefgelaufen, bitte versuche es noch einmal."
     omniauth_confirm_title: "Anmeldung per %{provider}"
     omniauth_confirm_button: "Weiter"
@@ -4183,7 +4188,7 @@ de:
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "Benachrichtigung an alte E-Mail-Adresse"
-      preview: "E-Mail Adresse aktualisiert."
+      preview: "E-Mail-Adresse aktualisiert."
       subject_template: "[%{email_prefix}] Deine E-Mail-Adresse wurde geändert"
       text_body_template: |
         Dies ist eine automatisierte Nachricht, um eine Änderung deiner E-Mail-Adresse für %{site_name} mitzuteilen. Bitte kontaktiere einen Website-Administrator, wenn du von einem Fehler ausgehst.
@@ -5051,7 +5056,7 @@ de:
   rss_by_tag: "Themen mit dem Schlagwort %{tag}"
   finish_installation:
     congratulations: "Glückwunsch, du hast Discourse installiert!"
-    login_with_discourse_id: "Mit Discourse-ID anmelden"
+    login_with_discourse_id: "Mit Discourse ID anmelden"
     discourse_id_help: "Bitte verwende den Button, um dich mit einem Discourse ID-Konto anzumelden. <br/><br/>Stelle sicher, dass du ein Discourse ID-Konto mit einer primären E-Mail-Adresse, die der Umgebungsvariablen `DISCOURSE_DEVELOPER_EMAILS` entspricht, verwendest."
     discourse_id_error_help: "Du hast dich entschieden, die Einrichtung der E-Mail vorerst zu überspringen. Leider kann die Einrichtung aufgrund der obigen Fehlermeldung nicht fortgesetzt werden. Bitte melde dieses Problem auf <a href='https://meta.discourse.org/'>meta.discourse.org</a>."
     register:
@@ -5068,7 +5073,7 @@ de:
     discourse_id:
       help: "Wir richten jetzt Discourse ID für dich ein."
       no_allowed_emails: "In DISCOURSE_DEVELOPER_EMAILS sind keine zulässigen E-Mail-Adressen konfiguriert. Die Einrichtung der Website kann nicht fortgesetzt werden."
-      global_notice: "Es haben sich noch keine Administratoren angemeldet. Bitte melde dich mit einem Discourse ID-Konto und einer E-Mail an, die der Umgebungsvariablen `DISCOURSE_DEVELOPER_EMAILS` entspricht, um die Installation abzuschließen."
+      global_notice: "Es haben sich noch keine Administratoren angemeldet. Bitte melde dich mit einem Discourse ID-Konto und einer E-Mail-Adresse an, die der Umgebungsvariablen `DISCOURSE_DEVELOPER_EMAILS` entspricht, um die Installation abzuschließen."
   safe_mode:
     title: "Abgesicherten Modus betreten"
     description: "Im abgesicherten Modus kannst du deine Website testen, ohne Themes oder clientseitige Plug-in-Anpassungen zu laden. Server-seitige Plug-in-Anpassungen bleiben aktiviert."
@@ -5082,7 +5087,7 @@ de:
   dev_mode:
     title: "Entwicklermodus"
     enable_rack_mini_profiler: "Rack Mini Profiler für 1 Stunde sitzungsunabhängig aktivieren"
-    enter: "Enter"
+    enter: "Entwicklermodus betreten"
   wizard:
     title: "Discourse einrichten"
     step:
@@ -5146,14 +5151,14 @@ de:
         open: "Offener Pull Request"
         approved: "Genehmigter Pull Request"
         changes_requested: "Änderungen angefordert"
-        merged: "Gemergter Pull Request"
+        merged: "Zusammengeführter Pull Request"
         closed: "Geschlossener Pull Request"
       status_date:
         open: "offen"
         draft: "entworfen"
         approved: "genehmigt"
         changes_requested: "Änderungen angefordert"
-        merged: "Merged am"
+        merged: "Zusammengeführt am"
         closed: "geschlossen"
   discourse_push_notifications:
     popup:
@@ -5306,7 +5311,7 @@ de:
         title: "Beitrag verwerfen"
         complete: "Beitrag verworfen."
       revise_and_reject_post:
-        title: "Überarbeitung anfordern..."
+        title: "Überarbeitung anfordern …"
         complete: "Beitrag wurde bis zur Überarbeitung abgelehnt."
       ignore:
         title: "Ignorieren"
@@ -5378,10 +5383,6 @@ de:
         complete: "Beitrag genehmigt und wieder sichtbar gemacht"
       post_actions:
         bundle_title: "Was willst du mit dem Beitrag machen?"
-      no_action_post:
-        title: "Keine Aktion"
-        description: "Keine Maßnahmen bezüglich des Beitrags ergreifen"
-        complete: "Keine Aktion bezüglich des Beitrags ausgeführt"
       delete_post:
         title: "Beitrag löschen"
         description: "Diesen Beitrag löschen"
@@ -5402,16 +5403,8 @@ de:
         title: "Beitrag bearbeiten"
         description: "Den Inhalt dieses Beitrags bearbeiten"
         complete: "Beitrag bearbeitet"
-      convert_to_pm:
-        title: "In PN umwandeln"
-        description: "Diesen Beitrag in eine persönliche Nachricht umwandeln"
-        complete: "Beitrag in persönliche Nachricht umgewandelt"
       user_actions:
         bundle_title: "Was willst du mit dem Benutzer machen?"
-      no_action_user:
-        title: "Keine Aktion"
-        description: "Keine Maßnahmen gegen den Benutzer ergreifen"
-        complete: "Keine Maßnahmen gegen den Benutzer ergriffen"
       silence_user:
         title: "Benutzer stummschalten"
         description: "Benutzer daran hindern Beiträge zu veröffentlichen"
@@ -5429,11 +5422,11 @@ de:
         reason: "Gelöscht via Warteschlange zur Überprüfung"
       delete_and_block_user:
         title: "Löschen & Blockieren"
-        description: "Lösche den Benutzer und blockiere seine IP/E-Mail"
+        description: "Lösche den Benutzer und blockiere seine IP/E-Mail-Adresse"
         complete: "Benutzer gelöscht und gesperrt"
       delete_user_block:
         title: "Löschen & Blockieren"
-        description: "Lösche den Benutzer und blockiere seine IP/E-Mail"
+        description: "Lösche den Benutzer und blockiere seine IP/E-Mail-Adresse"
         complete: "Benutzer gelöscht und gesperrt"
   email_style:
     html_missing_placeholder: "Die HTML-Vorlage muss %{placeholder} beinhalten"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index e8c2ddaee2959..586df155a2ffd 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -308,6 +308,7 @@ el:
   topic_not_found: "Κάτι πήγε στραβά. Ίσως αυτό το θέμα έκλεισε ή διαγράφηκε ενώ το κοιτούσατε."
   not_accepting_pms: "Λυπούμαστε, ο/η %{username} δεν δέχεται μηνύματα αυτή τη στιγμή."
   max_pm_recipients: "Λυπούμαστε, μπορείτε να στείλετε μήνυμα το μέγιστο σε %{recipients_limit} παραλήπτες."
+  removed_direct_reply_full_quotes: "Αφαιρέθηκε αυτόματα η παράθεση ολόκληρης της προηγούμενης ανάρτησης."
   slow_mode_enabled: "Αυτό το θέμα είναι σε αργή λειτουργία."
   just_posted_that: "είναι παρόμοιο με αυτό που δημοσιεύσατε πρόσφατα"
   invalid_characters: "περιέχει μη έγκυρους χαρακτήρες"
@@ -365,6 +366,7 @@ el:
       custom: "Προσαρμοσμένη ημερομηνία και ώρα"
   groups:
     errors:
+      grant_trust_level_not_valid: "Το '%{trust_level}' δεν είναι έγκυρο επίπεδο εμπιστοσύνης."
       can_not_modify_automatic: "Δεν μπορείς να τροποποιήσεις μια αυτόματη ομάδα"
       invalid_domain: "'%{domain}' δεν είναι έγκυρος τομέας."
       too_many_domains: "Πάρα πολλοί τομείς. Μέγιστο %{max}."
@@ -519,10 +521,13 @@ el:
     media_placeholder:
       blocked_hotlinked_title: "Πολυμέσο που φιλοξενείται σε άλλον ιστότοπο. Κάντε κλικ για να ανοίξετε σε νέα καρτέλα."
       blocked_hotlinked: "Εξωτερικό Πολυμέσο"
+    hidden_bidi_character: "Οι χαρακτήρες αμφίδρομου ελέγχου μπορούν να αλλάξουν τη σειρά με την οποία απεικονίζεται το κείμενο. Αυτό θα μπορούσε να χρησιμοποιηθεί για την απόκρυψη κακόβουλου κώδικα."
     has_likes:
       one: "%{count} «Μου αρέσει»"
       other: "%{count} «Μου αρέσει»"
   rate_limiter:
+    by_type:
+      public_group_membership: "Συμμετέχετε/αποχωρείτε από ομάδες λίγο πολύ συχνά. Παρακαλούμε περιμένετε %{time_left} πριν προσπαθήσετε ξανά."
     hours:
       one: "%{count} ώρα"
       other: "%{count} ώρες"
@@ -895,6 +900,7 @@ el:
       title: "Αρέσει"
       xaxis: "Ημέρα"
       yaxis: "Αριθμός νέων 'Μου αρέσει'"
+      description: "Αριθμός νέων \"Μου αρέσει\"."
     flags:
       title: "Σημάνσεις"
       xaxis: "Ημέρα"
@@ -1077,17 +1083,21 @@ el:
         filesize: Μέγεθος αρχείου
       description: "Λίστα όλων των μεταφορτώσεων κατά επέκταση, μέγεθος αρχείου και συντάκτη."
     top_users_by_likes_received:
+      title: "Κορυφαίοι χρήστες με βάση τα \"Μου αρέσει\" που έλαβαν"
       labels:
         user: Χρήστης
-        qtt_like: Μου αρέσει που λήφθησαν
+        qtt_like: Ληφθέντα "Μου αρέσει"
+      description: "Κορυφαίοι 10 χρήστες που έχουν λάβει \"Μου αρέσει\"."
     top_users_by_likes_received_from_inferior_trust_level:
+      title: "Κορυφαίοι χρήστες με βάση τα \"Μου αρέσει\" που έλαβαν από χρήστη με χαμηλότερο επίπεδο εμπιστοσύνης"
       labels:
         user: Χρήστης
-        qtt_like: Μου αρέσει που λήφθησαν
+        trust_level: Επίπεδο εμπιστοσύνης
+        qtt_like: Ληφθέντα "Μου αρέσει"
     top_users_by_likes_received_from_a_variety_of_people:
       labels:
         user: Χρήστης
-        qtt_like: Μου αρέσει που λήφθησαν
+        qtt_like: Ληφθέντα "Μου αρέσει"
     topic_view_stats:
       title: "Στατιστικά Προβολών Θέματος"
       labels:
@@ -1148,7 +1158,9 @@ el:
     show_pinned_excerpt_desktop: "Εμφάνιση αποσπάσματος σε καρφιτσωμένα νήματα στην προβολή για υπολογιστές."
     post_onebox_maxlength: "Μέγιστο μέγεθος μιας oneboxed ανάρτησης σε χαρακτήρες."
     allowed_inline_onebox_domains: "Μια λίστα από τομείς τα οποία θα γίνουν onebox σε σκίκρυνση αν αναφερθούν χωρίς τίτλο"
+    logo_small: "Η μικρή εικόνα λογότυπου επάνω αριστερά στον ιστότοπό σας, που φαίνεται κατά την κύλιση προς τα κάτω. Χρησιμοποιήστε μια εικόνα 120 × 120. Εάν αφεθεί κενό, θα εμφανιστεί ένα σύμβολο αρχικής σελίδας."
     notification_email: "Η από: διεύθυνση email που χρησιμοποιείται για την αποστολή όλων των απαραιτήτων μηνυμάτων του συστήματος. Ο τομέας που καθορίζεται εδώ πρέπει να έχει SPF, DKIM και reverse PTR αρχεία ρυθμισμένα σωστά για να φθάσει το μήνυμα."
+    email_subject: "Προσαρμόσιμη μορφή θέματος για τυπικά μηνύματα email. Δείτε το <a href='https://meta.discourse.org/t/customizing-specific-system-email-templates/88323' target='_blank'>https://meta.discourse.org/t/customizing-specific-system-email-templates/88323</a>"
     force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις και τα εξωτερικά σας λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
     summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίστε αυτό το θέμα»"
     summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
@@ -1218,6 +1230,7 @@ el:
     top_topics_formula_log_views_multiplier: "value of log views multiplier (n) in top topics formula: `log(views_count) * (n) + op_likes_count * 0.5 + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_first_post_likes_multiplier: "value of first post likes multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * (n) + LEAST(likes_count / posts_count, 3) + 10 + log(posts_count)`"
     top_topics_formula_least_likes_per_post_multiplier: "value of least likes per post multiplier (n) in top topics formula: `log(views_count) * 2 + op_likes_count * 0.5 + LEAST(likes_count / posts_count, (n)) + 10 + log(posts_count)`"
+    enable_safe_mode: "Να επιτρέπεται στους χρήστες να εισέλθουν στην ασφαλή λειτουργία για αποσφαλμάτωση των πρόσθετων."
     rate_limit_create_topic: "Μετά τη δημιουργία θέματος, οι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλου θέματος."
     rate_limit_create_post: "Μετά την ανάρτηση, οι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλης ανάρτησης."
     rate_limit_new_user_create_post: "Μετά την ανάρτηση, οι νέοι χρήστες πρέπει να περιμένουν (n) δευτερόλεπτα πριν τη δημιουργία άλλης ανάρτησης."
@@ -1270,7 +1283,7 @@ el:
     tl3_requires_max_flagged: "Ο χρήστης δεν θα πρέπει να είχε περισσότερες από x αναρτήσεις αναφερόμενες από x διαφορετικούς χρήστες τις τελευταίες (tl3 time period) ημέρες για να πληροί τις προϋποθέσεις για να προαχθεί σε επίπεδο εμπιστοσύνης 3, όπου x είναι η τιμή αυτής της ρύθμισης. (0 ή μεγαλύτερο)"
     tl3_promotion_min_duration: "Ο ελάχιστος αριθμός ημερών για τις οποίες διαρκεί μια προώθηση στο επίπεδο εμπιστοσύνης 3, προτού ένας χρήστης μπορεί να υποβιβαστεί στο επίπεδο εμπιστοσύνης 2. "
     tl3_requires_likes_given: "Ο ελάχιστος αριθμός των 'μου αρέσει' που πρέπει να έχουν δωθεί τις τελευταίες (tl3 time period) ημέρες, ώστε να πληρούνται οι προυποθέσεις για να προαχθεί στο επίπεδο εμπιστοσύνης 3. "
-    tl3_requires_likes_received: "Ο ελάχιστος αριθμός των 'μου αρέσει' που πρέπει να έχουν ληφθεί τις τελευταίες (tl3 time period) ημέρες, ώστε να πληρούνται οι προυποθέσεις για να προαχθεί στο επίπεδο εμπιστοσύνης 3. "
+    tl3_requires_likes_received: "Ο ελάχιστος αριθμός των \"Μου αρέσει\" που πρέπει να έχουν ληφθεί τις τελευταίες (tl3 time period) ημέρες, ώστε να πληρούνται οι προυποθέσεις για να προαχθεί στο επίπεδο εμπιστοσύνης 3."
     tl3_links_no_follow: "Μην αφαιρείτε rel=nofollow από συνδέσμους που αναρτήθηκαν από χρήστες επιπέδου εμπιστοσύνης 3."
     newuser_max_links: "Πόσους συνδέσμους μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
     newuser_max_attachments: "Πόσα συνημμένα μπορεί να προσθέσει ένας χρήστης σε μια ανάρτηση."
@@ -1317,6 +1330,7 @@ el:
     num_flaggers_to_close_topic: "Ελάχιστος αριθμός ξεχωριστών αναφορών που απαιτείται για την αυτόματη παύση ενός θέματος για παρέμβαση"
     num_hours_to_close_topic: "Αριθμός ωρών παύσης ενός θέματος για παρέμβαση"
     auto_respond_to_flag_actions: "Ενεργοποίηση αυτόματης απάντησης όταν αφαιρείται μια αναφορά."
+    fast_typing_threshold: "Ελάχιστος χρόνος που πρέπει να πληκτρολογήσει ένας χρήστης για την πρώτη του ανάρτηση. Εάν δεν επιτευχθεί το όριο, η ανάρτηση θα εισέλθει αυτόματα στην ουρά ελέγχου. Το ελάχιστο είναι 1 δευτερόλεπτο, το τυπικό είναι 3 δευτερόλεπτα και το μέγιστο είναι 5 δευτερόλεπτα."
     auto_silence_fast_typers_max_trust_level: "Μέγιστο επίπεδο εμπιστοσύνης για την αυτόματη σίγηση σε περίπτωση γρήγορης πληκτρολόγησης"
     reply_by_email_address: "Πρότυπο για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, για παράδειγμα: %%{reply_key}@reply.example.com or replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Λίστα εναλλακτικών προτύπων για την απάντηση μέσω email της διεύθυνσης email εισερχομένων μηνυμάτων, πχ: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
@@ -1344,7 +1358,7 @@ el:
     pop3_polling_password: "Ο κωδικός πρόσβασης του POP3 λογαριασμού για το email."
     email_prefix: "Το [label] που χρησιμοποιείται στο θέμα των μηνυμάτων email. Αυτό θα προκαθοριστεί σαν «τίτλος», αν δεν οριστεί."
     email_site_title: "Ο τίτλος της ιστοσελίδας που χρησιμοποιείται ως ο αποστολέας των email από την ιστοσελίδα. Η προκαθορισμένη ρύθμιση είναι 'τίτλος'. Εάν ο 'τίτλος' σας περιέχει χαρακτήρες οι οποίοι δεν επιτρέπονται στα email, χρησιμοποιήστε αυτή τη ρύθμιση. "
-    find_related_post_with_key: "Χρησιμοποίησε μόνο το 'reply key' για να βρεις την ανάρτηση replied-to. ΠΡΟΣΟΧΗ: αν απενεργοποιηθεί, επιτρέπει την πλαστοπροσωπία με βάση την διεύθυνση email."
+    find_related_post_with_key: "Χρησιμοποιήστε μόνο το 'reply key' για να βρείτε την ανάρτηση replied-to. ΠΡΟΣΟΧΗ: αν απενεργοποιηθεί, επιτρέπει την πλαστοπροσωπία με βάση την διεύθυνση email."
     minimum_topics_similar: "Πόσα νήματα χρειάζεται να υπάρχουν προτού παρουσιαστούν παρόμοια νήματα όταν δημιουργείς νέα νήματα."
     relative_date_duration: "Αριθμός ημερών μετά την ανάρτηση όταν οι ημερομηνίες ανάρτησης θα εμφανίζονται ως σχετικές (7ημ) αντί για απόλυτες (20 Φεβ). "
     delete_user_max_post_age: "Να μην επιτρέπεται η διαγραφή χρηστών των οποίων η πρώτη ανάρτηση είναι τουλάχιστον (Χ) ημερών. "
@@ -1366,6 +1380,7 @@ el:
     enable_user_directory: "Παροχή καταλόγου χρηστών για περιήγηση"
     enable_group_directory: "Παροχή καταλόγου με ομάδες για περιήγηση"
     enable_category_group_moderation: "Να επιτρέπεται στις ομάδες να συντονίζουν περιεχόμενο σε συγκεκριμένες κατηγορίες"
+    group_in_subject: "Ορίστε το %%{optional_pm} στο θέμα του email στο όνομα της πρώτης ομάδας στο ΠΜ, δείτε: <a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>Προσαρμογή μορφής θέματος για τυπικά μηνύματα email</a> (στα Αγγλικά)"
     allow_anonymous_mode: "Ενεργοποιήστε την επιλογή για τους χρήστες να μεταβαίνουν σε ανώνυμη λειτουργία για δημοσίευση. Όταν ενεργοποιηθεί, οι χρήστες μπορούν να επιλέξουν την απόκρυψη της ταυτότητάς τους κατά τη δημιουργία αναρτήσεων ή θεμάτων σε ολόκληρο τον ιστότοπο. Δείτε επίσης την επιλογή `allow anonymous likes`."
     allow_likes_in_anonymous_mode: "Ενεργοποιήστε αυτήν τη ρύθμιση για να επιτρέψετε στους χρήστες που περιηγούνται στον ιστότοπό σας ανώνυμα να κάνουν \"Μου αρέσει\" σε αναρτήσεις. Όταν ενεργοποιηθεί, οι χρήστες μπορούν να επιλέξουν να αποκρύπτεται η ταυτότητά τους όταν κάνουν \"Μου αρέσει\" σε αναρτήσεις ή θέματα σε ολόκληρο τον ιστότοπο. Αυτή η ρύθμιση απαιτεί την ενεργοποίηση της ρύθμισης `allow anonymous mode`."
     anonymous_account_duration_minutes: "Για να προστατευθεί η ανωνυμία δημιούργησε ένα νέο ανώνυμο λογαριασμό κάθε Ν λεπτά για κάθε χρήστη. Παράδειγμα: εάν τεθεί στο 600, μόλις περάσουν 600 λεπτά από την τελευταία ανάρτηση ΚΑΙ ο χρήστης αλλάξει σε ανώνυμος, ένας νέος ανώνυμος λογαριασμός δημιουργείται."
@@ -1375,6 +1390,7 @@ el:
     get_a_room_threshold: "Ο αριθμός των αναρτήσεων που πρέπει να κάνει ένας χρήστης στον ίδιο άνθρωπο και στο ίδιο θέμα προτού να προειδοποιηθεί. "
     enable_mobile_theme: "Οι κινητές συσκευές χρησιμοποιούν θέματα φιλικά προς τα κινητά, με δυνατότητα αλλαγής στον ολοκληρωμένο ιστότοπο. Απενεργοποιήστε το εάν θέλετε να χρησιμοποιήσετε ένα fully responsive stylesheet."
     dominating_topic_minimum_percent: "To ποσοστό αναρτήσεων που πρέπει να κάνει ένας χρήστης σε ένα νήμα πριν ειδοποιηθεί για υπερβολική χρήση του θέματος."
+    pm_warn_user_last_seen_months_ago: "Κατά τη δημιουργία ενός νέου ΠΜ, να προειδοποιούνται οι χρήστες όταν ο παραλήπτης-στόχος δεν έχει εμφανιστεί για περισσότερους από n μήνες."
     suppress_uncategorized_badge: "Να μην εμφανίζεται το παράσημο για τα θέματα που δεν ανήκουν σε κατηγορίες στις λίστες θεμάτων."
     permalink_normalizations: "Εφαρμόστε την ακόλουθη regex πριν ταιριάξετε τα permalinks, για παράδειγμα: /(topic.*)\\?.*/\\1 θα αφαιρέσει τις συμβολοσειρά για ερώτηση από τις διαδρομές για τα νήματα. Η μορφή είναι regex+συμβολοσειρά χρησημοποιήστε \\ 1 κ.λπ., για να αποκτήσετε πρόσβαση στις συλλήψεις"
     global_notice: "Εμφανίστε μια ΕΠΕΙΓΟΥΣΑ, ΕΚΤΑΚΤΗ ΑΝΑΓΚΗ, μη παραβλέψιμη καθολική ειδοποίηση banner σε όλους τους επισκέπτες, αλλάξτε την σε κενό για να την αποκρύψετε (επιτρέπεται HTML)."
@@ -1398,6 +1414,7 @@ el:
     approve_post_count: "Ο όγκος των αναρτήσεων ενός καινούριου ή βασικού χρήστη που θα πρέπει να εγκριθεί."
     auto_close_messages_post_count: "Ανώταρο όριο αναρτήσεων που επιτρέπονται σε ένα μήνυμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποιήση)"
     auto_close_topics_post_count: "Ανώτατο όριο αναρτήσεων που επιτρέπονται σε ένα νήμα πριν αυτό κλείσει αυτομάτως (0 για απενεργοποίηση)"
+    auto_close_topics_create_linked_topic: "Δημιουργήστε ένα νέο συνδεδεμένο θέμα όταν ένα θέμα κλείνει αυτόματα με βάση τη ρύθμιση 'auto close topics post count'"
     code_formatting_style: "Το κουμπί κώδικα στον συνθέτη θα έχει ως αποτέλεσμα αυτό το στυλ μορφοποίησης κώδικα "
     max_allowed_message_recipients: "Μέγιστος αριθμός παραληπτών που επιτρέπονται σε ένα μήνυμα"
     default_email_digest_frequency: "Πόσο συχνά οι χρήστες λαμβάνουν συνοπτικά email από προεπιλογή."
@@ -1436,6 +1453,8 @@ el:
     suppress_overlapping_tags_in_list: "Αν μία ετικέτα ταιριάζει ακριβώς με μία λέξη στον τίτλο ενός θέματος, τότε μην εμφανίσεις την ετικέτα. "
     shared_drafts_allowed_groups: "Να επιτρέπεται στους χρήστες σε αυτές τις ομάδες να βλέπουν και να επεξεργάζονται Κοινόχρηστα Προσχέδια."
     enable_desktop_push_notifications: "Ενεργοποιήστε τις ειδοποιήσεις push για τη διεπαφή στους υπολογιστές. Αυτή η λειτουργία επιτρέπει την αποστολή ειδοποιήσεων σε πραγματικό χρόνο από τον ιστότοπο απευθείας στον υπολογιστή σας, ενισχύοντας την αλληλεπίδραση και διασφαλίζοντας ότι οι χρήστες είναι πάντα ενημερωμένοι. Ωστόσο, η αποτελεσματικότητα αυτής της λειτουργίας εξαρτάται από την υποστήριξη του προγράμματος περιήγησης για ειδοποιήσεις push."
+    impersonate_without_logout: "Να επιτρέπεται στους διαχειριστές να προσποιούνται έναν χρήστη χωρίς να χρειάζεται να αποσυνδεθούν από τον λογαριασμό διαχειριστή τους."
+    experimental_impersonation_time_limit_minutes: "Πόσος χρόνος προτού τερματιστεί αυτόματα μια συνεδρία πλαστοπροσωπίας."
     viewport_based_mobile_mode: "Χρησιμοποιήστε το πλάτος του παραθύρου προβολής για να προσδιορίσετε τις λειτουργίες για κινητά/υπολογιστές. Αυτή η ρύθμιση θα καταργηθεί σύντομα. Εάν διαπιστώσετε ότι χρειάζεται να την απενεργοποιήσετε, ενημερώστε μας <a href='https://meta.discourse.org/t/384280'>στο Meta</a>."
     floating_dismiss_topics_on_mobile: "Εμφανίζει ένα αιωρούμενο κουμπί \"Παράβλεψη...\" στο κινητό για τη λίστα θεμάτων για ευκολότερη πρόσβαση και για να απελευθερωθεί χώρος στην κορυφή της λίστας θεμάτων"
     errors:
@@ -1462,9 +1481,10 @@ el:
       email_editable_enabled: "Θα πρέπει να απενεγοποιηθεί το 'email editable' πριν ενεργοποιηθεί αυτή η ρύθμιση."
       staged_users_disabled: "Θα πρέπει να ενεργοποιήσετε τους σταδιακούς χρηστες πριν ενεργοποιήσετε αυτή τη ρύθμιση."
       reply_by_email_disabled: "Θα πρέπει να ενεργοποιήσετε την απάντηση μέσω email πριν ενεργοποιήσετε αυτή τη ρύθμιση."
-      min_username_length_range: "Δεν μπορείς να θέσεις το ελάχιστο πιο πάνω από το μέγιστο"
-      max_username_length_range: "Δεν μπορείς να θέσεις το μέγιστο πιο κάτω από το ελάχιστο."
       markdown_linkify_tlds: "Δεν μπορείτε να συμπεριλάβετε την τιμή '*'."
+    placeholder:
+      discourse_connect_provider_secrets:
+        key: "www.example.com"
   search:
     within_post: "#%{post_number} από %{username}"
     types:
@@ -1478,6 +1498,9 @@ el:
       in_unseen: "Εμφάνιση θεμάτων που δεν έχετε δει"
       order_latest_post: "Ταξινόμηση κατά ημερομηνία τελευταίας ανάρτησης (νεότερη πρώτη)"
       order_latest_post_asc: "Ταξινόμηση κατά ημερομηνία τελευταίας ανάρτησης (παλαιότερη πρώτη)"
+      locale: "Φιλτράρισμα θεμάτων ανά πρωτότυπη γλώσσα"
+      locale_any: "Εμφάνιση θεμάτων που γράφτηκαν αρχικά σε οποιαδήποτε από τις καθορισμένες γλώσσες (διαχωρισμένες με κόμμα)"
+      exclude_locale: "Εξαίρεση θεμάτων που γράφτηκαν αρχικά σε μια συγκεκριμένη γλώσσα"
   discourse_connect:
     login_error: "Σφάλμα Σύνδεσης"
     not_found: "Ο λογαριασμός σου δεν ήταν δυνατόν να βρεθεί. Παρακαλώ επικοινώνησε με το διαχειριστή της ιστοσελίδας."
@@ -1489,6 +1512,7 @@ el:
   original_poster: "Αρχικός Αναρτητής"
   most_recent_poster: "Πιο Πρόσφατος Αναρτητής"
   frequent_poster: "Συχνός Αναρτητής"
+  poster_description_joiner: ", "
   redirected_to_top_reasons:
     new_user: "Καλώς ήλθες στην κοινότητά μας! Αυτά είναι τα πιο δημοφιλή πρόσφατα νήματα συζητήσεων."
     not_seen_in_a_month: "Καλώς ήλθες και πάλι! Δε σε έχουμε δει για αρκετό καιρό. Αυτά είναι τα πιο δημοφιλή νήματα συζητήσεων από την τελευταία σου επίσκεψη."
@@ -1595,6 +1619,10 @@ el:
     second_factor_backup_description: "Παρακαλώ εισαγάγετε έναν από τους εφεδρικούς κωδικούς σας:"
     second_factor_toggle:
       backup_code: "Χρησιμοποιήστε αντ 'αυτού έναν εφεδρικό κωδικό"
+  second_factor_auth:
+    actions:
+      discourse_connect_provider:
+        description: "Το %{hostname} σας ζήτησε να επιβεβαιώσετε το 2FA σας. Θα ανακατευθυνθείτε πίσω στον ιστότοπο μόλις επιβεβαιώσετε το 2FA σας."
   admin:
     email:
       sent_test: "στάλθηκε!"
@@ -1772,15 +1800,22 @@ el:
       title: "Καλωσόρισμα Χρήστη"
       preview: "Καλώς ήλθατε στην %{site_name}!"
       subject_template: "Καλώς ήλθατε στην %{site_name}!"
-      text_body_template: |2
-
-        Ευχαριστούμε για την εγγραφή σας στην %{site_name}, καλώς ορίσατε!
+      text_body_template: |
+        Ευχαριστούμε για την συμμετοχή σας στο %{site_name}, και καλώς ορίσατε!
 
         %{new_user_tips}
 
-        Πιστεύουμε και επικροτούμε την [πολιτισμένη επικοινωνία](%{base_url}/guidelines) στο διαδίκτυο.
+        Πιστεύουμε στην [πολιτισμένη συμπεριφορά της κοινότητας](%{base_url}/guidelines) ανά πάσα στιγμή.
 
         Να περάσετε καλά!
+    welcome_staff:
+      subject_template: "Συγχαρητήρια, σας έχει χορηγηθεί ιδιότητα %{role}!"
+      text_body_template: |
+        Σας έχει χορηγηθεί η ιδιότητα %{role} από ένα μέλος του προσωπικού.
+
+        Ως %{role}, έχετε πλέον πρόσβαση στη <a href='%{base_url}/admin' target='_blank'>διεπαφή διαχειριστή</a>.
+
+        Με μεγάλη δύναμη έρχεται και μεγάλη ευθύνη. Εάν είστε νέοι στη διαχείριση, ανατρέξτε στον [Οδηγό Συντονισμού](https://meta.discourse.org/t/discourse-moderation-guide/63116).
     welcome_invite:
       title: "Πρόσκληση Καλωσορίσματος"
       preview: "Καλώς ήλθατε στην %{site_name}!"
@@ -2056,11 +2091,10 @@ el:
     new_user_of_the_month:
       title: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
       subject_template: "Έχεις επιλεχθεί ως Χρήστης του Μήνα!"
-      text_body_template: |2
-
-        Συγχαρητήρια, κέρδισες το βραβείο **Χρήστης του Μήνα για %{month_year}**. :trophy:
+      text_body_template: |
+        Συγχαρητήρια, κέρδισες το βραβείο **Νέος Χρήστης του Μήνα για %{month_year}**. :trophy:
 
-        Αυτό το βραβείο επονέμεται σε δυο νέους χρήστες κάθε μήνα και θα είναι για πάντα ορατό στην [σελίδα χρήστη](%{url}).
+        Αυτό το βραβείο απονέμεται σε δυο νέους χρήστες κάθε μήνα και θα είναι για πάντα ορατό στη [σελίδα χρήστη](%{url}).
 
         Γίνατε γρήγορα ένα πολύτιμο μέλος της κοινότητάς μας. Σας ευχαριστούμε για την συμμετοχή σας και ελπίζουμε να συνεχίσετε έτσι και στο μέλλον!
     queued_posts_reminder:
@@ -2495,6 +2529,7 @@ el:
       size_not_found: "Λυπούμαστε, αλλά δεν μπορούμε να καθορίσουμε το μέγεθος της εικόνας. Μήπως η εικόνα σας είναι χαλασμένη;"
     placeholders:
       too_large: "(εικόνα μεγαλύτερη από %{max_size_kb}KB)"
+      too_large_humanized: "(εικόνα μεγαλύτερη από %{max_size})"
   avatar:
     missing: "Λυπούμαστε, αλλά δεν μπορέσαμε να βρούμε κάποιο άβαταρ που να αντιστοιχίζεται με τη συγκεκριμένη διεύθυνση email. Μπορείτε να δοκιμάσετε να το ανεβάσετε ξανά;"
   flag_reason:
@@ -2574,6 +2609,7 @@ el:
         Αυτό το παράσημο χορηγείται όταν φτάσετε στο επίπεδο εμπιστοσύνης 2. Σας ευχαριστούμε που συμμετέχετε για μια περίοδο εβδομάδων για να γίνετε πραγματικά μέλος της κοινότητάς μας. Μπορείτε πλέον να στέλνετε προσκλήσεις από τη σελίδα χρήστη σας ή από μεμονωμένα θέματα, να δημιουργείτε ομαδικά προσωπικά μηνύματα και να έχετε περισσότερα "Μου αρέσει" ανά ημέρα.
     regular:
       name: Τακτικός
+      description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Χορηγήθηκε</a> ανακατηγοριοποίηση, μετονομασία, σύνδεσμοι που ακολουθούνται, wiki, περισσότερα "Μου αρέσει"
     leader:
       name: Ηγέτης
       description: <a href="https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/">Χορηγήθηκαν</a> καθολική επεξεργασία, καρφίτσωμα, κλείσιμο, αρχειοθέτηση, διαχωρισμός και συγχώνευση, περισσότερα "Μου αρέσει"
@@ -2599,13 +2635,13 @@ el:
       description: Έλαβε 50 "Μου αρέσει" σε μια απάντηση
     nice_topic:
       name: Καλο Νήμα
-      description: Έλαβε 10 "Μου αρέσει" σε ένα νήμα
+      description: Έλαβε 10 "Μου αρέσει" σε ένα θέμα
     good_topic:
       name: Πολύ Καλό Νήμα
-      description: Έλαβε 25 "Μου αρέσει" σε ένα νήμα
+      description: Έλαβε 25 "Μου αρέσει" σε ένα θέμα
     great_topic:
       name: Υπέροχο Νήμα
-      description: Έλαβε 50 "Μου αρέσει" σε ένα νήμα
+      description: Έλαβε 50 "Μου αρέσει" σε ένα θέμα
     nice_share:
       name: Καλή Κοινοποίηση
       description: Κοινοποίησε μια ανάρτηση με 25 μοναδικούς επισκέπτες
@@ -2718,7 +2754,7 @@ el:
       name: Πρώτη Επισήμανση
       description: Επισήμανε έναν χρήστη σε μία ανάρτηση
       long_description: |
-        Αυτό το παράσημο απονέμεται την πρώτη φορά που επισημαίνεις το @όνομα χρήστη κάποιου στην ανάρτησή σου. Κάθε επισήμανση δημιουργεί μια ειδοποίηση προς αυτό το άτομο, ώστε να γνωρίζει για την ανάρτησή σου. Απλά ξεκίνα να πληκτρολογείς @ (σύμβολο παπάκι) για να επισημάνεις οποιονδήποτε χρήστη ή, αν επιτρέπεται, ομάδα – είναι ένας βολικός τρόπος να επιστήσεις την προσοχή του σε κάτι.
+        Αυτό το παράσημο χορηγείται την πρώτη φορά που επισημαίνεις το @όνομα χρήστη κάποιου στην ανάρτησή σου. Κάθε επισήμανση δημιουργεί μια ειδοποίηση προς αυτό το άτομο, ώστε να γνωρίζει για την ανάρτησή σου. Απλά ξεκίνα να πληκτρολογείς @ (σύμβολο παπάκι) για να επισημάνεις οποιονδήποτε χρήστη ή, αν επιτρέπεται, ομάδα – είναι ένας βολικός τρόπος να επιστήσεις την προσοχή του σε κάτι.
     first_onebox:
       name: Πρώτο Onebox
       description: Αναρτήθηκε σύνδεσμος ο οποίος είναι oneboxed
@@ -2730,9 +2766,8 @@ el:
     new_user_of_the_month:
       name: "Νέος Χρήστης του Μήνα"
       description: Εξαιρετική συνεισφορά κατά τον πρώτο μήνα
-      long_description: |2
-
-        Αυτό το βραβείο απονέμεται σε δύο νέους χρήστες κάθε μήνα για την εξαιρετική συνεισφορά τους στην κοινότητα, όπως αυτή μετρήθηκε από το πόσο σύχνα άρεσαν οι αναρτήσεις τους και σε ποιους.
+      long_description: |
+        Αυτό το παράσημο χορηγείται σε δύο νέους χρήστες κάθε μήνα για την εξαιρετική συνεισφορά τους στην κοινότητα, όπως αυτή μετρήθηκε από το πόσο σύχνα άρεσαν οι αναρτήσεις τους και σε ποιους.
     enthusiast:
       name: Θιασώτης
       description: Επισκέφθηκε 10 συνεχόμενες ημέρες
@@ -2753,7 +2788,7 @@ el:
     email_input: "Email Διαχειριστή"
     submit_button: "Αποστολή Email"
   performance_report:
-    initial_post_raw: Αυτό το θέμα περιλαμβάνει καθημερινές αναφορές απόδοσης για τη σελίδα σας.
+    initial_post_raw: Αυτό το θέμα περιλαμβάνει καθημερινές αναφορές απόδοσης για τον ιστότοπό σας.
     initial_topic_title: Εκθέσεις απόδοσης ιστοσελίδας
   tags:
     title: "Ετικέτες"
@@ -2774,8 +2809,6 @@ el:
     title: "Έναρξη ασφαλούς λειτουργίας"
     enter: "Έναρξη Ασφαλούς Λειτουργίας"
     must_select: "Θα πρέπει να διαλέξτε τουλάχιστον μία επιλογή για να εισέλθετε σε ασφαλή λειτοθργία."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Εγκατάσταση Discourse"
     step:
@@ -2790,7 +2823,10 @@ el:
               private:
                 label: "Ιδιωτική"
   onebox:
+    gitlab:
+      show_original: "εμφάνιση πρωτότυπου"
     github:
+      show_original: "εμφάνιση πρωτότυπου"
       closed: "κλειστό"
       review_by: "Έλεγχος από"
       status_date:
@@ -2959,8 +2995,6 @@ el:
         complete: "Η ανάρτηση εγκρίθηκε και επανεμφανίστηκε"
       post_actions:
         bundle_title: "Τι θέλετε να κάνετε με την ανάρτηση;"
-      no_action_post:
-        title: "Καμία ενέργεια"
       delete_post:
         title: "Διαγραφή ανάρτησης"
         description: "Διαγραφή ανάρτησης"
@@ -2981,14 +3015,8 @@ el:
         title: "Επεξεργασία ανάρτησης"
         description: "Επεξεργασία του περιεχομένου αυτής της ανάρτησης"
         complete: "Η ανάρτηση τροποποιήθηκε"
-      convert_to_pm:
-        title: "Μετατροπή σε ΠΜ"
-        description: "Μετατρέψτε αυτήν την ανάρτηση σε προσωπικό μήνυμα"
-        complete: "Η ανάρτηση μετατράπηκε σε προσωπικό μήνυμα"
       user_actions:
         bundle_title: "Τι θέλετε να κάνετε με τον χρήστη;"
-      no_action_user:
-        title: "Καμία ενέργεια"
       silence_user:
         title: "Σίγαση χρήστη"
         description: "Αποτρέψτε τον χρήστη από το να δημοσιεύσει"
@@ -3012,6 +3040,12 @@ el:
         title: "Διαγραφή & αποκλεισμός"
         description: "Διαγραφή του χρήστη και αποκλεισμός της IP/διεύθυνσης email του"
         complete: "Ο χρήστης διαγράφηκε και αποκλείστηκε"
+  create_linked_topic:
+    topic_title_with_sequence:
+      one: "%{topic_title} (Μέρος %{count})"
+      other: "%{topic_title} (Μέρος %{count})"
+    post_raw: "Συνέχεια της συζήτησης από %{parent_url}.\n\nΠροηγούμενες συζητήσεις:\n\n%{previous_topics}"
+    small_action_post_raw: "Συνεχίστε τη συζήτηση στο %{new_title}."
   fallback_username: "χρήστης"
   activemodel:
     errors:
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 00e0f7f887c37..ab1266fac068b 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -60,8 +60,6 @@ es:
   inline_oneboxer:
     topic_page_title_post_number: "nº %{post_number}"
     topic_page_title_post_number_by_user: "nº %{post_number} por %{username}"
-    too_many_urls: "No se pueden incluir más de 10 URL en una única solicitud de onebox."
-    concurrency_not_allowed: "No se permiten solicitudes simultáneas de inline-oneboxing. Envía una sola solicitud a la vez."
   components:
     enabled_filter: "Activado"
     disabled_filter: "Desactivado"
@@ -344,7 +342,6 @@ es:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Los agentes de usuario deben tener al menos 3 caracteres para evitar limitar accidentalmente la velocidad de los usuarios legítimos."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "No puedes añadir ninguno de los siguientes valores a este ajuste: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "No es posible desactivar «strip image metadata» si el ajuste «composer media optimization image enabled» está activado. Desactiva «composer media optimization image enabled» antes de desactivar «strip image metadata»."
-      x_summary_large_image_no_svg: "Las imágenes de resumen de Twitter usadas para los metadatos de twitter:image no pueden ser .svg"
       tl0_and_anonymous_flag: "Debes proporcionar el «site contact email» (correo electrónico de contacto del sitio) o la «email address to report illegal content» (dirección de correo electrónico para denunciar contenido ilegal) para los usuarios anónimos."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Este ajuste requiere que primero se active el ajuste «allow anonymous mode»."
     conflicting_google_user_id: 'El ID de la cuenta Google para esta cuenta ha cambiado; el personal debe intervenir por razones de seguridad. Ponte en contacto con el personal y envía esta referencia <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1776,7 +1773,6 @@ es:
     slow_down_crawler_rate: "Si slow_down_crawler_user_agents es especificado, esta proporción aplicará para todos los crawlers (número de segundos de demora entre solicitudes)"
     content_security_policy: "Activa la Política de Seguridad de Contenidos (CSP). La CSP es una capa adicional de seguridad que ayuda a evitar ciertos tipos de ataques, como el Cross Site Scripting (XSS) y la inyección de datos."
     content_security_policy_report_only: "Activar la política de seguridad de contenido de solo denuncias (CSP)"
-    content_security_policy_collect_reports: "Activar la recolección de denuncias de violación de CSP en /csp_reports"
     content_security_policy_frame_ancestors: "Restringir quién puede incrustar este sitio en iframes a través de CSP. Controla los hosts permitidos en <a href='%{base_path}/admin/customize/embedding'>Insertado</a>"
     content_security_policy_script_src: "Fuentes de scripts adicionales permitidas. El host actual y la CDN se incluyen por defecto. Ver <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigar los ataques XSS con la Política de Seguridad de Contenidos.</a> (CSP). Otras fuentes de host se ignoran, ya que está activada la dinámica estricta."
     invalidate_inactive_admin_email_after_days: "Las cuentas administrativas que no hayan visitado la página en este número de días deberán validar de nuevo su dirección de correo electrónico antes de iniciar sesión. Establecer a 0 para desactivar."
@@ -2093,7 +2089,6 @@ es:
     alternative_reply_by_email_addresses: "Lista de plantillas alternativa para las direcciones de respuesta por correo electrónico. Ejemplo: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Usar el HTML en vez del texto para los correos electrónicos entrantes."
     strip_incoming_email_lines: "Elimina los espacios en blanco iniciales y finales de cada línea de correos electrónicos entrantes."
-    disable_emails: "Evite que el Discourse envíe cualquier clase de correo electrónico. Seleccione «sí» para desactivar los correos electrónicos a todos los usuarios. Seleccione «no staff» para desactivar los correos electrónicos solo para usuarios que no formen parte del personal."
     strip_images_from_short_emails: "Quitar imágenes que tengan un tamaño menor a 2800 Bytes de los correos electrónicos"
     short_email_length: "Define la longitud máxima, en bytes, para que un correo electrónico se clasifique como «corto» para la supresión de imágenes. Si el tamaño de un correo electrónico no supera este valor, se eliminarán todas las imágenes (como avatares y emojis) que contenga."
     display_name_on_email_from: "Mostrar nombres completos en los campos de remitente de correos electrónicos"
@@ -2373,7 +2368,6 @@ es:
     dashboard_hidden_reports: "Permitir ocultar los informes especificados del panel de control."
     dashboard_visible_tabs: "Elige qué pestañas del panel de control se mostrarán."
     dashboard_general_tab_activity_metrics: "Selecciona las denuncias que se muestran como medidas de actividad en la pestaña general."
-    gravatar_enabled: "Usa el servicio <a href='https://gravatar.com/'>Gravatar</a> para los avatares de usuario. Esto evitará que los usuarios cambien a Gravatar para sus avatares, pero no afectará a quienes ya lo usan."
     gravatar_name: "Especifica el nombre del proveedor del servicio Gravatar. Este nombre se utiliza normalmente para identificar la fuente que proporciona avatares Gravatar al sitio."
     gravatar_base_url: "Especifica la URL para acceder a la API del proveedor de Gravatar. Este ajuste es fundamental para convertir las direcciones de correo electrónico en URL de Gravatar, donde se almacenan las imágenes de avatar."
     gravatar_login_url: "URL relativa a «gravatar_base_url», que proporciona al usuario el acceso al servicio Gravatar."
@@ -2454,12 +2448,6 @@ es:
       reply_by_email_disabled: "Primero debes activar «responder por correo electrónico» antes de activar esta configuración."
       discourse_connect_url_is_empty: "Debes rellenar «discourse connect url» antes de activar este ajuste."
       enable_local_logins_disabled: "Primero debes activar «activar inicio de sesión local» antes de activar esta configuración."
-      min_username_length_exists: "No puede establecer la longitud de usuario mínima por encima del nombre de usuario más corto (%{username})"
-      min_group_name_length_exists: "No puedes establecer la longitud de nombre de usuario mínima por encima del nombre de grupo más corto (%{group_name})"
-      min_username_length_range: "No puedes establecer el mínimo por encima del máximo."
-      max_username_length_exists: "No puedes establecer la longitud de usuario máxima por debajo del nombre de usuario más largo (%{username})."
-      max_group_name_length_exists: "No puedes establecer la longitud de nombre usuario máxima por debajo del nombre de grupo más largo (%{group_name})."
-      max_username_length_range: "No puedes establecer el máximo por debajo del mínimo."
       invalid_hex_value: "Los colores debe ser códigos hexadecimalesde 6 dígitos."
       empty_selectable_avatars: "Debes subir al menos dos avatares seleccionables antes de activar esta configuración."
       category_search_priority:
@@ -2518,7 +2506,6 @@ es:
       exclude_tag: "Excluir temas con una etiqueta específica"
       exclude_tags_any: "Excluir temas con cualquiera de las etiquetas especificadas (separadas por comas)"
       exclude_tags_all: "Excluir temas con todas las etiquetas especificadas (separadas por comas)"
-      tags_alias: "Alias para el filtro «etiqueta:»"
       tag_group: "Mostrar temas con etiquetas de un grupo de etiquetas específico"
       exclude_tag_group: "Excluir temas con etiquetas de un grupo de etiquetas específico"
       activity_before: "Mostrar temas con última actividad antes de una fecha (AAAA-MM-DD o hace días)"
@@ -4914,8 +4901,6 @@ es:
     deprecation_error_label: Hacer que las depreciaciones de Javascript produzcan un error
     enter: "Activar modo seguro"
     must_select: "Debes escoger al menos una opción para entrar en el modo seguro."
-  dev_mode:
-    enter: "Intro"
   wizard:
     title: "Instalación de Discourse"
     step:
@@ -5184,10 +5169,6 @@ es:
         complete: "Se ha aprobado la publicación y se ha dejado de ocultar"
       post_actions:
         bundle_title: "¿Qué quieres hacer con la publicación?"
-      no_action_post:
-        title: "Ninguna acción"
-        description: "No hacer nada"
-        complete: "No se ha tomado ninguna medida al respecto"
       delete_post:
         title: "Eliminar publicación"
         description: "Eliminar esta publicación"
@@ -5208,16 +5189,8 @@ es:
         title: "Editar publicación"
         description: "Editar el contenido de esta publicación"
         complete: "Publicación editada"
-      convert_to_pm:
-        title: "Convertir en mensaje personal"
-        description: "Convertir esta publicación en un mensaje personal"
-        complete: "Publicación convertida en mensaje personal"
       user_actions:
         bundle_title: "¿Qué quieres hacer con el usuario?"
-      no_action_user:
-        title: "Ninguna acción"
-        description: "No hacer nada con el usuario"
-        complete: "No se ha tomado ninguna medida contra el usuario"
       silence_user:
         title: "Silenciar al usuario"
         description: "Evitar que el usuario siga publicando"
diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml
index 3720668ba1f82..cfb713ae6261b 100644
--- a/config/locales/server.et.yml
+++ b/config/locales/server.et.yml
@@ -775,8 +775,6 @@ et:
     suppress_overlapping_tags_in_list: "Ära näita silti, kui see ühtib täpselt sõnaga teema päses"
     errors:
       invalid_integer: "Väärtuseks peab olema täisarv."
-      min_username_length_range: "Minimaalne ei tohi olla maksimaalsest suurem."
-      max_username_length_range: "Sa ei tohi maksimaalset seada minimaalsest väiksemaks."
   search:
     within_post: "postituse nr%{post_number} tegi %{username}"
     types:
@@ -1100,12 +1098,8 @@ et:
         title: "Jah"
       approve_and_unhide:
         title: "Jah"
-      no_action_post:
-        title: "Tegevust pole"
       delete_post:
         complete: "Postitus kustutatud"
-      no_action_user:
-        title: "Tegevust pole"
       delete_user:
         complete: "Kasutaja kustutatud"
   fallback_username: "kasutaja"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 663e6fac9d329..e679e6d5daca7 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -58,8 +58,6 @@ fa_IR:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} توسط %{username}"
-    too_many_urls: "نمی توان بیش از ۱۰ نشانی وب را در یک درخواست به صورت inline در یک جعبه قرار داد."
-    concurrency_not_allowed: "درخواست‌های inline-oneboxing همزمان مجاز نیستند. لطفاً هر بار یک درخواست ارسال کنید."
   components:
     enabled_filter: "فعال شده"
     disabled_filter: "غیرفعال"
@@ -335,7 +333,6 @@ fa_IR:
       cors_origins_should_not_have_trailing_slash: "شما نباید اسلش انتهایی (/) را به مبدا CORS اضافه کنید."
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "یوزر ایجینت باید حداقل 3 کاراکتر داشته باشند تا از محدود شدن نرخ درخواست کاربران قانونی به صورت تصادفی جلوگیری شود."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "شما نمی توانید هیچ یک از مقادیر زیر را به تنظیمات اضافه کنید: %{values}."
-      x_summary_large_image_no_svg: "تصاویر خلاصه توییتر مورد استفاده برای ابرداده twitter:image نمی توانند یک تصویر .svg باشند."
       tl0_and_anonymous_flag: "برای کاربران ناشناس باید «ایمیل تماس با سایت» یا «آدرس ایمیل برای گزارش محتوای غیرقانونی» ارائه شود."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "این تنظیم نیاز دارد که ابتدا تنظیمات «فعال‌سازی حالت ناشناس» فعال باشد."
     conflicting_google_user_id: 'شناسه حساب Google برای این حساب تغییر کرده است. مداخله کارکنان به دلایل امنیتی لازم است. لطفاً با کارکنان تماس بگیرید و به آنها نشان دهید <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1782,8 +1779,6 @@ fa_IR:
       reply_by_email_address_is_empty: "باید یک 'آدرس پاسخ با ایمیل' قبل از فعالسازی پاسخ با ایمیل تنظیم کنید."
       user_locale_not_enabled: "قبل از فعالسازی این قسمت، ابتدا باید 'اجازه انتخاب زبان' را به کاربر بدهید."
       invalid_regex: "الگوی regex نامعتبر یا غیر‌مجاز است."
-      min_username_length_range: "شما نمیتوانید مقدار حداقل را بیشتر از حداکثر قرار دهید."
-      max_username_length_range: "شما نمی‌توانید حداکثر را کمتر از حداقل قرار دهید."
       markdown_linkify_tlds: "شما مقدار «*» را نمی‌توانید وارد کنید."
       content_localization_locale_limit: "تعداد زبان‌های پشتیبانی‌شده نمی‌تواند بیش از %{max} باشد."
     placeholder:
@@ -2759,8 +2754,6 @@ fa_IR:
     title: "ورود به حالت امن"
     no_themes: "غیرفعال کردن پوسته‌ها و اجزای پوسته"
     enter: "فعال‌سازی حالت امن"
-  dev_mode:
-    enter: "وارد شدن "
   wizard:
     title: "راه اندازی Discourse"
     step:
@@ -2869,15 +2862,11 @@ fa_IR:
         title: "بله"
       approve_and_unhide:
         title: "بله"
-      no_action_post:
-        title: "هیچ اقدامی"
       delete_post:
         title: "حذف نوشته"
         complete: "نوشته حذف شده"
       restore_post:
         title: "بازیابی نوشته"
-      no_action_user:
-        title: "هیچ اقدامی"
       suspend_user:
         title: "کاربر تعلیق شده"
       delete_user:
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index d75edee5d703a..dcf6113236096 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -60,8 +60,6 @@ fi:
   inline_oneboxer:
     topic_page_title_post_number: "%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} käyttäjältä %{username}"
-    too_many_urls: "Yhdessä pyynnössä ei voi olla yli 10:tä URL-osoitetta yhdessä tekstiin sidotussa oneboxissa."
-    concurrency_not_allowed: "Samanaikaisia tekstiin sidottuja oneboxing-pyyntöjä ei sallita. Lähetä yksi pyyntö kerrallaan."
   components:
     enabled_filter: "Käytössä"
     disabled_filter: "Pois käytöstä"
@@ -344,7 +342,6 @@ fi:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Käyttäjäagenttien täytyy sisältää vähintään kolme merkkiä aitojen käyttäjien pyyntöjen virheellisen rajoittamisen välttämiseksi."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Et voi lisätä asetukseen mitään seuraavista arvoista: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Et voi poistaa kuvan metatietojen poistoa käytöstä, jos 'composer media optimization image enabled' on käytössä. Poista 'composer media optimization image enabled' käytöstä ennen kuvien metatietojen poiston poistamista käytöstä."
-      x_summary_large_image_no_svg: "Twitterin yhteenvetokuvat, joita käytetään twitter:image-metatiedoissa, eivät voi olla .svg-kuvia."
       tl0_and_anonymous_flag: "Joko \"site contact email\" tai \"email address to report illegal content\" täytyy antaa anonyymeille käyttäjille."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Tämä asetus edellyttää, että \"allow anonymous mode\" -asetus otetaan ensin käyttöön."
     conflicting_google_user_id: 'Tämän tilin Google-tilitunnus on muuttunut. Henkilökunnan toimenpiteet ovat tarpeen tietoturvasyistä. Ota yhteyttä henkilökuntaan ja ohjaa heidät osoitteeseen<br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1774,7 +1771,6 @@ fi:
     slow_down_crawler_rate: "Jos slow_down_crawler_user_agents on määritelty, tämä nopeusrajoitus koskee kaikkia hakurobotteja (kuinka monta sekuntia pitää kulua pyyntöjen välillä)"
     content_security_policy: "Ota Content-Security-Policy (CSP) käyttöön. CSP on ylimääräinen suojaustaso, joka auttaa estämään tietyntyyppiset hyökkäykset, kuten Cross Site Scriptingin (XSS) ja tietojen lisäyksen."
     content_security_policy_report_only: "Käytä epäilyttävän sisällön raportointia (Content-Security-Policy-Report-Only)"
-    content_security_policy_collect_reports: "Ota käyttöön CSP-seulontojen kerääminen lokiin kohteessa /csp_reports"
     content_security_policy_frame_ancestors: "Rajoita sitä, ketkä voivat upottaa tämän sivuston iframe-kehyksiin CSP:n kautta. Hallitse sallittuja isäntiä <a href='%{base_path}/admin/customize/embedding'>Upottaminen</a>-sivulla"
     content_security_policy_script_src: "Muut sallitut skriptilähteet. Nykyinen palvelin ja CDN sallitaan oletuksena. Katso <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigate XSS Attacks with Content Security Policy.</a> (CSP) Muut isäntälähteet ohitetaan, koska strict-dynamic on käytössä."
     invalidate_inactive_admin_email_after_days: "Ylläpitäjätilit, jotka eivät ole vierailleet sivustolla näin moneen päivään, joutuvat vahvistamaan sähköpostiosoitteensa uudelleen ennen sisäänkirjautumista. Aseta 0 poistaaksesi käytöstä."
@@ -2091,7 +2087,6 @@ fi:
     alternative_reply_by_email_addresses: "Lista vaihtoehtoisista saapuvien sähköpostivastausten sähköpostiosoitekaavoista, esimerkiksi: %%{reply_key}@reply.esimerkki.fi tai replies+%%{reply_key}@esimerkki.fi"
     incoming_email_prefer_html: "Käytä HTML:ää tekstin sijaan saapuvissa sähköposteissa."
     strip_incoming_email_lines: "Poista saapuvien sähköpostien jokaisen rivin alusta ja lopusta tyhjät merkit."
-    disable_emails: "Estä Discoursea lähettämästä minkäänlaisia sähköposteja. Ota pois sähköpostit kaikilta käyttäjiltä valitsemalla \"yes\" . \"Non-staff\" poistaa sähköpostit vain muilta kuin henkilökunnalta."
     strip_images_from_short_emails: "Poista kuvat sähköposteista, joiden koko on alle 2 800 tavua"
     short_email_length: "Määritä enimmäispituus tavuina lyhyeksi luokitellulle sähköpostille kuvien rajoittamista varten. Jos sähköpostin koko ei ylitä tätä asetusta, kaikki sähköpostissa olevat kuvat (kuten avatarit ja emojit) poistetaan."
     display_name_on_email_from: "Näytä sähköpostien lähettäjinä käyttäjien koko nimet"
@@ -2370,7 +2365,6 @@ fi:
     dashboard_hidden_reports: "Salli tiettyjen raporttien piilottaminen hallintapaneelista."
     dashboard_visible_tabs: "Valitse mitkä hallintapaneelin välilehdet ovat näkyvillä."
     dashboard_general_tab_activity_metrics: "Valitse raportit, jotka näytetään aktiivisuusmittareina Yleistä-välilehdellä."
-    gravatar_enabled: "Käytä <a href='https://gravatar.com/'>Gravatar</a>-palvelua käyttäjien avatareille. Tämä estää käyttäjiä vaihtamasta Gravatariin avatareillaan, mutta ei vaikuta käyttäjiin, jotka jo käyttävät sitä."
     gravatar_name: "Määritä Gravatar-palveluntarjoajan nimi. Tätä nimeä käytetään yleensä Gravatar-avatareita sivustolle tarjoavan lähteen tunnistamiseen."
     gravatar_base_url: "Määritä Gravatar-palveluntarjoajan APIn URL-osoite. Tämä asetus on ehdottoman tärkeä muunnettaessa sähköpostiosoitteita Gravatarin URL-osoitteiksi, joihin avatar-kuvat on tallennettu."
     gravatar_login_url: "URL suhteessa gravatar_base_url-osoitteeseen, jolla käyttäjä kirjautuu Gravatar-palveluun."
@@ -2451,12 +2445,6 @@ fi:
       reply_by_email_disabled: "Vastaus sähköpostilla täytyy ottaa käyttöön ennen tämän asetuksen käyttöönottoa."
       discourse_connect_url_is_empty: "Sinun täytyy määrittää \"discourse connect url'\" ennen kuin otat tämän asetuksen käyttöön."
       enable_local_logins_disabled: "Paikalliset kirjautumiset täytyy ottaa käyttöön ennen tämän asetuksen käyttöönottoa."
-      min_username_length_exists: "Käyttäjätunnuksen vähimmäispituus ei voi olla suurempi kuin lyhin käyttäjätunnus (%{username})."
-      min_group_name_length_exists: "Käyttäjätunnuksen vähimmäispituutta ei voi asettaa lyhintä ryhmän nimeä (%{group_name}) pidemmäksi."
-      min_username_length_range: "Vähimmäisarvo ei voi olla suurempi kuin enimmäisarvo."
-      max_username_length_exists: "Käyttäjätunnuksen enimmäispituus ei voi olla suurempi kuin pisin käyttäjätunnus (%{username})."
-      max_group_name_length_exists: "Käyttäjätunnuksen enimmäispituutta ei voi asettaa pisintä ryhmän nimeä (%{group_name}) lyhyemmäksi."
-      max_username_length_range: "Enimmäisarvo ei voi olla pienempi kuin vähimmäisarvo."
       invalid_hex_value: "Väriarvon täytyy olla kuusinumeroinen heksadesimaalikoodi."
       empty_selectable_avatars: "Sinun täytyy ladata ensin vähintään kaksi valittavaa avataria ennen kuin otat tämän asetuksen käyttöön."
       category_search_priority:
@@ -2515,7 +2503,6 @@ fi:
       exclude_tag: "Jätä pois ketjut tietyllä tunnisteella"
       exclude_tags_any: "Jätä pois ketjut millä tahansa määritetyillä tunnisteilla (pilkuilla erotettuna)"
       exclude_tags_all: "Jätä pois ketjut kaikilla määritetyillä tunnisteilla (plus-merkillä erotettuna)"
-      tags_alias: "Alias \"tag:\"-suodattimelle"
       tag_group: "Näytä ketjut, joilla on tietyn tunnisteiryhmän tunnisteita"
       exclude_tag_group: "Jätä pois ketjut, joilla on tietyn tunnisteiryhmän tunnisteita"
       activity_before: "Näytä ketjut, joissa viimeisin toiminta on ennen tiettyä päivämäärää (VVVV-KK-PP tai päivää sitten)"
@@ -4808,8 +4795,6 @@ fi:
     deprecation_error_label: Aseta Javascriptin vanhentumiset aiheuttamaan virhe
     enter: "Siirry vikasietotilaan"
     must_select: "Ainakin yksi on valittava, jotta voi siirtyä vikasietotilaan."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Discoursen asennus"
     step:
@@ -5067,8 +5052,6 @@ fi:
       approve_and_unhide:
         title: "Kyllä"
         complete: "Viesti hyväksytty ja näkyvissä"
-      no_action_post:
-        title: "Ei toimintaa"
       delete_post:
         title: "Poista viesti"
         complete: "Viesti poistettu"
@@ -5077,8 +5060,6 @@ fi:
       restore_post:
         title: "Palauta viesti"
         complete: "Viesti palautettu"
-      no_action_user:
-        title: "Ei toimintaa"
       silence_user:
         title: "Hiljennä käyttäjä"
         complete: "Käyttäjä hiljennetty"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 53804eb635bfe..35d072be9da7f 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -60,8 +60,6 @@ fr:
   inline_oneboxer:
     topic_page_title_post_number: "numéro %{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} par %{username}"
-    too_many_urls: "Impossible d'intégrer plus de 10 URL dans une seule requête."
-    concurrency_not_allowed: "Les demandes simultanées de « inline-oneboxing » ne sont pas autorisées. Veuillez envoyer une demande à la fois."
   components:
     enabled_filter: "Activé"
     disabled_filter: "Désactivé"
@@ -344,7 +342,6 @@ fr:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Les agents utilisateurs doivent comporter au moins 3 caractères pour éviter de limiter accidentellement le débit des utilisateurs légitimes."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Vous ne pouvez ajouter aucune des valeurs suivantes au paramètre : %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Vous ne pouvez pas désactiver la suppression des métadonnées d'image si l'option « Optimisation des images dans l'éditeur » est activée. Désactivez « Optimisation des images dans l'éditeur » avant de désactiver la suppression des métadonnées d'image."
-      x_summary_large_image_no_svg: "Les images de résumé X utilisées pour les métadonnées twitter:image ne peuvent pas être des images .svg."
       tl0_and_anonymous_flag: "Pour les utilisateurs anonymes, une « site contact email » ou une « email address to report illegal content » doit être fournie."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Ce paramètre nécessite que le paramètre « Autoriser le mode anonyme » soit activé au préalable."
     conflicting_google_user_id: 'Le Google Account ID a changé pour ce compte ; un responsable doit intervenir pour des raisons de sécurité. Merci de contacter les responsables et les renvoyer vers <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1774,7 +1771,6 @@ fr:
     slow_down_crawler_rate: "Si slow_down_crawler_user_agents est défini, ce taux s'appliquera à tous les robots d'indexation (nombre de secondes d'attente entre requêtes)"
     content_security_policy: "Activez la politique de sécurité du contenu (CSP). La CSP est une couche de sécurité supplémentaire qui permet de prévenir certains types d'attaques, notamment le Cross Site Scripting (XSS) et l'injection de données."
     content_security_policy_report_only: "Activer Content-Security-Policy-Report-Only (CSP)"
-    content_security_policy_collect_reports: "Activer la collecte des rapports de violation CSP sur la page /csp_reports"
     content_security_policy_frame_ancestors: "Limiter les parties autorisées à intégrer ce site dans une iframe par le biais de l'attribut « csp ». Appliquer les restrictions d'hôtes définies dans la page <a href='%{base_path}/admin/customize/embedding'>Intégration externe</a>."
     content_security_policy_script_src: "Sources de script supplémentaires autorisées. L'hôte actuel et le CDN sont inclus par défaut. Voir <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Empêcher les attaques XSS grâce à la politique de sécurité du contenu (CSP).</a> Les autres sources hôtes sont ignorées car la dynamique stricte est activée."
     invalidate_inactive_admin_email_after_days: "Les comptes administrateurs qui n'ont pas visité le site depuis ce nombre de jours devront revalider leur adresse e-mail avant de se connecter. Mettre à 0 pour désactiver."
@@ -2091,7 +2087,6 @@ fr:
     alternative_reply_by_email_addresses: "Liste des modèles alternatifs pour les adresses des e-mails entrants de la réponse par e-mail. Exemple : %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Utilisez du HTML plutôt que du texte pour les e-mails entrants."
     strip_incoming_email_lines: "Supprimer les espaces en début et fin de chaque ligne d'e-mail entrants."
-    disable_emails: "Empêcher Discourse d'envoyer tout type d'e-mails. Sélectionnez « oui » pour désactiver les e-mails pour tous les utilisateurs. Sélectionnez « non responsables » pour désactiver les e-mails uniquement pour les utilisateurs qui ne sont pas des responsables."
     strip_images_from_short_emails: "Retirer les images des e-mails dont la taille est inférieure à 2 800 octets"
     short_email_length: "Définissez la longueur maximale, en octets, pour qu'un e-mail soit classé comme « court » pour la suppression de l'image. Si la taille d'un e-mail ne dépasse pas ce paramètre, toutes les images (telles que les avatars et les émojis) contenues dans l'e-mail seront supprimées."
     display_name_on_email_from: "Afficher les noms complets dans le champ « De » des e-mails"
@@ -2371,7 +2366,6 @@ fr:
     dashboard_hidden_reports: "Permettre de masquer les rapports du tableau de bord."
     dashboard_visible_tabs: "Choisissez les onglets visibles sur le tableau de bord."
     dashboard_general_tab_activity_metrics: "Sélectionnez les rapports à afficher comme indicateurs d'activité dans l'onglet général."
-    gravatar_enabled: "Utilisez le service <a href='https://gravatar.com/'>Gravatar</a> pour les avatars des utilisateurs. Cela empêchera les utilisateurs de passer à Gravatar pour leurs avatars, mais cela n'affectera pas les utilisateurs qui l'utilisent déjà."
     gravatar_name: "Spécifiez le nom du fournisseur de services Gravatar. Ce nom est généralement utilisé pour identifier la source fournissant des avatars Gravatar au site."
     gravatar_base_url: "Spécifiez l'URL d'accès à l'API du fournisseur Gravatar. Ce paramètre est essentiel pour convertir les adresses e-mail en URL Gravatar dans lesquelles les images d'avatar sont stockées."
     gravatar_login_url: "URL relative à gravatar_base_url, qui fournit à l'utilisateur la connexion au service Gravatar."
@@ -2452,12 +2446,6 @@ fr:
       reply_by_email_disabled: "Vous devez d'abord activer « reply by email » avant d'activer ce paramètre."
       discourse_connect_url_is_empty: "Avant d'activer ce paramètre, vous devez d'abord définir le paramètre « discourse connect url »."
       enable_local_logins_disabled: "Vous devez d'abord activer « enable local logins » avant d'activer ce paramètre."
-      min_username_length_exists: "Il n'est pas possible de définir une longueur minimale de nom d'utilisateur qui soit plus longue qu'un nom d'utilisateur qui existe déjà (%{username})."
-      min_group_name_length_exists: "Vous ne pouvez pas définir une longueur minimale de nom d'utilisateur supérieure au nom de groupe le plus court (%{group_name})."
-      min_username_length_range: "Il n'est pas possible de définir un minimum plus grand qu'un maximum."
-      max_username_length_exists: "Il n'est pas possible de définir une longueur maximale de nom d'utilisateur qui soit plus courte qu'un nom d'utilisateur qui existe déjà (%{username})."
-      max_group_name_length_exists: "Vous ne pouvez pas définir une longueur maximale de nom d'utilisateur inférieure au nom de groupe le plus long (%{group_name})."
-      max_username_length_range: "Il n'est pas possible de définir un maximum plus petit que le minimum."
       invalid_hex_value: "Les valeurs de couleurs doivent être au format hexadécimal à 6 chiffres."
       empty_selectable_avatars: "Vous devez d'abord envoyer au moins deux avatars sélectionnables avant d'activer ce paramètre."
       category_search_priority:
@@ -2516,7 +2504,6 @@ fr:
       exclude_tag: "Exclure les sujets avec une étiquette spécifique"
       exclude_tags_any: "Exclure les sujets avec l'une des étiquettes spécifiées (séparés par des virgules)"
       exclude_tags_all: "Exclure les sujets comportant toutes les étiquettes spécifiées (séparées par des plus)"
-      tags_alias: "Alias pour le filtre « tag : »"
       tag_group: "Afficher les sujets dont les étiquettes appartiennent à un groupe de balises spécifique"
       exclude_tag_group: "Exclure les sujets comportant des balises d'un groupe de balises spécifique"
       activity_before: "Afficher les sujets dont la dernière activité est antérieure à une date (YYYY-MM-DD ou il y a quelques jours)"
@@ -4912,8 +4899,6 @@ fr:
     deprecation_error_label: Faire en sorte que les dépréciations de Javascript génèrent une erreur
     enter: "Activer le mode sans échec"
     must_select: "Vous devez sélectionner au moins une option pour activer le mode sans échec."
-  dev_mode:
-    enter: "Entrée"
   wizard:
     title: "Configuration de Discourse"
     step:
@@ -5171,8 +5156,6 @@ fr:
       approve_and_unhide:
         title: "Oui"
         complete: "Publication approuvée et visible"
-      no_action_post:
-        title: "Aucune action"
       delete_post:
         title: "Supprimer la publication"
         complete: "Publication supprimée"
@@ -5181,8 +5164,6 @@ fr:
       restore_post:
         title: "Rétablir le message"
         complete: "Publication restaurée"
-      no_action_user:
-        title: "Aucune action"
       silence_user:
         title: "Désactiver l'utilisateur"
         complete: "Utilisateur mis en sourdine"
diff --git a/config/locales/server.gl.yml b/config/locales/server.gl.yml
index ace86820691d4..e085d6a67719f 100644
--- a/config/locales/server.gl.yml
+++ b/config/locales/server.gl.yml
@@ -1316,7 +1316,6 @@ gl:
     allowed_crawler_user_agents: "Axentes de usuario de rastreadores web aos que se lles debería permitir o acceso ao sitio. AVISO! AO CONFIGURAR ISTO, VETARÁ TODOS OS RASTREXADORES NON LISTADOS AQUÍ!"
     blocked_crawler_user_agents: "Palabra única insensíbel a maiúsculas e minúsculas na cadea de axente de usuario que identifica rastrexadores web que non deberían ter permitido o acceso ao sitio. Non se lle aplica se está definida a listaxe de permitidos."
     slow_down_crawler_rate: "Se slow_down_crawler_user_agents está especificado, este valor aplicarase a todos os rastrexadores (número de segundos de demora entre respostas)"
-    content_security_policy_collect_reports: "Activar a recolección de informes de violación de CSP en /csp_reports"
     content_security_policy_frame_ancestors: "Restrinxir quen pode incorporar este sitio en iframes mediante CSP. O control de servidores permitidos en <a href='%{base_path}/admin/customize/embedding'>Incorporación</a>"
     invalidate_inactive_admin_email_after_days: "As contas administrativas que non visiten o sitio neste número de días terán que volver validar o seu enderezo electrónico antes de iniciar sesión. Estabelecer en 0 para desactivalo."
     share_links: "Determinar que elementos aparecen no cadro de compartir e en que orde."
@@ -1529,7 +1528,6 @@ gl:
     alternative_reply_by_email_addresses: "Lista de modelos alternativos para responder a enderezos de correo electrónico entrantes. Exemplo: %%{reply_key}@reply.example.com|respostas+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Utilizar HTML no canto de texto para o correo entrante."
     strip_incoming_email_lines: "Retirar os espazos en branco iniciais e finais de cada liña de correos electrónicos entrantes."
-    disable_emails: "Evita que Discourse envíe calquera clase de correo electrónico. Seleccione «si» para desactivar os correos electrónicos a todos os usuarios. Seleccione «non do equipo» para desactivar os correos electrónicos só para usuarios que non sexan do equipo."
     strip_images_from_short_emails: "Elimina as imaxes de correos electrónicos que teñan un tamaño inferior a 2800 bytes"
     display_name_on_email_from: "Amosar nomes completos nos campos de remitente do correo"
     unsubscribe_via_email: "Permitir aos usuarios darse de baixa dos correos electrónicos ao responder co texto «cancelar subscrición» no asunto ou no corpo da mensaxe"
@@ -1734,10 +1732,6 @@ gl:
       reply_by_email_disabled: "Primeiro debe activar «responder vía correo electrónico» antes de activar esta opción."
       discourse_connect_url_is_empty: "Debe estabelecer un «URL de discourse connect» antes de activar este axuste."
       enable_local_logins_disabled: "Debe activar primeiro «activar inicios de sesión locais» antes de activar esta opción."
-      min_username_length_exists: "Non pode estabelecer que a largura mínima do nome de usuario sexa maior có nome de usuario máis curto (%{username})."
-      min_username_length_range: "O mínimo non pode ser maior que o máximo."
-      max_username_length_exists: "Non pode estabelecer que a largura máxima do nome de usuario sexa menor que o nome de usuario máis longo (%{username})."
-      max_username_length_range: "Non pode estabelecer o máximo por debaixo do mínimo."
       invalid_hex_value: "Os valores das cores deben ser códigos de 6 díxitos hexadecimais."
       empty_selectable_avatars: "Debe subir polo menos dous avatares seleccionables antes de activar esta opción."
       category_search_priority:
@@ -3399,8 +3393,6 @@ gl:
     title: "Entrar en modo seguro"
     enter: "Entrar en modo seguro"
     must_select: "Debe seleccionar polo menos unha opción para entrar no modo seguro."
-  dev_mode:
-    enter: "Intro"
   wizard:
     title: "Configuración de Discourse"
     step:
@@ -3523,12 +3515,8 @@ gl:
         title: "Si"
       approve_and_unhide:
         title: "Si"
-      no_action_post:
-        title: "Sen acción"
       delete_post:
         complete: "Publicación eliminada"
-      no_action_user:
-        title: "Sen acción"
       delete_user:
         complete: "Usuario eliminado"
         reason: "Eliminado a través da cola de revisións"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 210e312fa0a09..e2f14e05ee8f6 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -60,8 +60,6 @@ he:
   inline_oneboxer:
     topic_page_title_post_number: "מס׳ %{post_number}"
     topic_page_title_post_number_by_user: "מס׳ %{post_number} מאת %{username}"
-    too_many_urls: "אי אפשר להכניס יותר מ־10 קישורים לתיבה תוחמת בבקשה אחת."
-    concurrency_not_allowed: "אי אפשר לשלוח בקשות להטמעת תיבות תוחמות במקביל. נא לשלוח בקשה אחת כל פעם."
   components:
     enabled_filter: "פעיל"
     disabled_filter: "כבוי"
@@ -398,7 +396,6 @@ he:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "סוכני משתמש חייבים להיות באורך של 3 תווים לפחות כדי למנוע הגבלה בשוגג של כמות פניות ממשתמשים תקפים."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "אי אפשר להוסיף אף אחת מהערכים הבאים להגדרה: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "אי אפשר להשבית הפשטת נתוני על מתמונה אם האפשרות ‚תמונת מיטוב מדיה בכתיבת הודעה פעילה’ פעילה. יש להשבית את האפשרות בטרם השבתת הפשטת נתוני על מתמונה."
-      x_summary_large_image_no_svg: "תמונות התקציר של טוויטר שמשמשות לנתוני העל של twitter:image לא יכולות להיות תמונת ‎.svg"
       tl0_and_anonymous_flag: "יש לספק ‚דוא״ל קשר עם האתר’ או ‚כתובת דוא״ל לדיווח על תוכן לא חוקי’ למשתמשים אלמוניים."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "ההגדרה הזאת דורשת את הפעלת ההגדרה ‚לאפשר מצב אלמוני’ תחילה."
     conflicting_google_user_id: 'מזהה חשבון ה־Google לחשבון זה השתנה, התערבות של חבר סגל נדרשת מטעמי אבטחה. נא ליצור קשר עם אחד מחברי הסגל ולהפנות אותו אל <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1944,7 +1941,6 @@ he:
     slow_down_crawler_rate: "אם הוגדר slow_down_crawler_user_agents (האטת סורקי אינטרנט) קצב זה יחול על כל סורקי האינטרנט (כמות ההמתנה בשניות בין בקשות)"
     content_security_policy: "אפשר מדיניות תוכן-אבטחה (CSP). CSP הוא שכבת אבטחה נוספת שעוזרת למנוע סוגים מסוימים של התקפות, כולל Cross Site Scripting (XSS) והזרקת נתונים."
     content_security_policy_report_only: "הפעלת Content-Security-Policy-Report-Only (מדיניות אבטחת תוכן בדיווח בלבד - CSP)"
-    content_security_policy_collect_reports: "הפעלת איסוף דוחות הפרה של CSP (מדיניות אבטחת תוכן) תחת ‎/csp_reports"
     content_security_policy_frame_ancestors: "להגביל מי יכול להטמיע את האתר הזה עם מסגרות iframes דרך CSP. ניתן לשלוח במארחים המורשים דרך <a href='%{base_path}/admin/customize/embedding'>הטמעה</a>"
     content_security_policy_script_src: "מקורות סקריפט נוספים ברשימת ההיתרים. השרת המקומי וה-CDN כלולים כברירת מחדל. ראה <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>הגבלת התקפות XSS עם מדיניות אבטחת תוכן.</a> (CSP). מקורות שרת מקומי יתעלמו שכן strict-dynamic מופעל."
     invalidate_inactive_admin_email_after_days: "חשבונות מנהלים שלא ביקרו באתר מעל כמות כזו של ימים יאלצו לאמת מחדש את כתובת הדוא״ל שלהם כדי לשוב ולהיכנס. להגדיר כ־0 כדי להשבית."
@@ -2030,7 +2026,6 @@ he:
     enable_local_logins_via_email: "לאפשר למשתמשים לבקש לשלוח אליהם קישור לכניסה בלחיצה אחת בדוא״ל."
     allow_new_registrations: "לאפשר הרשמות של משתמשים חדשים. יש לבטל סימון זה כדי למנוע יצירת חשבונות חדשים."
     enable_signup_cta: "להציג מודעה למשתמשים אלמוניים חוזרים שמציעה להם להירשם כדי לקבל חשבון."
-    enable_discourse_id: "הפעלת אימות דרך Discourse ID, שירות כניסה אחודה שמאפשר למשתמשים להיכנס למגוון אתרי Discourse עם חשבון אחד. ספקי כניסה נפוצים כגון Google,‏ Facebook,‏ Apple ו־GitHub נתמכים בלי הגדרות נוספות. בכתובת <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a> אפשר למצוא פרטים נוספים."
     enable_google_oauth2_logins: "להפעיל אימות עם Oauth2 מול Google. זו שיטת האימות שכרגע נתמכת מול Google. דורשת מפתח וסוד. יש לעיין ב<a href='https://meta.discourse.org/t/15858' target='_blank'>הגדרת כניסה עם Google ל־Discourse</a>."
     google_oauth2_client_id: "מזהה הלקוח הייחודי שסופק על ידי יישום ה־Google שלך, המשמש לתהליך האימות."
     google_oauth2_client_secret: "קוד סודי של לקוח (client secret) של אפליקציית Google."
@@ -2269,7 +2264,6 @@ he:
     alternative_reply_by_email_addresses: "רשימה של כמה תבניות לתגובות בדוא״ל באמצעות כתובות דוא״ל נכנסות. למשל: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "להשתמש ב־HTML במקום בטקסט בהודעות דוא״ל נכנסות."
     strip_incoming_email_lines: "להסיר רווחים מובילים וסוגרים בכל שורה בהודעות דוא״ל נכנסות."
-    disable_emails: "למנוע מ־Discourse לשלוח כל סוג של הודעות דוא״ל. יש לבחור ב־‚כן’ כדי להשבית את כל הודעות הדוא״ל לכל המשתמשים. ניתן גם לבחור ב־‚ללא סגל’ כדי להשבית את ההודעות למשתמשים שאינם נמנים עם הסגל."
     strip_images_from_short_emails: "הסרת תמונות מהודעות דוא״ל שגודלן אינו עולה על 2800 בתים"
     short_email_length: "הגדרת האורך המרבי, בבתים, לסיווג הודעת דוא״ל כ‚קצרה’ כדי להדחיק תמונות. אם גודל של הודעת דוא״ל לא חורג מהערך הזה, תמונות כלשהן (כגון תמונות ייצוגיות ואמוג׳ים) בהודעות הדוא״ל תוסרנה."
     display_name_on_email_from: "להציג שמות מלאים בשדה „מאת” בדוא״ל"
@@ -2555,7 +2549,6 @@ he:
     dashboard_hidden_reports: "לאפשר להסתיר את הדוחות המסוימים בלוח הבקרה."
     dashboard_visible_tabs: "נא לבחור אילו לשוניות תופענה בלוח הבקרה."
     dashboard_general_tab_activity_metrics: "נא לבחור דיווחים שיופיעו בתור מדדי פעילות בלשונית הכללית."
-    gravatar_enabled: "אפשר להשתמש בשירות <a href='https://gravatar.com/'>Gravatar</a> לתמונות ייצוגיות של משתמשים. ההגדרה הזאת תמנע ממשתמשים לעבור ל־Gravatar עבור התמונות ייצוגיות שלהם, אך לא תשפיע על משתמשים שכבר עשו זאת."
     gravatar_name: "נא לציין את שם ספק שירות Gravatar. השם הזה בדרך כלל ישמש לזיהוי ספק מקור תמונות ה־Gravatar הייצוגיות באתר."
     gravatar_base_url: "נא לציין את כתובת הגישה ל־API של ספק Gravatar. ההגדרה הזאת הכרחית להמרת כתובות דוא״ל לכתובות Gravatar בה מאוחסנות התמונות הייצוגיות."
     gravatar_login_url: "כתובת ביחס אל `gravatar_base_url` (כתובת הבסיס של Gravatar) שמספקת למשתמש גישה לשירות Gravatar."
@@ -2644,12 +2637,6 @@ he:
       reply_by_email_disabled: "עליך להפעיל את ‚תגובה בדוא״ל’ בטרם הפעלת הגדרה זו."
       discourse_connect_url_is_empty: "עליך להגדיר ‚כתובת discourse connect’ בטרם הפעלת הגדרה זו."
       enable_local_logins_disabled: "עליך תחילה להפעיל את ‚הפעלת כניסה מקומית’ בטרם הפעלת הגדרה זו."
-      min_username_length_exists: "לא ניתן להגדיר את האורך המזערי לשם המשתמש לפחות תווים מאשר שם המשתמש הקצר ביותר במערכת (%{username})."
-      min_group_name_length_exists: "לא ניתן להגדיר את האורך המזערי לשם המשתמש ליותר תווים מאשר שם הקבוצה הקצר ביותר (%{group_name})."
-      min_username_length_range: "לא ניתן לקבוע את המינימום מעל המקסימום."
-      max_username_length_exists: "לא ניתן להגדיר את האורך המרבי לשם המשתמש ליותר תווים מאשר שם המשתמש הארוך ביותר במערכת (%{username})."
-      max_group_name_length_exists: "לא ניתן להגדיר את האורך המרבי לשם המשתמש לפחות תווים מאשר שם הקבוצה הארוך ביותר (%{group_name})."
-      max_username_length_range: "לא ניתן לקבוע את המקסימום מתחת למינימום."
       invalid_hex_value: "ערכי הצבעים חייבים להיות קודים הקסדצימליים באורך 6 תווים."
       empty_selectable_avatars: "עליך להעלות שתי תמונות ייצוגיות לפחות כדי לבחור ביניהן לפני הפעלת האפשרות הזאת."
       category_search_priority:
@@ -2709,7 +2696,6 @@ he:
       exclude_tag: "החרגת נושאים עם תגית מסוימת"
       exclude_tags_any: "החרגת נושאים עם לפחות אחת מבין התגיות שצוינו (מופרדות בפסיקים)"
       exclude_tags_all: "החרגת נושאים עם כל התגיות שצוינו (מופרדים בפלוס)"
-      tags_alias: "כינוי למסנן ‚tag:‎’"
       tag_group: "הצגת נושאים עם תגיות מקבוצת תגיות מסוימת"
       exclude_tag_group: "החרגת נושאים עם תגיות מקבוצת תגיות מסוימת"
       activity_before: "הצגת נושאים עם פעילות אחרונה לפני תאריך (YYYY-MM-DD או כמות ימים לפני)"
@@ -5180,8 +5166,6 @@ he:
     deprecation_error_label: לגרום להשבתות נקודתיות של JavaScript לעורר שגיאה
     enter: "כנסו למצב בטוח"
     must_select: "עליך לבחור באפשרות אחת לפחות כדי להיכנס למצב בטוח."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "הקמת Discourse"
     step:
@@ -5458,10 +5442,6 @@ he:
         complete: "הפוסט אושר והוצג מחדש"
       post_actions:
         bundle_title: "מה לעשות עם הפוסט?"
-      no_action_post:
-        title: "אין פעולה"
-        description: "לא לנקוט בפעולה על הפוסט"
-        complete: "לא ננקטה פעולה על הפוסט"
       delete_post:
         title: "מחיקת פוסט"
         description: "למחוק את הפוסט הזה"
@@ -5482,16 +5462,8 @@ he:
         title: "עריכת פוסט"
         description: "עריכת תוכן הפוסט הזה"
         complete: "פוסט נערך"
-      convert_to_pm:
-        title: "המרה להודעה פרטית"
-        description: "להמיר את הפוסט הזה להודעה פרטית"
-        complete: "הפוסט הומר להודעה פרטית"
       user_actions:
         bundle_title: "מה לעשות עם המשתמש/ת?"
-      no_action_user:
-        title: "אין פעולה"
-        description: "לא לנקוט בפעולות נגד המשתמש/ת"
-        complete: "לא לנקוט בפעולה נגד המשתמש/ת"
       silence_user:
         title: "השתקת משתמש"
         description: "למנוע מהמשתמש/ת לפרסם"
diff --git a/config/locales/server.hr.yml b/config/locales/server.hr.yml
index 246a504fb57b8..2c20c9deb58d1 100644
--- a/config/locales/server.hr.yml
+++ b/config/locales/server.hr.yml
@@ -2750,8 +2750,6 @@ hr:
       help: "Za početak registrirajte novi korisnički račun."
     resend_email:
       title: "Ponovno pošaljite e-poštu za aktivaciju"
-  dev_mode:
-    enter: "Unesi"
   wizard:
     step:
       setup:
@@ -2854,13 +2852,9 @@ hr:
         title: "Da"
       approve_and_unhide:
         title: "Da"
-      no_action_post:
-        title: "Nema akcije"
       delete_post:
         title: "Izbrišite objavu"
         complete: "Post izbrisan"
-      no_action_user:
-        title: "Nema akcije"
       delete_user:
         complete: "Korisnik izbrisan"
   fallback_username: "korisnik"
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index d066fb2a9fa10..5debd17a1990c 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -60,8 +60,6 @@ hu:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} általa: %{username}"
-    too_many_urls: "Egy kérelemben nem lehet 10-nél több URL-címet beilleszteni."
-    concurrency_not_allowed: "Egyidejű beágyazott egydobozos kérések nem engedélyezettek. Kérjük, egyszerre egy kérést küldjön."
   components:
     enabled_filter: "Engedélyezed"
     disabled_filter: "Kikapcsolt"
@@ -347,7 +345,6 @@ hu:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "A felhasználói ügynököknek legalább 3 karakter hosszúaknak kell lenniük, hogy elkerüljék a jogos felhasználók véletlen sebességkorlátozását."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "A következő értékek egyikét sem adhatja hozzá a beállításhoz: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Nem lehet letiltani a szalagkép metaadatait, ha a composer médiaoptimalizáló kép engedélyezve van. Kapcsolja ki ezt az opciót, mielőtt letiltaná a szalagkép metaadatokat."
-      x_summary_large_image_no_svg: "A twitter:image metaadatokhoz használt Twitter összefoglaló képek nem lehetnek .svg képek."
       tl0_and_anonymous_flag: "A névtelen felhasználók számára meg kell adni a „webhely kapcsolatfelvételi e-mail-címét” vagy „az illegális tartalom bejelentéséhez szükséges e-mail-címet”."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Ehhez a beállításhoz először engedélyezni kell az 'anonim mód engedélyezése' beállítást."
     conflicting_google_user_id: 'A fiók Google-fiók azonosítója megváltozott; biztonsági okokból a személyzet beavatkozása szükséges. Kérjük, lépjen kapcsolatba a személyzettel, és mutassa meg nekik a következő címet: <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1805,7 +1802,6 @@ hu:
     llms_txt: "Töltsön fel egy szöveges fájlt, amely az /llms.txt útvonalon lesz elérhető az LLM-robotok (crawlerek) számára. További információért látogasson el az <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a> oldalra."
     content_security_policy: "Engedélyezze a Tartalombiztonsági Szabályzatot (Content-Security-Policy, CSP). A CSP egy további biztonsági réteg, amely segít megelőzni bizonyos típusú támadásokat, beleértve a keresztoldali szkriptelést (Cross Site Scripting, XSS) és az adatbefecskendezést."
     content_security_policy_report_only: "Engedélyezze a Tartalombiztonsági Szabályzat Csak Jelentés Módját (CSP)"
-    content_security_policy_collect_reports: "Engedélyezze a CSP-szabálysértési jelentések gyűjtését /csp_reports címen."
     content_security_policy_frame_ancestors: "Korlátozza, ki ágyazhatja be ezt a webhelyet iframe-ekbe a CSP segítségével. Az engedélyezett kiszolgálók szabályozása a <a href='%{base_path}/admin/customize/embedding'>Beágyazás</a> oldalon történik"
     content_security_policy_script_src: "További engedélyezett szkriptforrások. Az aktuális kiszolgáló és CDN alapértelmezetten szerepel. Lásd <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>XSS támadások mérséklése Tartalombiztonsági Szabályzattal.</a> (CSP). Egyéb kiszolgálóforrások figyelmen kívül maradnak, mivel a strict-dynamic engedélyezve van."
     invalidate_inactive_admin_email_after_days: "Azok az adminisztrátori fiókok, amelyek ennyi napja nem látogatták meg a webhelyet, újra kell érvényesíteniük az e-mail címüket a bejelentkezés előtt. Állítsa 0-ra a kikapcsoláshoz."
@@ -1891,7 +1887,6 @@ hu:
     enable_local_logins_via_email: "Engedélyezze a felhasználóknak, hogy egy kattintással bejelentkezési linket kérjenek, amelyet e-mailben kapnak meg."
     allow_new_registrations: "Új felhasználók regisztrációjának engedélyezése. Vegye ki a jelölést, hogy megakadályozza, hogy bárki új fiókot hozzon létre."
     enable_signup_cta: "Mutasson értesítést a visszatérő névtelen felhasználóknak, és ajánlja fel, hogy regisztráljanak egy fiókot."
-    enable_discourse_id: "Engedélyezze a Discourse ID-n keresztüli hitelesítést, amely egy egyszeri bejelentkezési szolgáltatás, amely lehetővé teszi a felhasználók számára, hogy egyetlen fiókkal több Discourse-oldalra is bejelentkezzenek. Az olyan gyakori közösségi bejelentkezési szolgáltatók, mint a Google, a Facebook, az Apple és a Github további konfiguráció nélkül támogatottak. További részletekért lásd: <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a>."
     enable_google_oauth2_logins: "Engedélyezze a Google Oauth2 hitelesítést. A Google jelenleg ezt a hitelesítési módszert támogatja. Kulcs és titkos kód szükséges. Lásd: <a href='https://meta.discourse.org/t/15858' target='_blank'>A Google bejelentkezés konfigurálása a Discourse</a>számára."
     google_oauth2_client_id: "A Google-alkalmazás által megadott egyedi ügyfél-azonosító, amelyet a hitelesítési folyamathoz használnak."
     google_oauth2_client_secret: "A Google-alkalmazás titkos kliens kódja."
@@ -2132,7 +2127,6 @@ hu:
     alternative_reply_by_email_addresses: "Alternatív sablonok listája a bejövő e-mail-címekre történő válaszadáshoz. Példa: %%{reply_key}@reply.example.com|válaszok+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Szöveg helyett HTML-kódot használjon bejövő e-mailekhez."
     strip_incoming_email_lines: "Távolítsa el a kezdő és a záró szóközöket a bejövő e-mailek minden sorából."
-    disable_emails: "Megakadályozza, hogy a Discourse bármilyen típusú e-mailt küldjön. Válassza az „igen” lehetőséget az e-mailek letiltásához az összes felhasználó számára. Válassza a „nem személyzet” lehetőséget, ha csak a nem stábtagok számára szeretné letiltani az e-maileket."
     allow_email_invites: "Ha le van tiltva, a felhasználók nem tudnak meghívókat küldeni a Discourse-on keresztül."
     strip_images_from_short_emails: "Képek eltávolítása 2800 bájtnál kisebb méretű e-mailekből"
     short_email_length: "Határozza meg bájtban azt a maximális hosszt, amelyen egy e-mailt „rövid”-nek kell minősíteni a képelnyomás miatt. Ha egy e-mail mérete nem haladja meg ezt a beállítást, az e-mailben található képek (például avatarok és hangulatjelek) törlődnek."
@@ -2418,7 +2412,6 @@ hu:
     dashboard_hidden_reports: "Engedélyezze a megadott jelentések elrejtését a vezérlőpulton."
     dashboard_visible_tabs: "Válassza ki, hogy a vezérlőpult mely lapjai legyenek láthatóak."
     dashboard_general_tab_activity_metrics: "Válassza ki azokat a jelentéseket, amelyek aktivitási mutatóként jelenjenek meg az általános fülön."
-    gravatar_enabled: "Használd a <a href='https://gravatar.com/'>Gravatar</a> szolgáltatást a felhasználói avatarokhoz. Ez megakadályozza, hogy a felhasználók a Gravatarra váltsanak avatarjaikhoz, de nem befolyásolja azokat a felhasználókat, akik már használják azt."
     gravatar_name: "Adja meg a Gravatar szolgáltató nevét. Ezt a nevet általában a Gravatar avatarokat biztosító forrás azonosítására használják a webhelyen."
     gravatar_base_url: "Adja meg a Gravatar szolgáltató API-jának elérési URL-jét. Ez a beállítás kulcsfontosságú az e-mail címek Gravatar URL-é alakításához, ahol az avatar képek tárolva vannak."
     gravatar_login_url: "A `gravatar_base_url`-hez viszonyított URL, amely lehetővé teszi a felhasználónak, hogy bejelentkezzen a Gravatar szolgáltatásba."
@@ -2514,12 +2507,6 @@ hu:
       reply_by_email_disabled: "A beállítás engedélyezése előtt először engedélyeznie kell a „válasz e-mailben” funkciót."
       discourse_connect_url_is_empty: "Először be kell állítania egy 'discourse connect url'-t, mielőtt engedélyezné ezt a beállítást."
       enable_local_logins_disabled: "Először engedélyeznie kell a 'helyi bejelentkezések engedélyezése' opciót, mielőtt ezt a beállítást engedélyezné."
-      min_username_length_exists: "Nem állíthatja a felhasználónév minimális hosszát a legrövidebb felhasználónév (%{username}) fölé."
-      min_group_name_length_exists: "A minimális felhasználónévhossz nem állítható a legrövidebb csoportnév (%{group_name}) fölé."
-      min_username_length_range: "Nem lehet a legnagyobb értéknél nagyobb legkisebb értéket beállítani."
-      max_username_length_exists: "Nem állíthatja a felhasználónév maximális hosszát a leghosszabb felhasználónév (%{username}) alá."
-      max_group_name_length_exists: "A felhasználónév maximális hossza nem állítható a leghosszabb csoportnév (%{group_name}) alá."
-      max_username_length_range: "Nem lehet a legkisebb értéknél kisebb legnagyobb értéket beállítani."
       invalid_hex_value: "A színértékeknek 6 számjegyű hexadecimális kódoknak kell lenniük."
       empty_selectable_avatars: "A beállítás engedélyezése előtt fel kell töltened legalább két választható avatart."
       category_search_priority:
@@ -2582,7 +2569,6 @@ hu:
       exclude_tag: "Egy adott címkével rendelkező témák kizárása"
       exclude_tags_any: "Kizárja a megadott címkék bármelyikét tartalmazó témákat (vesszővel elválasztva)."
       exclude_tags_all: "Kizárja a megadott címkékkel rendelkező témákat (plusz-szeparált)"
-      tags_alias: "A „tag:” szűrő álneve"
       tag_group: "Témák megjelenítése egy adott címkecsoport címkéivel"
       exclude_tag_group: "Címkékkel ellátott témák kizárása egy adott címkecsoportból"
       activity_before: "Mutassa a témákat, amelyek utolsó aktivitása egy adott dátum előtt (ÉÉÉÉ-HH-NN vagy nappal ezelőtt) történt"
@@ -5011,7 +4997,6 @@ hu:
   dev_mode:
     title: "Fejlesztői mód"
     enable_rack_mini_profiler: "Engedélyezze a Rack Mini Profiler 1 órás megőrzését a munkamenet-változások között"
-    enter: "Belépés"
   wizard:
     title: "Discourse telepítő"
     step:
@@ -5307,10 +5292,6 @@ hu:
         complete: "Bejegyzés jóváhagyva és felfedve"
       post_actions:
         bundle_title: "Mit akarsz csinálni a bejegyzéssel?"
-      no_action_post:
-        title: "Nincs művelet"
-        description: "Ne tegyen semmit a bejegyzéssel kapcsolatban"
-        complete: "Nem történt intézkedés a bejegyzéssel kapcsolatban"
       delete_post:
         title: "Bejegyzés törlése"
         description: "Bejegyzés törlése"
@@ -5331,16 +5312,8 @@ hu:
         title: "Bejegyzés szerkesztése"
         description: "A bejegyzés tartalmának szerkesztése"
         complete: "Bejegyzés szerkesztve"
-      convert_to_pm:
-        title: "Átalakít PÜ-re"
-        description: "Alakítsa át ezt a bejegyzést személyes üzenetté"
-        complete: "Bejegyzés személyes üzenetté alakítva"
       user_actions:
         bundle_title: "Mit szeretnél csinálni a felhasználóval?"
-      no_action_user:
-        title: "Nincs művelet"
-        description: "Ne tegyen lépéseket a felhasználó ellen"
-        complete: "Nem történt intézkedés a felhasználó ellen"
       silence_user:
         title: "Felhasználó némítása"
         description: "Felhasználó letiltása a posztolásról"
diff --git a/config/locales/server.hy.yml b/config/locales/server.hy.yml
index 66be9fddc1eef..8b0787d3319a0 100644
--- a/config/locales/server.hy.yml
+++ b/config/locales/server.hy.yml
@@ -1126,7 +1126,6 @@ hy:
     blocked_ip_blocks: "Մասնավոր IP արգելափակումների ցանկ, որոնք երբեք չպետք է ենթարկվեն տվյալների հավաքագրման Discourse-ի կողմից:"
     allowed_internal_hosts: "Ներքին հոսթերի ցանկ, որը discourse-ը կարող է ապահով հավաքագրել սմարթ-ներդիրի և այլ նպատակների համար"
     slow_down_crawler_rate: "Եթե slow_down_crawler_user_agents -ը որոշված է, այս գնահատականը կկիրառվի տվյալների բոլոր հավաքագրիչների նկատմամբ (հարցումների միջև դադարի վայրկյանների քանակը)"
-    content_security_policy_collect_reports: "Միացնել CSP խախտումների հաշվետվությունների հավաքածուն /csp_reports -ում"
     invalidate_inactive_admin_email_after_days: "Ադմինի հաշիվները, որոնք չեն այցելել կայք այսքան օրվա ընթացքում, պետք է վերա-վավերացնեն իրենց էլ. հասցեն մինչ մուտք գործելը: Սահմանեք 0 անջատելու համար:"
     share_links: "Որոշեք, թե որ տարրերն են հայտնվելու կիսման երկխոսության մեջ և ինչ հերթականությամբ:"
     site_contact_username: "Անձնակազմի որևէ վավեր օգտանուն, որից պետք է ուղարկվեն բոլոր ավտոմատ հաղորդագրությունները: Դատարկ թողնելու դեպքում կօգտագործվի Համակարգի լռելյայն հաշիվը:"
@@ -1290,7 +1289,6 @@ hy:
     reply_by_email_address: "Էլ. փոստի միջոցով պատասխանի մուտքային էլ. հասցեների ձևանմուշ, օրինակ՝ %%{reply_key}@reply.example.com կամ replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "Էլ. նամակի միջոցով պատասխանի համար մուտքային հասցեների այլընտրանքային ձևանմուշների ցանկ: Օրինակ՝ %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Մուտքային նամակի համար տեսքտի փոխարեն օգտագործեք HTML:"
-    disable_emails: "Կանխարգելել Discourse-ը՝ ցանկացած տիպի նամակ ուղարկելուց: Ընտրեք 'այո' ՝ բոլոր օգտատերերի համար էլ. նամակներն անջատելու համար: Ընտրեք 'ոչ-անձնակազմ' ՝ միայն ոչ-անձնակազմի օգտատերերի համար էլ. նամակներն անջատելու համար:"
     strip_images_from_short_emails: "Էլ. նամակներից առանձնացնել 2800 Բայթից քիչ չափ ունեցող նկարները"
     display_name_on_email_from: "Դաշտերից ցուցադրել նամակում ամբողջական անունները"
     unsubscribe_via_email: "Թույլատրել օգտատերերին դուրս գալ էլ. նամակների բաժանորդագրումից՝ ուղարկելով էլ. նամակ, որը կպարունակի 'unsubscribe' թեմայում կամ տեքստի մեջ"
@@ -1438,10 +1436,6 @@ hy:
       staged_users_disabled: "Դուք պետք է սկզբում միացնեք 'staged users' ՝ մինչև այս կարգավորումը միացնելը"
       reply_by_email_disabled: "Դուք պետք է սկզբում միացնեք 'reply by email'' ՝ մինչև այս կարգավորումը միացնելը"
       enable_local_logins_disabled: "Դուք պետք է սկզբում միացնեք 'enable local logins' ՝ մինչև այս կարգավորումը միացնելը"
-      min_username_length_exists: "Դուք չեք կարող սահմանել օգտանվան նվազագույն երկարություն ամենակարճ օգտանունից բարձր (%{username})"
-      min_username_length_range: "Դուք չեք կարող սահմանել նվազագույնը առավելագույնից բարձր:"
-      max_username_length_exists: "Դուք չեք կարող սահմանել օգտանվան առավելագույն երկարություն ամենաերկար օգտանունից ցածր (%{username}):"
-      max_username_length_range: "Դուք չեք կարող սահմանել առավելագույնը նվազագույնից ցածր:"
       invalid_hex_value: "Գույների արժեքները պետք է լինեն 6-նիշանոց տասնվեցերորդական կոդեր:"
     placeholder:
       discourse_connect_provider_secrets:
@@ -2734,8 +2728,6 @@ hy:
     title: "Մուտք գործել անվտանգ ռեժիմ"
     enter: "Մուտք գործել Ապահով Ռեժիմ"
     must_select: "Դուք պետք է ընտրեք առնվազն մեկ տարբերակ՝ անվտանգ ռեժիմ մուտք գործելու համար:"
-  dev_mode:
-    enter: "Մուտք"
   wizard:
     title: "Discourse Տեղադրում"
     step:
@@ -2844,12 +2836,8 @@ hy:
         title: "Այո"
       approve_and_unhide:
         title: "Այո"
-      no_action_post:
-        title: "Առանց գործողության"
       delete_post:
         complete: "Գրառումը ջնջված է"
-      no_action_user:
-        title: "Առանց գործողության"
       delete_user:
         complete: "Օգտատերը ջնջված է"
   fallback_username: "օգտատեր"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index 8fb90b336ac0c..ed6f496e0e333 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -209,7 +209,6 @@ id:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Agen pengguna harus memiliki panjang minimal 3 karakter untuk menghindari pengguna sah yang secara tidak sengaja dibatasi lajunya."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Anda tidak dapat menambahkan salah satu nilai berikut ke setelan: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Anda tidak dapat menonaktifkan metadata gambar strip jika 'composer media optimization image enabled' diaktifkan. Nonaktifkan 'composer media optimization image enabled' sebelum menonaktifkan metadata gambar strip."
-      x_summary_large_image_no_svg: "Gambar ringkasan Twitter yang digunakan untuk twitter:image metadata tidak boleh berupa gambar .svg."
     conflicting_google_user_id: 'ID Akun Google untuk akun ini telah berubah; intervensi staf diperlukan untuk alasan keamanan. Silakan hubungi staf dan arahkan mereka ke <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
     onebox:
       invalid_address: "Maaf, kami tidak dapat membuat pratinjau untuk halaman web ini karena server '%{hostname}' tidak dapat ditemukan. Alih-alih pratinjau, hanya tautan yang akan muncul di post Anda. :cry:"
@@ -1261,8 +1260,6 @@ id:
       invalid_email: "Alamat email tidak valid."
       invalid_csp_script_src: "Nilai harus berupa 'unsafe-eval' atau 'wasm-unsafe-eval', atau dalam bentuk '<hash algorithm>-<base64 value>' dengan algoritma hash yang didukung adalah sha256, sha384, atau sha512. Pastikan masukan Anda diapit tanda kutip tunggal."
       email_polling_disabled: "Anda harus mengaktifkan polling POP3 manual atau mengaktifkan poller email khusus sebelum mengaktifkan balasan melalui email."
-      min_username_length_range: "Anda tidak boleh menentukan minimum lebih dari maksimum."
-      max_username_length_range: "Anda tidak bisa menentukan jumlah maksimum dibawah jumlah minimum."
       invalid_uncategorized_category_setting: 'Kategori "Uncategorized" tidak dapat dipilih jika ''allow uncategorized topics'' tidak diaktifkan.'
       invalid_search_ranking_weights: "Nilai tidak valid untuk setelan situs search_ranking_weights. Contoh: '{0.1,0.2,0.3,1.0}'. Perhatikan bahwa nilai maksimum untuk setiap bobot adalah 1,0."
   search:
@@ -1758,8 +1755,6 @@ id:
     description: "Mode aman memungkinkan Anda menguji situs Anda tanpa memuat tema atau penyesuaian plugin client-side. Penyesuaian plugin server-side tetap diaktifkan."
     no_unofficial_plugins: "Nonaktifkan penyesuaian plugin client-side tidak resmi"
     no_plugins: "Nonaktifkan semua penyesuaian plugin client-side"
-  dev_mode:
-    enter: "Enter"
   wizard:
     step:
       setup:
@@ -1874,8 +1869,6 @@ id:
         title: "Ya"
       approve_and_unhide:
         title: "Ya"
-      no_action_post:
-        title: "Tidak ada tindakan"
       delete_post:
         title: "Hapus postingan"
         complete: "Pos dihapus"
@@ -1883,8 +1876,6 @@ id:
         title: "Sembunyikan pos"
       restore_post:
         title: "Pulihkan post"
-      no_action_user:
-        title: "Tidak ada tindakan"
       silence_user:
         title: "Senyapkan pengguna"
       suspend_user:
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 6d26d9f6c682c..24a4276cf43d3 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -60,8 +60,6 @@ it:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "n°%{post_number} da %{username}"
-    too_many_urls: "Non è possibile incorporare più di 10 URL in una singola richiesta."
-    concurrency_not_allowed: "Non sono consentite richieste simultanee di inline-oneboxing. Invia una richiesta alla volta."
   components:
     enabled_filter: "Abilitati"
     disabled_filter: "Disabilitati"
@@ -344,7 +342,6 @@ it:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Gli user agent devono essere lunghi almeno 3 caratteri per evitare di limitare accidentalmente le richieste degli utenti legittimi."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Non puoi aggiungere nessuno dei seguenti valori all'impostazione: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Non è possibile disabilitare i metadati delle immagini eliminate se è abilitata l'opzione \"Ottimizzazione multimediale del compositore abilitata\". Disattiva questa opzione prima di disabilitare i metadati delle immagini eliminate."
-      x_summary_large_image_no_svg: "Le immagini di riepilogo di Twitter utilizzate per i metadati di twitter:image non possono essere immagini .svg."
       tl0_and_anonymous_flag: "Per gli utenti anonimi è necessario fornire 'site contact email' o 'email address to report illegal content'."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Per questa impostazione è necessario prima abilitare l'impostazione \"Consenti modalità anonima\"."
     conflicting_google_user_id: 'Il Google Account ID per questo account è stato modificato; per motivi di sicurezza è richiesto l''intervendo dello staff. Si prega di contattare lo staff e indirizzarli a <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1768,7 +1765,6 @@ it:
     slow_down_crawler_rate: "Se viene specificato slow_down_crawler_user_agents, tale frequenza verrà applicata a tutti i crawler (numero di secondi di ritardo tra le richieste)"
     content_security_policy: "Abilita Content-Security-Policy (CSP). CSP aggiunge un livello di sicurezza extra che contribuisce a prevenire determinati tipi di attacco informatico, tra cui Cross Site Scripting (XSS) e data injection."
     content_security_policy_report_only: "Abilita Content-Security-Policy-Report-Only (CSP)"
-    content_security_policy_collect_reports: "Abilita raccolta di report di violazioni CSP in /csp_reports"
     content_security_policy_frame_ancestors: "Limita chi può incorporare questo sito in iframes tramite CSP. Controlla gli host ammessi su <a href='%{base_path}/admin/customize/embedding'>Incorporamenti</a>"
     content_security_policy_script_src: "Sorgenti di script aggiuntivi consentite. Il server e la rete CDN in uso sono inclusi per impostazione predefinita. Consulta la sezione <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigare gli attacchi XSS con i criteri di sicurezza dei contenuti</a> (CSP). Quando è abilitata strict-dynamic, le altre sorgenti host vengono ignorate."
     invalidate_inactive_admin_email_after_days: "Gli account amministratore che non hanno visitato il sito in questo numero di giorni dovranno riconvalidare il proprio indirizzo email prima di accedere. Impostare su 0 per disabilitare."
@@ -2085,7 +2081,6 @@ it:
     alternative_reply_by_email_addresses: "Elenco dei modelli alternativi per generare gli indirizzi di risposta alle email in arrivo. Esempio: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Usa HTML al posto del testo per le email in arrivo."
     strip_incoming_email_lines: "Rimuovi gli spazi bianchi iniziali e finali da ciascuna riga di email in arrivo."
-    disable_emails: "Impedisci a Discourse di inviare qualsiasi tipo di email. Seleziona 'Sì' per disabilitare le email per tutti gli utenti. Seleziona 'non-staff' per disabilitare le email solo per gli utenti non staff."
     strip_images_from_short_emails: "Elimina le immagini dalle email aventi dimensione inferiore a 2800 Byte."
     short_email_length: "Definisci in byte la lunghezza massima entro cui un'email viene classificata come \"breve\" per il blocco immagini. Se le dimensioni dell'email non superano il valore impostato, tutte le immagini (come avatar ed emoji) presenti nell'email verranno bloccate."
     display_name_on_email_from: "Mostra nomi completi per email dai campi"
@@ -2365,7 +2360,6 @@ it:
     dashboard_hidden_reports: "Consenti di nascondere i report specificati dal dashboard."
     dashboard_visible_tabs: "Scegli quali schede del dashboard sono visibili."
     dashboard_general_tab_activity_metrics: "Scegli i report da visualizzare come metriche di attività nella scheda generale."
-    gravatar_enabled: "Utilizza il servizio <a href='https://gravatar.com/'>Gravatar</a> per gli avatar degli utenti. Questo impedirà agli utenti di passare a Gravatar per i propri avatar, ma non avrà alcun impatto sugli utenti che già lo utilizzano."
     gravatar_name: "Specifica il nome del fornitore di servizi Gravatar. Questo nome serve generalmente a identificare la sorgente che fornisce al sito gli avatar Gravatar."
     gravatar_base_url: "Definisci l'URL di accesso all'API del provider di Gravatar. Questa impostazione è necessaria per convertire gli indirizzi email negli URL di Gravatar presso cui verranno archiviate le immagini degli avatar."
     gravatar_login_url: "URL relativo a `gravatar_base_url`, che fornisce all'utente le credenziali di accesso al servizio Gravatar."
@@ -2445,12 +2439,6 @@ it:
       reply_by_email_disabled: "Devi abilitare 'reply by email' prima di attivare questa impostazione ."
       discourse_connect_url_is_empty: "È necessario definire un 'discourse connect url' prima di abilitare questa impostazione."
       enable_local_logins_disabled: "Prima di abilitare questa impostazione è necessario abilitare 'enable local logins'."
-      min_username_length_exists: "Non è possibile impostare la lunghezza minima del nome utente a un valore maggiore di quella del nome utente più breve (%{username})."
-      min_group_name_length_exists: "Non è possibile impostare la lunghezza minima del nome utente al di sopra del nome del gruppo più corto (%{group_name})."
-      min_username_length_range: "Non puoi impostare il minimo più grande del massimo."
-      max_username_length_exists: "Non è possibile impostare la lunghezza massima del nome utente a un valore inferiore di quella del nome utente più lungo (%{username})."
-      max_group_name_length_exists: "Non è possibile impostare la lunghezza massima del nome utente al di sotto del nome del gruppo più lungo (%{group_name})."
-      max_username_length_range: "Non puoi impostare il massimo inferiore al minimo."
       invalid_hex_value: "I valori di colore devono essere codici esadecimali a 6 cifre."
       empty_selectable_avatars: "Devi caricare almeno due avatar selezionabili prima di abilitare questa impostazione."
       category_search_priority:
@@ -2509,7 +2497,6 @@ it:
       exclude_tag: "Escludi argomenti con un'etichetta specifica"
       exclude_tags_any: "Escludi gli argomenti con una qualsiasi delle etichette specificate (separate da una virgola)"
       exclude_tags_all: "Escludi gli argomenti di tutte le etichette specificate (separate dal segno più)"
-      tags_alias: "Alias per il filtro 'etichetta:'"
       tag_group: "Mostra argomenti con etichetta da un gruppo di etichette specifico"
       exclude_tag_group: "Escludi argomenti con etichetta da un gruppo di etichette specifico"
       activity_before: "Mostra argomenti con ultima attività prima di una data (AAAA-MM-GG o giorni fa)"
@@ -4503,8 +4490,6 @@ it:
     deprecation_error_label: Fai in modo che le deprecazioni di Javascript generino un errore
     enter: "Avvia Modalità Sicura"
     must_select: "È necessario selezionare almeno un'opzione per accedere alla modalità sicura."
-  dev_mode:
-    enter: "Invio"
   wizard:
     title: "Configurazione Discourse"
     step:
@@ -4762,8 +4747,6 @@ it:
       approve_and_unhide:
         title: "Sì"
         complete: "Messaggio approvato e reso visibile"
-      no_action_post:
-        title: "Nessuna azione"
       delete_post:
         title: "Elimina messaggio"
         complete: "Messaggio eliminato"
@@ -4772,8 +4755,6 @@ it:
       restore_post:
         title: "Ripristina messaggio"
         complete: "Messaggio ripristinato"
-      no_action_user:
-        title: "Nessuna azione"
       silence_user:
         title: "Silenzia utente"
         complete: "Utente silenziato"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 6d051ae4d0f5e..210350b5be2b3 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -60,8 +60,6 @@ ja:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "%{username} の #%{post_number}"
-    too_many_urls: "1 つのリクエストで 10 個以上の URL をワンボックスにインライン化できません。"
-    concurrency_not_allowed: "インラインワンボックスリクエストを同時に送信できません。リクエストを 1 つずつ送信してください。"
   components:
     enabled_filter: "有効"
     disabled_filter: "無効"
@@ -141,6 +139,8 @@ ja:
         invalid_type: "%{type} は有効な型ではありません"
         humanize_not_valid_string_value: "JSON ポインター '%{property_json_pointer}' のプロパティは文字列である必要があります。"
         not_valid_string_value: "は文字列である必要があります"
+        humanize_not_valid_datetime_value: "JSON ポインター '%{property_json_pointer}' のプロパティは有効な日時である必要があります。"
+        not_valid_datetime_value: "有効な日時である必要があります"
         humanize_not_valid_integer_value: "JSON ポインター '%{property_json_pointer}' のプロパティは整数である必要があります。"
         not_valid_integer_value: "は整数である必要があります"
         humanize_not_valid_float_value: "JSON ポインター '%{property_json_pointer}' のプロパティは浮動小数点である必要があります。"
@@ -256,6 +256,7 @@ ja:
       greater_than: は %{count} より大きい値である必要があります
       greater_than_or_equal_to: は %{count} 以上である必要があります
       has_already_been_used: "はすでに使用されています"
+      in: '%{count} 内である必要があります'
       inclusion: はリストに含まれていません
       invalid: は無効です
       is_invalid: "は曖昧です。完全な文ですか？"
@@ -317,7 +318,6 @@ ja:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "ユーザーエージェントは、正当なユーザーを誤ってレート制限しないように、3 文字以上である必要があります。"
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "設定に次の値を追加することはできません: %{values}。"
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "'composer media optimization image enabled' が有効である場合、画像メタデータの削除を無効にすることはできません。画像メタデータの削除を無効にする前に、'composer media optimization image enabled' を無効にしてください。"
-      x_summary_large_image_no_svg: "twitter:image メタデータに使用される X の要約画像に .svg 画像を使用できません。"
       tl0_and_anonymous_flag: "匿名ユーザーの場合は、'site contact email' または 'email address to report illegal content' のいずれかが指定されている必要があります。"
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "この設定では、先に 'allow anonymous mode' 設定が有効になっている必要があります。"
     conflicting_google_user_id: 'このアカウントの Google アカウント ID が変更されました。セキュリティの理由により、スタッフによる介入が必要です。スタッフに連絡し、<br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a> を示してください。'
@@ -365,6 +365,7 @@ ja:
     redemption_count_less_than_max: "は %{max_redemptions_allowed} より小さい値である必要があります。"
     email_xor_domain: "メールアドレスとドメインのフィールドを同時に使用できません"
     existing_user_success: "招待は正常に引き換えられました"
+    email_invites_disabled: "招待メールの送信は無効です"
   bulk_invite:
     file_should_be_csv: "アップロードファイルは csv 形式である必要があります。"
     max_rows: "最初の %{max_bulk_invites} 件の招待が送信されました。ファイルをより小さく分割してください。"
@@ -550,6 +551,7 @@ ja:
         other: "一度に最大 %{count} 個のメールドメインをカウントできます。"
       no_invites_with_discourse_connect: "DiscourseConnect が有効である場合にのみ、登録済みユーザーを招待できます"
       no_invites_without_local_logins: "ローカルログインが無効である場合にのみ、登録済みユーザーを招待できます"
+      update_existing_users_required: "この変更は %{count} 人の既存のグループメンバーに影響します。'update_existing_users' パラメーター (ture または false) によって、新しい通知のデフォルトを既存のメンバーに適用するかどうかを指定する必要があります。"
     default_names:
       everyone: "全員"
       admins: "管理者"
@@ -745,6 +747,8 @@ ja:
       email_already_used_in_group: "'%{email}' はすでに '%{group_name}' グループに使われています。"
       email_already_used_in_category: "'%{email}' はすでに '%{category_name}' カテゴリに使われています。"
       description_incomplete: "カテゴリの説明の投稿には少なくとも 1 段落必要です。"
+      description_too_long:
+        other: "説明が長すぎます (最大 %{count} 文字)。"
       permission_conflict: "サブカテゴリにアクセスできるグループは、その親カテゴリにもアクセスできます。次のグループは、サブカテゴリの 1 つにアクセスできますが、親カテゴリにはアクセスできません: %{group_names}"
       disallowed_topic_tags: "このトピックにはこのカテゴリで許可されていないタグがあります: '%{tags}'"
       disallowed_tags_generic: "このトピックはタグを許可していません。"
@@ -958,6 +962,7 @@ ja:
     too_many_drafts:
       title: "下書きが多すぎます"
       description: "許可される下書きの最大数に達しました。一部の[下書き](%{base_url}/my/activity/drafts)を削除してからもう一度お試しください。"
+    bulk_destroy_limit: "一度に削除できる下書きは %{limit} 件までです。"
   draft_backup:
     pm_title: "進行中のトピックのバックアップ下書き"
     pm_body: "バックアップの下書きを含むトピック"
@@ -1056,10 +1061,14 @@ ja:
       every_month: "毎月"
       every_six_months: "6 か月毎"
   user_api_key:
+    title: '「%{application_name}」の承認'
     authorize: "承認"
     deny: "キャンセル"
     read: "読み取り"
     read_write: "読み取り/書き込み"
+    logged_in_as: "ログイン中:"
+    permissions_header: 'これにより、「%{application_name}」で次を行えます:'
+    redirect_warning: "承認すると次の場所にリダイレクトされます:"
     instructions: '"%{application_name}" で使用できる新しいユーザー API キーを生成しました。次のキーをアプリケーションに貼り付けてください。'
     otp_description: '"%{application_name}" にこのサイトへのアクセスを許可しますか？'
     otp_confirmation:
@@ -1184,6 +1193,8 @@ ja:
       yaxis: "日"
       description: "通常の API キーとユーザー API キーの API リクエスト。"
     consolidated_page_views_browser_detection:
+      title: "ブラウザ検出による統合ページビュー (推奨)"
+      title_legacy: "ブラウザ検出による統合ページビュー (推奨)"
       xaxis:
         page_view_anon_browser: "匿名ブラウザ"
         page_view_logged_in_browser: "ログイン中のブラウザ"
@@ -1491,11 +1502,15 @@ ja:
       labels:
         provider: ログインプロバイダー
         no_accounts: "関連アカウントはありません"
+        discourse_connect: "Discourse Connect による SSO"
+        no_sso_accounts: "SSO レコードのないアカウント"
+        total_users: "合計アクティブユーザーアカウント数"
       description: "ログインプロバイダーでグループ化された関連アカウントの数を表示します。ソーシャルログインが有効になっている場合にのみ適用有れます。"
   dashboard:
     problem:
       twitter_login: 'X ログインは現在動作していないようです。<a href="%{base_path}/admin/site_settings/category/login?filter=twitter">サイト設定</a>で資格情報を確認してください。'
       group_email_credentials: 'グループ <a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a> のメールの資格情報に問題がありました。この問題が解決されるまで、このグループの受信トレイからメールを送信できません。%{error}'
+      upcoming_change_stable_opted_out: 'あなたのサイトは「%{upcoming_change}」の次回の変更をオプトアウトしていますが、この変更は「安定」ステータスに達したため、まもなく削除されるか正式に公開されます。この変更の詳細については、<a href="%{base_path}/admin/config/upcoming-changes">次回の変更ページ</a>をご覧ください。'
       rails_env: "サーバーは %{env} モードで実行中です。"
       host_names: "現在 config/database.yml ファイルは、デフォルトの localhost をホスト名として使用しています。あなたのサイトのホスト名に更新してください。"
       sidekiq: 'Sidekiq が実行していません。メール送信などの多くのタスクは sidekiq により非同期に実行されます。少なくとも 1 つの sidekiq プロセスが実行していることを確認してください。<a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq についてはこちらをご覧ください</a>。'
@@ -1526,6 +1541,7 @@ ja:
       category_style_deprecated: "あなたの Discourse は現在、Discourse 3.2 の最終ベータリリース前に削除が予定されている非推奨のカテゴリスタイルを使用しています。選択したカテゴリスタイルを維持する方法については、<a href='https://meta.discourse.org/t/282441'>単一カテゴリスタイルのサイト設定</a>をご覧ください。"
       maxmind_db_configuration: 'サーバーは逆 IP ルックアップに MaxMind データベースを使用するように構成されていますが、有効な MaxMind アカウント ID が構成されていないため、今後、MaxMind データベースのダウンロードに失敗する可能性があります。<a href="https://meta.discourse.org/t/configure-maxmind-for-reverse-ip-lookups/173941" target="_blank">詳しくは、こちらのガイドをご覧ください</a>。'
       admin_sidebar_deprecation: "古い管理者レイアウトは使用できなくなり、新しい<a href='https://meta.discourse.org/t/-/289281'>サイドバーレイアウト</a>に代わります。古いレイアウトは次のリリースで削除されます。その前に新しいサイドバーレイアウトを使用し始める場合は、今すぐ<a href='%{base_path}/admin/config/navigation?filter=admin%20sidebar'>構成</a>してください。"
+      starttls_disabled: "送信メールの構成では STARTTLS が無効になっています。これはほとんど必要ありません。環境から <pre>DISCOURSE_SMTP_ENABLE_START_TLS=false</pre> を削除することを検討してください。詳細については、<a href='https://meta.discourse.org/t/387286'>こちらのトピック</a>をご覧ください。"
     back_from_logster_text: "サイトに戻る"
   site_settings:
     allow_bulk_invite: "CSV ファイルのアップロードによる一括招待を許可する"
@@ -1570,6 +1586,7 @@ ja:
     allow_duplicate_topic_titles_category: "カテゴリが異なる場合、同一の重複したタイトルを持つトピックを許可する。allow_duplicate_topic_titles は無効にする必要があります。"
     unique_posts_mins: "同じコンテンツを投稿できるまでの時間 (分)"
     educate_until_posts: "最初の (n) 件の新規投稿を入力し始めたときに、新規ユーザーチュートリアルのパネルをポップアップ表示します。"
+    title: "このサイトの名前。匿名ユーザーを含むすべての訪問者に表示されます。このタイトルを変更すると、PWA のユーザーに、アプリの更新またはアンインストールを求めるプロンプトが送信される場合があります。"
     site_description: "このサイトを一文で説明してください。匿名ユーザーを含むすべての訪問者に表示されます。"
     short_site_description: "短い言葉で簡単に説明してください。匿名ユーザーを含むすべての訪問者に表示されます。"
     contact_email: "このサイトの責任者の主要連絡先のメールアドレス。重要な通知に使用され、<a href='%{base_path}/about' target='_blank'>サイト情報</a>にも表示されます。公開サイトの匿名ユーザーにも表示されます。"
@@ -1577,6 +1594,7 @@ ja:
     crawl_images: "リモート URL から画像を取得して、正しい幅と高さの寸法を挿入する。"
     download_remote_images_to_local: "リモート (ホットリンク) 画像をダウンロードしてローカル画像に変換します。これにより、サイトから画像が削除された場合でも、コンテンツが保持されます。"
     download_remote_images_threshold: "リモート画像をダウンロードするために必要なディスクの最低空き容量 (パーセント表示)"
+    disabled_image_download_domains: "これらのドメインのリモート画像をダウンロードしない。"
     block_hotlinked_media: "ユーザーがリモート (ホットリンク) メディアを投稿に導入できないようにします。'download_remote_images_to_local' でダウンロードされないリモートメディアは、プレースホルダーリンクに置き換えられます。"
     block_hotlinked_media_exceptions: "block_hotlinked_media 設定から除外されるベース URL のリストです。プロトコルを含めます (例: https://example.com)。"
     editing_grace_period: "投稿から (n) 秒間は、編集しても投稿履歴に新しいバージョンを作成しない。"
@@ -1615,6 +1633,7 @@ ja:
     logo: "サイトの左上にあるロゴ画像です。高さ 120、縦横比 3：1を超える広幅の長方形の画像を使用してください。空白のままにすると、サイトタイトルのテキストが表示されます。"
     logo_small: "あなたのサイトの左上にある小さなロゴ画像です。下にスクロールしたときに見えます。 120×120 の正方形の画像を使用してください。空白のままにすると、ホームグリフが表示されます。"
     digest_logo: "サイトのメール要約の上部で使用されるロゴの代替画像です。広い長方形の画像を使用してください。SVG 画像を使わないでください。空白のままにすると、`logo` で設定した画像が使用されます。"
+    mobile_logo: "あなたのサイトのモバイル版で使用されるロゴ。ヘッダーが混雑しないように正方形のアイコンを使用することをお勧めしますが、高さ 120、アスペクト比 3:1 以上の幅広の長方形画像を使用できます。空白のままにする後、ロゴ設定の画像が使用されます。"
     logo_dark: "'logo' サイト設定の代替のダークスキーム。"
     logo_small_dark: "'logo small' サイト設定の代替のダークスキーム。"
     mobile_logo_dark: "'mobile logo' サイト設定の代替のダークスキーム。"
@@ -1625,8 +1644,11 @@ ja:
     opengraph_image: "デフォルトの opengraph 画像。ページにほかの適切な画像がない場合に使用されます。空のままにすると、large_icon が使用されます"
     x_summary_large_image: "Twitter カードの 'summary large image' (幅 280 以上、高さ 150 以上である必要があり、.svg を使用できません)。空のままにすると、.svg でない限り opengraph_image を使って通常のカードメタデータが生成されます。"
     notification_email: "システムからの重要なメール送信に使用する from: メールアドレス。メールが届くように、ここに指定されたドメインは SPF、DKIM、逆引き PTR レコードが正しく設定されている必要があります。"
+    email_custom_headers: "カスタムメールヘッダーのリスト"
     email_subject: "標準メールのカスタマイズ可能な件名形式。<a href='https://meta.discourse.org/t/customizing-specific-system-email-templates/88323' target='_blank'>https://meta.discourse.org/t/customizing-specific-system-email-templates/88323</a> をご覧ください"
     detailed_404: "特定のトピックにアクセスできない詳細な理由をユーザーに提供します。注意: URL が有効なトピックにリンクしているかどうかがユーザーにわかるため、安全性が低くなります。"
+    enforce_second_factor: "ユーザーに Discourse UI にアクセスする前に二要素認証 (2FA) を有効にするように要求します。この設定は API または 'DiscourseConnect プロバイダー' 認証に影響しません。enforce_second_factor_on_external_auth が有効である場合、ユーザーは 2FA をセットアップした後、外部認証プロバイダーを使用してログインできなくなります。"
+    enforce_second_factor_on_external_auth: "ユーザーに常に二要素認証 (2FA) を使用するように要求します。これを有効にすると、2FA が有効である場合に、ソーシャルログインなどの外部認証方法でログインできなくなります。無効にすると、ユーザー名とパスワードでログインする際に 2FA のみを確認する必要があります。`enforce_second_factor` 設定も参照してください。"
     force_https: "サイトが HTTPS のみを使用するように強制する。警告: HTTPS が完全にセットアップ済みであり、すべての場所で機能していることを確認するまで、これを有効にしないでください！CDN、すべてのソーシャルログイン、および外部ロゴ/依存関係がすべて HTTPS 対応であることを確認しましたか？"
     summary_score_threshold: "「このトピックを要約」に含まれるために必要な投稿の最低スコア"
     summary_posts_required: "'このトピックを要約' を有効にするために最低限必要なトピック内の投稿数。この設定を変更すると、1 週間以内で遡って適用されます。"
@@ -1684,7 +1706,10 @@ ja:
     ga_universal_domain_name: "Google Universal Analytics ドメイン名。例: mysite.com。<a href='https://google.com/analytics' target='_blank'>https://google.com/analytics</a> をご覧ください"
     ga_universal_auto_link_domains: "Google Universal Analytics クロスドメイントラッキングを有効にする。これらのドメインへの発信リンクにはクライアント ID が追加されます。<a href='https://support.google.com/analytics/answer/1034342?hl=en' target='_blank'>Google のクロスドメイントラッキングガイド</a>をご覧ください。"
     gtm_container_id: "Google Tag Manager コンテナ ID。例: GTM-ABCD12E。<br/>注意: コンテンツセキュリティポリシー (CSP) が有効な場合に GTM を使用するには、メタのドキュメントをご覧ください: <a href='https://meta.discourse.org/t/use-nonces-in-google-tag-manager-scripts/188296' target='_blank'>Google Tag Manager スクリプトでノンスを使用する</a>。"
+    google_site_verification_token: Google 検索コンソールの認証トークン。HTML の head にメタタグとして含まれます。
     enable_escaped_fragments: "ウェブクローラーが検出されない場合、Google の Ajax-Crawling API にフォールバックする。<a href='https://developers.google.com/webmasters/ajax-crawling/docs/learn-more' target='_blank'>https://developers.google.com/webmasters/ajax-crawling/docs/learn-more</a> をご覧ください。"
+    moderators_manage_categories: "モデレーターによるカテゴリの作成と管理を許可する"
+    moderators_manage_groups: "モデレーターによるグループの作成と管理を許可する"
     moderators_change_post_ownership: "モデレーターによる投稿の所有権の変更を許可する"
     cors_origins: "CORS を許可。オリジンは http:// か https:// を含む必要があります。CORS を有効にするには、環境変数　DISCOURSE_ENABLE_CORS に true を設定する必要があります。"
     use_admin_ip_allowlist: "管理者はスクリーン対象 IP リスト (管理者 > ログ > スクリーン対象 IP) に定義されている IP アドレスからのみログインできる。"
@@ -1696,9 +1721,9 @@ ja:
     blocked_crawler_user_agents: "サイトへのアクセスを許可してはいけないウェブクローラーを識別する、ユーザーエージェント文字列の大文字と小文字を区別しない一意の語。ホワイトリストが定義されている場合は適用されません。"
     slow_down_crawler_user_agents: '"slow down crawler rate" 設定の構成のとおりに速度の制限が必要なウェブクローラーのユーザーエージェント。各値の長さは 3 文字以上です。'
     slow_down_crawler_rate: "このレートに slow_down_crawler_user_agents が指定されている場合、このレートはすべてのクローラーに適用されます (リクエスト間の遅延秒数)"
+    llms_txt: "LLM クローラー向けに /llms.txt に配信するテキストファイルをアップロードする。詳細は <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a> をご覧ください。"
     content_security_policy: "Content-Security-Policy (CSP) を有効にします。CSP は、クロスサイトスクリプティング (XSS) やデータインジェクションなどの特定の種類の攻撃を防ぐのに役立つ追加のセキュリティレイヤーです。"
     content_security_policy_report_only: "Content-Security-Policy-Report-Only (CSP) を有効にする"
-    content_security_policy_collect_reports: "/csp_reports で CSP 違反レポートの収集を有効にする"
     content_security_policy_frame_ancestors: "CSP を介してこのサイトを iframe に埋め込むことのできるユーザーを制限する。許可されるホストを <a href='%{base_path}/admin/customize/embedding'>埋め込み</a>で制御します。"
     content_security_policy_script_src: "追加のホワイトリストにあるスクリプトソース。現在のホストと CDN はデフォルトで含まれています。<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>コンテンツセキュリティポリシー (CSP) で XSS 攻撃を緩和する</a> をご覧ください。その他のホストソースは strict-dynamic が有効であるため無視されます。"
     invalidate_inactive_admin_email_after_days: "この日数以上サイトを訪問していない管理者アカウントは、ログインする前にメールアドレスを再確認する必要があります。0 に設定すると無効になります。"
@@ -1726,6 +1751,7 @@ ja:
     top_page_default_timeframe: "匿名ユーザーのデフォルトのトップページ期間 (ログインユーザーの場合は最終アクセスに基づいて自動的に調整されます)。"
     moderators_view_emails: "モデレーターによるユーザーのメールアドレスの閲覧を許可します。"
     moderators_view_ips: "モデレーターによるユーザーの IP アドレスの閲覧を許可します。"
+    moderators_change_trust_levels: "モデレーターによるユーザーの信頼レベルの変更を許可する。"
     prioritize_username_in_ux: "ユーザーページ、ユーザーカード、および投稿の最初にユーザー名を表示する (無効にすると先に名前が表示されます)"
     enable_rich_text_paste: "テキストをコンポーザーに貼り付ける際に、HTML からマークダウンへの自動変換を有効にする。"
     send_old_credential_reminder_days: "日数後に古い資格情報についてリマインダーする"
@@ -1736,6 +1762,8 @@ ja:
     whispers_allowed_groups: "特定のグループのメンバーに、トピック内での非公開コミュニケーションを許可します。"
     hidden_post_visible_groups: "これらのグループのメンバーが非表示の投稿を表示できるようにします。スタッフユーザーは常に非表示の投稿を表示できます。"
     allow_index_in_robots_txt: "このサイトはウェブ検索エンジンによるインデックス作成を許可されていることを robots.txt で指定します。<a href='%{base_path}/admin/customize/robots'>robots.txt のオーバーライドはこちら</a>で行えます。<b>警告</b>: 構成ルールを誤ると、期待どおりにサイトがクロールされない場合があります。"
+    blocked_email_domains: "ユーザーがアカウントの登録に使用できないメールドメインのリスト。サブドメインは自動的に指定されたドメインに対して処理されます。ワイルドカード記号の * と ? はサポートされていません。例: mailinator.com"
+    allowed_email_domains: "ユーザーがアカウントの登録に使用する必要のあるメールドメインのリスト。サブドメインは自動的に指定されたドメインに対して処理されます。ワイルドカード記号の * と ? はサポートされていません。警告: リストに含まれないメールドメインのユーザーは許可されません！"
     normalize_emails: "正規化されたメールアドレスが一意であるかをチェックします。正規化されたメールアドレスでは、ユーザー名のすべてのドットと、+ と @ 記号の間のすべてが削除されます。"
     auto_approve_email_domains: "このドメインリストにあるメールアドレスを持つユーザーは自動的に承認されます。サブドメインは自動的に指定されたドメインに対して処理されます。ワイルドカード記号の * と ? はサポートされていません。"
     hide_email_address_taken: "サインアップ中やパスワード忘れのフローの際に、指定したメールアドレスでアカウントが存在することをユーザーに知らせません。'パスワード忘れ' のリクエストでは、完全なメールアドレスが必要です。"
@@ -1769,6 +1797,7 @@ ja:
     auth_overrides_email: "ログインするたびにローカルメールを外部サイトメールでオーバーライドし、ローカルでの変更を防止する。すべての認証プロバイダーに適用されます (警告: ローカルメールの正規化により、矛盾が生じる可能性があります)"
     auth_overrides_username: "ログインするたびにローカルユーザー名を外部サイトのユーザー名でオーバーライドし、ローカルでの変更を防止する。すべての認証プロバイダーに適用されます (警告: ユーザー名の長さ/要件の違いにより、矛盾が発生する可能性があります)。"
     auth_overrides_name: "ログインするたびにローカルのフルネームを外部サイトのフルネームでオーバーライドする。すべての認証プロバイダーに適用されます。"
+    auth_overrides_avatar: "ログインするたびにローカルのアバターを外部サイトのアバターでオーバーライドする。すべての認証プロバイダーに適用されます。"
     discourse_connect_overrides_avatar: "ユーザーのアバターを DiscourseConnect ペイロードの値でオーバーライドする。有効である場合、ユーザーは Discourse にアバターをアップロードできなくなります。"
     discourse_connect_overrides_location: "ユーザーの場所を DiscourseConnect ペイロードの値でオーバーライドし、ローカルの変更を防止する。"
     discourse_connect_overrides_website: "ユーザーのウェブサイトを DiscourseConnect ペイロードの値でオーバーライドし、ローカルの変更を防止する。"
@@ -1848,6 +1877,7 @@ ja:
     invite_link_max_redemptions_limit_users: "通常のユーザーが生成した招待リンクに許可される最大引き換え数はこの値を超えることはできません。"
     alert_admins_if_errors_per_minute: "管理者アラートをトリガーするための 1 分あたりのエラー数。値 0 はこの機能を無効にします。注意: 再起動が必要です。"
     alert_admins_if_errors_per_hour: "管理者アラートをトリガーするための 1 時間あたりのエラー数。値 0 はこの機能を無効にします。注意: 再起動が必要です。"
+    categories_topics: '/categories ページに表示するトピックの数。0 に設定すると、2 つの列が対称になるように自動的に値が設定されます。「カテゴリと最新/トップトピック」<a href="%{base_path}/admin/site_settings/category/all_results?filter=category style">カテゴリページスタイル</a>のみに関係します。'
     suggested_topics: "トピックの下に表示される推奨トピックの数"
     limit_suggested_to_category: "推奨トピックには現在参照しているカテゴリのトピックのみを表示する。"
     suggested_topics_max_days_old: "投稿されて n 日経過したものを推奨トピックにしない。"
@@ -1874,6 +1904,7 @@ ja:
     selectable_avatars_mode: "ユーザーが selectable_avatars リストからアバターを選択できるようにし、カスタムアバターのアップロードを選択した信頼レベルに制限できるようにします。"
     selectable_avatars: "ユーザーがプロファイル写真に選択できるアバターのコレクションを指定します。この選択肢はユーザープロファイルの作成時またはプロファイルアバターの更新時に表示されます。"
     allow_all_attachments_for_group_messages: "グループメッセージのメールの添付ファイルをすべて許可する。"
+    image_quality: "サイトにアップロードされる画像の品質レベルを設定します。品質が低いほどファイルサイズが小さくなります。"
     png_to_jpg_quality: "変換された JPG ファイルの品質 (1 は最低品質、99 は最高品質、100 は無効)。"
     recompress_original_jpg_quality: "アップロードされた画像ファイルの品質 (1 は最低品質、99 は最高品質、100 は無効)。"
     image_preview_jpg_quality: "サイズ変更された画像ファイルの品質 (1 は最低品質、99 は最高品質、100 は無効)。"
@@ -1887,6 +1918,7 @@ ja:
     video_conversion_enabled: "アップロードした動画ファイルの動画変換を有効にします。これにより、動画をウェブ互換形式に変換できます。"
     video_conversion_service: "アップロードした動画の処理に使用する動画変換サービス。"
     mediaconvert_role_arn: "MediaConvert サービスの AWS IAM ロールの ARN。動画変換に AWS MediaConvert を使用する場合に必要です。"
+    mediaconvert_output_subdirectory: "MediaConvert が変換した動画を最終アップロード場所に移動する前に一時的に書き込む S3 バケットのサブディレクトリ。"
     min_ratio_to_crop: "高さのある画像のトリミングに使用される比率。幅 ÷ 高さの結果を入力します。"
     simultaneous_uploads: "コンポーザーにドラッグアンドドロップできるファイルの最大数"
     default_invitee_trust_level: "招待したユーザーのデフォルトの信頼レベル (0～4)。"
@@ -2002,6 +2034,7 @@ ja:
     auto_silence_fast_typers_on_first_post: "`fast typing threshold` を満たさないユーザーを自動的に投稿禁止にする"
     auto_silence_fast_typers_max_trust_level: "高速タイパーを自動的に投稿禁止する最高信頼レベル"
     auto_silence_first_post_regex: "大文字と小文字を区別しない正規表現。合格すると、ユーザーの最初の投稿は投稿禁止になり、承認キューに送られます。例: aging|a[bc]a はまず、「raging」または「aba」または「aca」を含むすべての投稿を投稿禁止にします。最初の投稿のみに適用されます。使用廃止: 代わりに「ウォッチ語の投稿禁止」を使用してください"
+    moderator_guide_topic: "コミュニティーのモデレーション方法を説明するトピック。リンクはモデレーターと管理者のレビューキューに表示されます。"
     reviewable_claiming: "レビュー待ちコンテンツは、対応前に割り当てられる必要があるかどうか"
     reviewable_default_topics: "デフォルトでレビュー待ちコンテンツをトピック別にグループ化して表示する"
     reviewable_default_visibility: "レビュー待ち項目がこの優先度を満たさない場合、それを表示しない"
@@ -2010,12 +2043,13 @@ ja:
     allow_all_users_to_flag_illegal_content: "匿名ユーザーには、違法コンテンツを管理者にメールで報告する必要があるという情報が表示されます。この設定は 'flag post allowed groups' より優先されます。"
     email_address_to_report_illegal_content: "空白のままにすると、デフォルトのサイト管理者のメールアドレスが使用されます。"
     cooldown_hours_until_reflag: "ユーザーが投稿をもう一度通報できるまでの時間"
+    slow_mode_prevents_editing: "「低速モード」では、'editing grace period' の後に編集できなくなりますか？"
     reply_by_email_enabled: "ユーザーがウェブサイトにログインせずに、直接メールでトピックに返信できるようにする機能を有効にします。詳細については、<a href='https://meta.discourse.org/t/set-up-reply-by-email-with-pop3-polling/14003' target='_blank'>Meta のガイド</a>をご覧ください。"
     reply_by_email_address: "メールによる返信の受信メールアドレスのテンプレート。例: %%{reply_key}@reply.example.com または replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "メールによる返信の受信メールアドレスの代替テンプレートのリスト。例: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "受信メールにテキストの代わりに HTML を使用する。"
     strip_incoming_email_lines: "受信メールの各行から先頭と末尾の空白を削除する。"
-    disable_emails: "Discourse があらゆる種類のメールを送信しないようにする。'はい' を選択するとすべてのユーザーのメールが無効になります。'スタッフ以外' を選択すると、スタッフ以外のユーザーのみのメールを無効にします。"
+    allow_email_invites: "無効にすると、ユーザーは Discourse 経由で招待メールを送信できなくなります。"
     strip_images_from_short_emails: "2800 バイト未満のメールから画像を削除します。"
     short_email_length: "画像抑制の目的でメールが '短い' として分類される最大長をバイトで定義します。メールのサイズがこの設定を超過しない場合、メール内の画像 (アバターや絵文字など) はすべて削除されます。"
     display_name_on_email_from: "email from フィールドにフルネームを表示する"
@@ -2075,6 +2109,7 @@ ja:
     relative_date_duration: "投稿後、投稿日が相対表示 (例: 7 日) から絶対表示 (2 月 20 日) に変わるまでの日数。"
     delete_user_max_post_age: "最初の投稿が (x) 日間以上前であるユーザーは削除しない"
     delete_all_posts_max: "[すべての投稿を削除] ボタンで一度に削除可能な最大投稿数。ユーザーがここで指定した以上の投稿を作成していた場合は、全投稿をまとめて削除することができません。またユーザーも削除されません。"
+    delete_all_posts_background_threshold: "バックグラウンドで削除が処理されるまでに、「すべての投稿を削除」ボタンで一度に削除できる投稿の最大件数。"
     delete_user_self_max_post_count: "セルフサービスのアカウント削除を許可しているときにユーザーが持つことのできる投稿の最大数。-1 を設定するとセルフサービスのアカウント削除が無効になります。"
     username_change_period: "アカウントがユーザー名を変更できる、登録後の最大日数 (0 に設定すると、ユーザー名の変更を禁止にします)。"
     email_editable: "登録後、ユーザーにメールアドレスの変更を許可します。"
@@ -2103,6 +2138,8 @@ ja:
     enable_category_group_moderation: "グループが特定のカテゴリのコンテンツに介入することを許可する"
     group_in_subject: "メールの件名の %%{optional_pm} を PM の最初のグループの名前に設定する。「<a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>標準メールの件名のフォーマットをカスタマイズする</a>」をご覧ください。"
     allow_anonymous_mode: "ユーザーが匿名モードに切り替えて投稿するオプションを有効にします。有効にすると、ユーザーはサイト全体で投稿またはトピックを作成する際に自分の ID を非表示することを選択できます。`allow anonymous likes` も参照してください。"
+    allow_likes_in_anonymous_mode: "サイトを匿名で閲覧しているユーザーが投稿に「いいね！」できるようにするには、この設定を有効にします。有効にすると、ユーザーはサイト全体で投稿またはトピックに「いいね！」する際に、自分の ID を非表示にすることを選択できます。この設定には `allow_anonymous_mode` 設定が有効になっている必要があります。"
+    anonymous_posting_allowed_groups: "匿名投稿を有効にできるグループ。この設定には `allow anonymous mode` 設定が有効になっている必要があります。"
     anonymous_account_duration_minutes: "匿名性を守るため、N 分毎に各ユーザーの匿名アカウントを作成しなおします。例 : 600 に設定すると、最終投稿から 600 分が経過し、さらにユーザーが匿名に切り替えると、新しい匿名アカウントが作成されます。"
     hide_user_profiles_from_public: "匿名ユーザーのユーザーカード、ユーザープロファイル、およびユーザーディレクトリを無効にする。"
     hide_new_user_profiles: "信頼レベル 1 以下のユーザープロファイルは、そのユーザーが初めて投稿するまで一般ユーザーと信頼レベル 1 のユーザーに対して非表示になります。この機能は must_approve_users と invite_only サイトでは無条件に無効になります。"
@@ -2118,6 +2155,7 @@ ja:
     clean_up_unused_staged_users_after_days: "未使用のステージングユーザー (投稿なし) が削除されるまでの日数。クリーンアップを無効にするには、0 に設定します。"
     user_selected_primary_groups: "ユーザーが独自のプライマリーグループを設定することを許可する"
     max_notifications_per_user: "ユーザー当たりの通知の最大数。この数を超えると、古い通知は削除されます。毎週適用されます。0 に設定すると無効になります"
+    allowed_user_website_domains: "ユーザーのウェブサイトはこれらのドメインに対して検証されます。"
     allow_profile_backgrounds: "ユーザーにプロファイル背景のアップロードを許可します。"
     get_a_room_threshold: "警告を受けるまでに、ユーザーが同じトピックの同じ人物に行える投稿数。"
     dont_feed_the_trolls_threshold: "警告を受けるまでの他のユーザーからの通報数。"
@@ -2196,6 +2234,7 @@ ja:
     disable_watched_word_checking_in_user_fields: "ユーザーフィールドでのウォッチ中の単語のチェックを無効にする"
     watched_words_regular_expressions: "単語をフィルタリングするための正規表現の使用を許可します。有効にすると、この機能は大文字と小文字を区別して、慎重な扱いを要する単語をグループ化します。そして選択されたすべての単語を 1 つの正規表現にコンパイルし、通常のウォッチ中の単語に単語境界を追加します。そのため、この正規表現を使用するフィルタリング手法では、より洗練された単語パターンをサポートすることで、コンテンツモデレーションに対する制御レイヤーがさらに追加されます。この設定は、元もテキストを任意の文字で置換したテキストに簡単に置き換えることも可能です。"
     enable_fast_edit: "投稿選択メニューにインラインで小さな選択範囲を編集できるボタンを追加します。"
+    old_post_notice_days: "新しいユーザーと復帰ユーザーの投稿の通知が非表示になるまでの日数。公式投稿の通知は常に表示されます。"
     new_user_notice_tl: "新しいユーザーの投稿通知を閲覧するために必要な最低信頼レベル。"
     returning_user_notice_tl: "リピートユーザーの投稿通知を閲覧するために必要な最低信頼レベル。"
     returning_users_days: "ユーザーがリピートとみなされる経過日数。"
@@ -2277,6 +2316,7 @@ ja:
     force_lowercase_tags: "すべての新しいタグが完全に小文字になるように強制する。"
     create_post_for_category_and_tag_changes: "トピックのカテゴリまたはタグが変更されたときにささやき投稿を作成する。ささやき投稿を有効にする必要があります。"
     automatically_clean_unused_tags: "どのトピックや個人メッセージにも使用されていないタグを毎日自動的に削除します。"
+    default_watched_precedence_over_muted: "ミュートしているものも含み、ユーザーがウォッチ中のカテゴリまたはタグ内のトピックについてユーザーに通知する"
     company_name: "会社または組織の名前。空白のままにすると、定型の利用規約またはプライバシーに関する通知は提供されません。"
     governing_law: "利用規約やプライバシーポリシーなど、サイトの法的な側面を管理する管轄を指定します。これは通常、サイトを運営する会社が登録している国または州、または事業を行っている国または州です。"
     city_for_disputes: "このフォーラムの使用に関連する紛争を解決するための管轄として使用される都市を指定します。この情報は通常、フォーラムの利用規約などの法的文書に含まれます。"
@@ -2292,10 +2332,10 @@ ja:
     sitemap_page_size: "各サイトマップページに含める URL の数。最大 50,000"
     enable_user_status: "ユーザーがカスタムステータスメッセージ (絵文字 + 説明) を設定できるようにする。"
     enable_user_tips: "重要な機能をユーザーに説明する新しいユーザーヒントを有効にする"
+    short_title: "短いタイトルはユーザーのホーム画面、ランチャー、またはスペースが限られている場所で使用されます。12 文字以内です。このタイトルを変更すると、PWA のユーザーに、アプリの更新またはアンインストールを求めるプロンプトが送信される場合があります。"
     dashboard_hidden_reports: "ダッシュボードから指定されたレポートを非表示にすることを許可する。"
     dashboard_visible_tabs: "表示するダッシュボードのタブを選択します。"
     dashboard_general_tab_activity_metrics: "アクティビティメトリクスとして一般タブに表示されるレポートを選択します。"
-    gravatar_enabled: "ユーザーアバターに <a href='https://gravatar.com/'>Gravatar</a> サービスを使用する。これにより、ユーザーはアバターを Gravatar に切り替えられなくなりますが、すでに使用しているユーザーには影響しません。"
     gravatar_name: "Gravatar サービスプロバイダーの名前を指定します。この名前は通常、Gravatar アバターをサイトに提供するソースを特定するために使用されます。"
     gravatar_base_url: "Gravatar プロバイダーの API にアクセスするための URL を指定します。この設定は、メールアドレスをアバター画像が保存されている Gravatar URL に変換するために重要です。"
     gravatar_login_url: "`gravatar_base_url` に相対する URL。ユーザーに Gravatar サービスへのログインを提供します。"
@@ -2312,6 +2352,7 @@ ja:
     welcome_banner_image: "ウェルカムバナーの背景に表示する画像を設定します。"
     welcome_banner_location: "ウェルカムバナーが表示されるページ内の場所を決定します。"
     welcome_banner_page_visibility: "ウェルカムバナーが表示されるページを決定します。"
+    welcome_banner_text_color: "上記の「ウェルカムバナーの画像」設定を構成した場合、この設定を使用してバナーを読み取りやすいテキストの色に変更してください。空白のままにするか、画像をアップロードしなかった場合は、アクティブなテーマによって色が設定されます。"
     splash_screen: "サイトアセットの読み込み中に一時的なローディング画面を表示します"
     navigation_menu: "サイトのメインナビゲーションメニューとして、サイドバーかヘッダーのドロップダウンを指定します。推奨はサイドバーです。"
     default_navigation_menu_categories: "選択されたカテゴリは、デフォルトでナビゲーションメニューのカテゴリセクションに表示されます。"
@@ -2320,6 +2361,7 @@ ja:
     show_preview_for_form_templates: "フォームテンプレート機能のプレビューを有効にする"
     lazy_load_categories_groups: "これらのグループのユーザーに対してのみ、カテゴリ情報を遅延読み込みする。これにより、カテゴリ数の多いサイトのパフォーマンスが改善されます。"
     enable_auto_grid_images: "作成ツールに 3 つ以上の画像がアップロードされると、画像を自動的に [grid] タグで囲みます。"
+    experimental_impersonation_time_limit_minutes: "代理操作セッションが自動的に終了するまでの時間。"
     page_loading_indicator: "Discourse 内のページナビゲーション中に表示される読み込みインジケーターを構成します。「スピナー」はページ全体のインジケーターです。「スライダー」は画面上部に細いバーを表示します。"
     show_user_menu_avatars: "ユーザーメニューにユーザーアバターを表示する"
     about_page_hidden_groups: "/about ページに特定のグループのメンバーを表示しない。"
@@ -2332,14 +2374,26 @@ ja:
     rich_editor: "作成ツールでリッチエディターを有効にして、すべてのユーザーがより直感的で使いやすく作成できるように、現在の Markdown モードと新しいリッチテキストエディターを切り替えられるようにする。"
     default_composition_mode: "コミュニティーの作成ツールのデフォルトモードを設定する。リッチテキストモードでは、よりモダンでほとんどのユーザーが使い慣れた書き心地を得られます。Markdown モードはより技術的な知識を持つユーザーに適しています。メンバーは作成ツールのツールバーにあるトグルでモードを切り替えられます。"
     reviewable_ui_refresh: "レビューキューで実験的な新しい UI を使用できるグループ。"
+    viewport_based_mobile_mode: "ビューポートの幅を使用してモバイル/デスクトップモードを決定する。この設定はまもなく削除されます。オフにする必要がある場合は、<a href='https://meta.discourse.org/t/384280'>Meta</a> でお知らせください。"
     content_localization_enabled: "ユーザーのブラウザまたはユーザの言語設定に基づいて、ローカライズされたコンテンツを表示します。コンテンツには、カテゴリ、タグ、投稿、トピックが含まれる場合があります。サポートされているロケールは、'content localization supported locales' に設定されているロケールです。"
+    content_localization_supported_locales: "ユーザーコンテンツを翻訳できるサポートされたロケールのリスト。'content localization enabled' が必要です。"
     content_localization_allowed_groups: "ローカライズされたコンテンツの更新を許可されたグループ。'content localization enabled' が必要です。"
+    content_localization_language_switcher: "訪問者が Discourse の翻訳バージョンとユーザー貢献コンテンツを切り替えられる言語切り替え機能をヘッダーに表示します。'content localization supported locales' に定義された言語を使用します"
+    content_localization_crawler_param: "'content localization enabled' と 'set locale from param' が有効な場合にローカライズされたコンテンツをウェブクローラーに配信する。サポートされたロケールのリストは 'content localization supported locales' に定義されています。"
+    content_localization_use_default_locale_when_unsupported: "優先言語が 'content localization supported locales' に含まれていないユーザーに、サイトのデフォルトのロケールでローカライズされたコンテンツを配信する。"
+    content_localization_allow_author_localization: "作成者が投稿メニューから自分のトピックと投稿を更新することを許可する。"
+    enable_upcoming_changes: "次回の変更を有効にする"
+    fake_upcoming_change: "これは実際の次回の変更ではありません。テストを目的としているため、この文字列の翻訳は不要です。"
+    floating_dismiss_topics_on_mobile: "モバイル版では、アクセスの簡易性とトピックリストの上部のスペースを空けるために「閉じる...」フローティングボタンを表示する"
+    enable_simplified_category_creation: "より少ないオプションとクリーンなインターフェースによって、シンプルなカテゴリ作成フローを実現します。"
     errors:
       invalid_css_color: "無効な色です。色名または 16 進数値を入力してください。"
+      invalid_datetime: "日付形式は無効です。有効な日付と時刻を入力したことを確認してください。"
       invalid_email: "無効なメールアドレスです。"
       invalid_username: "そのユーザー名のユーザは存在しません。"
       valid_username: "そのユーザー名のユーザーが存在します。"
       invalid_group: "その名前のグループは存在しません。"
+      invalid_topic: "その ID のトピックは存在しません。"
       invalid_integer_min_max: "値は %{min} から %{max} の間である必要があります。"
       invalid_integer_min: "値は %{min} 以上である必要があります。"
       invalid_integer_max: "値は %{max} を超えることはできません。"
@@ -2374,12 +2428,6 @@ ja:
       reply_by_email_disabled: "この設定を有効にする前に 'reply by email' を有効にする必要があります。"
       discourse_connect_url_is_empty: "この設定を有効にする前に 'discourse connect url' を設定する必要があります。"
       enable_local_logins_disabled: "この設定を有効にする前に 'enable local logins' を有効にする必要があります。"
-      min_username_length_exists: "最も短いユーザー名 (%{username}) を超える最小のユーザー名の長さを設定することはできません。"
-      min_group_name_length_exists: "ユーザー名の最低文字数は、最も短いグループ名 (%{group_name}) より多い文字数に設定できません。"
-      min_username_length_range: "最小値を最大値より上にすることはできません。"
-      max_username_length_exists: "最も長いユーザー名 (%{username}) を下回る最大のユーザー名の長さを設定することはできません。"
-      max_group_name_length_exists: "ユーザー名の最大文字数は、最も長いグループ名 (%{group_name}) より少ない文字数に設定できません。"
-      max_username_length_range: "最大値を最小値よりも小さくすることはできません。"
       invalid_hex_value: "色値は 6 桁の 16 進数コードである必要があります。"
       empty_selectable_avatars: "この設定を有効にする前に、少なくとも 2 つの選択可能なアバターをアップロードする必要があります。"
       category_search_priority:
@@ -2393,6 +2441,7 @@ ja:
         other: "リストには正確に %{count} 個の値が含まれている必要があります。"
       markdown_linkify_tlds: "値 '*' を含めることはできません。"
       google_oauth2_hd_groups: "この設定を有効にする前に、すべての 'google oauth2 hd' 設定を構成する必要があります。"
+      discourse_id_registration: "Discourse ID での自動登録に失敗しました。これは、ネットワーク接続の問題、ファイアウォールの制限、または Discourse ID サービスにアクセスできないことが原因である可能性があります。詳細については、サーバーログを確認するか、サポートにお問い合わせください。"
       linkedin_oidc_credentials: "この設定を有効にする前に、LinkedIn OIDC 資格情報 ('linkedin_oidc_client_id' および 'linkedin_oidc_client_secret') を構成する必要があります。"
       search_tokenize_chinese_enabled: "この設定を有効にする前に 'search_tokenize_chinese' を無効にする必要があります。"
       search_tokenize_japanese_enabled: "この設定を有効にする前に 'search_tokenize_japanese' を無効にする必要があります。"
@@ -2401,7 +2450,9 @@ ja:
       invalid_uncategorized_category_setting: '「未分類トピックを許可」が有効でない場合、「未分類」カテゴリを選択できません。'
       invalid_search_ranking_weights: "search_ranking_weights サイト設定の値が無効です。例: '{0.1,0.2,0.3,1.0}'。各重みの最大値は 1.0 であることに注意してください。"
       content_localization_locale_limit: "サポートされているロケールの数は %{max} 以下である必要があります。"
+      content_localization_language_switcher_requirements: "言語切り替え機能には、'set locale from cookie' と 'allow user locale' サイト設定が有効であり、'content localization supported locales' に少なくとも 1 つの言語が含まれている必要があります。"
       mediaconvert_role_arn_required: "AWS MediaConvert を使って動画変換を行う場合、AWS IAM ロールの ARN が必要です。"
+      mediaconvert_output_subdirectory_required: "MediaConvert 出力サブディレクトリが必要です。"
       s3_credentials_required_for_video_conversion: "動画変換には S3 資格情報が必要です。S3 アクセスキーを構成するか、IAM プロファイルを有効にしてください。"
     keywords:
       clean_up_inactive_users_after_days: "有効化解除|非アクティブ|未有効化"
@@ -2425,6 +2476,7 @@ ja:
   filter:
     description:
       status: "ステータスでトピックを絞り込みます"
+      in: "個人リスト内でトピックを絞り込みます"
       order: "特定のフィールドでトピックを並べ替えます"
       category: "特定のカテゴリのトピックを表示します"
       category_any: "指定されたカテゴリのトピックを表示します (カンマ区切り)"
@@ -2437,13 +2489,15 @@ ja:
       exclude_tag: "特定のタグが付いたトピックを除外します"
       exclude_tags_any: "指定されたタグのいずれかが付いたトピックを除外します (カンマ区切り)"
       exclude_tags_all: "指定されたすべてのタグが付いたトピックを除外します (プラス区切り)"
-      tags_alias: "'tag:' フィルタのエイリアス"
       tag_group: "特定のタググループのタグが付いたトピックを表示します"
       exclude_tag_group: "特定のタググループのタグが付いたトピックを除外します"
       activity_before: "日付より前に最終アクティビティがあるトピックを表示します (YYYY-MM-DD または数日前)"
       activity_after: "日付より後に最終アクティビティがあるトピックを表示します (YYYY-MM-DD または数日前)"
       created_before: "日付より前に作成されたトピックを表示します (YYYY-MM-DD または数日前)"
       created_after: "日付より後に作成されたトピックを表示します (YYYY-MM-DD または数日前)"
+      created_by: "特定のユーザーまたはグループが作成したトピックを表示します"
+      created_by_user: "ユーザー名またはグループが作成したトピックを表示します (@ を使用しない)"
+      created_by_multiple: "いずれかの特定のユーザーまたはグループが作成したトピックを表示します (カンマ区切り)"
       latest_post_before: "日付より前に最終投稿があるトピックを表示します (YYYY-MM-DD または数日前)"
       latest_post_after: "日付より後に最終投稿があるトピックを表示します (YYYY-MM-DD または数日前)"
       likes_min: "指定した数以上の「いいね！」があるトピックを表示します"
@@ -2473,6 +2527,7 @@ ja:
       in_new: "新規または新しい返信のあるトピックを表示します"
       in_new_replies: "新しい返信のあるトピックを表示します"
       in_new_topics: "新規トピックを表示します"
+      in_unseen: "まだ閲覧していないトピックを表示します"
       order_activity: "最終アクティビティで並べ替えます (新しい順)"
       order_activity_asc: "最終アクティビティで並べ替えます (古い順)"
       order_category: "カテゴリ名で並べ替えます (Z～A)"
@@ -2493,6 +2548,18 @@ ja:
       order_views_asc: "ビュー数で並べ替えます (少ない順)"
       order_read: "最後に読んだ順で並べ替えます (新しい順)"
       order_read_asc: "最後に読んだ順で並べ替えます (古い順)"
+      order_hot: "ホットスコアで並べ替えます (多い順)"
+      order_hot_asc: "ホットスコアで並べ替えます (少ない順)"
+      users: "参加者別にトピックを絞り込みます"
+      users_any: "指定されたユーザーのいずれかを含むトピックを表示します (カンマ区切り)"
+      users_all: "指定されたすべてのユーザーを含むトピックを表示します (プラス区切り)"
+      exclude_users: "指定されたユーザーを含むトピックを除外します"
+      group: "グループ別にトピックを絞り込みます"
+      groups_any: "指定されたグループのいずれかを含むトピックを表示します (カンマ区切り)"
+      groups_all: "指定されたすべてのグループを含むトピックを表示します (プラス区切り)"
+      locale: "元の言語でトピックを絞り込みます"
+      locale_any: "指定されたいずれかの言語で原文が記述されたトピックを表示します (カンマ区切り)"
+      exclude_locale: "指定された言語で原文が記述されたトピックを除外します"
   discourse_connect:
     login_error: "ログインエラー"
     not_found: "あなたのアカウントが見つかりませんでした。サイトの管理者にお問い合わせください。"
@@ -2656,6 +2723,7 @@ ja:
         updating_user_ids: "ユーザー ID を更新中…"
         deleting_source_user: "ソースユーザーを削除中…"
   user:
+    anonymized: "[ユーザー匿名化により削除されました]"
     deactivated: "'%{email}' からのバウンスメールが多すぎるため無効化されました。"
     deactivated_by_staff: "スタッフによる無効化"
     deactivated_by_inactivity:
@@ -2858,11 +2926,13 @@ ja:
     illegal: "あなたの投稿は**違法**として通報されました: コミュニティーは投稿が法律に違反している可能性があると考えています。"
     spam: "あなたの投稿は「迷惑」として通報されました。コミュニティーはあなたの投稿に営利目的、宣伝目的の性質があり、トピックに意図される有用性または関連性がないと判断しました。"
     notify_moderators: "あなたの投稿は「モデレーターの注意要」として通報されました。コミュニティーはあなたの投稿にスタッフメンバーによる手動介入が必要であると判断しました。"
+    needs_approval: "投稿は**要承認**として通報されました。投稿は[コミュニティーガイドライン](%{base_path}/guidelines)を満たすかどうかを確認するために、自動的にスタッフメンバーによるレビュー待ちとなっています。"
     responder:
       off_topic: "投稿は**話題に関係ない**として通報されました。コミュニティーはあなたの投稿がタイトルと最初の投稿で定義されているトピックにふさわしくないと判断しました。"
       inappropriate: "投稿は**不適切**として通報されました。コミュニティーは投稿が攻撃的、虐待的、ヘイト行為、または[コミュニティーガイドライン](%{base_path}/guidelines)に違反すると感じています。"
       spam: "投稿は**迷惑**として通報されました。コミュニティーはあなたの投稿に営利目的、宣伝目的の性質があり、トピックに意図される有用性または関連性がないと判断しました。"
       notify_moderators: "投稿は**モデレーターの注意要**として通報されました。コミュニティーはあなたの投稿にスタッフメンバーによる手動介入が必要であると判断しました。"
+      needs_approval: "投稿は**要承認**として通報されました。投稿は[コミュニティーガイドライン](%{base_path}/guidelines)を満たすかどうかを確認するために、自動的にスタッフメンバーによるレビュー待ちとなっています。"
   flags_dispositions:
     agreed: "ご連絡いただきありがとうございます。問題があることを認め、現在調査しています。"
     agreed_and_deleted: "ご連絡いただきありがとうございます。問題があることを認め、投稿を削除しました。"
@@ -2880,6 +2950,7 @@ ja:
     contents_hidden: "コンテンツを見るには投稿にアクセスしてください。"
     post_hidden:
       title: "非表示の投稿"
+      preview: "コミュニティーメンバーによる通報により投稿は非表示になりました。"
       subject_template: "コミュニティー通報によって非表示にされた投稿"
       text_body_template: |
         こんにちは。
@@ -2941,6 +3012,7 @@ ja:
         %{site_name} モデレーター
     post_hidden_again:
       title: "再度非表示"
+      preview: "コミュニティーメンバーによって投稿は再度非表示になりました。"
       subject_template: "コミュニティー通報によって非表示にされた投稿、スタッフ通知済み"
       text_body_template: |
         こんにちは。
@@ -3425,6 +3497,7 @@ ja:
         その他のガイダンスについては、[コミュニティーガイドライン](%{base_url}/guidelines)をご覧ください。
     too_many_spam_flags:
       title: "迷惑通報が多すぎます"
+      preview: "迷惑行為の通報により、投稿は一時的に非表示になっています。"
       subject_template: "新規アカウントは保留中です"
       text_body_template: |
         こんにちは。
@@ -3447,6 +3520,7 @@ ja:
         その他のガイダンスについては、[コミュニティーガイドライン](%{base_url}/guidelines)をご覧ください。
     silenced_by_staff:
       title: "スタッフにより投稿禁止にされました"
+      preview: "アカウントは一時的に保留されています。"
       subject_template: "アカウントは一時的に保留中です"
       text_body_template: |
         こんにちは。
@@ -3459,9 +3533,27 @@ ja:
     user_automatically_silenced:
       title: "ユーザーは自動的に投稿禁止にされました"
       subject_template: "新規ユーザー %{username} はコミュニティー通報により投稿禁止になりました"
+      text_body_template: |
+        これは自動メッセージです。
+
+        新規ユーザー [%{username}](%{user_url}) は自動的に投稿禁止になりました。
+
+        [通報をレビュー](%{base_url}/review)してください。%{username} が誤って投稿禁止になっている場合は、[このユーザーの管理者ページ](%{user_url})で投稿禁止を解除ボタンをクリックしてください。
+
+        このしきい値は、`silence_new_user` サイト設定で変更できます。
     user_automatically_silenced_with_reason:
       title: "ユーザーは自動的に投稿禁止にされました"
       subject_template: "新規ユーザー %{username} はコミュニティー通報により投稿禁止になりました"
+      text_body_template: |
+        これは自動メッセージです。
+
+        新規ユーザー [%{username}](%{user_url}) は自動的に投稿禁止になりました。
+
+        理由 - %{reason}
+
+        [通報をレビュー](%{base_url}/review)してください。%{username} が誤って投稿禁止になっている場合は、[このユーザーの管理者ページ](%{user_url})で投稿禁止を解除ボタンをクリックしてください。
+
+        このしきい値は、`silence_new_user` サイト設定で変更できます。
     spam_post_blocked:
       title: "迷惑投稿はブロックされました"
       subject_template: "同一リンクの連続投稿により、新規ユーザー %{username} の投稿をブロック"
@@ -3512,6 +3604,11 @@ ja:
         こんにちは。
 
         新規ユーザーの投稿が介入を必要としており、現在レビュー待ちとなっています。[こちらから承認または拒否](%{base_url}/review?type=ReviewableQueuedPost)してください。
+    user_posts_deleted:
+      title: "ユーザー投稿は削除されました"
+      subject_template: "%{user} の投稿はすべて削除されました"
+      text_body_template:
+        other: "@%{user} による %{count} 件の投稿が @%{staff_user} によって削除されました。"
   unsubscribe_link: |
     メールの購読を解除するには、[こちらをクリック](%{unsubscribe_url})してください。
   unsubscribe_link_and_mail: |
@@ -3623,6 +3720,7 @@ ja:
         %{respond_instructions}
     user_replied:
       title: "ユーザーが返信しました"
+      preview: "誰かがあなたの投稿に返信しました。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3645,6 +3743,7 @@ ja:
         %{respond_instructions}
     user_quoted:
       title: "ユーザーが引用しました"
+      preview: "誰かが投稿内であなたを引用しました。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3656,6 +3755,7 @@ ja:
         %{respond_instructions}
     user_linked:
       title: "ユーザーがリンクしました"
+      preview: "投稿が別のトピックにリンクされました。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3667,6 +3767,7 @@ ja:
         %{respond_instructions}
     user_mentioned:
       title: "ユーザーがメンションしました"
+      preview: "誰かが投稿であなたをメンションしました"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3722,6 +3823,7 @@ ja:
         %{respond_instructions}
     user_posted:
       title: "ユーザーが投稿しました"
+      preview: "あなたがウォッチ中のトピックに誰かが返信しました。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3755,6 +3857,7 @@ ja:
         %{respond_instructions}
     user_posted_pm:
       title: "ユーザーが PM を投稿しました"
+      preview: "誰かがあなたに PM を送信しました。"
       subject_template: "[%{email_prefix}] [PM] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3823,6 +3926,12 @@ ja:
     account_second_factor_disabled:
       title: "二要素認証が無効です"
       subject_template: "[%{email_prefix}] 二要素認証が無効です"
+      text_body_template: |
+        %{site_name} のアカウントの二要素認証が無効になったため、パスワードのみでログインできるようになりました。今後、追加の認証コードは不要です。
+
+        二要素認証 (2FA) を無効にしなかった場合、誰かがあなたのアカウントを侵害した可能性があります。
+
+        不明な点がございましたら、[スタッフにお問い合わせください](%{base_url}/about)。
     digest:
       why: "%{since} 以降の %{site_link} の簡単な要約"
       since_last_visit: "最終アクセス以降"
@@ -3843,6 +3952,7 @@ ja:
       preheader: "%{since} 以降の簡単な要約"
     forgot_password:
       title: "パスワードを忘れました"
+      preview: "パスワードをリセットしてください。"
       subject_template: "[%{email_prefix}] パスワードのリセット"
       text_body_template: |
         誰かが [%{site_name}](%{base_url}) のパスワードをリセットしようとしてます。
@@ -3864,6 +3974,7 @@ ja:
         %{base_url}/session/email-login/%{email_token}
     set_password:
       title: "パスワードを設定"
+      preview: "アカウントのパスワードを設定してください。"
       subject_template: "[%{email_prefix}] パスワードを設定してください"
       text_body_template: |
         誰かが [%{site_name}](%{base_url}) のあなたのアカウントにパスワードを追加するよう依頼しました。または、この検証済みのメールアドレスに関連付けられている対応のオンラインサービス (Google、Facebook など) を使用してログインすることもできます。
@@ -3874,6 +3985,7 @@ ja:
         %{base_url}/u/password-reset/%{email_token}
     admin_login:
       title: "管理者ログイン"
+      preview: "管理者ログインがリクエストされました。"
       subject_template: "[%{email_prefix}] ログイン"
       text_body_template: |
         誰かが [%{site_name}](%{base_url}) のアカウントにログインしようとしています。
@@ -3884,6 +3996,7 @@ ja:
         %{base_url}/session/email-login/%{email_token}
     account_created:
       title: "アカウントが作成されました"
+      preview: "あなたの新しいアカウントが作成されました。"
       subject_template: "[%{email_prefix}] 新しいアカウント"
       text_body_template: |
         あなたの新規アカウントが %{site_name} で作成されました
@@ -3928,6 +4041,7 @@ ja:
         %{base_url}/u/confirm-old-email/%{email_token}
     notify_old_email:
       title: "古いメールに通知"
+      preview: "メールアドレスが更新されました。"
       subject_template: "[%{email_prefix}] あなたのメールアドレスは変更されました"
       text_body_template: |
         これは、%{site_name} のあなたのメールアドレスが変更されたことを
@@ -3950,6 +4064,7 @@ ja:
         %{new_email}
     signup_after_approval:
       title: "登録 - 承認後"
+      preview: "新しいアカウントが承認されました。"
       subject_template: "%{site_name} での承認が完了しました！"
       text_body_template: "%{site_name} へようこそ！\n\nスタッフメンバーが %{site_name} のあなたのアカウントを承認しました。\n\nこれで、次の場所からログインすると、新しいアカウントにアクセスできるようになりました。\n%{base_url}\n\n上記のリンクをクリックできない場合は、それをコピーしてウェブブラウザのアドレスバーに貼り付けてください。\n\n%{new_user_tips}\n\nコミュニティーでは常に[礼節ある行動](%{base_url}/guidelines)を取ってもらえると信じています。 \n\nではお楽しみください！\n"
     signup_after_reject:
@@ -3961,6 +4076,7 @@ ja:
         %{reject_reason}
     signup:
       title: "登録"
+      preview: "アカウントを確認してください。"
       subject_template: "[%{email_prefix}] 新しいアカウントを確認してください"
       text_body_template: |
         %{site_name} へようこそ！
@@ -3983,6 +4099,7 @@ ja:
         このリンクがクリックできない場合は、リンクをコピーしてウェブブラウザのアドレスバーに貼り付けてください。
     suspicious_login:
       title: "新しいログインのアラート"
+      preview: "デバイスを認証してください。"
       subject_template: "[%{site_name}] %{location} からの新しいログイン"
       text_body_template: |
         こんにちは
@@ -4009,8 +4126,14 @@ ja:
   page_not_found:
     page_title: "ページが見つかりません"
     title: "おっとっと！ページが存在しないか非公開です。"
+    subtitle: "どこを探しても、お探しのページは見つかりませんでした。"
+    popular_topics: "人気のトピック"
+    recent_topics: "最近のトピック"
     see_more: "もっと"
+    search_title: "代わりに検索しますか？"
     search_button: "検索"
+    home: "ホームに移動"
+    placeholder: "タイトルまたはキーワードでトピックを検索..."
   offline:
     title: "アプリを読み込めません"
     offline_page_message: "オフラインになっているようです！ネットワーク接続を確認して、もう一度お試しください。"
@@ -4019,6 +4142,7 @@ ja:
   upload:
     edit_reason: "ダウンロードされた画像のコピー"
     unauthorized: "アップロードしようとしているファイルは許可されていません (許可されている拡張子: %{authorized_extensions})。"
+    images_only: "この設定では画像のみをアップロードできます。"
     pasted_image_filename: "貼り付けた画像"
     store_failure: "ユーザー #%{user_id} のアップロード #%{upload_id} の保存に失敗しました。"
     file_missing: "アップロードするファイルを指定する必要があります。"
@@ -4106,6 +4230,8 @@ ja:
     latte_theme_name: "ラテ"
     summer_theme_name: "夏"
     dark_rose_theme_name: "ダークローズ"
+    errors:
+      cannot_edit_remote_copies: "色パレットのリモートコピーの編集はできません。"
   edit_this_page: "このページを編集"
   csv_export:
     boolean_yes: "はい"
@@ -4557,12 +4683,18 @@ ja:
     nice_share:
       name: ナイスな共有
       description: 25 人の訪問者に投稿を共有
+      long_description: |
+        このバッジは、共有したリンクを 25 人の異なる外部訪問者がクリックすると付与されます。ディスカッションとこのコミュニティーの存在を伝えてくれ、ありがとう！
     good_share:
       name: イカした共有
       description: 300 人の訪問者に投稿を共有
+      long_description: |
+        このバッジは、300 人の異なる外部訪問者がクリックしたリンクを共有したときに付与されます。よくできました！あなたはたくさんの新しい人々に素晴らしいディスカッションを披露し、このコミュニティーの成長を助けました。
     great_share:
       name: グレートな共有
       description: 1000 人の訪問者に投稿を共有
+      long_description: |
+        このバッジは、1000 人の異なる外部訪問者がクリックしたリンクを共有したときに付与されます。わぉ！あなたは大勢の新しいオーディエンスに興味深いディスカッションを促進し、コミュニティーを大きく成長させることに役立ちました！
     first_like:
       name: 初めての「いいね！」
       description: 投稿に「いいね！」した
@@ -4729,6 +4861,13 @@ ja:
     minimum_required_tags:
       other: "少なくとも %{count} 個のタグを選択する必要があります。"
     upload_row_too_long: "CSV ファイルには 1 行につき 1 つのタグが必要です。オプションで、タグの後にカンマを付け、その後のグループ名を続けることができます。"
+    bulk_create:
+      invalid_params: "パラメーターが無効です。タグ名の配列を指定してください。"
+      invalid_name: "タグ名が無効です。"
+      tag_too_long:
+        other: "タグが長すぎます (最大 %{count} 文字)。"
+      too_many_tags:
+        other: "タグが長すぎます。一度に作成できるタグは %{count} 個までです。大量にインポートするには、CSV アップロード機能を使用してください。"
     forbidden:
       invalid:
         other: "選択したタブはどれも使用できません"
@@ -4750,6 +4889,9 @@ ja:
   rss_by_tag: "%{tag} がタグ付けされたトピック"
   finish_installation:
     congratulations: "おめでとうございます。Discourse をインストールしました！"
+    login_with_discourse_id: "Discourse ID でログイン"
+    discourse_id_help: "下のボタンを使って Discourse ID でログインしてください。<br/><br/>Discourse ID アカウントで、`DISCOURSE_DEVELOPER_EMAILS` 環境変数に一致するプライマリメールアドレスが使用されていることを確認してください。"
+    discourse_id_error_help: "メールアドレスの設定をスキップすることを選択しました。残念ながら、上記のエラーメッセージにより、セットアップを続行できません。この問題を <a href='https://meta.discourse.org/'>meta.discourse.org</a> にご報告ください。"
     register:
       button: "登録"
       title: "管理者アカウントの登録"
@@ -4761,6 +4903,10 @@ ja:
     resend_email:
       title: "アクティベーションメールの再送"
       message: "<p><b>%{email}</b> にアクティベーションメールを再送信しました"
+    discourse_id:
+      help: "あなたの Discourse ID をセットアップ中です。"
+      no_allowed_emails: "DISCOURSE_DEVELOPER_EMAILS に許可されたメールアドレスが構成されていません。サイトのセットアップを続行できません。"
+      global_notice: "管理者はまだログインしていません。`DISCOURSE_DEVELOPER_EMAILS` 環境変数に一致するメールアドレスを使用する Discourse ID アカウントを使って、インストールを完了してください。"
   safe_mode:
     title: "セーフモードを開始"
     description: "セーフモードを使用すると、テーマまたはクライアント側プラグインのカスタマイズを読み込まずにサイトをテストできます。サーバー側プラグインのカスタマイズは有効のままになります。"
@@ -4772,15 +4918,18 @@ ja:
     enter: "セーフモードを開始"
     must_select: "セーフモードを開始するには、少なくとも 1 つのオプションを選択する必要があります。"
   dev_mode:
-    enter: "Enter"
+    title: "開発者モード"
+    enable_rack_mini_profiler: "セッションを変更しても Rack Mini Profiler が 1 時間持続できるようにする"
   wizard:
     title: "Discourse のセットアップ"
     step:
       setup:
         title: "はじめに"
+        description: "まずはコミュニティーの基本設定をセットアップしましょう。この設定は後でいつでも変更できます。"
         fields:
           title:
             label: "コミュニティー名"
+            placeholder: "純子のたまり場"
           default_locale:
             label: "言語"
           login_required:
@@ -4828,9 +4977,20 @@ ja:
       review_by: "レビュー担当者"
       pr_summary: "%{commits} 個のコミットにより %{changed_files} 個のファイルが変更されました。%{additions} 個が追加され、%{deletions} 個が削除されました。"
       no_description: "GitHub でアカウントを作成して %{repo} の開発に貢献してください。"
+      pr_title:
+        default: "プルリクエスト"
+        draft: "プルリクエストの下書きを作成する"
+        open: "プルリクエストを開く"
+        approved: "プルリクエストを承認する"
+        changes_requested: "変更がリクエストされました"
+        merged: "プルリクエストがマージされました"
+        closed: "プルリクエストがクローズされました"
       status_date:
         open: "オープン"
+        draft: "下書き作成済み"
         approved: "承認"
+        changes_requested: "変更リクエスト"
+        merged: "マージ"
         closed: "閉鎖"
   discourse_push_notifications:
     popup:
@@ -4846,9 +5006,12 @@ ja:
       confirm_body: "成功！通知を有効にしました！"
       custom: "%{username} からの通知（%{site_title}）"
   staff_action_logs:
+    redacted: "[コンテンツは表示されません]"
     json_too_long: "値は列の長さ制限を超えているため、ログに記録されません"
     not_found: "は見つかりません"
     unknown: "不明"
+    site_setting:
+      update_existing_users: "既存のユーザーを更新しますか？%{value}"
     user_merged: "%{username} がこのアカウントにマージされました"
     user_delete_self: "%{url} から自分で削除"
     webhook_deactivation_reason: "あなたの Webhook は自動的に無効化されています。複数の '%{status}' HTTP ステータス失敗応答を受信しました。"
@@ -4867,9 +5030,14 @@ ja:
     auto_deleted_hidden_posts: "非表示の投稿は自動的に破棄されました"
     seed_data_topic_updated: "シードデータのトピックが更新されました"
     seed_data_topic_deleted: "シードデータのトピックが削除されました"
+    upcoming_changes:
+      log_manually_toggled: "ユーザーによる手動切り替え"
+      log_promoted: >
+        この次回の変更は '%{change_status}' ステータスに達したため、あなたのサイトで自動的に有効化されました。詳細は、<a href="%{base_path}/admin/config/upcoming-changes">次回の変更ページ</a>をご覧ください。
   reviewables:
     already_handled: "その投稿をすでにレビューし、再通報の必要はないと判断しました。"
     already_handled_and_user_not_exist: "誰かがすでにレビュー済みで、そのユーザーはもう存在しません。"
+    post_restored_by_author: "投稿は作成者によって復元されました"
     priorities:
       low: "低"
       medium: "普通"
@@ -4934,14 +5102,19 @@ ja:
         description: "通報に同意し、この投稿を非表示にします。さらに、ユーザーに編集を求めるメッセージを自動送信します。"
         complete: "投稿は非表示になり、ユーザーに通知されました。"
       agree_and_edit:
+        title: "投稿を編集する"
         description: "通報に同意し、コンポーザーウィンドウを開いて投稿を編集します。"
         complete: "通報が承認され、投稿を編集できるようになりました。"
       delete:
         title: "削除"
         complete: "投稿は削除されました。"
       delete_and_ignore:
+        title: "投稿を削除して通報を無視する"
+        description: "キューから削除すると、投稿を削除して通報を無視します。最初の投稿である場合、トピックも削除されます。 "
         complete: "投稿は削除されました。"
       delete_and_ignore_replies:
+        title: "投稿と返信を削除して通報を無視する"
+        description: "キューから削除すると、投稿とそのすべての返信を削除して通報を無視します。最初の投稿である場合、トピックも削除されます"
         confirm: "投稿への返信も削除してよろしいですか？"
         complete: "投稿と返信を削除しました。"
       delete_and_agree:
@@ -4955,19 +5128,23 @@ ja:
         complete: "投稿と返信を削除しました。"
       disagree_and_restore:
         title: "投稿を復元する"
+        description: "通報を却下して投稿を復元します"
         complete: "投稿を復元しました。"
       disagree_bundle:
         title: "いいえ"
       disagree:
         title: "投稿を維持する"
+        description: "通報を却下する"
         complete: "通報は無視されました。"
       discard_post:
         title: "投稿を破棄"
         complete: "投稿を破棄しました。"
       revise_and_reject_post:
+        title: "修正をリクエストする..."
         complete: "投稿を修正待ちで拒否しました。"
       ignore:
         title: "無視"
+        description: "対応せずにキューから削除します。"
         complete: "通報は無視されました。"
       ignore_and_do_nothing:
         title: "何もしない"
@@ -4995,6 +5172,7 @@ ja:
         title: "いいえ"
         delete:
           title: "ユーザーの削除"
+          description: "ブロックせずにユーザーを削除します"
           complete: "ユーザーは削除されました。"
         block:
           title: "ユーザーの削除とブロック"
@@ -5004,6 +5182,7 @@ ja:
         title: "はい"
       not_spam:
         title: "いいえ"
+        description: "迷惑行為ではないためユーザーを承認します"
       reject:
         title: "却下"
         bundle_title: "拒否…"
@@ -5016,9 +5195,13 @@ ja:
       reject_and_delete:
         title: "投稿の拒否と削除"
         complete: "投稿を拒否し、削除しました。"
+      reject_and_delete_standalone:
+        title: "いいえ。投稿を削除する"
       reject_and_keep_deleted:
         title: "投稿を削除されたままにする"
         complete: "投稿を拒否し、削除のままにしました。"
+      reject_and_keep_deleted_standalone:
+        title: "いいえ。投稿を削除されたままにする"
       scrub:
         title: レコードを削除
       approve_and_restore:
@@ -5027,25 +5210,53 @@ ja:
       approve_and_unhide:
         title: "はい"
         complete: "投稿を承認して非表示状態を解除しました"
-      no_action_post:
-        title: "未対応"
+      post_actions:
+        bundle_title: "投稿をどうしますか？"
       delete_post:
         title: "投稿を削除"
+        description: "この投稿を削除します"
         complete: "削除された投稿"
       hide_post:
         title: "投稿を非表示にする"
+        description: "この投稿を非公開にします"
+        complete: "投稿は非表示になりました"
+      unhide_post:
+        title: "投稿を表示する"
+        description: "この投稿をすべてのユーザーに公開します"
+        complete: "投稿を公開しました"
       restore_post:
         title: "投稿を復元する"
-      no_action_user:
-        title: "未対応"
+        description: "削除されたこの投稿を復元します"
+        complete: "投稿を復元しました"
+      edit_post:
+        title: "投稿を編集する"
+        description: "この投稿のコンテンツを編集します"
+        complete: "投稿を編集しました"
+      user_actions:
+        bundle_title: "ユーザーをどうしますか？"
       silence_user:
         title: "ユーザーを投稿禁止にする"
+        description: "ユーザーが投稿できないようにします"
+        complete: "ユーザーを投稿禁止にしました"
+        reason: "ユーザーはレビューキューを通じて投稿禁止にされました"
       suspend_user:
         title: "ユーザーを凍結する"
+        description: "ユーザーアカウントを凍結します"
+        complete: "ユーザーを凍結しました"
+        reason: "ユーザーはレビューキューを通じて凍結されました"
       delete_user:
         title: "ユーザーを削除"
+        description: "このユーザーをフォーラムから削除します"
         complete: "削除されたユーザー"
         reason: "レビューキューを介して削除されました"
+      delete_and_block_user:
+        title: "削除してブロックする"
+        description: "ユーザーを削除して、ユーザーの IP/メールアドレスをブロックします"
+        complete: "ユーザーを削除してブロックしました"
+      delete_user_block:
+        title: "削除してブロックする"
+        description: "ユーザーを削除して、ユーザーの IP/メールアドレスをブロックします"
+        complete: "ユーザーを削除してブロックしました"
   email_style:
     html_missing_placeholder: "html テンプレートには %{placeholder} が含まれている必要があります。"
   notification_level:
@@ -5088,6 +5299,11 @@ ja:
       reserved_id: "には ID: %{id} として予約されたキーワードがあります"
       unsafe_description: "には安全でない HTML 記述が含まれます"
       invalid_tag_group: "には無効なタググループがあります: %{tag_group_name}"
+  discourse_id:
+    already_registered: "このサイトはすでに Discourse ID で登録されています"
+    errors:
+      not_configured: "Discourse ID が構成されていません。まず Discourse ID を有効にしてください。"
+      regenerate_failed: "認証情報の再作成に失敗しました。後でもう一度お試しください。"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index b95bdfa7f1ebf..47b1664164dc9 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -1345,7 +1345,6 @@ ko:
     allowed_crawler_user_agents: "사이트 액세스를 허용해야 하는 웹 크롤러의 사용자 에이전트입니다. 경고! 이것을 설정하면 여기에 나열되지 않은 모든 크롤러가 비활성화됩니다!"
     blocked_crawler_user_agents: "사이트 액세스가 허용되지 않아야 하는 웹 크롤러를 식별하는 사용자 에이전트 스트링에서 대소문자를 구분하지 않는 고유한 단어입니다. 허용 목록이 정의된 경우 적용되지 않습니다."
     slow_down_crawler_rate: "slow_down_crawler_user_agents를 지정하면 이 비율이 모든 크롤러에 적용됩니다(요청 간 지연 시간(초))."
-    content_security_policy_collect_reports: "/csp_reports에서 CSP 위반 리포트 수집 활성화"
     content_security_policy_frame_ancestors: "CSP를 통해 iframe에 이 사이트를 임베드할 수 있는 사용자를 제한합니다. <a href='%{base_path}/admin/customize/embedding'>임베딩</a>에서 허용된 호스트를 제어합니다."
     invalidate_inactive_admin_email_after_days: "이 기간에 사이트를 방문하지 않은 관리자 계정은 로그인하기 전에 이메일 주소를 다시 확인해야 합니다. 비활성화하려면 0으로 설정하세요."
     share_links: "공유 대화창에 표시할 항목과 순서를 결정합니다."
@@ -1568,7 +1567,6 @@ ko:
     alternative_reply_by_email_addresses: "수신 이메일 주소로 회신 이메일을 보내는 데 사용하는 대체 템플릿 목록입니다. 예: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "수신 이메일에 텍스트 대신 HTML을 사용합니다."
     strip_incoming_email_lines: "수신 이메일의 각 줄에서 앞뒤 공백을 제거합니다."
-    disable_emails: "Discourse에서 모든 유형의 이메일을 보내지 못하도록 합니다. 모든 사용자의 이메일을 비활성화하려면 '예'를 선택합니다. 운영진이 아닌 사용자에 대해서만 이메일을 비활성화하려면 '비운영진'을 선택하세요."
     strip_images_from_short_emails: "2800바이트, 즉 2.73KB 이내 크기를 가지도록 이메일에서 이미지 제거"
     display_name_on_email_from: "이메일 보내는 사람 필드에 전체 이름 표시"
     unsubscribe_via_email: "사용자가 이메일 제목이나 본문에 '구독 해제'를 포함하여 답장하면 이메일을 구독 해제하도록 허용"
@@ -1785,10 +1783,6 @@ ko:
       reply_by_email_disabled: "이 설정을 활성화하기 전에 먼저 '이메일로 회신'을 활성화해야 합니다."
       discourse_connect_url_is_empty: "이 설정을 활성화하기 전에 'discourse connect url'을 설정해야 합니다."
       enable_local_logins_disabled: "이 설정을 활성화하기 전에 먼저 '로컬 로그인 활성화'를 활성화해야 합니다."
-      min_username_length_exists: "최소 아이디 길이를 가장 짧은 아이디(%{username}) 이상으로 설정할 수 없습니다."
-      min_username_length_range: "최솟값은 최댓값보다 크게 설정할 수 없습니다."
-      max_username_length_exists: "최대 아이디 길이를 가장 긴 아이디(%{username}) 이하로 설정할 수 없습니다."
-      max_username_length_range: "최솟값은 최댓값보다 작게 설정할 수 없습니다."
       invalid_hex_value: "색상 값은 6자리 16진수 코드여야 합니다."
       empty_selectable_avatars: "이 설정을 활성화하기 전에 먼저 두 개 이상의 선택 가능한 아바타를 업로드해야 합니다."
       category_search_priority:
@@ -3524,8 +3518,6 @@ ko:
     title: "안전 모드 시작"
     enter: "안전 모드 시작"
     must_select: "안전 모드를 시작하려면 옵션을 하나 이상 선택하세요."
-  dev_mode:
-    enter: "시작하다"
   wizard:
     title: "Discourse Setup"
     step:
@@ -3670,12 +3662,8 @@ ko:
         title: "예"
       approve_and_unhide:
         title: "예"
-      no_action_post:
-        title: "조치 없음"
       delete_post:
         complete: "게시물 삭제됨"
-      no_action_user:
-        title: "조치 없음"
       delete_user:
         complete: "사용자 삭제됨"
         reason: "검토 대기열을 통해 삭제됨"
diff --git a/config/locales/server.lt.yml b/config/locales/server.lt.yml
index 63ee3deb89f00..fdff51b4026d3 100644
--- a/config/locales/server.lt.yml
+++ b/config/locales/server.lt.yml
@@ -1391,8 +1391,6 @@ lt:
       invalid_string_min_max: "Turi būti tarp %{min} ir %{max} simbolių."
       invalid_json: "Netinkamas JSON."
       invalid_reply_by_email_address: "Reikšmę turi sudaryti „%{reply_key}“ ir ji turi skirtis nuo pranešimo el. pašto."
-      max_username_length_exists: "Negalite nustatyti maksimalaus vartotojo vardo ilgio žemiau ilgiausio vartotojo vardo (%{username})."
-      max_username_length_range: "Negalite nustatyti didžiausios vertės žemiau minimumo."
       invalid_hex_value: "Spalvų reikšmės turi būti 6 skaitmenų šešioliktainiai kodai."
       empty_selectable_avatars: "Prieš įgalindami šį nustatymą, pirmiausia turite įkelti bent du pasirinktus avatarus."
       allowed_unicode_usernames:
@@ -2510,8 +2508,6 @@ lt:
     title: "Įeikite į saugųjį režimą"
     enter: "Įeikite į saugųjį režimą"
     must_select: "Norėdami įjungti saugųjį režimą, turite pasirinkti bent vieną parinktį."
-  dev_mode:
-    enter: "Įeiti"
   wizard:
     title: "Discourse sąranka"
     step:
@@ -2641,12 +2637,8 @@ lt:
         title: "Taip"
       approve_and_unhide:
         title: "Taip"
-      no_action_post:
-        title: "Jokių veiksmų"
       delete_post:
         complete: "Įrašas ištrintas"
-      no_action_user:
-        title: "Jokių veiksmų"
       delete_user:
         complete: "Naudotojas ištrintas"
   create_linked_topic:
diff --git a/config/locales/server.lv.yml b/config/locales/server.lv.yml
index 579f89029d49f..28fd95c8d0069 100644
--- a/config/locales/server.lv.yml
+++ b/config/locales/server.lv.yml
@@ -492,8 +492,6 @@ lv:
       button: "Reģistrēties"
     resend_email:
       title: "Atkārtoti nosūtīt aktivācijas e-pastu"
-  dev_mode:
-    enter: "Ievadīt"
   wizard:
     step:
       setup:
diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml
index 54341be7afe6a..5fe7f24b9208a 100644
--- a/config/locales/server.nb_NO.yml
+++ b/config/locales/server.nb_NO.yml
@@ -1005,8 +1005,6 @@ nb_NO:
       invalid_integer_min_max: "Verdien må være mellom %{min} og %{max}."
       invalid_integer: "Verdien må være et heltall."
       invalid_string: "Ugyldig verdi"
-      min_username_length_range: "Du kan ikke sette minimum høyere enn maksimum."
-      max_username_length_range: "Du kan ikke sette maksimum under minimum."
   search:
     within_post: "#%{post_number} av %{username}"
     types:
@@ -1280,8 +1278,6 @@ nb_NO:
       message: "<p>Vi har sendt aktiverings-eposten på nytt til <b>%{email}</b>"
   safe_mode:
     title: "Start sikkerhetsmodus"
-  dev_mode:
-    enter: "Angi"
   wizard:
     title: "Discourse-oppsett"
     step:
@@ -1374,12 +1370,8 @@ nb_NO:
         title: "Ja"
       approve_and_unhide:
         title: "Ja"
-      no_action_post:
-        title: "Ingen handling"
       delete_post:
         complete: "Post slettet"
-      no_action_user:
-        title: "Ingen handling"
       delete_user:
         complete: "Bruker slettet"
   fallback_username: "bruker"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index 7289f49ad0e20..b90591eb98c85 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -60,8 +60,6 @@ nl:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "%{post_number} van %{username}"
-    too_many_urls: "Er kunnen niet meer dan 10 URL's inlijn worden ge-oneboxt in één verzoek."
-    concurrency_not_allowed: "Gelijktijdige inline oneboxverzoeken zijn niet toegestaan. Stuur één verzoek tegelijk."
   components:
     enabled_filter: "Ingeschakeld"
     disabled_filter: "Uitgeschakeld"
@@ -344,7 +342,6 @@ nl:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "User agents moeten minimaal 3 tekens lang zijn om te voorkomen dat de snelheid van legitieme gebruikers per ongeluk wordt beperkt."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Je kunt de volgende waarden niet toevoegen aan de instelling: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Je kunt megagegevens van afbeeldingen strippen niet uitschakelen als 'composer media optimization image enabled' is ingeschakeld. Schakel 'composer media optimization image enabled' uit voordat je megagegevens van afbeeldingen strippen uitschakelt."
-      x_summary_large_image_no_svg: "Twitter-samenvattingsafbeeldingen die worden gebruikt voor twitter:image-metadata mogen geen .svg-afbeelding zijn."
       tl0_and_anonymous_flag: "Voor anonieme gebruikers moet ofwel 'site contact email' of 'email address to report illegal content' worden opgegeven."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Voor deze instelling moet eerst de instelling 'allow anonymous mode' worden ingeschakeld."
     conflicting_google_user_id: 'De Google-account-ID voor deze account is gewijzigd; om beveiligingsredenen is medewerkerinterventie vereist. Neem contact op met een medewerker en wijs hem of haar op <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1768,7 +1765,6 @@ nl:
     slow_down_crawler_rate: "Als slow_down_crawler_user_agents is opgegeven, is deze beperking op alle crawlers van toepassing (aantal seconden vertraging tussen verzoeken)"
     content_security_policy: "Schakel Content-Security-Policy (CSP) in. CSP is een extra beveiligingslaag die bepaalde soorten aanvallen helpt voorkomen, waaronder cross-site scripting (XSS) en data-injectie."
     content_security_policy_report_only: "Content-Security-Policy-Report-Only (CSP) inschakelen"
-    content_security_policy_collect_reports: "Rapportverzameling voor CSP-schendingen inschakelen via /csp_reports"
     content_security_policy_frame_ancestors: "Beperken wie deze website kan insluiten in iframes via CSP. Beheer toegestane hosts op <a href='%{base_path}/admin/customize/embedding'>Insluiten</a>"
     content_security_policy_script_src: "Aanvullende scriptbronnen op de toelatingslijst. De huidige host en CDN zijn standaard inbegrepen. Zie <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>XSS-aanvallen beperken met Content Security Policy.</a> (CSP). Andere hostbronnen worden genegeerd omdat strict-dynamic is ingeschakeld."
     invalidate_inactive_admin_email_after_days: "Beheerdersaccounts die de website dit aantal dagen niet hebben bezocht, dienen hun e-mailadres voor het aanmelden opnieuw te valideren. Stel dit in op 0 om uit te schakelen."
@@ -2085,7 +2081,6 @@ nl:
     alternative_reply_by_email_addresses: "Lijst van alternatieve sjablonen voor adressen voor inkomende e-mail bij antwoorden per e-mail. Voorbeeld: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "HTML in plaats van tekst gebruiken voor inkomende e-mail."
     strip_incoming_email_lines: "Voorloop- en volgspaties uit elke regel van inkomende e-mails verwijderen."
-    disable_emails: "Voorkomen dat Discourse alle soorten e-mail verstuurt. Selecteer 'yes' om e-mails voor alle gebruikers uit te schakelen. Selecteer 'non-medewerkerf' om alleen e-mails voor medewerkers uit te schakelen."
     strip_images_from_short_emails: "Afbeeldingen met grootte van minder dan 2800 bytes uit e-mails verwijderen"
     short_email_length: "Bepaal de maximale lengte, in bytes, voor een e-mail om te worden geclassificeerd als 'kort' voor afbeeldingsonderdrukking. Als een e-mail niet groter is dan deze instelling, worden alle afbeeldingen (zoals avatars en emoji's) in de e-mail verwijderd."
     display_name_on_email_from: "Volledige namen in van-veld van e-mails weergeven"
@@ -2365,7 +2360,6 @@ nl:
     dashboard_hidden_reports: "Toestaan dat de opgegeven rapporten worden verborgen op het dashboard."
     dashboard_visible_tabs: "Kiezen welke dashboardtabbladen zichtbaar zijn."
     dashboard_general_tab_activity_metrics: "Kies rapporten die als activiteitsgegevens op het algemene tabblad worden weergegeven."
-    gravatar_enabled: "Gebruik de <a href='https://gravatar.com/'>Gravatar</a>-service voor gebruikersavatars. Dit voorkomt dat gebruikers overschakelen naar Gravatar voor hun avatars, maar heeft geen invloed op gebruikers die het al gebruiken."
     gravatar_name: "Geef de naam op van de Gravatar-provider. Deze naam wordt meestal gebruikt om de bron te identificeren die Gravatar-avatars aan de site levert."
     gravatar_base_url: "Geef de URL op voor toegang tot de API van de Gravatar-provider. Deze instelling is cruciaal voor het omzetten van e-mailadressen in Gravatar-URL's waar avatarafbeeldingen worden opgeslagen."
     gravatar_login_url: "URL relatief aan `gravatar_base_url`, waarmee de gebruiker zich kan aanmelden op de Gravatar-service."
@@ -2446,12 +2440,6 @@ nl:
       reply_by_email_disabled: "Je moet eerst 'reply by email' inschakelen voordat je deze instelling inschakelt."
       discourse_connect_url_is_empty: "Je moet een 'DiscourseConnect-URL' instellen voordat je deze instelling inschakelt."
       enable_local_logins_disabled: "Je moet eerst 'enable local logins' inschakelen voordat je deze instelling inschakelt."
-      min_username_length_exists: "Je kunt de minimale gebruikersnaamlengte niet hoger instellen dan de kortste gebruikersnaam (%{username})."
-      min_group_name_length_exists: "Je kunt de minimale gebruikersnaamlengte niet hoger instellen dan de kortste groepsnaam (%{group_name})."
-      min_username_length_range: "Je kunt het minimum niet hoger instellen dan het maximum."
-      max_username_length_exists: "Je kunt de maximale gebruikersnaamlengte niet lager instellen dan de langste gebruikersnaam (%{username})."
-      max_group_name_length_exists: "Je kunt de maximale gebruikersnaamlengte niet lager instellen dan de langste groepsnaam (%{group_name})."
-      max_username_length_range: "Je kunt het maximum niet lager instellen dan het minimum."
       invalid_hex_value: "Kleurwaarden moeten 6-cijferige hexadecimale codes zijn."
       empty_selectable_avatars: "Je moet eerst minimaal twee selecteerbare avatars uploaden voordat je deze instelling inschakelt."
       category_search_priority:
@@ -2510,7 +2498,6 @@ nl:
       exclude_tag: "Sluit topics met een specifieke tag uit"
       exclude_tags_any: "Sluit topics met een van de opgegeven tags uit (door komma's gescheiden)"
       exclude_tags_all: "Sluit topics met alle opgegeven tags uit (door plustekens gescheiden)"
-      tags_alias: "Alias voor 'tag:'-filter"
       tag_group: "Geef topics met tags van een specifieke taggroep weer"
       exclude_tag_group: "Sluit topics met tags van een specifieke taggroep uit"
       activity_before: "Geef topics weer met de laatste activiteit vóór een datum (JJJJ-MM-DD of aantal dagen geleden)"
@@ -4902,8 +4889,6 @@ nl:
     deprecation_error_label: Laat Javascript-deprecaties een foutmelding geven
     enter: "Veilige modus starten"
     must_select: "Je moet ten minste één optie selecteren om naar de veilige modus te gaan."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Discourse instellen"
     step:
@@ -5161,8 +5146,6 @@ nl:
       approve_and_unhide:
         title: "Ja"
         complete: "Bericht goedgekeurd en zichtbaar gemaakt"
-      no_action_post:
-        title: "Geen actie"
       delete_post:
         title: "Bericht verwijderen"
         complete: "Bericht verwijderd"
@@ -5171,8 +5154,6 @@ nl:
       restore_post:
         title: "Bericht herstellen"
         complete: "Bericht hersteld"
-      no_action_user:
-        title: "Geen actie"
       silence_user:
         title: "Gebruiker dempen"
         complete: "Gebruiker gedempt"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index eccfd76791607..29550e2b501bf 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -60,8 +60,8 @@ pl_PL:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} przez %{username}"
-    too_many_urls: "Nie można umieścić więcej niż 10 adresów URL w jednym żądaniu."
-    concurrency_not_allowed: "Jednoczesne żądania inline-oneboxing nie są dozwolone. Prosimy o wysyłanie jednego żądania na raz."
+    too_many_urls: "Nie można przekonwertować więcej niż 10 adresów URL na wbudowane pola jednoskrzynkowe w jednym żądaniu."
+    concurrency_not_allowed: "Jednoczesne żądania konwersji adresów URL na wbudowane pola jednoskrzynkowe są niedozwolone. Prosimy o wysyłanie jednej prośby na raz."
   components:
     enabled_filter: "Włączona"
     disabled_filter: "Wyłączone"
@@ -401,7 +401,7 @@ pl_PL:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "User-Agent musi mieć co najmniej 3 znaki, aby uniknąć przypadkowego ograniczania prawdziwych użytkowników."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Do ustawienia nie można dodać żadnej z następujących wartości: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Nie można wyłączyć usuwania metadanych obrazu, jeśli 'composer media optimization image enabled'. Wyłącz 'composer media optimization image enabled' przed wyłączeniem usuwania metadanych obrazu."
-      x_summary_large_image_no_svg: "Obrazy podsumowania Twittera używane w metadanych twitter:image nie mogą być obrazami .svg."
+      x_summary_large_image_no_svg: "Obrazy podsumowania X używane w metadanych twitter:image nie mogą być obrazami w formacie .svg."
       tl0_and_anonymous_flag: "W przypadku anonimowych użytkowników należy podać 'site contact email' lub 'email address to report illegal content'."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "To ustawienie wymaga, aby najpierw włączyć ustawienie 'allow anonymous mode'."
     conflicting_google_user_id: 'Identyfikator konta Google dla tego konta został zmieniony; interwencja personelu jest wymagana ze względów bezpieczeństwa. Skontaktuj się z personelem i wskaż go <br> <a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1960,7 +1960,6 @@ pl_PL:
     llms_txt: "Prześlij plik tekstowy, który będzie udostępniany w katalogu /llms.txt robotom LLM. Więcej informacji znajdziesz na stronie <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a> ."
     content_security_policy: "Włącz ochronę Content-Security-Policy (CSP). CSP to dodatkowa warstwa bezpieczeństwa, która pomaga zapobiegać niektórym rodzajom ataków, takim jak Cross Site Scripting (XSS) i wstrzykiwanie danych."
     content_security_policy_report_only: "Włącz Content-Security-Policy-Report-Only (CSP)."
-    content_security_policy_collect_reports: "Włącz zbieranie raportów o naruszeniach CSP na / csp_reports"
     content_security_policy_frame_ancestors: "Określ, kto może osadzić tę witrynę w ramkach iframe za pośrednictwem CSP. Kontroluj dozwolone hosty w <a href='%{base_path}/admin/customize/embedding'>ustawieniach osadzania</a>"
     content_security_policy_script_src: "Dodatkowe dozwolone źródła skryptów. Bieżący host i CDN są domyślnie uwzględnione. Zobacz <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Ograniczanie ataków XSS za pomocą polityki bezpieczeństwa treści.</a> (CSP). Inne źródła hosta są ignorowane, ponieważ włączona jest funkcja strict-dynamic."
     invalidate_inactive_admin_email_after_days: "Konta administracyjne, które nie odwiedzały witryny w tej liczbie dni, będą musiały ponownie zweryfikować swój adres e-mail przed zalogowaniem. Ustaw na 0, aby wyłączyć."
@@ -2046,7 +2045,7 @@ pl_PL:
     enable_local_logins_via_email: "Zezwalaj użytkownikom na żądanie linku logowania do jednego kliknięcia, który zostanie im przesłany pocztą e-mail."
     allow_new_registrations: "Zezwól na rejestrację nowych użytkowników. Odznacz opcję żeby uniemożliwić rejestrację nowych kont."
     enable_signup_cta: "Pokazuj wiadomość dla powracających użytkowników anonimowych, zachęcającą ich do założenia konta."
-    enable_discourse_id: "Włącz uwierzytelnianie za pomocą Discourse ID – usługi logowania jednokrotnego, która umożliwia użytkownikom logowanie się do wielu witryn Discourse za pomocą jednego konta. Popularni dostawcy logowania społecznościowego, tacy jak Google, Facebook, Apple i Github, są obsługiwani bez dodatkowej konfiguracji. Więcej informacji znajdziesz na stronie <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a> ."
+    enable_discourse_id: "Włącz uwierzytelnianie za pomocą Discourse ID – usługi logowania jednokrotnego, która umożliwia użytkownikom logowanie się do wielu witryn Discourse za pomocą jednego konta. Popularni dostawcy logowania społecznościowego, tacy jak Google, Facebook, Apple i GitHub, są obsługiwani bez dodatkowej konfiguracji. Więcej informacji znajdziesz na stronie <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a>."
     enable_google_oauth2_logins: "Włącz uwierzytelnianie Google Oauth2. Jest to metoda uwierzytelniania obsługiwana obecnie przez Google. Wymaga podania klucza i sekretu. Zobacz <a href='https://meta.discourse.org/t/15858' target='_blank'>Konfigurowanie logowania Google dla Discourse</a>."
     google_oauth2_client_id: "Unikalny identyfikator klienta udostępniany przez Twoją aplikację Google, wykorzystywany do procesu uwierzytelnienia."
     google_oauth2_client_secret: "Client Secret twojej aplikacji w Google"
@@ -2289,7 +2288,7 @@ pl_PL:
     alternative_reply_by_email_addresses: "Lista alternatywnych szablonów do odpowiedzi przez adres email. Przykład: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Do przychodzących wiadomości e-mail używaj HTML zamiast tekstu."
     strip_incoming_email_lines: "Usuń wiodące i końcowe białe spacje z każdej linii przychodzących wiadomości e-mail."
-    disable_emails: "Zapobiegaj wysyłaniu przez Discourse jakichkolwiek wiadomości e-mail. Wybierz 'yes', aby wyłączyć e-maile dla wszystkich użytkowników. Wybierz opcję 'non-staff', aby wyłączyć wiadomości e-mail tylko dla użytkowników niebędących członkami personelu."
+    disable_emails: "Zapobiegaj wysyłaniu przez Discourse jakichkolwiek wiadomości e-mail. Wybierz 'yes', aby wyłączyć wychodzące wiadomości e-mail dla wszystkich użytkowników. Wybierz opcję 'non-staff', aby wyłączyć wiadomości e-mail tylko dla użytkowników niebędących członkami personelu."
     allow_email_invites: "Po wyłączeniu tej opcji użytkownicy nie będą mogli wysyłać zaproszeń e-mailem za pośrednictwem Discourse"
     strip_images_from_short_emails: "Pasek zdjęć z emaila o rozmiarze mniejszym niż 2800 bajtów"
     short_email_length: "Ustal maksymalną długość wiadomości e-mail w bajtach, aby uznać ją za 'krótką' w celu ukrycia obrazów. Jeżeli rozmiar wiadomości nie przekroczy tego ustawienia, wszelkie obrazy (takie jak awatary i emotikony) w wiadomości zostaną usunięte."
@@ -2580,7 +2579,7 @@ pl_PL:
     dashboard_hidden_reports: "Zezwalaj na ukrycie określonych raportów z panelu administracyjnego."
     dashboard_visible_tabs: "Wybierz, które karty panelu administracyjnego są widoczne."
     dashboard_general_tab_activity_metrics: "Wybierz raporty, które mają być wyświetlane jako metryki aktywności na karcie ogólne."
-    gravatar_enabled: "Użyj usługi <a href='https://gravatar.com/'>Gravatar</a> dla awatarów użytkowników. Uniemożliwi to użytkownikom przełączanie się na usługę Gravatar dla swoich awatarów, ale nie wpłynie to na użytkowników, którzy już z niej korzystają."
+    gravatar_enabled: "Użyj usługi <a href='https://gravatar.com/'>Gravatar</a> dla awatarów użytkowników. Wyłączenie tej opcji uniemożliwi użytkownikom przełączanie się na Gravatar dla swoich awatarów, ale nie wpłynie to na użytkowników, którzy już z niej korzystają."
     gravatar_name: "Podaj nazwę dostawcy usługi Gravatar. Ta nazwa jest zwykle używana do identyfikacji źródła dostarczającego awatary Gravatar do witryny."
     gravatar_base_url: "Podaj adres URL umożliwiający dostęp do API serwisu Gravatar. To ustawienie jest niezbędne do konwersji adresów e-mail na adresy URL Gravatar, gdzie przechowywane są obrazy awatarów."
     gravatar_login_url: "Odnoszący się do `gravatar_base_url` adres URL, który umożliwia użytkownikowi zalogowanie się do usługi Gravatar."
@@ -2635,9 +2634,11 @@ pl_PL:
     fake_upcoming_change: "Jest to fałszywa nadchodząca zmiana do celów testowych. Nie musisz tłumaczyć tego ciągu znaków."
     floating_dismiss_topics_on_mobile: "Wyświetla na urządzeniu mobilnym pływający przycisk „Odrzuć...” dla listy tematów, aby ułatwić dostęp i zwolnić miejsce u góry listy tematów"
     rename_faq_to_guidelines: "Ta zmiana zmienia nazwę strony FAQ na Wytyczne. Strona FAQ będzie nadal dostępna pod adresem /faq. Ustawienie „faq url” działa jak poprzednio."
+    experimental_tag_settings_page: "Włącz dedykowaną stronę ustawień dla tagów w /tag/:slug/:id/edit."
     enable_simplified_category_creation: "Umożliwia uproszczony proces tworzenia kategorii z mniejszą liczbą opcji i bardziej przejrzystym interfejsem."
     enable_custom_splash_screen: "Umożliwia dostosowanie ekranu powitalnego ładowania za pomocą własnego obrazu SVG. Prześlij obraz za pomocą ustawienia „obraz ekranu powitalnego”. Uwaga: może to negatywnie wpłynąć na wyniki LCP i indeksowanie Google."
     modernize_foundation_theme: "Zmiana ta wprowadza modyfikacje projektowe do motywu Foundation w Discourse."
+    reporting_improvements: "Ulepszenia nawigacji, projektu i użyteczności raportów administracyjnych Discourse."
     errors:
       invalid_css_color: "Nieprawidłowy kolor. Wpisz nazwę koloru lub wartość szesnastkową."
       invalid_datetime: "Nieprawidłowy format daty i godziny. Upewnij się, że wprowadzono prawidłową datę i godzinę."
@@ -2688,12 +2689,12 @@ pl_PL:
       reply_by_email_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć opcję 'reply by email'."
       discourse_connect_url_is_empty: "Musisz ustawić 'discourse connect url' przed włączeniem tego ustawienia."
       enable_local_logins_disabled: "Przed włączeniem tego ustawienia musisz najpierw włączyć opcję 'enable local logins'."
-      min_username_length_exists: "Nie możesz ustawić minimalnej długości nazwy użytkownika powyżej najkrótszej nazwy użytkownika (%{username})."
-      min_group_name_length_exists: "Nie możesz ustawić minimalnej długości nazwy użytkownika powyżej najkrótszej nazwy grupy (%{group_name})."
-      min_username_length_range: "Nie możesz ustawić minimum powyżej maksimum."
-      max_username_length_exists: "Nie możesz ustawić maksymalnej długości nazwy użytkownika poniżej najdłuższej nazwy użytkownika (%{username})."
-      max_group_name_length_exists: "Nie możesz ustawić maksymalnej długości nazwy użytkownika poniżej najdłuższej nazwy grupy (%{group_name})."
-      max_username_length_range: "Nie możesz ustawić maksimum poniżej minimum."
+      min_username_length_exists: "Nie można ustawić wartości „minimalnej długości nazwy użytkownika” wyższej niż najkrótsza nazwa użytkownika (%{username})."
+      min_group_name_length_exists: "Nie można ustawić wartości „minimalnej długości nazwy użytkownika” wyższej niż najkrótsza nazwa grupy (%{group_name})."
+      min_username_length_range: "Nie można ustawić wartości „minimalnej długości nazwy użytkownika” na poziomie wyższym niż „maksymalna długość nazwy użytkownika”."
+      max_username_length_exists: "Nie można ustawić maksymalnej długości nazwy użytkownika poniżej najdłuższej nazwy użytkownika (%{username})."
+      max_group_name_length_exists: "Nie można ustawić maksymalnej długości nazwy użytkownika poniżej najdłuższej nazwy grupy (%{group_name})."
+      max_username_length_range: "Nie można ustawić maksymalnej długości nazwy użytkownika poniżej minimalnej długości nazwy użytkownika."
       invalid_hex_value: "Wartości kolorów muszą być sześciocyfrowymi kodami szesnastkowymi."
       empty_selectable_avatars: "Przed włączeniem tego ustawienia należy najpierw przesłać co najmniej dwa wybrane awatary."
       category_search_priority:
@@ -2758,7 +2759,6 @@ pl_PL:
       exclude_tag: "Wyklucz tematy z określonym tagiem"
       exclude_tags_any: "Wyklucz tematy zawierające dowolne ze wskazanych tagów (rozdzielone przecinkami)"
       exclude_tags_all: "Wyklucz tematy zawierające wszystkie określone tagi (rozdzielone znakiem plus)"
-      tags_alias: "Alias dla filtra „tag:”"
       tag_group: "Pokaż tematy z tagami z określonej grupy tagów"
       exclude_tag_group: "Wyklucz tematy z tagami z określonej grupy tagów"
       activity_before: "Pokaż tematy z ostatnią aktywnością przed datą (RRRR-MM-DD lub dni temu)"
@@ -5326,7 +5326,7 @@ pl_PL:
   dev_mode:
     title: "Tryb programisty"
     enable_rack_mini_profiler: "Włącz funkcję Rack Mini Profiler, aby zmiany w sesjach były zachowywane przez 1 godzinę"
-    enter: "Wejdź"
+    enter: "Przejdź do trybu programisty"
   wizard:
     title: "Instalacja Discourse"
     step:
@@ -5628,10 +5628,6 @@ pl_PL:
         complete: "Post zatwierdzony i nieukryty"
       post_actions:
         bundle_title: "Co chcesz zrobić z tym wpisem?"
-      no_action_post:
-        title: "Brak akcji"
-        description: "Nie podejmuj żadnych działań w związku ze wpisem"
-        complete: "Nie podjęto żadnych działań w związku ze wpisem"
       delete_post:
         title: "Usuń wpis"
         description: "Usuń ten wpis"
@@ -5652,16 +5648,8 @@ pl_PL:
         title: "Edytuj wpis"
         description: "Edytuj treść tego wpisu"
         complete: "Wpis edytowany"
-      convert_to_pm:
-        title: "Konwertuj na PW"
-        description: "Zmień ten post na prywatną wiadomość"
-        complete: "Wpis przekształcony w prywatną wiadomość"
       user_actions:
         bundle_title: "Co chcesz zrobić z użytkownikiem?"
-      no_action_user:
-        title: "Brak akcji"
-        description: "Nie podejmuj żadnych działań wobec użytkownika"
-        complete: "Nie podjęto żadnych działań wobec użytkownika"
       silence_user:
         title: "Wycisz użytkownika"
         description: "Zablokuj użytkownikowi możliwość tworzenia wpisów"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index b88fbd32a8d3e..5866c59e8bbcd 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -1270,8 +1270,6 @@ pt:
       reply_by_email_address_is_empty: "É necessário definir um email para 'resposta por endereço de email' antes de ligar a resposta por email."
       user_locale_not_enabled: "Tem de ligar 'permitir definições regionais do utilizador' antes de ligar esta configuração."
       invalid_regex: "A expressão regular não é válida ou permitida."
-      min_username_length_range: "Não pode definir o mínimo acima do máximo."
-      max_username_length_range: "Não pode definir o máximo abaixo do mínimo."
   search:
     within_post: "#%{post_number} por %{username}"
     types:
@@ -2036,8 +2034,6 @@ pt:
   safe_mode:
     title: "Entrar em modo de segurança"
     enter: "Entrar em Modo de Segurança"
-  dev_mode:
-    enter: "Entrar"
   wizard:
     title: "Configuração do Discourse"
     step:
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index eb0ec9b62d1b9..4c95d672577ce 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -60,8 +60,6 @@ pt_BR:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} de %{username}"
-    too_many_urls: "Não é possível incorporar com onebox mais de dez URLs numa única solicitação."
-    concurrency_not_allowed: "Solicitações simultâneas de incorporação com onebox não são permitidas. Envie uma solicitação por vez."
   components:
     enabled_filter: "Ativado(a)"
     disabled_filter: "Desativado(a)"
@@ -344,7 +342,6 @@ pt_BR:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Agentes de usuário(a) devem ter pelo menos três caracteres para evitar limitação de taxa de usuários(as) legítimos(as) sem querer."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Não é possível adicionar nenhum dos valores a seguir à configuração: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Você não pode desativar a remoção de metadados de imagem se 'a imagem de otimização de mídia do compositor habilitada' estiver ativada. Desative a 'imagem de otimização de mídia do compositor ativada' antes de desativar a remoção dos metadados da imagem."
-      x_summary_large_image_no_svg: "Imagens de resumo do Twitter usadas para metadados twitter:image não podem ser uma imagem .svg."
       tl0_and_anonymous_flag: "É preciso informar o \"site contact email\" ou \"email address to report illegal content\" para usuários(as) anônimos(as)."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Para usar esta configuração, ative a definição \"allow anonymous mode\" primeiro."
     conflicting_google_user_id: 'A ID da conta Google para esta conta foi alterada. A intervenção da equipe é necessária por razões de segurança. Entre em contato com a equipe e direcione para <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1769,7 +1766,6 @@ pt_BR:
     slow_down_crawler_rate: "Se slow_down_crawler_user_agents for especificado, essa taxa será aplicada a todos os rastreadores (quantidade de segundos de atraso entre os pedidos)"
     content_security_policy: "Ative Política de Segurança de Conteúdo (CSP). A CSP é uma camada adicional de segurança que ajuda a impedir certos tipos de ataque, incluindo Cross Site Scripting (XSS) e injeção de dados."
     content_security_policy_report_only: "Ativar Content-Security-Policy-Report-Only (CSP)"
-    content_security_policy_collect_reports: "Ativar a coleta de relatórios de violação de CSP em /csp_reports"
     content_security_policy_frame_ancestors: "Restrinja quem incorpora este site em iframes via CSP. Controle os hosts permitidos em <a href='%{base_path}/admin/customize/embedding'>Incorporação</a>"
     content_security_policy_script_src: "Fontes de scripts adicionais na lista de permissões. O host e CDN atual estão inclusos por padrão. Consulte <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Mitigue ataques XSS com a política de segurança de conteúdo.</a> (CSP). Outras fontes de hosts são ignoradas, pois a dinâmica estrita está ativada."
     invalidate_inactive_admin_email_after_days: "As contas de administrador(a) que não acessaram o site nesta quantidade de dias precisarão validar novamente seu endereço de e-mail antes de entrarem com a conta. Defina como 0 para desativar."
@@ -2086,7 +2082,6 @@ pt_BR:
     alternative_reply_by_email_addresses: "Lista de modelos alternativos para responder por e-mail a endereços de e-mail recebidos. Por exemplo:%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Use HTML em vez de texto para e-mail recebido."
     strip_incoming_email_lines: "Remova os espaços em branco iniciais e finais de cada linha de e-mails recebidos."
-    disable_emails: "Evite que o Discourse envie qualquer tipo de e-mail. Selecione \"sim\" para desativar os e-mails de todos(as) os(as) usuários(as). Selecione \"não pertence à equipe\" para desativar os e-mails apenas para usuários(as) que não fizerem parte da equipe."
     strip_images_from_short_emails: "Tirar imagens de e-mails cujo tamanho seja menor que 2.800 bytes"
     short_email_length: "Defina o tamanho máximo, em bytes, para que um e-mail seja classificado como \"curto\" para compactação de imagem. Se o tamanho do e-mail não exceder esta configuração, as imagens no e-mail (como avatar e emojis) serão removidas."
     display_name_on_email_from: "Exibir nomes completos no e-mail dos campos"
@@ -2366,7 +2361,6 @@ pt_BR:
     dashboard_hidden_reports: "Permita que relatórios específicos sejam ocultos no painel de controle."
     dashboard_visible_tabs: "Escolha quais abas do painel de controle estão visíveis."
     dashboard_general_tab_activity_metrics: "Escolha relatórios para serem exibidos como métricas de atividade na aba geral."
-    gravatar_enabled: "Use o serviço <a href='https://gravatar.com/'>Gravatar</a> para os avatares dos(as) usuários(as). Impede que os(as) usuários(as) troquem para o Gravatar para obter seus avatares, mas não afeta os(as) usuários(as) que já o usam."
     gravatar_name: "Especifique o nome do provedor de serviço do Gravatar. Geralmente, o nome é usado para identificar a origem dos avatares do Gravatar no site."
     gravatar_base_url: "Especifique a URL para acessar a API do provedor do Gravatar. Esta configuração é fundamental para converter endereços de e-mail em URLs do Gravatar onde as imagens de avatares estão armazenadas."
     gravatar_login_url: "URL relacionada a \"gravatar_base_url\", que permite ao(à) usuário(a) entrar com a conta no serviço Gravatar."
@@ -2447,12 +2441,6 @@ pt_BR:
       reply_by_email_disabled: "Você deve ativar \"responder por e-mail\" antes de ativar esta configuração primeiro."
       discourse_connect_url_is_empty: "É preciso definir uma \"url de conexão do Discourse\" antes de ativar esta configuração."
       enable_local_logins_disabled: "Você deve ativar \"ativar entradas com e-mail em modo local\" antes de ativar esta configuração."
-      min_username_length_exists: "Você não pode definir o tamanho mínimo do nome do(a) usuário(a) acima do nome do(a) usuário(a) mais curto (%{username})."
-      min_group_name_length_exists: "Você não pode definir o tamanho mínimo do nome de usuário(a) acima do nome de grupo mais curto (%{group_name})."
-      min_username_length_range: "Você não pode definir o mínimo acima do máximo."
-      max_username_length_exists: "Você não pode definir o tamanho máximo do nome do(a) usuário(a) abaixo do nome do(a) usuário(a) mais longo (%{username})."
-      max_group_name_length_exists: "Você não pode definir o tamanho máximo do nome de usuário(a) abaixo do nome de grupo mais longo (%{group_name})."
-      max_username_length_range: "Você não pode definir o máximo abaixo do mínimo."
       invalid_hex_value: "Os valores de cor precisam ser códigos hexadecimais de seis dígitos."
       empty_selectable_avatars: "É preciso enviar pelo menos dois avatares selecionáveis antes de ativar esta configuração."
       category_search_priority:
@@ -2511,7 +2499,6 @@ pt_BR:
       exclude_tag: "Excluir tópicos com uma etiqueta especificada"
       exclude_tags_any: "Excluir tópicos com qualquer uma das etiquetas especificadas (separadas por vírgula)"
       exclude_tags_all: "Excluir tópicos com todas as etiquetas especificadas (separadas por vírgula)"
-      tags_alias: "Alias para \"etiqueta\": filtro"
       tag_group: "Exibir tópicos com etiquetas de um grupo de etiquetas específico"
       exclude_tag_group: "Excluir tópicos com tags de um grupo de etiquetas específico"
       activity_before: "Exibir tópicos com atividade mais recente antes de uma data (DD-MM-AAAA ou dias atrás)"
@@ -4894,8 +4881,6 @@ pt_BR:
     deprecation_error_label: Faça com que conteúdos obsoletos de Javascript causem um erro
     enter: "Entrar no modo de segurança"
     must_select: "Você deve selecionar pelo menos uma opção para entrar no modo de segurança."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Configuração do Discourse"
     step:
@@ -5154,8 +5139,6 @@ pt_BR:
       approve_and_unhide:
         title: "Sim"
         complete: "Postagem aprovada e revelada"
-      no_action_post:
-        title: "Sem ação"
       delete_post:
         title: "Excluir postagem"
         complete: "Postagem excluída"
@@ -5164,8 +5147,6 @@ pt_BR:
       restore_post:
         title: "Restaurar postagem"
         complete: "Postagem restaurada"
-      no_action_user:
-        title: "Sem ação"
       silence_user:
         title: "Silenciar usuário(a)"
       suspend_user:
diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml
index 9e7bba019dd35..d4fe1ba5fa977 100644
--- a/config/locales/server.ro.yml
+++ b/config/locales/server.ro.yml
@@ -1037,7 +1037,6 @@ ro:
     auth_overrides_avatar: "Suprascrie avatarul local cu avatarul site-ului extern la fiecare conectare și previne modificările locale. Se aplică tuturor furnizorilor de autentificare."
     allow_new_registrations: "Permite înregistrarea noilor utilizatori. Debifați pentru a restricționa pe oricine să creeze un cont nou."
     enable_signup_cta: "Arată o notificare către utilizatorii anonimi care revin prin care să le ceri să se înregistreze pentru a avea un cont pe site."
-    enable_discourse_id: "Activează autentificarea prin Discourse ID, un serviciu de conectare unică ce permite utilizatorilor să se conecteze la mai multe site-uri Discourse folosind un singur cont. Furnizorii comuni de conectare socială, cum ar fi Google, Facebook, Apple și GitHub, sunt acceptați fără configurare suplimentară. Consultă <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a> pentru mai multe detalii."
     google_oauth2_client_secret: "Secret client al aplicației tale Google."
     google_oauth2_hd_groups: "Preia grupurile Google ale utilizatorilor pe domeniul găzduit la autentificare. Grupurile Google preluate pot fi utilizate pentru a acorda automat calitatea de membru al grupului Discourse (consultă setările grupului). Pentru mai multe informații, vezi https://meta.discourse.org/t/226850"
     google_oauth2_verbose_logging: "Înregistrează diagnostice verbale legate de Google OAuth2 în <a href='%{base_path}/logs' target='_blank'>/logs</a>"
@@ -1318,8 +1317,6 @@ ro:
       reply_by_email_address_is_empty: "Trebuie să setezi o adresă pentru „răspunde prin email” înainte să poți activa răspunsul prin email."
       user_locale_not_enabled: "Trebuie să activezi întâi „permite locale utilizator” înainte de activa această setare."
       invalid_regex: "Regex invalid sau nepermis."
-      min_username_length_range: "Nu poți seta minimum cu o valoare mai mare decât a maximului."
-      max_username_length_range: "Nu poți seta maximum cu o valoare mai mică decât a minimului."
       content_localization_locale_limit: "Numărul de locale acceptate nu poate depăși %{max}."
       content_localization_language_switcher_requirements: "Comutatorul de limbă necesită ca „setarea localei din cookie” și „permite locala utilizatorului” din setările site-ului să fie activate, și „locale acceptate din localizarea de conținut” să aibă cel puțin o limbă."
       mediaconvert_role_arn_required: "Rolul AWS IAM ARN este necesar atunci când utilizezi AWS MediaConvert pentru conversia video."
@@ -1353,7 +1350,6 @@ ro:
       exclude_tag: "Exclude subiectele cu o anumită etichetă"
       exclude_tags_any: "Exclude subiectele cu oricare dintre etichetele specificate (separate prin virgulă)"
       exclude_tags_all: "Exclude subiectele cu toate etichetele specificate (separate prin virgulă)"
-      tags_alias: "Alias pentru filtrul „etichetă:”"
       tag_group: "Arată subiectele cu etichete dintr-un anumit grup de etichete"
       exclude_tag_group: "Exclude subiectele cu etichete dintr-un anumit grup de etichete"
       activity_before: "Arată subiectele cu ultima activitate înainte de o dată (AAAA-LL-ZZ sau acum câteva zile)"
@@ -2226,8 +2222,6 @@ ro:
     deprecation_error_description: "Pentru a verifica compatibilitatea cu viitoarele actualizări Discourse, poți face ca deprecierile Javascript să ridice o eroare:"
     deprecation_error_label: Fă ca deprecierile Javascript să ridice o eroare
     enter: "Activează modul sigur"
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Configurare Discourse"
     step:
@@ -2367,18 +2361,12 @@ ro:
       approve_and_unhide:
         title: "Da"
         complete: "Postare aprobată și afișată"
-      no_action_post:
-        title: "Nicio acțiune"
       delete_post:
         complete: "Postarea a fost ștearsă"
       restore_post:
         complete: "Postarea a fost restaurată"
       user_actions:
         bundle_title: "Ce vrei să faci cu utilizatorul?"
-      no_action_user:
-        title: "Nicio acțiune"
-        description: "Nu lua nicio măsură împotriva utilizatorului"
-        complete: "Nicio măsură luată împotriva utilizatorului"
       silence_user:
         title: "Redu la tăcere utilizatorul"
         description: "Împiedică utilizatorul să posteze"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index b42f705ddc811..2e2baf8bb2d58 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -60,8 +60,6 @@ ru:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} от пользователя %{username}"
-    too_many_urls: "Невозможно встроить как OneBox более 10 URL-адресов в один запрос."
-    concurrency_not_allowed: "Нельзя делать несколько запросов OneBox одновременно. Отправляйте их по одному за раз."
   components:
     enabled_filter: "Включено"
     disabled_filter: "Отключено"
@@ -396,7 +394,6 @@ ru:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Значение User agent должно содержать не менее 3 символов, чтобы избежать случайного ограничения скорости для полномочных пользователей."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Не допускается использование следующих значений: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "В не можете отключить удаление метаданных из изображения, пока включена оптимизация загружаемых файлов изображений на стороне клиента. Отключите параметр «composer media optimization image enabled» перед отключением параметра «strip image metadata»."
-      x_summary_large_image_no_svg: "Изображения сводной карточки Twitter, используемые для метаданных twitter:image, не могут быть в формате «.svg»."
       tl0_and_anonymous_flag: "Для анонимных пользователей необходимо указать 'site contact email' или 'email address to report illegal content'."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Для этой настройки сначала нужно включить параметр 'allow anonymous mode'."
     conflicting_google_user_id: 'Идентификатор аккаунта Google для этого аккаунта изменился. По соображениям безопасности требуется вмешательство персонала. Свяжитесь с персоналом и укажите <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1925,7 +1922,6 @@ ru:
     slow_down_crawler_rate: "Если указано значение «slow_down_crawler_user_agents» (количество секунд между запросами), то это значение будет применяться ко всем поисковым роботам"
     content_security_policy: "Включить Content-Security-Policy (CSP). CSP — это дополнительный уровень защиты, который помогает предотвратить определенные типы атак, включая межсайтовый скриптинг (XSS) и внедрение данных."
     content_security_policy_report_only: "Включить Content-Security-Policy-Report-Only (CSP)"
-    content_security_policy_collect_reports: "Включить отчёты о нарушениях CSP в /csp_reports"
     content_security_policy_frame_ancestors: "Ограничить через CSP число тех, кто может встроить этот сайт в iframes. Перечень разрешённых хостов настраивается на закладке <a href='%{base_path}/admin/customize/embedding'>Встраивание</a>."
     content_security_policy_script_src: "Дополнительные источники сценариев в белом списке. Текущий хост и CDN включены по умолчанию. См. <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>«Смягчение атак XSS с помощью политики безопасности контента (CSP)».</a> Другие хост-источники игнорируются, так как включена директива strict-dynamic."
     invalidate_inactive_admin_email_after_days: "Аккаунты администраторов, которые не посещали сайт в течение указанного здесь количества дней, должны будут повторно подтвердить свой адрес электронной почты перед входом в систему. Для отключения параметра установите это значение в 0."
@@ -2244,7 +2240,6 @@ ru:
     alternative_reply_by_email_addresses: "Список альтернативных шаблонов для ответа, применяемый на основе входящих адресов электронной почты. Пример: %%{reply_key}@reply.example.com|replies+1%%{reply_key}@example.com"
     incoming_email_prefer_html: "Использовать HTML вместо обычного текста для входящих писем."
     strip_incoming_email_lines: "Удалять начальные и конечные пробелы из каждой строки входящих писем."
-    disable_emails: "Запретить отправлять электронные письма. Выберите «yes», чтобы отключить электронную почту для всех пользователей. Выберите «non-staff», чтобы отключить электронную почту для пользователей, не являющихся персоналом."
     strip_images_from_short_emails: "Удалять картинки из коротких писем — размером менее 2800 байт"
     short_email_length: "Максимальная длина в байтах, при которой электронное письмо будет определено как «короткое». Если размер письма не превышает это значение, изображения в нем (например, аватары и эмодзи) будут удалены."
     display_name_on_email_from: "Отображать в поле «От» полные имена отправителей электронных писем"
@@ -2527,7 +2522,6 @@ ru:
     dashboard_hidden_reports: "Разрешать скрывать отдельные отчёты в панели управления."
     dashboard_visible_tabs: "Закладки, которые будут отображаться в панели управления."
     dashboard_general_tab_activity_metrics: "Отчёты, отображаемые в метриках активности на основной вкладке панели управления."
-    gravatar_enabled: "Использовать сервис <a href='https://gravatar.com/'>Gravatar</a> для аватаров пользователей. Эта настройка отключает у пользователей возможность вручную переключаться на Gravatar, но не затрагивает тех, кто его уже использует."
     gravatar_name: "Укажите имя поставщика услуг Gravatar. Это имя обычно используется для идентификации источника, предоставляющего сайту аватары Gravatar."
     gravatar_base_url: "Укажите URL-адрес для доступа к API поставщика Gravatar. Этот параметр имеет решающее значение для преобразования адресов электронной почты в URL-адреса Gravatar, где хранятся изображения аватаров."
     gravatar_login_url: "URL-адрес, связанный с `gravatar_base_url`, который обеспечивает вход пользователя в сервис Gravatar."
@@ -2614,12 +2608,6 @@ ru:
       reply_by_email_disabled: "Перед включением этого параметра необходимо включить параметр «Ответить по электронной почте»."
       discourse_connect_url_is_empty: "Перед включением этого параметра необходимо настроить параметр «discourse connect url»."
       enable_local_logins_disabled: "Перед включением этого параметра необходимо включить параметр «Включить локальные аккаунты»."
-      min_username_length_exists: "Вы не можете установить минимальную длину имени пользователя более самого короткого (%{username})."
-      min_group_name_length_exists: "Минимальная длина имени пользователя не может превышать длину самого короткого названия группы (%{group_name})."
-      min_username_length_range: "Нельзя установить минимум больше максимума."
-      max_username_length_exists: "Вы не можете установить максимальную длину имени пользователя менее самого длинного (%{username})."
-      max_group_name_length_exists: "Максимальная длина имени пользователя не может быть меньше длины самого длинного названия группы (%{group_name})."
-      max_username_length_range: "Нельзя установить максимум ниже минимума."
       invalid_hex_value: "Значения цвета — шесть цифр в шестнадцатеричной системе исчисления."
       empty_selectable_avatars: "Для включения этого параметра необходимо загрузить не менее двух аватаров, из которых можно будет сделать выбор."
       category_search_priority:
@@ -2678,7 +2666,6 @@ ru:
       exclude_tag: "Исключать темы с определенным тегом"
       exclude_tags_any: "Исключать темы с любым из указанных тегов (через запятую)"
       exclude_tags_all: "Исключать темы со всеми указанными тегами (через «+»)"
-      tags_alias: "Псевдоним для фильтра 'tag:'"
       tag_group: "Показывать темы с тегами из определенной группы тегов"
       exclude_tag_group: "Исключать темы с тегами из определенной группы тегов"
       activity_before: "Показывать темы с последней активностью до указанной даты (YYYY-MM-DD или количество дней назад)"
@@ -5156,8 +5143,6 @@ ru:
     deprecation_error_label: Сделать так, чтобы прекращение поддержки Javascript вызывало ошибку
     enter: "Войти в безопасный режим"
     must_select: "Для перехода в безопасный режим необходимо выбрать хотя бы один параметр."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Настройка Discourse"
     step:
@@ -5420,10 +5405,6 @@ ru:
         complete: "Публикация одобрена и показана"
       post_actions:
         bundle_title: "Что вы хотите сделать с этим постом?"
-      no_action_post:
-        title: "Нет действий"
-        description: "Не предпринимать никаких действий по сообщению"
-        complete: "Никаких действий по сообщению не предпринято."
       delete_post:
         title: "Удалить публикацию"
         description: "Удалить этот пост"
@@ -5442,10 +5423,6 @@ ru:
         complete: "Публикация восстановлена"
       user_actions:
         bundle_title: "Что вы хотите сделать с пользователем?"
-      no_action_user:
-        title: "Нет действий"
-        description: "Не предпринимать никаких действий против пользователя"
-        complete: "Никаких действий против пользователя не предпринято."
       silence_user:
         title: "Заморозка пользователя"
         description: "Запретить пользователю публиковать сообщения"
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index 7f18865ebf8e3..b63919fe7e4dd 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -60,8 +60,6 @@ sk:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} podľa %{username}"
-    too_many_urls: "V jednej požiadavke nie je možné vložiť do jedného poľa viac ako 10 adries URL."
-    concurrency_not_allowed: "Súbežné požiadavky na inline-oneboxing nie sú povolené. Prosím, pošlite vždy len jednu žiadosť."
   components:
     enabled_filter: "Povolené"
     disabled_filter: "Vypnuté"
@@ -398,7 +396,6 @@ sk:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Používateľské agendy musia mať dĺžku aspoň 3 znaky, aby nedošlo k náhodnému obmedzeniu rýchlosti legitímnych používateľov."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "K nastaveniu nemôžete pridať žiadnu z nasledujúcich hodnôt: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Ak je povolená možnosť „optimalizácia obrazu pre kompozitor“, nemôžete zakázať metadáta obrázka pásu. Pred zakázaním metadát obrázkov pásu zakážte možnosť „optimalizácia obrazu kompozitora je povolená“."
-      x_summary_large_image_no_svg: "Súhrnné obrázky Twitteru používané pre metadáta twitter:image nemôžu byť obrázky .svg."
       tl0_and_anonymous_flag: "V prípade anonymných používateľov sa musí uviesť buď \"kontaktný e-mail stránky\", alebo \"e-mailová adresa na nahlásenie nezákonného obsahu\"."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Toto nastavenie vyžaduje, aby bolo najprv povolené nastavenie \"povoliť anonymný režim\"."
     conflicting_google_user_id: 'ID účtu Google pre toto konto sa zmenilo; z bezpečnostných dôvodov je potrebný zásah personálu. Obráťte sa na personál a odkážte ich na <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>.'
@@ -1919,7 +1916,6 @@ sk:
     slow_down_crawler_rate: "Ak je zadaný parameter slow_down_crawler_user_agents, táto rýchlosť sa uplatní na všetky crawlery (počet sekúnd oneskorenia medzi požiadavkami)"
     content_security_policy: "Povoľte Content-Security-Policy (CSP). CSP je ďalšia vrstva zabezpečenia, ktorá pomáha predchádzať určitým typom útokov vrátane Cross Site Scripting (XSS) a injekcie dát."
     content_security_policy_report_only: "Povoliť Content-Security-Policy-Report-Only (CSP)"
-    content_security_policy_collect_reports: "Povolenie zberu správ o porušeniach CSP na adrese /csp_reports"
     content_security_policy_frame_ancestors: "Obmedziť, kto môže túto stránku vložiť do iframe prostredníctvom CSP. Kontrola povolených hostiteľov pri <a href='%{base_path}/admin/customize/embedding'>vkladaní</a>"
     content_security_policy_script_src: "Ďalšie zdroje skriptov uvedené v zozname povolených zdrojov. Aktuálny hostiteľ a CDN sú predvolene zahrnuté. Pozrite si časť <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>Zmiernenie útokov XSS pomocou zásad zabezpečenia obsahu.</a> (CSP). Ostatné zdroje hostiteľa sú ignorované, pretože je povolená funkcia strict-dynamic."
     invalidate_inactive_admin_email_after_days: "Účty administrátorov, ktorí nenavštívili stránku počas tohto počtu dní, budú musieť pred prihlásením znovu overiť svoju e-mailovú adresu. Nastavte na 0, aby ste to zakázali."
@@ -2234,7 +2230,6 @@ sk:
     alternative_reply_by_email_addresses: "Zoznam alternatívnych šablón pre odpoveď e-mailom na prichádzajúce e-mailové adresy. Príklad: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Používajte HTML namiesto textu pre prichádzajúce e-maily."
     strip_incoming_email_lines: "Odstráňte úvodné a koncové biele znaky z každého riadku prichádzajúcich e-mailov."
-    disable_emails: "Zabráňte aplikácii Discourse odosielať akékoľvek e-maily. Výberom možnosti \"áno\" zakážete odosielanie e-mailov všetkým používateľom. Výberom možnosti \"non-staff\" zakážete e-maily len pre používateľov, ktorí nie sú členmi personálu."
     strip_images_from_short_emails: "Odobrať obrázky z e-mailov s veľkosťou menšou ako 2800 bajtov"
     short_email_length: "Definujte maximálnu dĺžku e-mailu v bajtoch, aby bol klasifikovaný ako \"krátky\" na potlačenie obrázkov. Ak veľkosť e-mailu neprekročí toto nastavenie, všetky obrázky (napríklad avatary a emotikony) v e-maile budú odstránené."
     display_name_on_email_from: "V emailovom poli Od zobraziť plné mená"
@@ -2512,7 +2507,6 @@ sk:
     dashboard_hidden_reports: "Povoliť skrytie zadaných správ z hlavného panela."
     dashboard_visible_tabs: "Vyberte, ktoré karty hlavného panela budú viditeľné."
     dashboard_general_tab_activity_metrics: "Na karte Všeobecné vyberte správy, ktoré sa majú zobrazovať ako metriky aktivity."
-    gravatar_enabled: "Používajte službu <a href='https://gravatar.com/'>Gravatar</a> pre avatary používateľov. Zabráni to používateľom prejsť na službu Gravatar pre ich avatary, ale nebude to mať vplyv na používateľov, ktorí ju už používajú."
     gravatar_name: "Zadajte názov poskytovateľa služby Gravatar. Tento názov sa zvyčajne používa na identifikáciu zdroja, ktorý poskytuje avatary Gravatar na lokalitu."
     gravatar_base_url: "Zadajte adresu URL na prístup k rozhraniu API poskytovateľa Gravatar. Toto nastavenie je rozhodujúce pre konverziu e-mailových adries na adresy URL Gravataru, v ktorých sú uložené obrázky avataru."
     gravatar_login_url: "URL relatívna k `gravatar_base_url`, ktorá poskytuje používateľovi prihlásenie do služby Gravatar."
@@ -2595,12 +2589,6 @@ sk:
       reply_by_email_disabled: "Pred povolením tohto nastavenia musíte najprv povoliť funkciu \"odpovedať e-mailom\"."
       discourse_connect_url_is_empty: "Pred povolením tohto nastavenia musíte nastaviť \"url adresu discourse connect\"."
       enable_local_logins_disabled: "Pred povolením tohto nastavenia musíte najskôr povoliť „povoliť miestne prihlásenie“."
-      min_username_length_exists: "Minimálnu dĺžku používateľského mena nemôžete nastaviť nad najkratšie používateľské meno (%{username})."
-      min_group_name_length_exists: "Minimálnu dĺžku používateľského mena nemôžete nastaviť nad najkratší názov skupiny (%{group_name})."
-      min_username_length_range: "Nemôžete nastaviť minimum viac ako maximum."
-      max_username_length_exists: "Maximálnu dĺžku používateľského mena nemôžete nastaviť pod najdlhšie používateľské meno (%{username})."
-      max_group_name_length_exists: "Maximálnu dĺžku používateľského mena nemôžete nastaviť pod najdlhší názov skupiny (%{group_name})."
-      max_username_length_range: "Nemôžete nastaviť maximum menšie ako minimum."
       invalid_hex_value: "Hodnoty farieb musia byť 6-miestne hexadecimálne kódy."
       empty_selectable_avatars: "Pred povolením tohto nastavenia musíte najprv nahrať aspoň dva vyberateľné avatary."
       category_search_priority:
@@ -2661,7 +2649,6 @@ sk:
       exclude_tag: "Vylúčenie tém s konkrétnou značkou"
       exclude_tags_any: "Vylúčiť témy s niektorou zo zadaných značiek (oddelených čiarkami)"
       exclude_tags_all: "Vylúčiť témy so všetkými zadanými značkami (oddelenými plusom)"
-      tags_alias: "Alias pre filter 'tag:'"
       tag_group: "Zobrazenie tém so značkami z konkrétnej skupiny značiek"
       exclude_tag_group: "Vylúčenie tém so značkami z určitej skupiny značiek"
       activity_before: "Zobraziť témy s poslednou aktivitou pred dátumom (RRRR-MM-DD alebo pred niekoľkými dňami)"
@@ -5131,8 +5118,6 @@ sk:
     deprecation_error_label: Zabezpečte, aby deprekácie Javascriptu vyvolali chybu
     enter: "Vstup do núdzového režimu"
     must_select: "Ak chcete vstúpiť do núdzového režimu, musíte vybrať aspoň jednu možnosť."
-  dev_mode:
-    enter: "Zadajte"
   wizard:
     title: "Nastavenie Discourse"
     step:
@@ -5396,8 +5381,6 @@ sk:
       approve_and_unhide:
         title: "Áno"
         complete: "Príspevok schválený a odkrytý"
-      no_action_post:
-        title: "Žiadna akcia"
       delete_post:
         title: "Odstrániť príspevok"
         complete: "Príspevok zmazaný"
@@ -5406,8 +5389,6 @@ sk:
       restore_post:
         title: "Obnoviť príspevok"
         complete: "Príspevok bol obnovený"
-      no_action_user:
-        title: "Žiadna akcia"
       silence_user:
         title: "Umlčať používateľa"
         complete: "Používateľ umlčaný"
diff --git a/config/locales/server.sl.yml b/config/locales/server.sl.yml
index 4eb8af75a23bc..ea91739c68369 100644
--- a/config/locales/server.sl.yml
+++ b/config/locales/server.sl.yml
@@ -106,7 +106,6 @@ sl:
         other: ! "%{count} napak preprečuje tej %{model} da se shrani"
     site_settings:
       second_factor_cannot_be_enforced_with_discourse_connect_enabled: "2FA ne morete nastaviti kot zahtevano, če je omogočena možnost DiscourseConnect."
-      x_summary_large_image_no_svg: "Slike povzetka Twitterja, ki se uporabljajo za metapodatke twitter:image, ne morejo biti slike tipa .svg."
   invite:
     confirm_email: "<p>Ste skoraj na koncu! Poslali smo vam aktivacijsko e-sporočilo na vaš e-naslov. Sledite navodilom v e-sporočilu za aktivacijo računa.</p><p>Če e-sporočila ne prejmete, preverite predal z vsiljeno pošto.</p>"
     disabled_errors:
@@ -1905,8 +1904,6 @@ sl:
     resend_email:
       title: "Ponovno pošlji aktivacijsko e-sporočilo"
       message: "<p>Ponovno smo poslali aktivacijsko e-sporočilo na<b>%{email}</b>"
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Postavitev Discourse"
     step:
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 1e669364e309f..47b2282926f7d 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -1375,8 +1375,6 @@ sq:
       title: "Konfirmoni emailin tuaj"
     resend_email:
       title: "Dërgo përsëri emailin e aktivizimit"
-  dev_mode:
-    enter: "Hyni"
   wizard:
     step:
       setup:
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index f1b90eae8c60a..755172b4b46f9 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -241,7 +241,6 @@ sv:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Användaragenter måste vara minst 3 tecken långa för att undvika oavsiktligt hastighetsbegränsande legitima användare."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Du kan inte lägga till något av följande värden till inställningen: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Du kan inte inaktivera Radera metadata för bild om 'composer media optimization image enabled' är aktiverat. Inaktivera 'composer media optimization image enabled' innan du inaktiverar Radera metadata för bild."
-      x_summary_large_image_no_svg: "Twitter, sammanfattningsbilder som används för twitter: bildens metadata kan inte vara .svg"
     conflicting_google_user_id: 'Google-konto-ID:et för det här kontot har ändrats och av säkerhetsskäl krävs personalens ingripande. Kontakta personalen och hänvisa dem till <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
     onebox:
       invalid_address: "Tyvärr kunde vi inte generera en förhandsvisning av den här webbsidan eftersom servern '%{hostname}' inte kunde hittas. I stället för en förhandsvisning visas enbart en länk i ditt inlägg. :cry:"
@@ -1534,7 +1533,6 @@ sv:
     slow_down_crawler_user_agents: 'Användaragenter för sökrobotar som ska vara hastighetsbegränsade vilket konfigurerats i inställningen "sakta ned sökrobots hastighet". Varje värde måste vara minst 3 tecken långt.'
     slow_down_crawler_rate: "Om slow_down_crawler_user_agents anges kommer denna hastighet att gälla för alla sökrobotar (fördröjning mellan förfrågningarna uttryckt i sekunder)"
     content_security_policy_report_only: "Aktivera enbart rapport över säkerhetspolicy för innehåll (CSP)"
-    content_security_policy_collect_reports: "Aktivera insamling av CSP-överträdelserapporter på /csp_reports"
     content_security_policy_frame_ancestors: "Begränsa vem som kan bädda in denna webbplats i iframes via CSP. Kontrollera tillåtna värdar på <a href='%{base_path}/admin/customize/embedding'>Inbäddning</a>"
     invalidate_inactive_admin_email_after_days: "Administratörskonton som inte har besökt webbplatsen under detta antal dagar kommer att behöva validera sin e-postadress innan de loggar in. Ställ in till 0 för att inaktivera."
     include_secure_categories_in_tag_counts: "När detta är aktiverat kommer antalet ämnen för en tagg att omfatta ämnen som finns i läsbegränsade kategorier för alla användare. När detta är inaktiverat visas normala användare endast ett antal ämnen för en tagg där alla ämnen är i offentliga kategorier."
@@ -1797,7 +1795,6 @@ sv:
     alternative_reply_by_email_addresses: "Lista på alternativa mallar för svar genom inkommen e-post. Exempelvis: %%{reply_key}@svar.exempel.se|replies+%% {reply_key}@exempel.se"
     incoming_email_prefer_html: "Använd HTML istället för text för inkommande e-post."
     strip_incoming_email_lines: "Ta bort ledande och efterföljande blanksteg från varje rad för inkommande e-post."
-    disable_emails: "Förhindra att Discourse skickar några e-postmeddelanden alls. Välj 'ja' för att inaktivera e-postmeddelanden för alla användare. Välj 'icke-personliga' för att inaktivera e-postmeddelanden endast för användare som inte är personal."
     strip_images_from_short_emails: "Rensa bilder från e-post som har mindre storlek än 2 800 bytes."
     display_name_on_email_from: "Visa fullständiga namn på e-postmeddelandens Från-fält."
     unsubscribe_via_email: "Tillåt att användare avprenumererar från e-post genom att skicka ett e-postmeddelande med 'unsubscribe' i ämnesrubriken eller innehållet."
@@ -2062,10 +2059,6 @@ sv:
       reply_by_email_disabled: "Du måste först aktivera 'svara med e-post' innan du aktiverar denna inställning."
       discourse_connect_url_is_empty: "Du måste ange en 'discourse connect url' innan du aktiverar denna inställning."
       enable_local_logins_disabled: "Du måste först 'aktivera lokala inloggningar' innan du aktiverar denna inställning."
-      min_username_length_exists: "Du kan inte ställa in kortast tillåtna längd på användarnamn till att vara längre än det kortaste användarnamnet (%{username})."
-      min_username_length_range: "Du kan inte ställa in minimum till att vara högre än maximum"
-      max_username_length_exists: "Du kan inte ställa in högsta tillåtna längd på användarnamn till att vara kortare än det längsta användarnamnet (%{username})."
-      max_username_length_range: "Du kan inte ställa in maximum till att vara mindre än minimum."
       invalid_hex_value: "Färgvärden måste vara sexsiffriga hexadecimala koder."
       empty_selectable_avatars: "Du måste först ladda upp åtminstone två valbara avatarer innan du aktiverar denna inställning."
       category_search_priority:
@@ -4058,8 +4051,6 @@ sv:
     deprecation_error_label: Se till att Javascript-utfasningar ger upphov till ett fel
     enter: "Starta felsäkert läge"
     must_select: "Du måste välja minst ett alternativ för att aktivera felsäkert läge."
-  dev_mode:
-    enter: "Retur"
   wizard:
     title: "Discourse-inställningar"
     step:
@@ -4265,8 +4256,6 @@ sv:
         title: "Ja"
       approve_and_unhide:
         title: "Ja"
-      no_action_post:
-        title: "Ingen åtgärd"
       delete_post:
         title: "Radera inlägg"
         complete: "Inlägg raderat"
@@ -4274,8 +4263,6 @@ sv:
         title: "Dölj inlägg"
       restore_post:
         title: "Återställ inlägg"
-      no_action_user:
-        title: "Ingen åtgärd"
       silence_user:
         title: "Tysta användare"
       suspend_user:
diff --git a/config/locales/server.sw.yml b/config/locales/server.sw.yml
index 9899d96a04c34..08115ae99a124 100644
--- a/config/locales/server.sw.yml
+++ b/config/locales/server.sw.yml
@@ -911,8 +911,6 @@ sw:
       staged_users_disabled: "Kwanza ruhusu 'watumiaji walio staged' kabla ya kuruhusu mpangilio huu."
       reply_by_email_disabled: "Kwanza ruhusu 'jibu kupitia barua pepe' kabla ya kuruhusu mpangilio huu."
       enable_local_logins_disabled: "Kwanza ruhusu 'ruhusu programu-jalizi ' kabla ya kuruhusu mpangilio huu."
-      min_username_length_range: "Hauwezi ukaseti kiwango cha chini kiwe zaidi ya kiwango cha juu."
-      max_username_length_range: "Hauwezi ukaweka kiwango cha juu kiwe kidogo ya kiwango cha chini."
   search:
     within_post: "#%{post_number} za %{username}"
     types:
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 3f0ffa8a8588a..6382190f87f33 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -171,7 +171,6 @@ te:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "చట్టబద్ధమైన వినియోగదారులను ప్రమాదవశాత్తూ రేట్-పరిమితం చేయడాన్ని నివారించడానికి వినియోగదారు ఏజెంట్‌లు తప్పనిసరిగా కనీసం 3 అక్షరాల పొడవు ఉండాలి."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "మీరు సెట్టింగ్‌కు కింది విలువల్లో దేనినీ జోడించలేరు: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "'కంపోజర్ మీడియా ఆప్టిమైజేషన్ ఇమేజ్ ఎనేబుల్' ప్రారంభించబడితే మీరు స్ట్రిప్ ఇమేజ్ మెటాడేటాను డిజేబుల్ చేయలేరు. స్ట్రిప్ ఇమేజ్ మెటాడేటాను డిసేబుల్ చేయడానికి ముందు 'కంపోజర్ మీడియా ఆప్టిమైజేషన్ ఇమేజ్ ఎనేబుల్ చేయబడింది' అని డిజేబుల్ చేయండి."
-      x_summary_large_image_no_svg: "Twitter కోసం ఉపయోగించే Twitter సారాంశం చిత్రాలు:ఇమేజ్ మెటాడేటా .svg చిత్రం కాకూడదు."
   word_connector:
     comma: ", "
   invite:
@@ -1120,7 +1119,6 @@ te:
     slow_down_crawler_user_agents: '"స్లో డౌన్ క్రాలర్ రేట్" సెట్టింగ్‌లో కాన్ఫిగర్ చేయబడినట్లుగా రేట్ పరిమితం చేయబడే వెబ్ క్రాలర్‌ల వినియోగదారు ఏజెంట్‌లు. ప్రతి విలువ తప్పనిసరిగా కనీసం 3 అక్షరాల పొడవు ఉండాలి.'
     slow_down_crawler_rate: "slow_down_crawler_user_agents పేర్కొనబడితే, ఈ రేటు అన్ని క్రాలర్‌లకు వర్తిస్తుంది (అభ్యర్థనల మధ్య సెకన్ల ఆలస్యం సంఖ్య)"
     content_security_policy_report_only: "కంటెంట్-సెక్యూరిటీ-పాలసీ-రిపోర్ట్-మాత్రమే (CSP)ని ప్రారంభించండి"
-    content_security_policy_collect_reports: "/csp_reports వద్ద CSP ఉల్లంఘన నివేదిక సేకరణను ప్రారంభించండి"
     content_security_policy_frame_ancestors: "CSP ద్వారా iframesలో ఈ సైట్‌ను ఎవరు పొందుపరచవచ్చో నియంత్రించండి. <a href='%{base_path}/admin/customize/embedding'>ఎంబెడ్డింగ్</a>లో అనుమతించబడిన హోస్ట్‌లను నియంత్రించండి"
     invalidate_inactive_admin_email_after_days: "ఇన్ని రోజులలో సైట్‌ను సందర్శించని అడ్మిన్ ఖాతాలు లాగిన్ చేయడానికి ముందు వారి ఇమెయిల్ చిరునామాను మళ్లీ ధృవీకరించాలి. నిలిపివేయడానికి 0కి సెట్ చేయండి."
     include_secure_categories_in_tag_counts: "ప్రారంభించబడినప్పుడు, ట్యాగ్ కోసం టాపిక్‌ల గణన వినియోగదారులందరికీ చదవడానికి పరిమితం చేయబడిన వర్గాల్లోని అంశాలను కలిగి ఉంటుంది. నిలిపివేయబడినప్పుడు, సాధారణ వినియోగదారులకు ట్యాగ్ కోసం అంశాల గణన మాత్రమే చూపబడుతుంది, ఇక్కడ అన్ని అంశాలు పబ్లిక్ కేటగిరీలలో ఉంటాయి."
@@ -1382,7 +1380,6 @@ te:
     alternative_reply_by_email_addresses: "ఇమెయిల్ ఇన్‌కమింగ్ ఇమెయిల్ చిరునామాల ద్వారా ప్రత్యుత్తరం కోసం ప్రత్యామ్నాయ టెంప్లేట్‌ల జాబితా. ఉదాహరణ: %%{reply_key}@reply.example.com|ప్రత్యుత్తరాలు+%%{reply_key}@example.com"
     incoming_email_prefer_html: "ఇన్‌కమింగ్ ఇమెయిల్ కోసం టెక్స్ట్‌కు బదులుగా HTMLని ఉపయోగించండి."
     strip_incoming_email_lines: "ఇన్‌కమింగ్ ఇమెయిల్‌ల ప్రతి లైన్ నుండి లీడింగ్ మరియు ట్రైలింగ్ వైట్‌స్పేస్‌లను తీసివేయండి."
-    disable_emails: "ఎలాంటి ఇమెయిల్‌లను పంపకుండా ఉపన్యాసం నిరోధించండి. వినియోగదారులందరికీ ఇమెయిల్‌లను నిలిపివేయడానికి 'అవును' ఎంచుకోండి. సిబ్బందియేతర వినియోగదారుల కోసం మాత్రమే ఇమెయిల్‌లను నిలిపివేయడానికి 'నాన్-స్టాఫ్'ని ఎంచుకోండి."
     strip_images_from_short_emails: "2800 బైట్‌ల కంటే తక్కువ పరిమాణం ఉన్న ఇమెయిల్‌ల నుండి చిత్రాలను తీసివేయండి"
     display_name_on_email_from: "ఫీల్డ్‌ల నుండి ఇమెయిల్‌లో పూర్తి పేర్లను ప్రదర్శించండి"
     unsubscribe_via_email: "సబ్జెక్ట్ లేదా బాడీలో 'అన్‌సబ్‌స్క్రయిబ్'తో ఇమెయిల్ పంపడం ద్వారా ఇమెయిల్‌ల నుండి అన్‌సబ్‌స్క్రైబ్ చేయడానికి వినియోగదారులను అనుమతించండి"
@@ -1647,10 +1644,6 @@ te:
       reply_by_email_disabled: "ఈ సెట్టింగ్‌ని ఎనేబుల్ చేసే ముందు మీరు ముందుగా 'ఇమెయిల్ ద్వారా ప్రత్యుత్తరం' ఎనేబుల్ చేయాలి."
       discourse_connect_url_is_empty: "మీరు ఈ సెట్టింగ్‌ని ప్రారంభించే ముందు తప్పనిసరిగా 'డిస్కోర్స్ కనెక్ట్ url'ని సెట్ చేయాలి."
       enable_local_logins_disabled: "ఈ సెట్టింగ్‌ని ప్రారంభించే ముందు మీరు ముందుగా 'స్థానిక లాగిన్‌లను ప్రారంభించు'ని తప్పనిసరిగా ప్రారంభించాలి."
-      min_username_length_exists: "మీరు చిన్న వినియోగదారు పేరు (%{username}) కంటే కనీస వినియోగదారు పేరు పొడవును సెట్ చేయలేరు."
-      min_username_length_range: "మీరు కనిష్టాన్ని గరిష్టం కంటే ఎక్కువగా సెట్ చేయలేరు."
-      max_username_length_exists: "మీరు పొడవైన వినియోగదారు పేరు (%{username}) క్రింద గరిష్ట వినియోగదారు పేరు పొడవును సెట్ చేయలేరు."
-      max_username_length_range: "మీరు గరిష్టాన్ని కనిష్ట స్థాయికి దిగువన సెట్ చేయలేరు."
       invalid_hex_value: "రంగు విలువలు 6-అంకెల హెక్సాడెసిమల్ కోడ్‌లుగా ఉండాలి."
       empty_selectable_avatars: "ఈ సెట్టింగ్‌ని ప్రారంభించే ముందు మీరు తప్పనిసరిగా కనీసం రెండు ఎంచుకోదగిన అవతార్‌లను అప్‌లోడ్ చేయాలి."
       category_search_priority:
@@ -2414,8 +2407,6 @@ te:
   safe_mode:
     title: "సురక్షిత మోడ్‌ను నమోదు చేయండి"
     enter: "సేఫ్ మోడ్‌ని నమోదు చేయండి"
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "డిస్కర్స్ సెటప్"
     step:
@@ -2558,16 +2549,12 @@ te:
         title: "అవును"
       approve_and_unhide:
         title: "అవును"
-      no_action_post:
-        title: "చర్య తీసుకోలేదు"
       delete_post:
         title: "పోస్ట్ తొలగించండి"
       hide_post:
         title: "పోస్ట్ను దాచండి"
       restore_post:
         title: "పోస్ట్‌ని పునరుద్ధరించండి"
-      no_action_user:
-        title: "చర్య తీసుకోలేదు"
       silence_user:
         title: "సభ్యుని నిశ్శబ్దం చేయండి"
       suspend_user:
diff --git a/config/locales/server.th.yml b/config/locales/server.th.yml
index da91b4f26bb95..19a2c0098844e 100644
--- a/config/locales/server.th.yml
+++ b/config/locales/server.th.yml
@@ -491,8 +491,6 @@ th:
       button: "ลงทะเบียน"
     resend_email:
       title: "ส่งอีเมลยืนยันตัวตนอีกครั้ง"
-  dev_mode:
-    enter: "เอ็นเทอร์"
   wizard:
     step:
       setup:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 86d84a2443c3f..34dc59299cb76 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -60,8 +60,6 @@ tr_TR:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "%{username} tarafından #%{post_number}"
-    too_many_urls: "Tek bir talepte 10’dan fazla URL’yi satır içinde onebox olarak ekleyemezsiniz."
-    concurrency_not_allowed: "Eş zamanlı satır içi onebox yapma taleplerine izin verilmez. Lütfen her seferinde bir talep gönderin."
   components:
     enabled_filter: "Etkin"
     disabled_filter: "Devre Dışı"
@@ -344,7 +342,6 @@ tr_TR:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Kullanıcı aracıları, geçerli kullanıcıların yanlışlıkla sınırlandırılmasını önlemek için en az 3 karakter uzunluğunda olmalıdır."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Ayara şu değerlerden herhangi birini ekleyemezsiniz: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "\"Besteci medya optimizasyonu görüntüsü etkin\" etkinleştirilmişse şerit görüntü meta verilerini devre dışı bırakamazsınız. Şerit görüntü meta verilerini devre dışı bırakmadan önce \"besteci medya optimizasyonu görüntüsü etkin\" seçeneğini devre dışı bırakın."
-      x_summary_large_image_no_svg: "twitter:image meta verileri için kullanılan Twitter özet görüntüleri .svg görüntüsü olamaz."
       tl0_and_anonymous_flag: "Anonim kullanıcılar için ya \"site contact email\" ya da \"email address to report illegal content\" sağlanmalıdır."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Bu ayar öncelikle \"anonim moduna izin ver\" ayarının etkinleştirilmesini gerektiriyor."
     conflicting_google_user_id: 'Bu hesabın Google Hesap Kimliği değişti; güvenlik nedeniyle personelin müdahalesi gerekiyor. Lütfen personelle iletişime geçin ve onları <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>adresine yönlendirin.'
@@ -1774,7 +1771,6 @@ tr_TR:
     slow_down_crawler_rate: "slow_down_crawler_user_agents belirtilirse bu oran tüm veri gezginleri için geçerli olur (istekler arasındaki saniye gecikme sayısı)"
     content_security_policy: "İçerik Güvenliği Politikasını (CSP) etkinleştirin. CSP, Siteler Arası Komut Dosyası Çalıştırma (XSS) ve veri enjeksiyonu da dâhil olmak üzere belirli saldırı türlerini önlemeye yardımcı olan ek bir güvenlik katmanıdır."
     content_security_policy_report_only: "Sadece-Raporla-İçerik-Güvenlik-Politikasını (CSP) Etkinleştir"
-    content_security_policy_collect_reports: "CSP ihlal raporu toplamayı /csp_reports adresinde etkinleştir"
     content_security_policy_frame_ancestors: "CSP aracılığıyla bu siteyi iframe'lere kimlerin yerleştirebileceğini kısıtlayın. <a href='%{base_path}/admin/customize/embedding'>Gömme</a> bölümünde izin verilen sunucuları kontrol edin"
     content_security_policy_script_src: "İzin verilen ek komut dosyası kaynakları. Geçerli sunucu ve İTA varsayılan olarak dâhil edilir. <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>İçerik Güvenliği İlkesi ile XSS Saldırılarını Azaltma.</a> (CSP). Diğer sunucu kaynakları, strict-dynamic etkinleştirildiği için yok sayılır."
     invalidate_inactive_admin_email_after_days: "Bu kadar gün içinde siteyi ziyaret etmemiş olan yönetici hesaplarının oturum açmadan önce e-posta adreslerini yeniden doğrulamaları gerekir. Devre dışı bırakmak için 0 olarak ayarlayın."
@@ -2091,7 +2087,6 @@ tr_TR:
     alternative_reply_by_email_addresses: "Gelen e-posta adreslerini e-posta ile yanıtlamak için alternatif şablonların listesi. Örnek: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Gelen e-postalar için metin yerine HTML kullanın."
     strip_incoming_email_lines: "Gelen e-postaların her satırından baştaki ve sondaki boşlukları kaldırın."
-    disable_emails: "Discourse'un her türlü e-posta göndermesini engelleyin. Tüm kullanıcılar için e-postaları devre dışı bırakmak için \"evet\"i seçin. Yalnızca personel olmayan kullanıcılar için e-postaları devre dışı bırakmak amacıyla \"personel olmayan\" seçeneğini belirleyin."
     strip_images_from_short_emails: "Boyutu 2800 Bayt'tan küçük olan e-postalardaki görüntüleri soyun"
     short_email_length: "Bir e-postanın görüntü bastırma için \"kısa\" olarak sınıflandırılacağı maksimum uzunluğu bayt cinsinden tanımlayın. Bir e-postanın boyutu bu ayarı aşmazsa e-postadaki tüm görüntüler (avatarlar ve emoji'ler gibi) çıkarılır."
     display_name_on_email_from: "Alanlardan gelen e-postalarda tam adları gösterin"
@@ -2371,7 +2366,6 @@ tr_TR:
     dashboard_hidden_reports: "Belirtilen raporların panodan gizlenmesine izin verin."
     dashboard_visible_tabs: "Hangi pano sekmelerinin görünür olacağını seçin."
     dashboard_general_tab_activity_metrics: "Genel sekmesinde aktivite metrikleri olarak görüntülenecek raporları seçin."
-    gravatar_enabled: "Kullanıcı avatarları için <a href='https://gravatar.com/'>Gravatar</a> hizmetini kullanın. Bu, kullanıcıların avatarları için Gravatar'a geçmesini engeller ancak halihazırda Gravatar kullanan kullanıcıları etkilemez."
     gravatar_name: "Gravatar hizmet sağlayıcısının adını belirtin. Bu ad genellikle siteye Gravatar avatarları sağlayan kaynağı tanımlamak için kullanılır."
     gravatar_base_url: "Gravatar sağlayıcısının API'sine erişmek için URL'yi belirtin. Bu ayar, e-posta adreslerini avatar görüntülerinin depolandığı Gravatar URL'lerine dönüştürmek için kritik öneme sahiptir."
     gravatar_login_url: "Kullanıcıya Gravatar hizmetine giriş yapmasını sağlayan `gravatar_base_url` ögesine göre URL."
@@ -2452,12 +2446,6 @@ tr_TR:
       reply_by_email_disabled: "Bu ayarı etkinleştirmeden önce \"e-posta ile yanıtla\" özelliğini etkinleştirmeniz gerekiyor."
       discourse_connect_url_is_empty: "Bu ayarı etkinleştirmeden önce bir \"discourse bağlantı URL'si\" ayarlamanız gerekiyor."
       enable_local_logins_disabled: "Bu ayarı etkinleştirmeden önce \"yerel girişleri etkinleştir\" seçeneğini etkinleştirmeniz gerekiyor."
-      min_username_length_exists: "Minimum kullanıcı adı uzunluğunu en kısa kullanıcı adının üzerinde ayarlayamazsınız (%{username})."
-      min_group_name_length_exists: "En kısa grup adının (%{group_name}) üstünde minimum kullanıcı adı uzunluğunu ayarlayamazsınız."
-      min_username_length_range: "Minimum değeri maksimum değerin üzerinde ayarlayamazsınız."
-      max_username_length_exists: "Maksimum kullanıcı adı uzunluğunu en uzun kullanıcı adının (%{username}) altında ayarlayamazsınız."
-      max_group_name_length_exists: "Kullanıcı adı uzunluğunu en uzun grup adının (%{group_name}) altına ayarlayamazsınız."
-      max_username_length_range: "Maksimum değeri minimum değerin altında ayarlayamazsınız."
       invalid_hex_value: "Renk değerleri 6 haneli onaltılık kodlar olmalıdır."
       empty_selectable_avatars: "Bu ayarı etkinleştirmeden önce en az iki seçilebilir avatar yüklemeniz gerekiyor."
       category_search_priority:
@@ -2516,7 +2504,6 @@ tr_TR:
       exclude_tag: "Belirli bir etikete sahip konuları hariç tutun"
       exclude_tags_any: "Belirtilen etiketlerden herhangi birine sahip konuları hariç tutun (virgülle ayrılmış)"
       exclude_tags_all: "Belirtilen etiketlerin tümüne sahip konuları hariç tutun (artı ile ayrılmış)"
-      tags_alias: "\"tag:\" filtresi için takma ad"
       tag_group: "Belirli bir etiket grubundan etiketlere sahip konuları gösterin"
       exclude_tag_group: "Belirli bir etiket grubundan etiketli konuları hariç tutun"
       activity_before: "Belirli bir tarihten önceki son aktiviteye sahip konuları gösterin (YYYY-AA-GG veya günler önce)"
@@ -4864,8 +4851,6 @@ tr_TR:
     deprecation_error_label: Javascript kullanımdan kaldırmaları hata oluştursun
     enter: "Güvenli Moda Gir"
     must_select: "Güvenli moda girmek için en az bir seçenek belirlemelisiniz."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Discourse Kurulumu"
     step:
@@ -5123,8 +5108,6 @@ tr_TR:
       approve_and_unhide:
         title: "Evet"
         complete: "Gönderi onaylandı ve gizlemesi kaldırıldı"
-      no_action_post:
-        title: "Eylem yok"
       delete_post:
         title: "Gönderiyi sil"
         complete: "Gönderi silindi"
@@ -5133,8 +5116,6 @@ tr_TR:
       restore_post:
         title: "Gönderiyi geri yükle"
         complete: "Gönderi geri yüklendi"
-      no_action_user:
-        title: "Eylem yok"
       silence_user:
         title: "Kullanıcıyı sustur"
         complete: "Kullanıcı susturuldu"
diff --git a/config/locales/server.ug.yml b/config/locales/server.ug.yml
index afcb0d7a51572..85f63080d4599 100644
--- a/config/locales/server.ug.yml
+++ b/config/locales/server.ug.yml
@@ -60,8 +60,6 @@ ug:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} / %{username}"
-    too_many_urls: "بىر ئىلتىماستا 10 دىن ئارتۇق تور ئادرېسىنى كۆرۈنۈش قۇتىسىنىڭ بىر قۇرىغا سىغدۇرغىلى بولمايدۇ."
-    concurrency_not_allowed: "بىرلا ۋاقىتتا بىر قانچە ئىچكى onebox ئىلتىماس قىلىشقا يول قويۇلمايدۇ. بىر قېتىمدا بىر ئىلتىماس يوللاڭ."
   components:
     enabled_filter: "قوزغىتىلدى"
     disabled_filter: "چەكلەندى"
@@ -344,7 +342,6 @@ ug:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "تاسادىپىي قانۇنلۇق ئىشلەتكۈچىنى سۈرئىتىنى چەكلەشنىڭ ئالدىنى ئېلىش ئۈچۈن ئىشلەتكۈچى ۋاكالەتچىنىڭ ئۇزۇنلۇقى كەم دېگەندە 3 ھەرپ بولۇشى كېرەك."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "تۆۋەندىكى ھەر قانداق قىممەتنى تەڭشەككە قوشالمايسىز: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "ئەگەر «كومپوزىتور ۋاسىتە ئەلالاشتۇرۇش سۈرىتى قوزغىتىلغان» نى قوزغاتقان بولسا، بەلگە سۈرەت مېتا سانلىق مەلۇماتىنى چەكلىيەلمەيسىز. بەلگە سۈرەت مېتا سانلىق مەلۇماتىنى چەكلەشتىن بۇرۇن «كومپوزىتور ۋاسىتە ئەلالاشتۇرۇش سۈرىتى قوزغىتىلغان» نى چەكلەڭ."
-      x_summary_large_image_no_svg: "twitter:image مېتا سانلىق مەلۇماتىغا ئىشلىتىلىدىغان Twitter خۇلاسە سۈرەت .sage سۈرەت بولسا بولمايدۇ."
       tl0_and_anonymous_flag: "چوقۇم «تور بېكەت ئالاقە ئېلخېتى» ياكى «قانۇنسىز مەزمۇننى پاش قىلىدىغان ئېلخەت ئادرېسى» نى نامسىز ئىشلەتكۈچىلەرگە تەمىنلەش كېرەك."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "بۇ تەڭشەك ئالدى بىلەن «نامسىز ھالەتكە يول قوي» تەڭشىكىنى قوزغىتىشنى تەلەپ قىلىدۇ."
     conflicting_google_user_id: 'بۇ ھېساباتنىڭ Google ھېسابات كىملىكى ئۆزگەردى؛ بىخەتەرلىك سەۋەبىدىن باشقۇرغۇچى خادىملار مۇداخىلە قىلىشى كېرەك. باشقۇرغۇچى خادىملار بىلەن ئالاقىلىشىپ، ئۇلارنى <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a> نىشانلاڭ.'
@@ -1774,7 +1771,6 @@ ug:
     slow_down_crawler_rate: "ئەگەر slow_down_crawler_user_agents بەلگىلەنگەن بولسا، بۇ نىسبەت بارلىق ئۆمىلىگۈچ (ئىككى قېتىملىق ئىلتىماس ئارىسىدىكى كۈتىدىغان سېكۇنت سانى) لەرگە قوللىنىلىدۇ"
     content_security_policy: "مەزمۇن بىخەتەرلىك تۈزۈمى(CSP) قوزغىتىلسا، CSP بىر قوشۇمچە بىخەتەرلىك قەۋىتى بولۇپ، بەزى خىلدىكى يەنى بېكەت ھالقىغان قوليازما (XSS) ۋە سانلىق مەلۇمات ئوكۇلىغا ئوخشاش سانلىق مەلۇمات ھۇجۇملىرىنىڭ ئالدىنى ئالىدۇ."
     content_security_policy_report_only: "مەزمۇن بىخەتەرلىك تۈزۈمى (CSP) دوكلاتىنىلا قوزغات"
-    content_security_policy_collect_reports: "/ Csp_reports دىكى CSP بەلگىلىمىگە خىلاپلىق قىلىش دوكلاتى توپلاشنى قوزغىتىدۇ"
     content_security_policy_frame_ancestors: "كىمنىڭ بۇ تور بېكەتنى CSP ئارقىلىق iframe گە سىڭدۈرەلەيدىغانلىقىنى چەكلەيدۇ. <a href='%{base_path}/admin/customize/embedding'>سىڭدۈرۈش</a>تە يول قويۇلىدىغان مۇلازىمېتىرنى تېزگىنلەيدۇ."
     content_security_policy_script_src: "يول قويۇش تىزىمىغا قوشۇلغان باشقا قوليازما مەنبەسى. كۆڭۈلدىكى ئەھۋالدا نۆۋەتتىكى مۇلازىمېتىر ۋە CDN نى ئۆز ئىچىگە ئالىدۇ. <a <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>مەزمۇن بىخەتەرلىك تۈزۈمى (CSP) نى ئىشلىتىش ئارقىلىق XSS ھۇجۇمىنى ئازايتىدۇ</a> ئەگەر strict-dynamic قوزغىتىلغاندا، باشقا مۇلازىمېتىر مەنبەسىگە پەرۋا قىلمايدۇ."
     invalidate_inactive_admin_email_after_days: "مۇشۇ كۈن ئىچىدە تور بېكەتنى زىيارەت قىلمىغان باشقۇرغۇچى ھېساباتى تىزىمغا كىرىشتىن ئىلگىرى ئېلخەت ئادرېسىنى قايتا دەلىللىشى كېرەك. 0 گە تەڭشەلسە چەكلىنىدۇ."
@@ -2088,7 +2084,6 @@ ug:
     alternative_reply_by_email_addresses: "كەلگەن ئېلخەت ئادرېسى ئارقىلىق جاۋاب قايتۇرىدىغان زاپاس قېلىپ تىزىمى، مەسىلەن: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "كەلگەن ئېلخەتتە تېكىستنىڭ ئورنىغا HTML ئىشلىتىلىدۇ."
     strip_incoming_email_lines: "كەلگەن ئېلخەتنىڭ ھەر بىر قۇر بېشى ۋە ئاخىرىدىكى بوشلۇقنى چىقىرىۋېتىدۇ."
-    disable_emails: "Discourse نىڭ ھەر قانداق ئېلخەت يوللىشىنىڭ ئالدىنى ئالىدۇ. «ھەئە» تاللانسا بارلىق ئىشلەتكۈچىلەرگە ئېلخەتنى چەكلەيدۇ. «باشقۇرغۇچى بولمىغانلار» تالانسا پەقەت باشقۇرغۇچى بولمىغان ئىشلەتكۈچىلەرگىلا ئېلخەتنى چەكلەيدۇ."
     strip_images_from_short_emails: "سىغىمى 2800 بايتتىن تۆۋەن بولغان ئېلخەتتىكى سۈرەتنى چىقىرىۋېتىدۇ"
     short_email_length: "ئېلخەتنى «قىسقا» دەپ تۈرگە ئايرىپ بايت بىلەن ئىپادىلىنىدىغان ئەڭ چوڭ سۈرەت چوڭلۇقىنى چەكلەشنى بەلگىلەيدۇ. ئەگەر ئېلخەتنىڭ چوڭلۇقى بۇ تەڭشەكتىكى قىممەتتىن ئېشىپ كەتمىسە، ئېلخەتتىكى ھېچقانداق سۈرەت (سىما ۋە چىراي ئىپادىگە ئوخشاش) نىڭ ھەممىسى چىقىرىۋېتىلىدۇ."
     display_name_on_email_from: "ئېلخەت يوللىغۇچى بۆلىكىدە تولۇق ئىسمىنى كۆرسىتىدۇ"
@@ -2441,12 +2436,6 @@ ug:
       reply_by_email_disabled: "بۇ تەڭشەكنى قوزغىتىشتىن ئىلگىرى ئالدى بىلەن «ئېلخەتتە جاۋاب قايتۇر» نى قوزغىتىشىڭىز كېرەك."
       discourse_connect_url_is_empty: "بۇ تەڭشەكنى قوزغىتىشتىن ئىلگىرى «discourse ئۇلىنىش تور ئادرېسى» نى تەڭشىشىڭىز كېرەك."
       enable_local_logins_disabled: "بۇ تەڭشەكنى قوزغىتىشتىن ئىلگىرى ئالدى بىلەن «يەرلىكتە تىزىمغا كىرىشنى قوزغات» نى قوزغىتىشىڭىز كېرەك."
-      min_username_length_exists: "ئەڭ قىسقا ئىشلەتكۈچى ئاتى ئۇزۇنلۇقىنى قىسقا ئىشلەتكۈچى ئاتى (%{username}) دىنمۇ قىسقا قىلىپ تەڭشىيەلمەيسىز."
-      min_group_name_length_exists: "ئەڭ قىسقا ئىشلەتكۈچى ئاتى ئۇزۇنلۇقىنى قىسقا گۇرۇپپا ئاتى (%{group_name}) دىنمۇ قىسقا قىلىپ تەڭشىيەلمەيسىز."
-      min_username_length_range: "ئەڭ كىچىك قىممەتنى ئەڭ چوڭ قىممەتتىن چوڭ قىلىپ تەڭشىيەلمەيسىز."
-      max_username_length_exists: "ئەڭ ئۇزۇن ئىشلەتكۈچى ئاتى ئۇزۇنلۇقىنى ئەڭ ئۇزۇن ئىشلەتكۈچى ئاتى (%{username}) دىن قىسقا قىلىپ تەڭشىيەلمەيسىز."
-      max_group_name_length_exists: "ئەڭ ئۇزۇن ئىشلەتكۈچى ئاتى ئۇزۇنلۇقىنى ئەڭ ئۇزۇن گۇرۇپپا ئاتى (%{group_name}) دىن قىسقا قىلىپ تەڭشىيەلمەيسىز."
-      max_username_length_range: "ئەڭ چوڭ قىممەتنى ئەڭ كىچىك قىممەتتىن كىچىك قىلىپ تەڭشىيەلمەيسىز."
       invalid_hex_value: "رەڭ قىممىتى ئون ئالتىلىك سىستېمىدىكى 6 خانىلىق كود بولۇشى كېرەك."
       empty_selectable_avatars: "بۇ تەڭشەكنى قوزغىتىشتىن ئىلگىرى ئالدى بىلەن كەم دېگەندە تاللاشچان سىمادىن ئىككىنى يۈكلىشىڭىز كېرەك."
       category_search_priority:
@@ -2498,7 +2487,6 @@ ug:
       exclude_tag: "مۇئەييەن بەلگە بار تېمىنى ئۆز ئىچىگە ئالمايدۇ"
       exclude_tags_any: "بەلگىلەنگەن خالىغان بەلگە (پەش بىلەن ئايرىلغان) بار تېمىنى ئۆز ئىچىگە ئالمايدۇ"
       exclude_tags_all: "بەلگىلەنگەن ھەممە بەلگە (قوشۇش بەلگىسى بىلەن ئايرىلغان) بار تېمىنى ئۆز ئىچىگە ئالمايدۇ"
-      tags_alias: "«بەلگە:» سۈزگۈچنىڭ باشقا ئىسمى"
       tag_group: "بەلگىلەنگەن بەلگە گۇرۇپپىسىدىن بەلگىسى بار تېمىنى كۆرسىتىدۇ"
       exclude_tag_group: "بەلگىلەنگەن بەلگە گۇرۇپپىسىدىن بەلگىسى بار تېمىنى چىقىرىۋېتىدۇ"
       status_open: "ئوچۇق تېمىنى كۆرسەت (تاقالمىغان ياكى ئارخىپلانمىغان)"
@@ -4675,8 +4663,6 @@ ug:
     deprecation_error_label: Javascript ئىشلەتمەسلىك خاتالىقى كەلتۈرۈپ چىقىرىدۇ
     enter: "بىخەتەر ھالەتكە كىرىدۇ"
     must_select: "بىخەتەر ھالەتكە كىرىشتە كەم دېگەندە تاللاشتىن بىرى تاللىنىدۇ."
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Discourse تەڭشەك"
     step:
@@ -4938,9 +4924,6 @@ ug:
         complete: "يازما تەستىقلاندى ۋە ئاشكارىلاندى"
       post_actions:
         bundle_title: "يازمىغا نېمە ئىش قىلماقچى؟"
-      no_action_post:
-        title: "تەدبىر قوللانمىغان"
-        complete: "يازمىغا ھېچنېمە قىلمايدۇ"
       delete_post:
         title: "يازما ئۆچۈر"
         description: "بۇ يازمىنى ئۆچۈرىدۇ"
@@ -4961,11 +4944,6 @@ ug:
         title: "يازما تەھرىر"
         description: "بۇ يازمىنىڭ مەزمۇنىنى تەھرىرلەيدۇ"
         complete: "يازما تەھرىرلەندى"
-      convert_to_pm:
-        title: "شەخسىي ئۇچۇرغا ئۆزگەرت"
-        description: "بۇ يازمىنى شەخسىي ئۇچۇرغا ئايلاندۇرىدۇ"
-      no_action_user:
-        title: "تەدبىر قوللانمىغان"
       silence_user:
         title: "ئىشلەتكۈچىنى ئۈنسىزلە"
         complete: "ئىشلەتكۈچى ئۈنسىزلەندى"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index 064a13e03fef9..a47e90db81666 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -19,7 +19,7 @@ uk:
       calendar_ics: "%Y%m%dT%H%M%SZ"
   date:
     month_names:
-    - null
+    -
     - Січень
     - Лютий
     - Березень
@@ -60,8 +60,8 @@ uk:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number} від %{username}"
-    too_many_urls: "Неможливо вставити більше 10 URL-адрес в один запит."
-    concurrency_not_allowed: "Одночасні запити inline-oneboxing заборонені. Будь ласка, надсилайте по одному запиту."
+    too_many_urls: "Неможливо конвертувати більше 10 URL-адрес у вбудовані OneBox за один запит."
+    concurrency_not_allowed: "Одночасні запити на перетворення URL-адрес у вбудовані OneBox не дозволені. Надсилайте по одному запиту за раз."
   components:
     enabled_filter: "Включено"
     disabled_filter: "Вимкнено"
@@ -401,7 +401,7 @@ uk:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "Значення «User agent» мають містити щонайменше 3 символи, щоб уникнути обмеження швидкості сканування."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Ви не можете додати жодного з наведених нижче значень до параметра: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Ви не можете вимкнути видалення метаданих зображення, якщо ввімкнено оптимізацію зображення для редактора на боці клієнта. Вимкніть 'composer media optimization image enabled', перш ніж вимикати метадані зображення."
-      x_summary_large_image_no_svg: "Зображення для Twitter, що використовуються для twitter:image metadata не може бути у форматі .svg."
+      x_summary_large_image_no_svg: "Зображення зведення X, що використовуються для метаданих twitter:image, не можуть бути зображеннями .svg."
       tl0_and_anonymous_flag: "Для анонімних користувачів необхідно вказати або «контактну електронну адресу сайту», або «електронну адресу для повідомлення про незаконний вміст»."
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "Для цього параметра потрібно спочатку увімкнути параметр «дозволити анонімний режим»."
     conflicting_google_user_id: 'Ідентифікатор облікового запису Google для цього облікового запису змінився; потрібне втручання команди обслуговування через міркування безпеки. Будь ласка, звʼяжіться з командою обслуговування і вкажіть на <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1960,7 +1960,6 @@ uk:
     llms_txt: "Завантажте текстовий файл, який буде відображатися за адресою /llms.txt для сканерів LLM. Див. <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a> для отримання додаткової інформації."
     content_security_policy: "Увімкнути політику безпеки вмісту (CSP). CSP - це додатковий шар безпеки, який допомагає запобігти деяким типам атак, в тому числі Cross Site Scripting (XSS) та під час введення даних."
     content_security_policy_report_only: "Увімкнути політику безпеки вмісту, лише звіт (CSP)"
-    content_security_policy_collect_reports: "Увімкнути збір звітів про порушення CSP на /csp_reports"
     content_security_policy_frame_ancestors: "Обмежити за допомогою CSP, хто може вбудувати цей сайт в iframes. Керування дозволеними хостами у <a href='%{base_path}/admin/customize/embedding'>Вбудовування</a>"
     content_security_policy_script_src: "Додаткові дозволені джерела скриптів. Поточний хост і CDN включено за замовчуванням. Див. статтю Запобігання <a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>XSS-атакам за допомогою політики безпеки вмісту.</a> (CSP). Джерела інших хостів ігноруються, оскільки увімкнено строгий динамічний режим."
     invalidate_inactive_admin_email_after_days: "Облікові записи адміністраторів, які не відвідували сайт протягом цієї кількості днів, потрібно буде повторно підтвердити свою електронну адресу пошти перед входом у систему. Встановіть 0, щоб вимкнути."
@@ -2046,7 +2045,7 @@ uk:
     enable_local_logins_via_email: "Дозвольте користувачам запитувати посилання для входу в один клік, яке буде надіслано їм електронною поштою."
     allow_new_registrations: "Дозволити реєстрацію нових користувачів. Зніміть цей прапорець, щоб ніхто не міг створити новий обліковий запис."
     enable_signup_cta: "Показувати сповіщення анонімним користувачам, що повертаються, із проханням зареєструвати обліковий запис."
-    enable_discourse_id: "Увімкніть автентифікацію за допомогою Discourse ID, служби єдиного входу, яка дозволяє користувачам входити на кілька сайтів Discourse за допомогою одного облікового запису. Поширені постачальники соціальних мереж для входу, такі як Google, Facebook, Apple та Github, підтримуються без додаткового налаштування. Див. <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a> для отримання додаткової інформації."
+    enable_discourse_id: "Увімкніть автентифікацію за допомогою Discourse ID, служби єдиного входу, яка дозволяє користувачам входити на кілька сайтів Discourse за допомогою одного облікового запису. Поширені постачальники соціальних мереж для входу, такі як Google, Facebook, Apple та GitHub, підтримуються без додаткового налаштування. Див. <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a> для отримання додаткової інформації."
     enable_google_oauth2_logins: "Увімкніть автентифікацію Google Oauth2. Це метод автентифікації, який зараз підтримує Google. Потрібен ключ і секрет. Див. <a href='https://meta.discourse.org/t/15858' target='_blank'>Налаштування входу Google для Discourse</a>."
     google_oauth2_client_id: "Унікальний ідентифікатор клієнта, наданий вашою програмою Google, який використовується для процесу автентифікації."
     google_oauth2_client_secret: "Клієнтський секрет вашого застосунку Google."
@@ -2289,7 +2288,7 @@ uk:
     alternative_reply_by_email_addresses: "Список альтернативних шаблонів для відповіді, який застосовується на основі вхідних адрес електронної пошти. Наприклад: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "Використовуйте HTML замість звичайного тексту для вхідної електронної пошти."
     strip_incoming_email_lines: "Видаляти проміжні пробіли та пробіли з кожного рядка вхідних електронних листів."
-    disable_emails: "Заборонити Discourse надсилати будь-які електронні листи. Виберіть «так», щоб вимкнути надсилання електронних листів для всіх користувачів. Виберіть «не команда обслуговування», щоб вимкнути електронні листи лише для звичайних користувачів."
+    disable_emails: "Заборонити Discourse надсилати будь-які електронні листи. Виберіть «так», щоб вимкнути вихідні електронні листи для всіх користувачів. Виберіть «не для співробітників», щоб вимкнути електронні листи лише для користувачів, які не є співробітниками."
     allow_email_invites: "Якщо вимкнено, користувачі не зможуть надсилати електронні листи із запрошеннями через Discourse."
     strip_images_from_short_emails: "Видаляти зображення з електронних листів розміром менше 2800 байт"
     short_email_length: "Визначте максимальну довжину листа в байтах, який буде класифіковано як \"короткий\" для придушення зображень. Якщо розмір листа не перевищує цей параметр, будь-які зображення (наприклад, аватарки та емодзі) в ньому будуть вилучені."
@@ -2580,7 +2579,6 @@ uk:
     dashboard_hidden_reports: "Дозволити приховати вказані звіти з панелі інструментів."
     dashboard_visible_tabs: "Виберіть, які вкладки інформаційної панелі будуть видимі."
     dashboard_general_tab_activity_metrics: "Виберіть звіти, які показуватимуться як показники активності на загальній вкладці."
-    gravatar_enabled: "Використовувати сервіс <a href='https://gravatar.com/'>Gravatar</a> для аватарок користувачів. Це не дозволить користувачам переключитися на Gravatar для своїх аватарок, але не вплине на користувачів, які вже використовують його."
     gravatar_name: "Вкажіть назву постачальника послуг Gravatar. Ця назва зазвичай використовується для ідентифікації джерела, яке надає аватари Gravatar на сайт."
     gravatar_base_url: "Вкажіть URL-адресу для доступу до API постачальника Gravatar. Цей параметр є критичним для перетворення адрес електронної пошти на URL-адреси Gravatar, де зберігаються зображення аватарів."
     gravatar_login_url: "URL-адреса відносно `gravatar_base_url`, яка надає користувачеві можливість входу до служби Gravatar."
@@ -2635,6 +2633,7 @@ uk:
     fake_upcoming_change: "Це фальшива майбутня зміна для тестових цілей. Немає потреби перекладати цей рядок."
     floating_dismiss_topics_on_mobile: "Відображає плаваючу кнопку «Закрити...» на мобільному пристрої для списку тем для легшого доступу та звільнення місця у верхній частині списку тем."
     rename_faq_to_guidelines: "Ця зміна перейменовує сторінку поширених запитань на «Правила». Сторінка поширених запитань все ще буде доступна за адресою /faq. Налаштування «faq url» працює як і раніше."
+    experimental_tag_settings_page: "Увімкнути окрему сторінку налаштувань для тегів за адресою /tag/:slug/:id/edit."
     enable_simplified_category_creation: "Забезпечує спрощений процес створення категорій з меншою кількістю опцій та зрозумілішим інтерфейсом."
     enable_custom_splash_screen: "Дозволяє налаштувати заставку завантаження за допомогою власного зображення SVG. Завантажте зображення за допомогою налаштування «зображення заставки». Попередження: це може негативно вплинути на оцінки LCP та індексацію Google."
     modernize_foundation_theme: "Ця зміна запроваджує проектні перетворення на тему Foundation на Discourse."
@@ -2688,12 +2687,6 @@ uk:
       reply_by_email_disabled: "Перш ніж активувати це налаштування, потрібно спочатку увімкнути 'відповідь електронною поштою'."
       discourse_connect_url_is_empty: "Ви повинні встановити 'discourse connect url' перед увімкненням цього параметра."
       enable_local_logins_disabled: "Перш ніж активувати цей параметр, спочатку потрібно ввімкнути функцію 'enable local logins'."
-      min_username_length_exists: "Ви не можете встановити мінімальну довжину імені користувача менше найкоротшого імені користувача (%{username})."
-      min_group_name_length_exists: "Ви не можете встановити мінімальну довжину імені користувача більшою найкоротшого імені групи (%{group_name})."
-      min_username_length_range: "Ви не можете встановити мінімум вище максимуму."
-      max_username_length_exists: "Ви не можете встановити максимальну довжину імені користувача нижче найдовшого імені користувача (%{username})."
-      max_group_name_length_exists: "Ви не можете встановити максимальну довжину імені користувача менше найдовшої назви групи (%{group_name})."
-      max_username_length_range: "Ви не можете встановити максимум нижче мінімуму."
       invalid_hex_value: "Значення кольорів мають бути шестизначними шістнадцятковими hex кодами."
       empty_selectable_avatars: "Ви повинні спочатку завантажити принаймні два доступні для вибору аватари, перш ніж увімкнути цей параметр."
       category_search_priority:
@@ -2758,7 +2751,6 @@ uk:
       exclude_tag: "Виключити теми з певним тегом"
       exclude_tags_any: "Виключити теми з будь-яким із зазначених тегів (розділені комами)"
       exclude_tags_all: "Виключити теми з усіма вказаними тегами (розділені символом плюс)"
-      tags_alias: "Псевдонім для фільтра 'tag:'"
       tag_group: "Показати теми з тегами вибраної групи тегів"
       exclude_tag_group: "Виключити теми з тегами зі певної групи тегів"
       activity_before: "Показати теми з останньою активністю до дати (YYYY-MM-DD або днів тому)"
@@ -5279,7 +5271,7 @@ uk:
   dev_mode:
     title: "Режим розробника"
     enable_rack_mini_profiler: "Дозволити Rack Mini Profiler зберігати зміни сеансу протягом 1 години"
-    enter: "Enter"
+    enter: "Увійти в режим розробника"
   wizard:
     title: "Налаштування Discourse"
     step:
@@ -5581,10 +5573,6 @@ uk:
         complete: "Публікація схвалена та розблокована"
       post_actions:
         bundle_title: "Що ви хочете зробити з публікацією?"
-      no_action_post:
-        title: "Немає дій"
-        description: "Не вживати жодних дій щодо публікації"
-        complete: "Жодних дій щодо публікації не вжито"
       delete_post:
         title: "Видалити повідомлення"
         description: "Видалити цей допис"
@@ -5605,16 +5593,8 @@ uk:
         title: "Редагувати публікацію"
         description: "Редагувати вміст цієї публікації"
         complete: "Допис відредаговано"
-      convert_to_pm:
-        title: "Перетворити на ПП"
-        description: "Перетворити цей пост у особисте повідомлення"
-        complete: "Публікацію перетворено на особисте повідомлення"
       user_actions:
         bundle_title: "Що ви хочете зробити з користувачем?"
-      no_action_user:
-        title: "Немає дій"
-        description: "Не вживати жодних заходів проти користувача"
-        complete: "Жодних заходів щодо користувача не вжито"
       silence_user:
         title: "Заблокувати користувача"
         description: "Заборонити користувачеві публікувати повідомлення"
diff --git a/config/locales/server.ur.yml b/config/locales/server.ur.yml
index 3a42137502ab3..b0440ee173a83 100644
--- a/config/locales/server.ur.yml
+++ b/config/locales/server.ur.yml
@@ -57,8 +57,6 @@ ur:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "%{username} کی طرف سے #%{post_number}"
-    too_many_urls: "ایک درخواست میں 10 سے زیادہ یو آر ایل ون باکس کو ان لائن نہیں کر سکتے۔"
-    concurrency_not_allowed: "ایک ساتھ ان لائن ون باکسنگ کی درخواستوں کی اجازت نہیں ہے۔ براہ کرم ایک وقت میں ایک درخواست بھیجیں۔"
   components:
     enabled_filter: "فعال"
     disabled_filter: "غیر فعال"
@@ -1457,7 +1455,6 @@ ur:
     allowed_internal_hosts: "اندرونی ہَوسٹس کی فہرست جو ڈِسکَورس محفوظ طریقے سے وَن باکس اور دیگر مقاصد کیلئے کرال کر سکتا ہے"
     allowed_crawler_user_agents: "وَیب کرالرز کے صارف ایجنٹوں جن کو سائٹ تک رسائی کی اجازت دی جانی چاہیئے۔ انتباہ! اِس ترتیب کو فعال کرنے سے وہ تمام کرالرز جو یہاں فہرست کردہ نہیں ہیں رد کر دہے جائیں گے!"
     slow_down_crawler_rate: "اگر slow_down_crawler_user_agents کی وضاحت کی گئی ہے تو یہ شرح تمام کرالرز پر لاگو ہوگی (درخواستوں کے درمیان سیکنڈوں کی تاخیر)"
-    content_security_policy_collect_reports: "سی ایس پی کی خلاف ورزی کی رپورٹ کو /csp_reports پر جمع کرنے کو فعال کریں"
     invalidate_inactive_admin_email_after_days: "ایڈمن اکاؤنٹس جنہوں نے دنوں کی اتنی تعداد میں سائٹ کا دورہ نہیں کیا، اُن کو لاگ اِن کرنے سے پہلے اپنے ایمیل ایڈریس کی دوبارہ توثیق کرنے کی ضرورت ہوگی۔ غیر فعال کرنے کیلئے 0 پر سَیٹ کریں۔"
     top_menu: "اس بات کا تعین کریں کہ ہوم پیج نیویگیشن میں کون سے اشیاء، اور کس ترتیب میں نظر آئیں۔"
     share_links: "اِس بات کا تعین کریں کہ شیئر ڈائیلاگ پر کونسی، اور کس ترتیب کے ساتھ اشیاء ظاہر ہوں۔"
@@ -1692,7 +1689,6 @@ ur:
     alternative_reply_by_email_addresses: "جواب بذریعہ ای میل کے آنے والا ای میل ایڈریس کیلئے متبادل ٹیمپلیٹس، مثال: %%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "آنے والے ای میل کیلئے ٹیکسٹ کے بجائے HTML کا استعمال کریں۔"
     strip_incoming_email_lines: "آنے والی ای میلز کی ہر سطر سے آگے اور پیچھے آنی والی خالی جگہیں ہٹا دیں۔"
-    disable_emails: "ڈِسکورس کو کسی بھی قسم کے ای میل بھیجنے سے روکیں۔ تمام صارفین کیلئے ای میلز غیر فعال کرنے کیلئے 'ہاں' منتخب کریں۔ صرف غیر سٹاف صارفین کیلئے ای میلز غیر فعال کرنے کیلئے 'غیر سٹاف' کا انتخاب کریں۔"
     strip_images_from_short_emails: "2800 بائٹس سے کم سائز والے ای میلز سے تصاویر ہٹا دیں"
     display_name_on_email_from: "ای میل کی \"سے\" فیلڈ پر مکمل نام دکھائیں"
     unsubscribe_via_email: "صارفین کو ای میل کے موضوع یا متن میں 'غیر سَبسکرائب' کا لِنک بھیج کر ای میلز سے غیر سَبسکرائب ہو جانے کی اجازت دیں"
@@ -1884,10 +1880,6 @@ ur:
       staged_users_disabled: "اس ترتیب کو فعال کرنے سے پہلے آپ کا 'عارضی اراکین' فعال کرنا ضروری ہے۔"
       reply_by_email_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'جواب بذریعہ ای میل' فعال کرنا ضروری ہے۔"
       enable_local_logins_disabled: "اِس ترتیب کو فعال کرنے سے پہلے آپ کا 'مقامی لاگ اِن' فعال کرنا ضروری ہے۔"
-      min_username_length_exists: "آپ اسمِ صارف کی کم از کم لمبائی، سب سے مختصر صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے (%{username})۔"
-      min_username_length_range: "آپ کم از کم، زیادہ سے زیادہ سے اوپر مقرر نہیں کرسکتے۔"
-      max_username_length_exists: "آپ اسمِ صارف کی زیادہ سے زیادہ لمبائی، سب سے طویل صارف نام کی لمبائی سے کم مقرر نہیں کرسکتے (%{username})۔"
-      max_username_length_range: "آپ زیادہ سے زیادہ، کم از کم سے نیچے مقرر نہیں کرسکتے۔"
       invalid_hex_value: "رنگ اقدار کا 6-عددی ہیکسا ڈَیسیمل کوڈ ہونا ضروری ہے۔"
       allowed_unicode_usernames:
         regex_invalid: "رَیگولر اَیکسپرَیشَ غلط ہے: %{error}"
@@ -3559,8 +3551,6 @@ ur:
     deprecation_error_description: "آنے والے ڈسکورس اپ ڈیٹس کے ساتھ مطابقت کی جانچ کرنے کے لیے، آپ جاوا اسکرپٹ کی فرسودگی کو ایک خرابی پیدا کر سکتے ہیں:"
     enter: "سَیف مَوڈ میں داخل ہوں"
     must_select: "سَیف مَوڈ میں داخل ہونے کیلئے آپ کا کم از کم ایک آپشن منتخب کرنا ضروری ہے۔"
-  dev_mode:
-    enter: "اَینٹر"
   wizard:
     title: "ڈِسکورس سَیٹ اَپ"
     step:
@@ -3699,13 +3689,9 @@ ur:
         title: "جی ہاں"
       approve_and_unhide:
         title: "جی ہاں"
-      no_action_post:
-        title: "کوئی کارروائی نہیں"
       delete_post:
         title: "پوسٹ کو حذف"
         complete: "دھاگہ مٹا دیا"
-      no_action_user:
-        title: "کوئی کارروائی نہیں"
       delete_user:
         complete: "صارف مٹادیا گیا"
         reason: "بذریعہ نظر ثانی قطار کے حذف کر دیا گیا"
diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml
index 923e8f523dd33..b6fc8cbec310a 100644
--- a/config/locales/server.vi.yml
+++ b/config/locales/server.vi.yml
@@ -189,7 +189,6 @@ vi:
       cors_origins_should_not_have_trailing_slash: "Bạn không nên thêm dấu gạch chéo (/) vào nguồn gốc CORS."
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "Bạn không thể thêm bất kỳ giá trị nào sau đây vào cài đặt: %{values}."
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "Bạn không thể tắt siêu dữ liệu hình ảnh dải nếu bật 'hình ảnh tối ưu hóa phương tiện tổng hợp' được bật. Tắt 'đã bật hình ảnh tối ưu hóa phương tiện tổng hợp' trước khi tắt siêu dữ liệu hình ảnh dải."
-      x_summary_large_image_no_svg: "Hình ảnh tóm tắt trên Twitter được sử dụng cho twitter: siêu dữ liệu hình ảnh không được là hình ảnh .svg."
     conflicting_google_user_id: 'ID Tài khoản Google cho tài khoản này đã thay đổi; cần có sự can thiệp của nhân viên vì lý do an ninh. Vui lòng liên hệ với nhân viên và chỉ họ đến <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
     onebox:
       invalid_address: "Xin lỗi, chúng tôi không thể tạo bản xem trước cho trang web này vì không thể tìm thấy máy chủ %{hostname}. Thay vì xem trước, chỉ một liên kết sẽ xuất hiện trong tút của bạn :cry:"
@@ -1354,8 +1353,6 @@ vi:
       pop3_polling_authentication_failed: "Chứng thực POP3 thất bại, xin hãy kiểm tra lại thông tin."
       reply_by_email_address_is_empty: "Bạn phải thiết lập 'reply by email address' trước khi kích hoạt trả lời bằng email."
       user_locale_not_enabled: "Bạn phải bật 'allow user locale' trước khi kích hoạt thiết lập này."
-      min_username_length_range: "Bạn không thiết lập giá trị nhỏ nhất lớn hơn giá trị lớn nhất"
-      max_username_length_range: "Bạn không thể thiết lập số tối đa nhỏ hơn số tối thiểu"
   search:
     within_post: "#%{post_number} bởi %{username}"
     types:
@@ -1379,7 +1376,6 @@ vi:
       exclude_tag: "Loại trừ chủ đề chứa thẻ cụ thể"
       exclude_tags_any: "Loại trừ chủ đề chứa bất kỳ thẻ cụ thể (phân cách bằng dấu phẩy)"
       exclude_tags_all: "Loại trừ chủ đề có chứa tất cả thẻ cụ thể (phân cách bằng dấu cộng)"
-      tags_alias: "Tên gọi khác cho bộ lọc 'tag:'"
       tag_group: "Hiển thị chủ đề chứa thẻ từ một nhóm thẻ cụ thể"
       exclude_tag_group: "Loại trừ chủ đề chứa thẻ từ một nhóm thẻ cụ thể"
       activity_before: "Hiển thị chủ đề có hoạt động cuối cùng trước một ngày cụ thể (YYYY-MM-DD hoặc số ngày trước)"
@@ -2377,8 +2373,6 @@ vi:
       button: "Đăng ký"
     resend_email:
       title: "Gửi lại email kích hoạt"
-  dev_mode:
-    enter: "Nhập"
   wizard:
     step:
       setup:
@@ -2488,12 +2482,8 @@ vi:
         title: "Đồng ý"
       approve_and_unhide:
         title: "Đồng ý"
-      no_action_post:
-        title: "Không có hành động"
       delete_post:
         complete: "Tút đã bị xóa"
-      no_action_user:
-        title: "Không có hành động"
       delete_user:
         complete: "Người dùng đã bị xóa"
   discord:
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 31456beee3c18..05dc1447ae0a6 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -60,8 +60,6 @@ zh_CN:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number}，来自 %{username}"
-    too_many_urls: "无法在单个请求中内联超过 10 个 URL。"
-    concurrency_not_allowed: "不允许并发内嵌请求。请一次发送一个请求。"
   components:
     enabled_filter: "已启用"
     disabled_filter: "已禁用"
@@ -141,8 +139,8 @@ zh_CN:
         invalid_type: "%{type}不是有效类型"
         humanize_not_valid_string_value: "JSON 指针 '%{property_json_pointer}' 处的属性必须是字符串。"
         not_valid_string_value: "必须是字符串"
-        humanize_not_valid_datetime_value: "JSON 指针 “%{property_json_pointer}” 处的属性必须是有效的日期时间。"
-        not_valid_datetime_value: "必须是有效的日期时间"
+        humanize_not_valid_datetime_value: "JSON 指针 “%{property_json_pointer}” 处的属性必须为有效的日期时间。"
+        not_valid_datetime_value: "必须为有效的日期时间"
         humanize_not_valid_integer_value: "JSON 指针 '%{property_json_pointer}' 处的属性必须是整数。"
         not_valid_integer_value: "必须是整数"
         humanize_not_valid_float_value: "JSON 指针 '%{property_json_pointer}' 处的属性必须是浮点数。"
@@ -320,7 +318,6 @@ zh_CN:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "用户代理的长度必须至少为 3 个字符，以避免意外限制合法用户的速率。"
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "您不能将以下任何值添加到设置中：%{values}。"
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "如果启用了 'composer media optimization image enabled'，则无法禁用带状图片元数据。在禁用带状图片元数据之前，禁用 'composer media optimization image enabled'。"
-      x_summary_large_image_no_svg: "用于 twitter:image 元数据的 Twitter 摘要图片不能是 .svg 图片。"
       tl0_and_anonymous_flag: "对于匿名用户，必须提供 'site contact email' 或 'email address to report illegal content'。"
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "此设置需要先启用 'allow anonymous mode' 设置。"
     conflicting_google_user_id: '此帐户的 Google 帐号 ID 已更改；出于安全原因，需要管理人员干预。请联系管理人员并将他们指向 <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -554,7 +551,7 @@ zh_CN:
         other: "一次最多可以统计 %{count} 个电子邮件域"
       no_invites_with_discourse_connect: "如果已启用 DiscourseConnect，您只能邀请注册用户"
       no_invites_without_local_logins: "如果已启用社交登录，您只能邀请注册用户"
-      update_existing_users_required: "此更改影响 %{count} 现有群组成员。必须指定 “update_existing_users” 参数（真或假），以指明是否将新通知默认应用于现有成员。"
+      update_existing_users_required: "此更改影响 %{count} 个现有群组成员。您必须指定 'update_existing_users' 参数（true 或 false），以指明是否将新通知默认设置应用于现有成员。"
     default_names:
       everyone: "所有人"
       admins: "管理员"
@@ -751,7 +748,7 @@ zh_CN:
       email_already_used_in_category: "'%{email}' 已被类别 '%{category_name}' 使用。"
       description_incomplete: "类别描述帖子至少要有一段。"
       description_too_long:
-        other: "描述太长（最多 %{count} 个字符）。"
+        other: "描述过长（最多 %{count} 个字符）。"
       permission_conflict: "任何被允许访问子类别的组也必须被允许访问父类别。以下群组可以访问子类别之一，但无法访问父类别：%{group_names}。"
       disallowed_topic_tags: "此话题包含此类别不允许的标签：%{tags}"
       disallowed_tags_generic: "此话题包含禁止的标签。"
@@ -1069,8 +1066,8 @@ zh_CN:
     deny: "取消"
     read: "读取"
     read_write: "读/写"
-    logged_in_as: "登录为"
-    permissions_header: '这将允许 “%{application_name}”：'
+    logged_in_as: "登录身份"
+    permissions_header: '这将允许“%{application_name}”：'
     redirect_warning: "授权会将您重定向到"
     instructions: '我们刚刚生成了一个新的用户 API 密钥供您与“%{application_name}”搭配使用，请将以下密钥粘贴到您的应用程序中：'
     otp_description: '要允许“%{application_name}”访问此网站吗？'
@@ -1507,13 +1504,13 @@ zh_CN:
         no_accounts: "无关联帐户"
         discourse_connect: "通过 Discourse Connect 的 SSO"
         no_sso_accounts: "没有 SSO 记录的帐户"
-        total_users: "活动用户帐户总数"
+        total_users: "活跃用户帐户总数"
       description: "显示按登录提供商分组的关联帐户数量。仅在启用社交登录方法时适用。"
   dashboard:
     problem:
       twitter_login: 'X 登录目前似乎无法使用。请在 <a href="%{base_path}/admin/site_settings/category/login?filter=twitter">网站设置</a>中检查凭据。'
       group_email_credentials: '群组“<a href="%{base_path}/g/%{group_name}/manage/email">%{group_full_name}</a>”的电子邮件凭据存在问题。在解决此问题之前，不会从群组收件箱发送任何电子邮件。%{error}'
-      upcoming_change_stable_opted_out: '您的网站已选择退出 "%{upcoming_change}" 即将到来的变更。该变更现已进入 "稳定 "状态，可能很快就会被移除或永久化。请访问<a href="%{base_path}/admin/config/upcoming-changes">"即将发生的更改 "页面</a>，查看有关此更改的详细信息。'
+      upcoming_change_stable_opted_out: '您的网站已选择退出即将推出的更改“%{upcoming_change}”。此更改现已进入“稳定”状态，可能很快就会被移除或设为永久。请访问<a href="%{base_path}/admin/config/upcoming-changes">"即将推出的更改页面</a>，查看有关此更改的详细信息。'
       rails_env: "您的服务器正在以%{env}模式运行。"
       host_names: "您的 config/database.yml 文件使用的是默认的 localhost 主机名。请将其更新为您的网站的主机名。"
       sidekiq: 'Sidekiq 未运行。许多任务（例如发送电子邮件）都是由 Sidekiq 异步执行的。请确保至少一个 Sidekiq 进程正在运行。<a href="https://github.com/mperham/sidekiq" target="_blank">在此处了解 Sidekiq</a>。'
@@ -1545,7 +1542,7 @@ zh_CN:
       category_style_deprecated: "您的 Discourse 目前使用的是过时的类别样式，该样式将在 Discourse 3.2 最终测试版发布前移除。请参阅<a href='https://meta.discourse.org/t/282441'>迁移至单一类别样式网站设置</a>，了解如何保留所选类别样式。"
       maxmind_db_configuration: '服务器已被配置为使用 MaxMind 数据库进行反向 IP 查找，但尚未配置有效的 MaxMind 帐户 ID，这可能导致 MaxMind 数据库将来无法下载。<a href="https://meta.discourse.org/t/configure-maxmind-for-reverse-ip-lookups/173941" target="_blank">请参阅本指南了解更多详情</a>。'
       admin_sidebar_deprecation: "旧的管理布局已被替换为新的<a href='https://meta.discourse.org/t/-/289281'>边栏布局</a>，旧布局将在下一个版本中移除。您现在可以选择<a href='%{base_path}/admin/config/navigation?filter=admin%20sidebar'>配置</a>新的边栏布局。"
-      starttls_disabled: "外发电子邮件配置已禁用 STARTTLS。这几乎没有必要。请考虑从您的环境中移除<pre>DISCOURSE_SMTP_ENABLE_START_TLS=false</pre>。有关详细信息，请参阅<a href='https://meta.discourse.org/t/387286'>此主题</a>。"
+      starttls_disabled: "外发电子邮件配置已禁用 STARTTLS。这几乎没有必要。考虑从您的环境中移除 <pre>DISCOURSE_SMTP_ENABLE_START_TLS=false</pre>。有关详情，请参阅<a href='https://meta.discourse.org/t/387286'>此话题</a>。"
     back_from_logster_text: "返回网站"
   site_settings:
     allow_bulk_invite: "允许通过上传 CSV 文件批量邀请"
@@ -1590,7 +1587,7 @@ zh_CN:
     allow_duplicate_topic_titles_category: "如果类别不同，允许有相同或重复标题的话题。必须禁用 allow_duplicate_topic_titles。"
     unique_posts_mins: "用户可以再次发布相同内容的帖子前需要等待的分钟数"
     educate_until_posts: "当用户开始输入他们的前几 (n) 个新帖子时，在编辑器中显示弹出式新用户教育面板。"
-    title: "此站点的名称。所有访客（包括匿名用户）均可见。请注意，更改此标题可能会向 PWA 用户发送提示，要求他们更新或卸载该应用。"
+    title: "此站点的名称。对所有访客（包括匿名用户）可见。请注意，更改此标题可能会向 PWA 用户发送提示，询问他们是更新还是卸载应用。"
     site_description: "用一句话描述此网站。对包括匿名用户在内的所有访客可见。"
     short_site_description: "几个字的简短描述。对包括匿名用户在内的所有访客可见。"
     contact_email: "负责此网站的主要联系人的电子邮件地址，用于重要通知，也会显示在 <a href='%{base_path}/about' target='_blank'>/about</a> 上。对公共网站上的匿名用户可见。"
@@ -1598,7 +1595,7 @@ zh_CN:
     crawl_images: "从远程 URL 检索图片以插入正确的宽度和高度尺寸。"
     download_remote_images_to_local: "通过下载将远程（热链接）图片转换为本地图片；即使图片将来从远程网站移除，这也会保留内容。"
     download_remote_images_threshold: "将远程图片下载到本地所需的最小磁盘空间（百分比）"
-    disabled_image_download_domains: "永远不会从这些网域下载远程图片。"
+    disabled_image_download_domains: "永远不会从这些域下载远程图片。"
     block_hotlinked_media: "阻止用户在他们的帖子中引入远程（热链接）媒体。未通过 'download_remote_images_to_local' 下载的远程媒体将被替换为占位符链接。"
     block_hotlinked_media_exceptions: "不受 block_hotlinked_media 设置影响的基础 URL 列表。包括协议（例如，https://example.com）。"
     editing_grace_period: "发帖后 (n) 秒内，编辑不会在帖子历史记录中创建新版本。"
@@ -1637,7 +1634,7 @@ zh_CN:
     logo: "您的网站左上角的徽标图片。使用高度为 120 且宽高比大于 3:1 的宽矩形图片。如果留空，将显示网站标题文本。"
     logo_small: "您的网站左上角的小徽标图片，向下滚动后可见。使用 120×120 的方形图片。如果留空，将显示首页标志符号。"
     digest_logo: "在您网站的电子邮件总结顶部使用的备用徽标图片。使用宽矩形图片。不要使用 SVG 图片。如果留空，则使用 `logo` 设置中的图片。"
-    mobile_logo: "您网站的移动版本上使用的徽标。我们建议使用方形图标以避免标题拥挤，但您可以使用高度为 120 且宽高比大于 3:1 的宽矩形图像。如果留空，将使用徽标设置中的图像。"
+    mobile_logo: "您的站点的移动版本上使用的徽标。我们建议使用方形图标以避免标题拥挤，但您可以使用高度为 120 且宽高比大于 3:1 的宽矩形图片。如果留空，将使用徽标设置中的图片。"
     logo_dark: "'logo' 网站设置的深色方案替代选择。"
     logo_small_dark: "'logo small' 网站设置的深色方案替代选择。"
     mobile_logo_dark: "'mobile logo' 网站设置的深色方案替代选择。"
@@ -1652,8 +1649,8 @@ zh_CN:
     email_custom_headers: "自定义邮件头列表"
     email_subject: "标准电子邮件的可自定义主题格式。请参阅 <a href='https://meta.discourse.org/t/customizing-specific-system-email-templates/88323' target='_blank'>https://meta.discourse.org/t/customizing-specific-system-email-templates/88323</a>"
     detailed_404: "向用户提供有关他们无法访问特定话题的更多详细信息。注意：这不太安全，因为用户会知道 URL 是否链接到有效话题。"
-    enforce_second_factor: "要求用户启用双重身份验证 (2FA)，然后才能访问 Discourse 用户界面。此设置不影响 API 或 “DiscourseConnect 提供商” 身份验证。如果启用了 enforce_second_factor_on_external_auth，则用户在设置 2FA 后将无法使用外部身份验证提供商登录。"
-    enforce_second_factor_on_external_auth: "要求用户始终使用双重身份验证 (2FA)。启用后，如果用户已启用双重身份验证 (2FA)，则将阻止他们使用外部身份验证方法（例如社交登录）登录。禁用后，用户只需在使用用户名和密码登录时确认双重身份验证 (2FA)。另请参阅“enforce_second_factor”设置。"
+    enforce_second_factor: "要求用户启用双重身份验证 (2FA)，然后才能访问 Discourse 用户界面。此设置不影响 API 或 'DiscourseConnect provider' 身份验证。如果启用了 enforce_second_factor_on_external_auth，则用户在设置 2FA 后将无法使用外部身份验证提供商登录。"
+    enforce_second_factor_on_external_auth: "要求用户始终使用双重身份验证 (2FA)。启用后，如果用户已启用双重身份验证 (2FA)，将阻止他们使用外部身份验证方法（例如社交登录）登录。禁用后，用户只需要在使用用户名和密码登录时确认双重身份验证 (2FA)。另请参阅 `enforce_second_factor` 设置。"
     force_https: "强制您的网站仅使用 HTTPS。警告：在您验证 HTTPS 已完全设置并在任何地方都可以正常工作之前，请勿启用此功能！您是否检查过您的 CDN、所有社交登录以及任何外部徽标/依赖项，以确保它们都与 HTTPS 兼容？"
     summary_score_threshold: "将帖子包含在“总结此话题”中所需的最低分数"
     summary_posts_required: "启用“总结此话题”之前话题中的最少帖子数。对此设置的更改将在一周内追溯应用。"
@@ -1726,10 +1723,9 @@ zh_CN:
     blocked_crawler_user_agents: "用户代理字符串中不区分大小写的唯一字词，用于标识不应被允许访问网站的网抓取工具。如果定义了许可名单，则不适用。"
     slow_down_crawler_user_agents: '网络爬虫的用户代理应该按照“减慢爬虫速率”设置中的配置进行速率限制。每个值的长度必须至少为 3 个字符。'
     slow_down_crawler_rate: "如果指定了 slow_down_crawler_user_agents，则此速率将应用于所有抓取工具（请求之间的延迟秒数）"
-    llms_txt: "上传一个文本文件，该文件将通过 /llms.txt 提供给 LLM 爬虫。更多信息请访问 <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a> 。"
+    llms_txt: "上传一个文本文件，该文件将通过 /llms.txt 提供给 LLM 爬虫。有关详情，请参阅 <a href='https://llmstxt.org/' target='_blank'>llmstxt.org</a>。"
     content_security_policy: "启用内容安全策略 (CSP)。CSP 是一个附加安全层，有助于防止某些类型的攻击，包括跨站脚本 (XSS) 和数据注入。"
     content_security_policy_report_only: "启用仅限内容安全策略报告 (CSP)"
-    content_security_policy_collect_reports: "在 /csp_reports 启用 CSP 违规报告收集"
     content_security_policy_frame_ancestors: "限制谁可以通过 CSP 将此网站嵌入 iframe 中。在<a href='%{base_path}/admin/customize/embedding'>嵌入</a>上控制允许的主机。"
     content_security_policy_script_src: "额外的允许脚本源。默认包括当前主机和 CDN。请参阅<a href='https://meta.discourse.org/t/mitigate-xss-attacks-with-content-security-policy/104243' target='_blank'>使用内容安全策略 (CSP) 缓解 XSS 攻击</a>。启用 strict-dynamic 后，其他主机源将被忽略。"
     invalidate_inactive_admin_email_after_days: "在此天数内未访问网站的管理员帐户将需要在登录前重新验证其电子邮件地址。设置为 0 将禁用。"
@@ -1768,8 +1764,8 @@ zh_CN:
     whispers_allowed_groups: "允许指定群组的成员在话题内进行不公开交流。"
     hidden_post_visible_groups: "允许这些群组的成员查看隐藏的帖子。管理人员始终可以查看隐藏的帖子。"
     allow_index_in_robots_txt: "在 robots.txt 中指定允许网络搜索引擎索引本网站。您可以在<a href='%{base_path}/admin/customize/robots'>此处</a>覆盖 robots.txt。<b>警告</b>：错误配置的规则可能导致网站无法按预期被抓取。"
-    blocked_email_domains: "用户不允许注册帐户的电子邮件域列表。 子域自动处理指定域名。不支持通配符 * 和 ? 。例如：mailinator.com"
-    allowed_email_domains: "用户必须注册帐户的电子邮件域列表。子域将自动处理指定域名。 Wildcard 符号 * 和 ? 不支持。警告: 电子邮件域名以外的用户将不被允许！"
+    blocked_email_domains: "用户不可以用于注册帐户的电子邮件域列表。将针对指定域自动处理子域。不支持通配符 * 和 ? 。例如：mailinator.com"
+    allowed_email_domains: "用户必须用于注册帐户的电子邮件域列表。将针对指定域自动处理子域。不支持通配符 * 和 ?。警告：使用不在列出的电子邮件域的用户将不被允许！"
     normalize_emails: "检查规范化电子邮件是否唯一。规范化电子邮件移除了用户名中的所有点以及 + 和 @ 符号之间的所有内容。"
     auto_approve_email_domains: "使用来自此域列表的电子邮件地址的用户将被自动批准。系统会自动处理指定域的子域。不支持通配符 * 和 ?。"
     hide_email_address_taken: "在注册或忘记密码的过程中，不要告知用户存在一个使用给定电子邮件地址的帐户。对于“忘记密码”请求，需要完整的电子邮件。"
@@ -1815,7 +1811,6 @@ zh_CN:
     enable_local_logins_via_email: "允许用户请求通过电子邮件向他们发送一键登录链接。"
     allow_new_registrations: "允许新用户注册。取消选中此项以防止任何人创建新帐户。"
     enable_signup_cta: "向回访匿名用户显示通知，提示他们注册帐户。"
-    enable_discourse_id: "通过 Discourse ID 启用身份验证，这是一种单点登录服务，允许用户使用一个帐户登录多个 Discourse 站点。无需额外配置即可支持 Google、Facebook 和 Twitter 等常见社交登录提供商。如需了解详情，请参阅 <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a>。"
     enable_google_oauth2_logins: "启用 Google Oauth2 身份验证。这是 Google 当前支持的身份验证方法。要求密钥和密钥代码。请参阅<a href='https://meta.discourse.org/t/15858' target='_blank'>为 Discourse 配置 Google 登录</a>。"
     google_oauth2_client_id: "由 Google 应用程序提供的唯一客户端 ID，用于身份验证流程。"
     google_oauth2_client_secret: "您的 Google 应用的客户端密钥。"
@@ -1884,7 +1879,7 @@ zh_CN:
     invite_link_max_redemptions_limit_users: "普通用户生成的邀请链接允许的最大确认次数不能超过此值。"
     alert_admins_if_errors_per_minute: "激活管理员警告的每分钟错误数量。值为 0 会禁用此功能。注意：需要重启。"
     alert_admins_if_errors_per_hour: "激活管理员警告的每小时错误数量。值为 0 会禁用此功能。注意：需要重启。"
-    categories_topics: '在 /categories 页面上显示的主题数量。如果设置为 0，则会自动设置一个值以保持两列对称。该设置仅适用于“分类和最新/热门主题” <a href="%{base_path}/admin/site_settings/category/all_results?filter=category style">分类页面样式</a>。'
+    categories_topics: '在 /categories 页面上显示的话题数量。如果设置为 0，则会自动设置一个值以保持两列对称。该设置仅适用于“类别和最新/热门话题” <a href="%{base_path}/admin/site_settings/category/all_results?filter=category style">类别页面样式</a>。'
     suggested_topics: "在话题底部显示的推荐话题的数量。"
     limit_suggested_to_category: "仅在推荐话题中显示当前类别中的话题"
     suggested_topics_max_days_old: "推荐话题的存在时间不应超过 n 天。"
@@ -1911,7 +1906,7 @@ zh_CN:
     selectable_avatars_mode: "允许用户从 selectable_avatars 列表中选择头像，并将自定义头像上传限制在所选信任级别。"
     selectable_avatars: "指定一组头像，用户可以从中选择自己的个人资料照片。该选择将在用户个人资料创建期间或更新个人资料头像时出现。"
     allow_all_attachments_for_group_messages: "允许群组消息的所有电子邮件附件。"
-    image_quality: "设置上传到您站点图像的质量等级。较低的质量等级将减少文件尺寸。"
+    image_quality: "设置上传到您的站点的图片的质量等级。较低的质量等级将缩减文件大小。"
     png_to_jpg_quality: "转换后的 JPG 文件的质量（1 为最低质量，99 为最佳质量，100 为禁用）。"
     recompress_original_jpg_quality: "上传的图片文件的质量（1 为最低质量，99 为最佳质量，100 为禁用）。"
     image_preview_jpg_quality: "调整大小的图片文件的质量（1 为最低质量，99 为最佳质量，100 为禁用）。"
@@ -1925,7 +1920,7 @@ zh_CN:
     video_conversion_enabled: "为上传的视频文件启用视频转换。这可以将视频转换为与网页兼容的格式。"
     video_conversion_service: "用于处理所上传视频的视频转换服务。"
     mediaconvert_role_arn: "用于 MediaConvert 服务的 AWS IAM 角色 ARN。使用 AWS MediaConvert 进行视频转换时需要此角色。"
-    mediaconvert_output_subdirectory: "S3 存储桶中的子目录。MediaConvert 会将转码后的视频临时写入此目录，之后再移动到最终的上传位置。"
+    mediaconvert_output_subdirectory: "S3 存储桶中的子目录，MediaConvert 会将转换后的视频临时写入此目录，之后再移动到最终的上传位置。"
     min_ratio_to_crop: "用于裁剪高图片的比率。输入宽度/高度的结果。"
     simultaneous_uploads: "可以在编辑器中拖放的最大文件数"
     default_invitee_trust_level: "受邀用户的默认信任级别 (0-4)。"
@@ -2052,14 +2047,13 @@ zh_CN:
     allow_all_users_to_flag_illegal_content: "匿名用户将看到需要通过电子邮件向管理员举报非法内容的信息。此设置优先于“允许举报帖子的群组”。"
     email_address_to_report_illegal_content: "如果留空，将使用默认的网站管理员电子邮件地址。"
     cooldown_hours_until_reflag: "用户需要等待多长时间才能重新举报帖子"
-    slow_mode_prevents_editing: "在 \"编辑宽限期 \"之后，\"慢速模式 \"是否会阻止编辑？"
+    slow_mode_prevents_editing: "在 'editing grace period' 之后，Slow mode' 是否会阻止编辑？"
     reply_by_email_enabled: "激活允许用户直接通过电子邮件回复话题的功能，无需他们登录网站。有关详情，请参阅 <a href='https://meta.discourse.org/t/set-up-reply-by-email-with-pop3-polling/14003' target='_blank'>Meta 上的指南</a> 。"
     reply_by_email_address: "通过传入电子邮件地址回复的模板。示例：%%{reply_key}@reply.example.com 或 replies+%%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "通过传入电子邮件地址回复的备用模板列表。示例：%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "对传入电子邮件使用 HTML 而不是文本。"
     strip_incoming_email_lines: "从传入电子邮件的每一行中移除前导和尾随空格。"
-    disable_emails: "禁止 Discourse 发送任何类型的电子邮件。选择“是”将对所有用户禁用电子邮件。选择“非管理人员”将仅对非管理人员用户禁用电子邮件。"
-    allow_email_invites: "禁用此功能后，用户将无法通过 Discourse 发送邀请邮件。"
+    allow_email_invites: "禁用后，用户将无法通过 Discourse 发送邀请电子邮件。"
     strip_images_from_short_emails: "从大小小于 2800 字节的电子邮件中去除图片"
     short_email_length: "定义电子邮件被归类为“短”以禁止图片的最大长度（以字节为单位）。如果电子邮件的大小未超过此设置，则电子邮件中的任何图片（例如头像和表情符号）都将被删除。"
     display_name_on_email_from: "在电子邮件发件人字段上显示全名"
@@ -2148,8 +2142,8 @@ zh_CN:
     enable_category_group_moderation: "允许群组审核特定类别的内容"
     group_in_subject: "在电子邮件主题中将 %%{optional_pm} 设置为私信中第一个群组的名称，请参阅：<a href='https://meta.discourse.org/t/customize-specific-email-templates/88323' target='_blank'>自定义标准电子邮件的主题格式</a>"
     allow_anonymous_mode: "启用可供用户切换到匿名发帖模式的选项。激活后，用户在网站上创建帖子或话题时可以选择隐藏身份。另请参阅 `allow anonymous likes`。"
-    allow_likes_in_anonymous_mode: "启用此设置，允许匿名浏览网站的用户点赞帖子。 激活后，用户在为帖子或话题点赞时，可以选择隐藏其身份。 此设置需要先启用 `允许匿名模式`。"
-    anonymous_posting_allowed_groups: "允许匿名发帖的群组。此设置需要启用“允许匿名模式”设置。"
+    allow_likes_in_anonymous_mode: "启用此设置，允许匿名浏览您的站点的用户为帖子点赞。激活后，用户在为帖子或话题点赞时可以选择隐藏其身份。此设置需要先启用 `allow anonymous mode`。"
+    anonymous_posting_allowed_groups: "可以启用匿名发帖的群组。此设置需要启用 `allow anonymous mode` 设置。"
     anonymous_account_duration_minutes: "为了保护匿名性，每 N 分钟为每个用户创建一个新的匿名帐户。示例：如果设置为 600，则在距离上次发帖 600 分钟且用户切换到匿名时，将创建一个新的匿名帐户。"
     hide_user_profiles_from_public: "禁用匿名用户的用户卡片、用户个人资料和用户目录。"
     hide_new_user_profiles: "向公众隐藏信任级别 1 或更低的用户个人资料，并隐藏信任级别 1 的用户，直到他们首次发帖。此功能在 must_approve_users 和 invite_only 网站上无条件禁用。"
@@ -2167,7 +2161,7 @@ zh_CN:
     clean_up_unused_staged_users_after_days: "未使用的暂存用户（没有任何帖子）被移除前的等待天数。设为 0 将禁用清理。"
     user_selected_primary_groups: "允许用户设置自己的主要群组"
     max_notifications_per_user: "每个用户的最大通知数量，如果超过此数值，旧通知将被删除。每周强制执行。设置为 0 将禁用"
-    allowed_user_website_domains: "用户网站将根据这些域名进行验证。"
+    allowed_user_website_domains: "用户网站将根据这些域进行验证。"
     allow_profile_backgrounds: "允许用户上传个人资料背景。"
     get_a_room_threshold: "在被警告之前，用户必须在同一话题中向同一个人发布的帖子数。"
     dont_feed_the_trolls_threshold: "被警告前来自其他用户的举报数量。"
@@ -2247,7 +2241,7 @@ zh_CN:
     disable_watched_word_checking_in_user_fields: "在用户字段中禁用关注词检查"
     watched_words_regular_expressions: "允许使用正则表达式筛选字词。如果启用，它会根据字词的大小写将敏感词分组。然后，它将所有选定字词编译成一个单一的正则表达式，并为常规关注词添加字词边界。因此，这种基于正则表达式的筛选方法通过支持更复杂的字词模式，对内容审核增加了额外一层控制。该设置还允许轻松地使用选择的替换文本替换原始文本。"
     enable_fast_edit: "在帖子选择菜单中添加一个按钮以内联编辑小部分内容。"
-    old_post_notice_days: "新用户和回访用户发布通知后隐藏的天数。官方发布的通知将始终可见。"
+    old_post_notice_days: "新用户和回访用户发布通知后隐藏的天数。官方帖子通知将始终可见。"
     new_user_notice_tl: "查看新用户帖子通知所需的最低信任级别。"
     returning_user_notice_tl: "查看回访用户帖子通知所需的最低信任级别。"
     returning_users_days: "在用户被视为回访之前应经过的天数。"
@@ -2329,7 +2323,7 @@ zh_CN:
     force_lowercase_tags: "强制所有新标签完全小写。"
     create_post_for_category_and_tag_changes: "当一个话题的类别或标签发生更改时，创建密语帖子，需要启用密语帖子。"
     automatically_clean_unused_tags: "每天自动删除未在任何话题或个人消息中使用的标签。"
-    default_watched_precedence_over_muted: "如果我正在关注的类别或标签中有我已设为免打扰的话题，请通知我。"
+    default_watched_precedence_over_muted: "如果用户正在关注的类别或标签中有他们已设为免打扰的类别或标签，则通知他们"
     company_name: "您的公司或组织的名称。如果留空，将不会提供样板《服务条款》或《隐私声明》。"
     governing_law: "指定管辖网站法律方面（包括《服务条款》和《隐私政策》）的司法管辖区。这通常是运营网站的公司注册或开展业务的国家/地区或州。"
     city_for_disputes: "指定将用作解决与使用此论坛相关的任何争议的管辖城市。此信息通常包含在法律文件（例如论坛的《服务条款》）中。"
@@ -2345,11 +2339,10 @@ zh_CN:
     sitemap_page_size: "每个网站地图页面中包含的 URL 数量。最大 50.000"
     enable_user_status: "允许用户设置自定义状态消息（表情符号 + 描述）。"
     enable_user_tips: "启用向用户描述关键功能的新用户提示"
-    short_title: "简短标题将显示在用户的主屏幕、启动器或其他空间有限的地方。标题长度应限制在 12 个字符以内。请注意，更改此标题可能会向 PWA 用户发送提示，询问他们是否需要更新或卸载该应用。"
+    short_title: "简短标题将显示在用户的主屏幕、启动器或其他空间有限的地方。标题长度应限制在 12 个字符以内。请注意，更改此标题可能会向 PWA 用户发送提示，询问他们是更新还是卸载应用。"
     dashboard_hidden_reports: "允许从信息中心隐藏指定报告。"
     dashboard_visible_tabs: "选择可见的信息中心标签页。"
     dashboard_general_tab_activity_metrics: "选择要在“常规”标签页上显示为活动指标的报告。"
-    gravatar_enabled: "使用 <a href='https://gravatar.com/'>Gravatar</a> 服务制作用户头像。这将阻止用户改用 Gravatar 制作头像，但不会影响已使用 Gravatar 的用户。"
     gravatar_name: "指定 Gravatar 服务提供商的名称。此名称通常用于标识向网站提供 Gravatar 头像的来源。"
     gravatar_base_url: "指定用于访问 Gravatar 提供商的 API 的 URL。此设置对于将电子邮件地址转换为存储头像图片的 Gravatar URL 至关重要。"
     gravatar_login_url: "相对于 `gravatar_base_url` 的 URL，它为用户提供了登录 Gravatar 服务的途径。"
@@ -2367,7 +2360,7 @@ zh_CN:
     welcome_banner_image: "设置在欢迎横幅背景中显示的图片。"
     welcome_banner_location: "确定欢迎横幅在页面上的显示位置。"
     welcome_banner_page_visibility: "确定哪些页面会显示欢迎横幅。"
-    welcome_banner_text_color: "配置 “欢迎横幅图片” 设置后，使用此设置更改横幅文字颜色，以确保其可读性。当留空或未上传任何图像时，则颜色由当前主题控制。"
+    welcome_banner_text_color: "配置 'Welcome banner image' 设置后，使用此设置更改横幅文本颜色，以确保其清晰可读。如果留空或未上传任何图片，有效主题将控制颜色。"
     splash_screen: "在加载网站资源时显示临时加载屏幕"
     splash_screen_image: "网站加载时在启动画面上显示的 SVG 图像。动画 SVG 只能使用 CSS 变换或不透明动画。为 CSS 类和关键帧使用唯一的名称。你可以使用 var (--primary)、var (--secondary) 和 var (--terriary) 来引用主题颜色。"
     navigation_menu: "指定边栏或标题下拉菜单作为网站的主导航菜单。推荐使用边栏。"
@@ -2392,24 +2385,24 @@ zh_CN:
     rich_editor: "为输入框启用富文本编辑器，以便所有用户都可以在当前 Markdown 模式和新的富文本编辑器之间切换，从而实现更直观、更人性化的写作体验。"
     default_composition_mode: "设置社区编辑器的默认模式。富文本模式为大多数用户提供了更现代、更熟悉的写作体验，而 Markdown 模式可能更适合技术能力更高的用户。成员可以使用编辑器工具栏中的切换按钮在不同模式之间切换。"
     reviewable_ui_refresh: "可以在审核队列中使用实验性新 UI 的群组。"
-    viewport_based_mobile_mode: "使用视口宽度来确定移动/桌面模式。此设置即将移除。如果您需要将其关闭，请在 Meta 中告知我们 <a href='https://meta.discourse.org/t/384280'></a>。"
+    viewport_based_mobile_mode: "使用视口宽度来确定移动/桌面模式。此设置即将移除。如果您需要将其关闭，请在 <a href='https://meta.discourse.org/t/384280'>Meta</a> 上告诉我们。"
     content_localization_enabled: "根据用户的浏览器或语言偏好设置，显示本地化内容。此类内容可能包括类别、标签、帖子和话题。支持的语言环境在 'content localization supported locales' 中设置。"
-    content_localization_supported_locales: "用户内容可翻译成的支持语言列表。网站默认语言始终包含在内。需要启用 'content localization enabled'。"
+    content_localization_supported_locales: "用户内容可以翻译成的支持语言区域列表。站点的默认语言区域始终包含在内。需要启用 'content localization enabled'。"
     content_localization_allowed_groups: "允许更新本地化内容的群组。需要 'content localization enabled'。"
-    content_localization_language_switcher: "在页眉中显示语言切换器，允许访问者在翻译版本的 Discourse 和用户贡献的内容之间切换。使用 \"内容本地化支持的本地语言 \"中定义的语言"
-    content_localization_crawler_param: "启用 \"内容本地化 \"和 \"从参数设置本地化 \"后，向网络爬虫提供本地化内容。支持的本地化语言列表在 \"内容本地化支持的本地化语言 \"中定义。"
-    content_localization_use_default_locale_when_unsupported: "向首选语言未列在 \"内容本地化支持的语言 \"中的用户提供网站默认语言的本地化内容。"
-    content_localization_allow_author_localization: "允许作者通过帖子菜单更新自己主题和帖子的本地化内容。"
-    enable_upcoming_changes: "启用即将到来的更改"
-    fake_upcoming_change: "这是为测试目的即将进行的虚假更改。无需翻译此字符串。"
-    floating_dismiss_topics_on_mobile: "在移动设备上为话题列表显示一个浮动的 \"忽略... \"按钮，以方便用户访问，并腾出话题列表顶部的空间"
+    content_localization_language_switcher: "在页眉中显示语言切换器，允许访客在翻译版本的 Discourse 和用户贡献的内容之间切换。使用 'content localization supported locales' 中定义的语言"
+    content_localization_crawler_param: "启用 'content localization enabled' 和 'set locale from param' 后，向网络爬虫提供本地化内容。支持的语言区域列表在 'content localization supported locales' 中定义。"
+    content_localization_use_default_locale_when_unsupported: "向首选语言未列在 'content localization supported locales' 中的用户提供站点的默认语言区域的本地化内容。"
+    content_localization_allow_author_localization: "允许作者通过帖子菜单更新自己话题和帖子的本地化。"
+    enable_upcoming_changes: "启用即将推出的更改"
+    fake_upcoming_change: "这是用于测试目的虚假即将推出的更改。无需翻译此字符串。"
+    floating_dismiss_topics_on_mobile: "在移动设备上为话题列表显示一个浮动式 'Dismiss...' 按钮，以方便用户访问，并腾出话题列表顶部的空间"
     rename_faq_to_guidelines: "此更改将常见问题页面重命名为指南。常见问题页面仍可通过 /faq 访问。 'faq url' 的设置与以前一样有效。"
-    enable_simplified_category_creation: "使用更少的选项和更简洁的界面来简化类别创建流程。"
+    enable_simplified_category_creation: "使用更少的选项和更简洁的界面简化类别创建流程。"
     enable_custom_splash_screen: "允许您使用自己的 SVG 图片自定义加载启动画面。通过“启动画面图片”设置上传图片。警告：这可能会对 LCP 分数和 Google 索引产生负面影响。"
     modernize_foundation_theme: "此次更改对 Discourse 中的 Foundation 主题进行了设计修改。"
     errors:
       invalid_css_color: "颜色无效。输入颜色名称或十六进制值。"
-      invalid_datetime: "日期时间格式无效。请确保您输入的日期和时间有效。"
+      invalid_datetime: "日期时间格式无效。请确保输入有效的日期和时间。"
       invalid_email: "无效的电子邮件地址。"
       invalid_username: "没有使用该用户名的用户。"
       valid_username: "存在一个使用该用户名的用户。"
@@ -2449,12 +2442,6 @@ zh_CN:
       reply_by_email_disabled: "在启用此设置之前，您必须先启用 'reply by email'。"
       discourse_connect_url_is_empty: "在启用此设置之前，您必须先设置 'discourse connect url'。"
       enable_local_logins_disabled: "在启用此设置之前，您必须先启用 'enable local logins'。"
-      min_username_length_exists: "您不能将最小用户名长度设置为高于最短用户名 (%{username})。"
-      min_group_name_length_exists: "您不能将最小用户名长度设置为大于最短群组名称 (%{group_name})。"
-      min_username_length_range: "您不能将最小值设置为高于最大值。"
-      max_username_length_exists: "您不能将最大用户名长度设置为低于最长用户名 (%{username})。"
-      max_group_name_length_exists: "您不能将最大用户名长度设置为小于最长群组名称 (%{group_name})。"
-      max_username_length_range: "您不能将最大值设置为低于最小值。"
       invalid_hex_value: "颜色值必须是 6 位十六进制代码。"
       empty_selectable_avatars: "在启用此设置之前，您必须先上传至少两个可选择的头像。"
       category_search_priority:
@@ -2468,7 +2455,7 @@ zh_CN:
         other: "该列表必须恰好包含 %{count} 个值。"
       markdown_linkify_tlds: "您不能包含 '*' 的值。"
       google_oauth2_hd_groups: "在启用此设置之前，您必须配置所有 'google oauth2 hd' 设置。"
-      discourse_id_registration: "使用 Discourse ID 自动注册失败。这可能是由于网络连接问题、防火墙限制或 Discourse ID 服务无法访问造成的。请查看服务器日志了解更多详情或联系技术支持。"
+      discourse_id_registration: "无法使用 Discourse ID 自动注册。这可能是由于网络连接问题、防火墙限制或 Discourse ID 服务无法访问。请查看服务器日志了解更多详情或联系支持团队。"
       linkedin_oidc_credentials: "启用此设置前，必须先配置 LinkedIn OIDC 凭据 ('linkedin_oidc_client_id' 和 'linkedin_oidc_client_secret')。"
       search_tokenize_chinese_enabled: "在启用此设置之前，您必须禁用 'search_tokenize_chinese'。"
       search_tokenize_japanese_enabled: "在启用此设置之前，您必须禁用 'search_tokenize_japanese'。"
@@ -2477,9 +2464,9 @@ zh_CN:
       invalid_uncategorized_category_setting: '如果“允许未分类话题”设置未启用，则无法选择“未分类”类别。'
       invalid_search_ranking_weights: "该值对于 search_ranking_weights 网站设置无效。示例：'{0.1,0.2,0.3,1.0}'。注意，每个权重的最大值为 1.0。"
       content_localization_locale_limit: "支持的语言环境数量不能超过 %{max} 个。"
-      content_localization_language_switcher_requirements: "语言切换器要求启用 \"从 cookie 设置本地化 \"和 \"允许用户本地化 \"网站设置，并且 \"内容本地化支持的本地化 \"至少有一种语言。"
+      content_localization_language_switcher_requirements: "语言切换器要求启用 'set locale from cookie' 和 'allow user locale' 站点设置，并且 'content localization supported locales' 至少有一种语言。"
       mediaconvert_role_arn_required: "使用 AWS MediaConvert 进行视频转换时需要具有 AWS IAM 角色 ARN。"
-      mediaconvert_output_subdirectory_required: "MediaConvert 输出子目录是必填的。"
+      mediaconvert_output_subdirectory_required: "MediaConvert 输出子目录为必选项。"
       s3_credentials_required_for_video_conversion: "需要具有 S3 凭据才能进行视频转换。请配置 S3 访问密钥或启用 IAM 配置文件。"
     keywords:
       clean_up_inactive_users_after_days: "已停用|闲置|未激活"
@@ -2503,7 +2490,7 @@ zh_CN:
   filter:
     description:
       status: "按状态筛选话题"
-      in: "筛选个人列表中的主题"
+      in: "筛选个人列表中的话题"
       order: "按特定字段排列话题"
       category: "显示特定类别中的话题"
       category_any: "显示任意指定类别（以逗号分隔）中的话题"
@@ -2516,7 +2503,6 @@ zh_CN:
       exclude_tag: "排除带有特定标签的话题"
       exclude_tags_any: "排除带有任意指定标签（以逗号分隔）的话题"
       exclude_tags_all: "排除带有所有指定标签（以加号分隔）的话题"
-      tags_alias: "“标签：”筛选器的别名"
       tag_group: "显示带有特定标签组的标签的话题"
       exclude_tag_group: "排除带有特定标签组的标签的话题"
       activity_before: "显示最新活动在某个日期之前（YYYY-MM-DD 或几天前）的话题"
@@ -2524,8 +2510,8 @@ zh_CN:
       created_before: "显示在某个日期之前（YYYY-MM-DD 或几天前）创建的话题"
       created_after: "显示在某个日期之后（YYYY-MM-DD 或几天前）创建的话题"
       created_by: "显示特定用户或群组创建的话题"
-      created_by_user: "显示由用户名或群组创建的主题（不带@符号）"
-      created_by_multiple: "显示任何指定用户或群组创建的主题（以逗号分隔）"
+      created_by_user: "显示由用户名或群组创建的话题（不带 @）"
+      created_by_multiple: "显示任何指定用户或群组创建的话题（以逗号分隔）"
       latest_post_before: "显示最新帖子在某个日期之前（YYYY-MM-DD 或几天前）的话题"
       latest_post_after: "显示最新帖子在某个日期之后（YYYY-MM-DD 或几天前）的话题"
       likes_min: "显示至少有这些赞的话题"
@@ -2578,15 +2564,15 @@ zh_CN:
       order_read_asc: "按最后阅读时间排序（时间最早的优先）"
       order_hot: "按热门程度排序（最高优先）"
       order_hot_asc: "按热门程度排序（最低优先）"
-      users: "按参与者筛选主题"
-      users_any: "显示任何指定用户的主题（以逗号分隔）"
-      users_all: "显示所有指定用户参与的主题（以加号分隔）"
+      users: "按参与者筛选话题"
+      users_any: "显示包含任意指定用户的话题（以逗号分隔）"
+      users_all: "显示包含所有指定用户的话题（以加号分隔）"
       exclude_users: "排除特定用户的话题"
-      group: "按群组筛选主题"
-      groups_any: "显示任意指定群组的主题（以逗号分隔）"
-      groups_all: "显示包含所有指定群组的主题（加号分隔）"
-      locale: "按原始语言过滤话题"
-      locale_any: "显示以任何指定语言撰写的原始话题（以逗号分隔）"
+      group: "按群组筛选话题"
+      groups_any: "显示包含任意指定群组的话题（以逗号分隔）"
+      groups_all: "显示包含所有指定群组的话题（以加号分隔）"
+      locale: "按原始语言筛选话题"
+      locale_any: "显示以任意指定语言撰写的原始话题（以逗号分隔）"
       exclude_locale: "排除最初以特定语言撰写的话题"
   discourse_connect:
     login_error: "登录错误"
@@ -2752,7 +2738,7 @@ zh_CN:
         updating_user_ids: "正在更新用户 ID…"
         deleting_source_user: "正在删除源用户…"
   user:
-    anonymized: "[因用户匿名化已移除]"
+    anonymized: "[已因用户匿名化移除]"
     deactivated: "由于 '%{email}' 的退回电子邮件过多，已被停用。"
     deactivated_by_staff: "被管理人员停用"
     deactivated_by_inactivity:
@@ -2958,13 +2944,13 @@ zh_CN:
     illegal: "您的帖子被举报为**非法**：社区认为这可能触犯了法律。"
     spam: "您的帖子被举报为**垃圾信息**：社区认为它是广告，像是在过度地推广着什么，而不是预期中与话题有关的内容。"
     notify_moderators: "您的帖子被举报为**需要版主注意**：社区认为帖子需要管理人员手动干预。"
-    needs_approval: "您的帖子被标记为**需要批准**：它已加入审核队列，管理人员将审核它是否满足[我们的社区准则](%{base_path}/guidelines)。"
+    needs_approval: "您的帖子被标记为**需要审批**：它已自动加入审核队列，管理人员将确保它满足[我们的社区准则](%{base_path}/guidelines)。"
     responder:
       off_topic: "该帖子被举报为**偏离话题**：鉴于话题标题和第一个帖子，社区认为它不适合该话题。"
       inappropriate: "这个帖子被举报为**不当言论**：社区认为它具有冒犯性、侮辱性、属于仇恨行为或违反了[我们的社区准则](%{base_path}/guidelines)。"
       spam: "该帖子被举报为**垃圾信息**：社区认为这是一个广告，本质上是过度宣传的东西，而不是像预期的那样有用或与话题相关。"
       notify_moderators: "该帖子被举报为**需要版主注意**：社区认为帖子需要管理人员手动干预。"
-      needs_approval: "该帖子被标记为**需要批准**：它已加入审核队列，管理人员将审核它是否满足[我们的社区准则](%{base_path}/guidelines)。"
+      needs_approval: "该帖子被标记为**需要审批**：它已自动加入审核队列，管理人员将确保它满足[我们的社区准则](%{base_path}/guidelines)。"
   flags_dispositions:
     agreed: "感谢通知我们。我们认为这是个问题，正在进行调查。"
     agreed_and_deleted: "感谢通知我们。我们认为这是个问题，并且已将该帖子移除。"
@@ -3566,24 +3552,26 @@ zh_CN:
       title: "用户被自动禁言"
       subject_template: "新用户 %{username} 因社区举报被禁言"
       text_body_template: |
-        新用户[%{username}](%{user_url})已被系统自动禁言。
+        这是一条由系统发送的消息。
+
+        新用户 [%{username}](%{user_url}) 已被自动禁言。
 
-        请[审核举报内容](%{base_url}/review)。如果%{username}被错误地禁言，请点击[此用户管理页面](%{user_url})中的解除禁言按钮。
+        请[审核举报内容](%{base_url}/review)。如果 %{username} 被错误地禁言，请点击[此用户管理页面](%{user_url})中的解除禁言按钮。
 
-        自动禁言阈值可以通过站点设置中的`silence_new_user`调整。
+        此阈值可以通过 `silence_new_user` 站点设置进行更改。
     user_automatically_silenced_with_reason:
       title: "用户被自动禁言"
       subject_template: "新用户 %{username} 因社区举报被禁言"
       text_body_template: |
         这是一条由系统发送的消息。
 
-        新用户[%{username}](%{user_url})已被系统自动禁言。
+        新用户 [%{username}](%{user_url}) 已被自动禁言。
 
-        原因：%{reason}
+        原因 - %{reason}
 
-        请[审核举报内容](%{base_url}/review)。如果%{username}被错误地禁言，请点击[此用户管理页面](%{user_url})中的解除禁言按钮。
+        请[审核举报内容](%{base_url}/review)。如果 %{username} 被错误地禁言，请点击[此用户管理页面](%{user_url})中的解除禁言按钮。
 
-        自动禁言阈值可以通过站点设置中的`silence_new_user`调整。
+        此阈值可以通过 `silence_new_user` 站点设置进行更改。
     spam_post_blocked:
       title: "垃圾信息帖子被屏蔽"
       subject_template: "新用户 %{username} 的帖子因重复链接被屏蔽"
@@ -3597,7 +3585,7 @@ zh_CN:
         可以通过 `newuser_spam_host_threshold` 和 `allowed_spam_host_domains` 网站设置对此进行修改。如果他们应该被豁免，请考虑将 %{domains} 添加到许可名单中。
     unsilenced:
       title: "已被取消禁言"
-      preview: "帐户不再处于暂停状态."
+      preview: "帐户不再处于暂停状态。"
       subject_template: "帐户不再处于暂停状态"
       text_body_template: |
         您好，
@@ -3635,10 +3623,10 @@ zh_CN:
 
         新用户的帖子目前正在等待审核。[在此处批准或拒绝他们](%{base_url}/review?type=ReviewableQueuedPost)。
     user_posts_deleted:
-      title: "用户的帖子已被删除"
+      title: "用户帖子已被删除"
       subject_template: "%{user} 的所有帖子已被删除"
       text_body_template:
-        other: "@%{user} 的%{count}个帖子已被 @%{staff_user} 删除。"
+        other: "@%{user} 的 %{count} 个帖子已被 @%{staff_user} 删除。"
   unsubscribe_link: |
     要退订这些电子邮件，请[点击此处](%{unsubscribe_url})。
   unsubscribe_link_and_mail: |
@@ -3750,7 +3738,7 @@ zh_CN:
         %{respond_instructions}
     user_replied:
       title: "用户回复"
-      preview: "有用户回复了你的帖子。"
+      preview: "有人回复了您的帖子。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3773,7 +3761,7 @@ zh_CN:
         %{respond_instructions}
     user_quoted:
       title: "用户引用"
-      preview: "有用户在帖子内引用了你的内容。"
+      preview: "有人在帖子中引用了您的内容。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3785,7 +3773,7 @@ zh_CN:
         %{respond_instructions}
     user_linked:
       title: "用户链接"
-      preview: "你的帖子与另一个话题相关联。"
+      preview: "帖子链接到另一个话题。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3797,7 +3785,7 @@ zh_CN:
         %{respond_instructions}
     user_mentioned:
       title: "用户提及"
-      preview: "有用户在帖子中@了你。"
+      preview: "有人在帖子中提到了您。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3853,7 +3841,7 @@ zh_CN:
         %{respond_instructions}
     user_posted:
       title: "用户发帖"
-      preview: "有用户回复了你关注的帖子。"
+      preview: "有人回复了您关注的话题。"
       subject_template: "[%{email_prefix}] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3887,7 +3875,7 @@ zh_CN:
         %{respond_instructions}
     user_posted_pm:
       title: "用户发布私信"
-      preview: "有用户向你发送了私信。"
+      preview: "有人向您发送了一条 PM。"
       subject_template: "[%{email_prefix}] [私信] %{topic_title}"
       text_body_template: |
         %{header_instructions}
@@ -3957,11 +3945,11 @@ zh_CN:
       title: "双重身份验证已禁用"
       subject_template: "[%{email_prefix}] 双重身份验证已禁用"
       text_body_template: |
-        您在 %{site_name} 上的账户的双重身份验证已被停用，现在你可以通过密码登录账户，而无需额外的身份验证码。
+        您在 %{site_name} 上的帐户的双重身份验证已被禁用。您现在可以仅使用您的密码登录；不再需要额外的身份验证代码。
 
-        如果您未曾选择禁用双重身份验证，那么您的帐户可能已被他人盗用。
+        如果您没有选择禁用双重身份验证 (2FA)，则可能有人盗用了您的帐户。
 
-        如果您对此有任何疑问，请[联系网站管理](%{base_url}/about)。
+        如果您有任何问题，请[联系我们友好的管理人员](%{base_url}/about)。
     digest:
       why: "自 %{since} 以来 %{site_link} 的简要摘要"
       since_last_visit: "自从您上次访问以来"
@@ -3993,7 +3981,7 @@ zh_CN:
         %{base_url}/u/password-reset/%{email_token}
     email_login:
       title: "通过链接登录"
-      preview: "通过链接登录."
+      preview: "通过链接登录。"
       subject_template: "[%{email_prefix}] 通过链接登录"
       text_body_template: |
         这是您用于登录 [%{site_name}](%{base_url}) 的链接
@@ -4170,9 +4158,9 @@ zh_CN:
     popular_topics: "热门话题"
     recent_topics: "近期话题"
     see_more: "更多"
-    search_title: "尝试搜索感兴趣的话题"
+    search_title: "尝试改为搜索？"
     search_button: "搜索"
-    home: "返回主页"
+    home: "返回首页"
     placeholder: "通过标题或关键字搜索话题…"
   offline:
     title: "无法加载应用"
@@ -4724,17 +4712,17 @@ zh_CN:
       name: 不错的分享
       description: 与 25 个唯一身份访客分享帖子
       long_description: |
-        当您分享的链接被 25 位独立外部访客点击时，将授予此徽章。感谢您宣传我们的讨论和社区。
+        当您分享的链接被 25 个唯一身份外部访客点击时，将授予此徽章。感谢您宣传我们的讨论和社区。
     good_share:
       name: 很棒的分享
       description: 与 300 个唯一身份访客分享帖子
       long_description: |
-        当您分享的链接被 300 个独立外部访客点击时，将授予此徽章。干得漂亮！您向一群新人展示了一场精彩的讨论，并帮助这个社区成长。
+        当您分享的链接被 300 个唯一身份外部访客点击时，将授予此徽章。干得漂亮！您向一群新人展示了一场精彩的讨论，并帮助这个社区成长。
     great_share:
       name: 精彩的分享
       description: 与 1000 个唯一身份访客分享帖子
       long_description: |
-        当您分享的链接被 1000 个独立外部访客点击时，将授予此徽章。哇！您将一个有趣的讨论介绍给大量新受众，并帮助社区前进了一大步！
+        当您分享的链接被 1000 个唯一身份外部访客点击时，将授予此徽章。哇！您将一个有趣的讨论介绍给大量新受众，并帮助社区前进了一大步！
     first_like:
       name: 第一个赞
       description: 赞了一个帖子
@@ -4903,11 +4891,11 @@ zh_CN:
     upload_row_too_long: "CSV 文件的每行应该有一个标签。或者，标签后面可以跟一个逗号，然后是标签组名称。"
     bulk_create:
       invalid_params: "参数无效。请提供标签名称数组。"
-      invalid_name: "无效的标签名称。"
+      invalid_name: "标签名称无效。"
       tag_too_long:
         other: "标签过长（最多 %{count} 个字符）。"
       too_many_tags:
-        other: "标签太多了。您一次最多可以创建 %{count} 标签。对于较大的导入，请使用 CSV 上传功能。"
+        other: "标签过多。您一次最多可以创建 %{count} 个标签。对于较大的导入，请使用 CSV 上传功能。"
     forbidden:
       invalid:
         other: "您选择的标签均无法使用"
@@ -4930,8 +4918,8 @@ zh_CN:
   finish_installation:
     congratulations: "恭喜，您已安装 Discourse！"
     login_with_discourse_id: "使用 Discourse ID 登录"
-    discourse_id_help: "请使用 Discourse ID 登录。<br/><br/>请确保您使用的 Discourse ID 账户的主电子邮件与 `DISCOURSE_DEVELOPER_EMAILS` 环境变量相匹配。"
-    discourse_id_error_help: "您选择暂时跳过设置电子邮件。不幸的是，由于上述错误信息，设置无法继续。请在<a href='https://meta.discourse.org/'>meta.discourse.org</a> 上报告此问题。"
+    discourse_id_help: "请通过以下按钮使用 Discourse ID 登录。<br/><br/>请确保您使用的 Discourse ID 帐户的主电子邮件地址与 `DISCOURSE_DEVELOPER_EMAILS` 环境变量相匹配。"
+    discourse_id_error_help: "您选择暂时跳过设置电子邮件地址。很抱歉，由于上述错误消息，设置无法继续。请在 <a href='https://meta.discourse.org/'>meta.discourse.org</a> 上报告此问题。"
     register:
       button: "注册"
       title: "注册管理员帐户"
@@ -4945,8 +4933,8 @@ zh_CN:
       message: "<p>我们已将激活电子邮件重新发送至 <b>%{email}</b>"
     discourse_id:
       help: "我们正在为您设置 Discourse ID。"
-      no_allowed_emails: "DISCOURSE_DEVELOPER_EMAILS 中未配置允许的电子邮件。无法继续站点设置。"
-      global_notice: "目前还没有管理员登录。请使用与 `DISCOURSE_DEVELOPER_EMAILS` 环境变量中邮箱地址匹配的 Discourse ID 帐户登录，以完成安装。"
+      no_allowed_emails: "DISCOURSE_DEVELOPER_EMAILS 中未配置允许的电子邮件地址。无法继续站点设置。"
+      global_notice: "目前还没有管理员登录。请通过与 `DISCOURSE_DEVELOPER_EMAILS` 环境变量匹配的电子邮件地址使用 Discourse ID 帐户登录，以完成安装。"
   safe_mode:
     title: "进入安全模式"
     description: "安全模式允许您在不加载主题或客户端插件自定义的情况下测试您的网站。服务器端插件自定义保持启用状态。"
@@ -4960,17 +4948,16 @@ zh_CN:
   dev_mode:
     title: "开发者模式"
     enable_rack_mini_profiler: "启用 Rack Mini Profiler，使其在会话切换后保持 1 小时。"
-    enter: "Enter"
   wizard:
     title: "Discourse 设置"
     step:
       setup:
         title: "使用入门"
-        description: "我们将使用基本设置完成您社区的设置流程，您可以在后续修改这些设置。"
+        description: "我们将使用基本设置完成您社区的设置，您可以在后续修改这些设置。"
         fields:
           title:
             label: "社区名称"
-            placeholder: "Jane's Hangout"
+            placeholder: "朱桦的环聊"
           default_locale:
             label: "语言"
           login_required:
@@ -4990,7 +4977,7 @@ zh_CN:
               invite_only:
                 label: "仅限邀请"
           must_approve_users:
-            description: "要手动批准成员帐户吗？"
+            description: "是否要批准成员帐户？"
             choices:
               "no":
                 label: "否，新成员可以立即加入"
@@ -5023,14 +5010,14 @@ zh_CN:
         draft: "草稿拉取请求"
         open: "打开拉取请求"
         approved: "已批准的拉取请求"
-        changes_requested: "请求更改"
-        merged: "合并拉取请求"
+        changes_requested: "已请求更改"
+        merged: "已合并的拉取请求"
         closed: "已关闭的拉取请求"
       status_date:
         open: "已打开"
         draft: "草稿"
         approved: "已批准"
-        changes_requested: "请求更改"
+        changes_requested: "已请求更改"
         merged: "已合并"
         closed: "已关闭"
   discourse_push_notifications:
@@ -5052,7 +5039,7 @@ zh_CN:
     not_found: "找不到"
     unknown: "未知"
     site_setting:
-      update_existing_users: "更新现有用户？ %{value}"
+      update_existing_users: "更新现有用户？%{value}"
     user_merged: "%{username} 已被合并到此帐户"
     user_delete_self: "被自己从 %{url} 删除"
     webhook_deactivation_reason: "您的网络钩子已自动停用。我们收到了多个 '%{status}' HTTP 状态失败响应。"
@@ -5074,7 +5061,7 @@ zh_CN:
     upcoming_changes:
       log_manually_toggled: "用户手动切换"
       log_promoted: >
-        这项即将进行的更改达到了 '%{change_status}' 状态，因此它已在您的网站上自动启用。有关更多详细信息，请参阅 <a href="%{base_path}/admin/config/upcoming-changes">即将进行的更改页面</a> 。
+        这项即将推出的更改达到了 '%{change_status}' 状态，因此它已在您的站点上自动启用。有关更多详细信息，请参阅<a href="%{base_path}/admin/config/upcoming-changes">即将推出的更改页面</a> 。
   reviewables:
     already_handled: "谢谢，但我们已经审核该帖子并确定不需要再次举报它。"
     already_handled_and_user_not_exist: "谢谢，但有人已经审核过了，该用户已不存在。"
@@ -5151,11 +5138,11 @@ zh_CN:
         complete: "帖子已被删除。"
       delete_and_ignore:
         title: "删除帖子并忽略举报"
-        description: "删除帖子并忽略举报，将其从队列中移除；如果是第一篇帖子，则同时删除话题。 "
+        description: "删除帖子并忽略举报，将其从队列中移除；如果是第一个帖子，同时删除话题。 "
         complete: "帖子已被删除。"
       delete_and_ignore_replies:
-        title: "删除帖子及与之关联的回复，并忽略该举报"
-        description: "删除帖子及与之关联的回复，忽略该举报，并将其从审核队列中移除；如果这是首帖，则同时删除该话题"
+        title: "删除帖子与回复，并忽略举报"
+        description: "删除帖子及其所有回复，忽略举报，并将其从队列中移除；如果是第一个帖子，同时删除话题"
         confirm: "确定要同时删除对帖子的回复吗？"
         complete: "帖子和回复已被删除。"
       delete_and_agree:
@@ -5169,23 +5156,23 @@ zh_CN:
         complete: "帖子和回复已被删除。"
       disagree_and_restore:
         title: "恢复帖子"
-        description: "拒绝该举报，恢复帖子"
+        description: "不同意举报，并恢复帖子"
         complete: "帖子已恢复。"
       disagree_bundle:
         title: "否"
       disagree:
         title: "保留帖子"
-        description: "拒绝该举报"
+        description: "不同意举报"
         complete: "举报已被忽略。"
       discard_post:
         title: "舍弃帖子"
         complete: "帖子已被舍弃。"
       revise_and_reject_post:
-        title: "打回帖子"
+        title: "请求修订…"
         complete: "帖子被拒绝，等待修订。"
       ignore:
         title: "忽略"
-        description: "将其从审核队列中移除，不采取任何措施"
+        description: "将其从队列中移除，不采取任何措施。"
         complete: "举报已被忽略。"
       ignore_and_do_nothing:
         title: "不进行操作"
@@ -5213,7 +5200,7 @@ zh_CN:
         title: "否"
         delete:
           title: "删除用户"
-          description: "删除用户，而不封禁其IP/Email"
+          description: "删除用户，而不封禁"
           complete: "用户已被删除。"
         block:
           title: "删除并阻止用户"
@@ -5223,7 +5210,7 @@ zh_CN:
         title: "是"
       not_spam:
         title: "否"
-        description: "不是，批准该用户"
+        description: "非垃圾信息，批准用户"
       reject:
         title: "拒绝"
         bundle_title: "拒绝…"
@@ -5237,12 +5224,12 @@ zh_CN:
         title: "拒绝并删除帖子"
         complete: "帖子被拒绝并被删除。"
       reject_and_delete_standalone:
-        title: "不是，删除帖子"
+        title: "否，删除帖子"
       reject_and_keep_deleted:
         title: "保持帖子删除"
         complete: "帖子被拒绝，保持删除状态。"
       reject_and_keep_deleted_standalone:
-        title: "不是，保持帖子删除状态"
+        title: "否，保持帖子删除状态"
       scrub:
         title: 清除记录
       approve_and_restore:
@@ -5252,11 +5239,7 @@ zh_CN:
         title: "是"
         complete: "帖子已获批准并取消隐藏"
       post_actions:
-        bundle_title: "您想对这篇帖子做什么？"
-      no_action_post:
-        title: "无行动"
-        description: "不对帖子采取任何行动"
-        complete: "未对帖子采取任何行动"
+        bundle_title: "您想如何处理该帖子？"
       delete_post:
         title: "删除帖子"
         description: "删除此帖子"
@@ -5267,48 +5250,40 @@ zh_CN:
         complete: "帖子已隐藏"
       unhide_post:
         title: "取消隐藏帖子"
-        description: "让所有用户都可以看到此帖子"
-        complete: "帖子取消隐藏"
+        description: "将此帖子设为对所有用户可见"
+        complete: "帖子已取消隐藏"
       restore_post:
         title: "恢复帖子"
         description: "恢复已删除的帖子"
         complete: "帖子已恢复"
       edit_post:
         title: "编辑帖子"
-        description: "编辑此帖内容"
+        description: "编辑此帖子内容"
         complete: "帖子已编辑"
-      convert_to_pm:
-        title: "转换为 PM"
-        description: "将此帖子转换为个人消息"
-        complete: "帖子已转换为私人消息"
       user_actions:
-        bundle_title: "您想对这位用户做什么？"
-      no_action_user:
-        title: "无行动"
-        description: "不执行任何操作"
-        complete: "不执行任何操作"
+        bundle_title: "您想如何处理该用户？"
       silence_user:
-        title: "禁言用户"
+        title: "将用户禁言"
         description: "禁止该用户发帖"
-        complete: "用户被禁言"
+        complete: "用户已被禁言"
         reason: "用户通过审核队列被禁言"
       suspend_user:
         title: "封禁用户"
-        description: "封禁用户"
-        complete: "用户被封禁"
+        description: "封禁用户帐户"
+        complete: "用户已被封禁"
         reason: "用户通过审核队列被封禁"
       delete_user:
         title: "删除用户"
-        description: "删除用户"
-        complete: "用户被删除"
+        description: "从论坛中删除此用户"
+        complete: "用户已被删除"
         reason: "已通过审核队列删除"
       delete_and_block_user:
-        title: "删除并禁止用户"
-        description: "删除用户，并禁止 IP/email"
-        complete: "用户被删除且被禁止"
+        title: "删除并屏蔽"
+        description: "删除该用户并屏蔽其 IP /电子邮件地址"
+        complete: "用户已被删除并屏蔽"
       delete_user_block:
         title: "删除并屏蔽"
-        description: "删除该用户并屏蔽其 IP 地址/邮箱。"
+        description: "删除该用户并屏蔽其 IP /电子邮件地址"
         complete: "用户已被删除并屏蔽"
   email_style:
     html_missing_placeholder: "HTML 模板必须包含 %{placeholder}"
@@ -5353,10 +5328,10 @@ zh_CN:
       unsafe_description: "有不安全的 HTML 描述"
       invalid_tag_group: "具有无效的标签组：%{tag_group_name}"
   discourse_id:
-    already_registered: "该站点已经使用 Discourse ID 注册"
+    already_registered: "此站点已经使用 Discourse ID 注册"
     errors:
       not_configured: "Discourse ID 尚未配置，请先启用 Discourse ID 。"
-      regenerate_failed: "重新生成凭据失败，请稍后重试。"
+      regenerate_failed: "无法重新生成凭据。请稍后再试。"
   activemodel:
     errors:
       <<: *errors
diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml
index 5de717c843e7a..641728a87bef0 100644
--- a/config/locales/server.zh_TW.yml
+++ b/config/locales/server.zh_TW.yml
@@ -1125,7 +1125,6 @@ zh_TW:
     allowed_internal_hosts: "Discourse 可以安全抓取以用於 Onebox 與其他用途的內部主機列表"
     allowed_crawler_user_agents: "使用者代理（User Agents）的網路爬蟲（Web Crawlers）將允許存取網站。警告！設置此將取消未列出的所有網路爬蟲者（Web Crawlers）"
     slow_down_crawler_rate: "如果指定了slow_down_crawler_user_agents，則此速率將適用於所有抓取工具（請求之間的延遲秒數）"
-    content_security_policy_collect_reports: "在 /csp_reports 啟用CSP違規報告蒐集"
     invalidate_inactive_admin_email_after_days: "在這幾天沒有訪問網站的管理員帳戶，在登入前需要重新驗證該管理員帳戶的電子郵件。設定為0禁用。"
     share_links: "決定在分享對話方塊裡顯示哪些項目、以什麼順序顯示。"
     site_contact_username: "以一個有效的工作成員帳號來發送所有自動化消息。如果保留空白，則會使用預設的系統帳號。"
@@ -1296,7 +1295,6 @@ zh_TW:
     alternative_reply_by_email_addresses: "通過郵件回覆的回覆地址模板，例如：%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "電子郵件格式使用HTML而不是純文字（text）檔"
     strip_incoming_email_lines: "從每行傳入電子郵件中刪除前導、尾隨空格。"
-    disable_emails: "防止Discourse發送任何類型的電子郵件。 選擇“是”以禁用所有使用者的電子郵件。選擇“非工作人員”僅為非管理權限帳戶禁用電子郵件。"
     strip_images_from_short_emails: "郵件小於 2800 位元組時去除圖片"
     display_name_on_email_from: "在郵件的來自欄顯示暱稱"
     unsubscribe_via_email: "允許使用者在發送的郵件「退訂」來退訂郵件訂閲，「退訂」可在主題或正文中。"
@@ -1456,10 +1454,6 @@ zh_TW:
       staged_users_disabled: "您必須先啟用「暫存使用者（staged users）」，才能啟用此設定"
       reply_by_email_disabled: "在啟用此設定之前，您必須先啟用「通過電子郵件回覆」設定"
       enable_local_logins_disabled: "在啟用此設定之前，必須先啟用「啟用本地登入（local logins）」設定。"
-      min_username_length_exists: "你不能設比現有使用者名稱短的「最小使用者名稱長度」。"
-      min_username_length_range: "您不能將下限設定的高於上限。"
-      max_username_length_exists: "您不能設置比現有使用者名稱短的「最大使用者名稱長度」。"
-      max_username_length_range: "您不能將上限設定的低於下限。"
       invalid_hex_value: "顏色值必須是6位十六進制代碼（hex codes），例如：紅色，FF0000。"
       allowed_unicode_usernames:
         regex_invalid: "正則表達式無效：%{error}"
@@ -2765,8 +2759,6 @@ zh_TW:
     title: "進入安全模式"
     enter: "進入安全模式"
     must_select: "您必須至少選擇一個選項才能進入安全模式。"
-  dev_mode:
-    enter: "Enter"
   wizard:
     title: "Discourse 安裝"
     step:
@@ -2891,12 +2883,8 @@ zh_TW:
         title: "是"
       approve_and_unhide:
         title: "是"
-      no_action_post:
-        title: "沒有動作"
       delete_post:
         title: "刪除貼文"
-      no_action_user:
-        title: "沒有動作"
       silence_user:
         title: "使用者靜音"
       delete_user:
diff --git a/plugins/automation/config/locales/client.ar.yml b/plugins/automation/config/locales/client.ar.yml
index 7725e8eca9417..17eddd82e0501 100644
--- a/plugins/automation/config/locales/client.ar.yml
+++ b/plugins/automation/config/locales/client.ar.yml
@@ -10,6 +10,7 @@ ar:
       logs:
         staff_actions:
           actions:
+            create_automation: إنشاء أتمتة
             update_automation: تحديث الأتمتة
             delete_automation: حذف الأتمتة
     discourse_automation:
@@ -72,8 +73,10 @@ ar:
           fields:
             categories:
               label: الفئات
+              description: تُشغل فقط عندما يكون الموضوع المُبلّغ عنه ضمن هذه الفئات
             tags:
               label: الوسوم
+              description: تُشغل فقط عندما يحتوي الموضوع المُبلغ عنه على أي من هذه الوسوم
         not_found: تعذَّر العثور على المشغِّل `%{trigger}` للأتمتة `%{automation}`، تأكَّد من تثبيت المكوِّن الإضافي ذي الصلة
         user_badge_granted:
           fields:
@@ -284,6 +287,14 @@ ar:
               label: الوسوم
               description: اختياري، لن يتم تشغيله إلا إذا كان المنشور يحتوي على أي هذه الوسوم
       scriptables:
+        email_on_flagged_post:
+          fields:
+            email_template:
+              label: قالب البريد الإلكتروني
+              description: يدعم عناصر نائبة للأتمتة
+            recipients:
+              label: المستلمون
+              description: المستخدمون أو عناوين البريد الإلكتروني لإرسال الإشعار إليهم
         not_found: تعذَّر العثور على البرنامج النصي `%{script}` للأتمتة `%{automation}`، تأكَّد من تثبيت المكوِّن الإضافي ذي الصلة
         zapier_webhook:
           fields:
@@ -433,6 +444,11 @@ ar:
               label: "اسم الحقل المخصَّص للمستخدم"
         set_topic_timer:
           title: تعيين مؤقِّت للموضوع
+          fields:
+            type:
+              label: نوع المؤقت
+            duration:
+              label: مدة المؤقت
       unnamed_automation: "أتمتة دون اسم"
       models:
         script:
diff --git a/plugins/automation/config/locales/client.de.yml b/plugins/automation/config/locales/client.de.yml
index 41cf6ad991d2a..4a88ac3d67454 100644
--- a/plugins/automation/config/locales/client.de.yml
+++ b/plugins/automation/config/locales/client.de.yml
@@ -11,7 +11,7 @@ de:
         staff_actions:
           actions:
             create_automation: Automatisierung erstellen
-            update_automation: automatisierung aktualisieren
+            update_automation: Automatisierung aktualisieren
             delete_automation: Automatisierung löschen
     discourse_automation:
       title: Automatisierung
diff --git a/plugins/automation/config/locales/client.el.yml b/plugins/automation/config/locales/client.el.yml
index d638eb9e42115..6558789e9b2cc 100644
--- a/plugins/automation/config/locales/client.el.yml
+++ b/plugins/automation/config/locales/client.el.yml
@@ -46,6 +46,9 @@ el:
           raw:
             label: Κύριο μέρος
         pms:
+          confirm_remove_pm: "Σίγουρα θέλετε να αφαιρέσετε αυτό το ΠΜ;"
+          placeholder_title: Τίτλος ΠΜ
+          add_pm: Προσθήκη ΠΜ
           no_pm_created: Δεν έχετε δημιουργήσει ακόμη κανένα προσωπικό μήνυμα. Τα προσωπικά μηνύματα θα σταλούν μόλις πυροδοτηθεί ο αυτοματισμός σας.
           title:
             label: Τίτλος
@@ -68,6 +71,8 @@ el:
           fields:
             badge:
               label: Παράσημο
+            only_first_grant:
+              label: Μόνο στην πρώτη χορήγηση
         stalled_topic:
           durations:
             PT1H: "Μία ώρα"
@@ -119,6 +124,10 @@ el:
           fields:
             restricted_group:
               label: Περιορισμός σε ομάδα
+            trust_level_transition:
+              label: Μετάβαση επιπέδου εμπιστοσύνης
+          trust_levels:
+            ALL: "Όλα τα επίπεδα εμπιστοσύνης"
         point_in_time:
           fields:
             execute_at:
@@ -132,17 +141,34 @@ el:
             original_post_only:
               label: Μόνο η αρχική ανάρτηση
               description: Θα ενεργοποιηθεί μόνο αν η ανάρτηση είναι η αρχική ανάρτηση στο θέμα
+            action_type:
+              description: "Προαιρετικό, περιορίστε το έναυσμα μόνο σε συμβάντα δημιουργίας ή επεξεργασίας"
+            valid_trust_levels:
+              label: Έγκυρα επίπεδα εμπιστοσύνης
             restricted_tags:
               label: Ετικέτες
             restricted_categories:
               label: Κατηγορίες
+            exclude_subcategories:
+              label: Εξαίρεση υποκατηγοριών
             restricted_archetype:
               description: Προαιρετικά, να επιτρέπεται το έναυσμα μόνο σε θέματα ή προσωπικά μηνύματα
+            restricted_groups:
+              label: Περιορισμένες ομάδες
+            excluded_groups:
+              label: Εξαιρούμενες ομάδες
             first_post_only:
               label: Πρώτη ανάρτηση μόνο
             first_topic_only:
               label: Πρώτο θέμα μόνο
+            skip_via_email:
+              label: "Παράλειψη μέσω email"
+              description: "Παράλειψη του εναύσματος εάν η ανάρτηση δημιουργήθηκε μέσω email"
+            post_features:
+              label: Χαρακτηριστικά ανάρτησης
+              description: "Προαιρετικό, περιορίστε το έναυσμα μόνο σε αναρτήσεις με αυτά τα χαρακτηριστικά"
           created: Δημιουργήθηκε
+          edited: Επεξεργάστηκε
           topics: Όλα τα θέματα
           personal_messages: Προσωπικά μηνύματα
           public_topics: Δημόσια θέματα (εξαιρούνται όλες οι ασφαλείς κατηγορίες)
@@ -156,6 +182,7 @@ el:
               label: Πεδία προφίλ χρήστη
               description: Θα ενεργοποιηθεί μόνο αν ο χρήστης έχει συμπληρώσει όλα αυτά τα πεδία
             custom_fields:
+              label: Προσαρμοσμένα πεδία χρήστη
               description: Θα ενεργοποιηθεί μόνο αν ο χρήστης έχει συμπληρώσει όλα αυτά τα πεδία
             once_per_user:
               label: Μία φορά ανά χρήστη
@@ -178,6 +205,8 @@ el:
             ignore_group_members:
               label: Αγνόηση μελών ομάδας
               description: Παράλειψη ενεργοποίησης αν ο αποστολέας είναι μέλος της ομάδας που καθορίστηκε παραπάνω
+            valid_trust_levels:
+              label: Έγκυρα επίπεδα εμπιστοσύνης
         topic_tags_changed:
           trigger_on_modes:
             tags_added_or_removed: Ετικέτες προστέθηκαν ή αφαιρέθηκαν
@@ -192,6 +221,8 @@ el:
               description: Θα ενεργοποιηθεί μόνο αν το θέμα έχει κάποια από αυτές τις ετικέτες
         after_post_cook:
           fields:
+            valid_trust_levels:
+              label: Έγκυρα επίπεδα εμπιστοσύνης
             restricted_category:
               label: Κατηγορία
             restricted_tags:
@@ -348,7 +379,7 @@ el:
           enabled:
             label: "Ενεργοποίηση αυτοματισμού"
           disabled:
-            label: Απενεργοποιημένο
+            label: Απενεργοποιημένος
           last_updated_at:
             label: Τελευταία ενημέρωση
           last_run:
diff --git a/plugins/automation/config/locales/client.ja.yml b/plugins/automation/config/locales/client.ja.yml
index 51e8650e93709..c4519b483eb2a 100644
--- a/plugins/automation/config/locales/client.ja.yml
+++ b/plugins/automation/config/locales/client.ja.yml
@@ -10,6 +10,7 @@ ja:
       logs:
         staff_actions:
           actions:
+            create_automation: 自動化を作成する
             update_automation: 自動化を更新
             delete_automation: 自動化を削除
     discourse_automation:
@@ -67,8 +68,10 @@ ja:
           fields:
             categories:
               label: カテゴリ
+              description: 通報されたトピックがこれらのカテゴリに含まれる場合にのみトリガーします
             tags:
               label: タグ
+              description: 通報されたトピックにこれらのタグが付いている場合にのみトリガーします
         not_found: 自動化 `%{automation}` のトリガー `%{trigger}` が見つかりませんでした。関連するプラグインがインストールされていることを確認してください。
         user_badge_granted:
           fields:
@@ -279,6 +282,14 @@ ja:
               label: タグ
               description: オプション。投稿にこれらのいずれかのタグが設定されている場合にのみトリガーされます。
       scriptables:
+        email_on_flagged_post:
+          fields:
+            email_template:
+              label: メールのテンプレート
+              description: 自動化プレースホルダーをサポートします
+            recipients:
+              label: 受信者
+              description: 通知するユーザーまたはメールアドレス
         not_found: 自動化 `%{automation}` のスクリプト `%{script}` が見つかりませんでした。関連するプラグインがインストールされていることを確認してください。
         zapier_webhook:
           fields:
@@ -428,6 +439,11 @@ ja:
               label: "ユーザーカスタムフィールド名"
         set_topic_timer:
           title: トピックタイマーを設定
+          fields:
+            type:
+              label: タイマータイプ
+            duration:
+              label: タイマー時間
       unnamed_automation: "無題の自動化"
       models:
         script:
diff --git a/plugins/automation/config/locales/client.zh_CN.yml b/plugins/automation/config/locales/client.zh_CN.yml
index fc15b96a4760e..a7ef8804b1939 100644
--- a/plugins/automation/config/locales/client.zh_CN.yml
+++ b/plugins/automation/config/locales/client.zh_CN.yml
@@ -68,10 +68,10 @@ zh_CN:
           fields:
             categories:
               label: 类别
-              description: 仅当举报的话题属于这些类别时才会触发
+              description: 仅当被举报的话题属于这些类别时才触发
             tags:
               label: 标签
-              description: 仅当标记的话题包含以下任一标签时才会触发
+              description: 仅当被举报的话题包含以下任一标签时才触发
         not_found: 找不到用于自动化 `%{automation}` 的触发器 `%{trigger}`，请确保关联插件已安装
         user_badge_granted:
           fields:
diff --git a/plugins/automation/config/locales/server.ar.yml b/plugins/automation/config/locales/server.ar.yml
index a6d38b9e916c0..39ae55017ac9b 100644
--- a/plugins/automation/config/locales/server.ar.yml
+++ b/plugins/automation/config/locales/server.ar.yml
@@ -8,6 +8,8 @@ ar:
   site_settings:
     discourse_automation_enabled: "تفعيل المكوِّن الإضافي discourse-automation"
   discourse_automation:
+    staff_action_logs:
+      empty_value: "(فارغ)"
     models:
       automations:
         validations:
@@ -20,6 +22,9 @@ ar:
         invalid_field: لا يمكن استخدام المكوّن %{component} الخاص بالحقل على %{target}:%{target_name}.
         invalid_metadata: بيانات الحقل `%{field}` غير صالحة أو المكوِّن `%{component}` غير معروف.
     triggerables:
+      post_flag_created:
+        title: إنشاء بلاغ على منشور
+        description: تُفعّل الأتمتة تلقائيًا عندما يُقدَّم بلاغ على منشور
       errors:
         custom_fields_or_user_profile_required: "يجب إدخال مشغِّل واحد على الأقل من بين‎ 'custom_fields' ‎أو‎ 'user_profile'."
       user_badge_granted:
@@ -67,6 +72,9 @@ ar:
         description: سيتم تشغيل الأتمتة عند تغيير وسوم أحد الموضوعات.
       topic:
         title: الموضوع
+      topic_closed:
+        title: تم إغلاق الموضوع
+        description: يشغّل البرنامج النصي عند إغلاق الموضوع.
       after_post_cook:
         title: بعد معالجة المنشور
         description: عند معالجة محتوى المنشور، سيتم تشغيل الأتمتة
@@ -74,6 +82,24 @@ ar:
         title: بعد تحديث المستخدم
         description: عندما يقوم المستخدم بتحديث أي معلومات، سيتم تشغيل الأتمتة
     scriptables:
+      email_on_flagged_post:
+        title: إرسال بريد إلكتروني عند وجود بلاغ على منشور
+        description: إرسال بريد إلكتروني مخصص عند إنشاء بلاغ على أي منشور
+        subject: "المنشور المُبلّغ عنه: %{topic_title} بواسطة (%{flagger_username})"
+        default_template: |-
+          تم الإبلاغ عن منشور.
+
+          الموضوع: {{topic_title}} ({{topic_url}})
+          المنشور: {{post_url}} (#{{post_number}})
+          نوع البلاغ: {{flag_type}}
+          المستخدم المُبلِّغ عنه: {{flagged_username}}
+          المُبلِّغ: {{flagger_username}}
+          الفئة: {{category}}
+          الوسوم: {{tags}}
+
+          --------
+          مقتطف من المنشور:
+          {{post_excerpt}}
       post:
         title: إنشاء منشور
         description: إنشاء منشور في الموضوع المحدَّد
@@ -104,6 +130,10 @@ ar:
         title: تبادل الهدايا
         description: يسمح بإقران مستخدمي المجموعة بشكلٍٍ مجهول لإرسال هدية لبعضهم البعض.
         doc: يتطلَّب تبادل الهدايا وجود مجموعة حالية تضم 3 مستخدمين على الأقل. سيتم إقران كل مستخدم في المجموعة بمُرسل هدايا واحد ومستقبل هدايا واحد في التاريخ المختار.
+      remove_upload_markup_from_deleted_posts:
+        title: إزالة علامات التحميل من المنشورات المحذوفة
+        description: يعمل هذا الخيار كمستخدم نظام، ويضيف نسخةً معدلةً إلى المنشورات المحذوفة التي أُزيلت منها علامات التحميل. وبالتزامن مع مهمة "تنظيف التحميلات"، يؤدي ذلك إلى حذف التحميلات نهائيًا من المنشورات المحذوفة. يُرجى توخي الحذر عند الاستخدام!
+        edit_reason: أزالت الأتمتة علامات التحميل من المنشور المحذوف
       send_pms:
         title: إرسال رسائل شخصية
         description: يسمح بإرسال الرسائل الشخصية (ربما تتأخر).
@@ -159,3 +189,4 @@ ar:
         description: "تعيين الموضوعات عشوائيًا إلى مجموعة"
       set_topic_timer:
         title: "تعيين مؤقِّت للموضوع"
+        description: "تعيين مؤقت لموضوع معين"
diff --git a/plugins/automation/config/locales/server.de.yml b/plugins/automation/config/locales/server.de.yml
index 6f52db4f245fc..5edbc67410525 100644
--- a/plugins/automation/config/locales/server.de.yml
+++ b/plugins/automation/config/locales/server.de.yml
@@ -16,7 +16,7 @@ de:
           script_blank: "Skript darf nicht leer sein"
           trigger_blank: "Auslöser darf nicht leer sein"
           script_missing_required_fields: "Dem Skript fehlen erforderliche Felder: %{fields}"
-          trigger_missing_required_fields: "Dem Trigger fehlen erforderliche Felder: %{fields}"
+          trigger_missing_required_fields: "Dem Auslöser fehlen erforderliche Felder: %{fields}"
       fields:
         required_field: Feld `%{name}` muss bei `%{target}:%{target_name}` ausgefüllt sein.
         invalid_field: Die Komponente `%{component}` des Feldes kann nicht bei `%{target}:%{target_name}` verwendet werden.
diff --git a/plugins/automation/config/locales/server.el.yml b/plugins/automation/config/locales/server.el.yml
index bb7e51170212e..e10685a31c9ba 100644
--- a/plugins/automation/config/locales/server.el.yml
+++ b/plugins/automation/config/locales/server.el.yml
@@ -6,7 +6,21 @@
 
 el:
   discourse_automation:
+    staff_action_logs:
+      empty_value: "(κενό)"
+    models:
+      fields:
+        required_field: Το πεδίο `%{name}` πρέπει να συμπληρωθεί στο `%{target}:%{target_name}`.
+        invalid_field: Το πεδίο του στοιχείου `%{component}` δεν είναι χρησιμοποιήσιμο στο `%{target}:%{target_name}`.
+        invalid_metadata: Τα δεδομένα για το πεδίο `%{field}` δεν είναι έγκυρα ή το στοιχείο `%{component}` είναι άγνωστο.
     triggerables:
+      post_flag_created:
+        description: Πυροδοτεί έναν αυτοματισμό όταν γίνεται αναφορά μιας ανάρτησης
+      user_badge_granted:
+        title: Παράσημο χρήστη χορηγήθηκε
+        doc: Πυροδοτεί έναν αυτοματισμό όταν χορηγείται σε έναν χρήστη ένα παράσημο.
+      user_first_logged_in:
+        doc: Πυροδοτεί έναν αυτοματισμό όταν ένας χρήστης συνδέεται για πρώτη φορά.
       api_call:
         title: Κλήση API
       category_created_edited:
@@ -19,6 +33,9 @@ el:
         title: Προσωπικό μήνυμα δημιουργήθηκε
       topic:
         title: Θέμα
+      topic_closed:
+        title: Θέμα έκλεισε
+        description: Πυροδοτεί μια δέσμη ενεργειών όταν ένα θέμα κλείνει.
     scriptables:
       email_on_flagged_post:
         subject: "Αναφερόμενη ανάρτηση: %{topic_title} (%{flagger_username})"
diff --git a/plugins/automation/config/locales/server.ja.yml b/plugins/automation/config/locales/server.ja.yml
index f8e88e33cfbc8..6d2824bd3a94b 100644
--- a/plugins/automation/config/locales/server.ja.yml
+++ b/plugins/automation/config/locales/server.ja.yml
@@ -8,6 +8,8 @@ ja:
   site_settings:
     discourse_automation_enabled: "discourse-automation プラグインを有効にする"
   discourse_automation:
+    staff_action_logs:
+      empty_value: "(空)"
     models:
       automations:
         validations:
@@ -20,6 +22,9 @@ ja:
         invalid_field: フィールドのコンポーネント `%{component}` は `%{target}:%{target_name}` では使用できません。
         invalid_metadata: '`%{field}` のデータが無効であるか、コンポーネント `%{component}` が不明です。'
     triggerables:
+      post_flag_created:
+        title: 投稿の通報が作成された
+        description: 投稿が通報されると自動化がトリガーされます
       errors:
         custom_fields_or_user_profile_required: "少なくとも 'custom_fields' または 'user_profile' のいずれかを指定する必要があります。"
       user_badge_granted:
@@ -67,6 +72,9 @@ ja:
         description: トピックのタグが変更されると、自動化がトリガーされます
       topic:
         title: トピック
+      topic_closed:
+        title: トピックをクローズ
+        description: トピックがクローズされるとスクリプトをトリガーします。
       after_post_cook:
         title: 投稿のクック処理後
         description: 投稿内容がクックされると、自動化がトリガーされます。
@@ -74,6 +82,24 @@ ja:
         title: ユーザー更新後
         description: ユーザーが情報を更新すると、自動化がトリガーされます
     scriptables:
+      email_on_flagged_post:
+        title: 通報された投稿のメール
+        description: 投稿に通報が作成されるたびにカスタムメールを送信します
+        subject: "通報された投稿: %{topic_title} (%{flagger_username})"
+        default_template: |-
+          投稿が通報されました。
+
+          トピック: {{topic_title}} ({{topic_url}})
+          投稿: {{post_url}} (#{{post_number}})
+          通報タイプ: {{flag_type}}
+          通報されたユーザー: {{flagged_username}}
+          通報者: {{flagger_username}}
+          カテゴリ: {{category}}
+          タグ: {{tags}}
+
+          --------
+          投稿の抜粋:
+          {{post_excerpt}}
       post:
         title: 投稿を作成する
         description: 指定されたトピックで投稿を作成します
@@ -104,6 +130,10 @@ ja:
         title: ギフト交換
         description: グループの 2 人のユーザーが匿名で互いにギフトを贈ることができます。
         doc: ギフト交換には、3 人以上のユーザーがいる既存のグループが必要です。選択した日に、一方がギフトを贈る側、もう一方がギフトを受ける側として、グループの各ユーザーがペアリングされます。
+      remove_upload_markup_from_deleted_posts:
+        title: 削除された投稿のアップロードマークアップを削除
+        description: システムユーザーとして、アップロードマークアップが削除された削除済みの投稿にリビジョンを追加します。'clean up uploads' ジョブと合わせて、これにより、削除された投稿のアップロードが完全に削除されます。使用には注意してください！
+        edit_reason: 自動化により、削除済みの投稿からアップロードマークアップが削除されました
       send_pms:
         title: PM を送信する
         description: PM の送信を許可します（遅延の可能性があります）。
@@ -159,3 +189,4 @@ ja:
         description: "グループにトピックをランダムに割り当てます"
       set_topic_timer:
         title: "トピックタイマーを設定"
+        description: "トピックにトピックタイマーを設定します"
diff --git a/plugins/automation/config/locales/server.zh_CN.yml b/plugins/automation/config/locales/server.zh_CN.yml
index 6ed6a2b399c5d..2cde3d6d8b65c 100644
--- a/plugins/automation/config/locales/server.zh_CN.yml
+++ b/plugins/automation/config/locales/server.zh_CN.yml
@@ -9,7 +9,7 @@ zh_CN:
     discourse_automation_enabled: "启用 discourse-automation 插件"
   discourse_automation:
     staff_action_logs:
-      empty_value: "(空)"
+      empty_value: "（空）"
     models:
       automations:
         validations:
@@ -23,8 +23,8 @@ zh_CN:
         invalid_metadata: '`%{field}` 的数据无效或组件 `%{component}` 未知。'
     triggerables:
       post_flag_created:
-        title: 帖子被举报
-        description: 帖子被标记时触发自动操作
+        title: 帖子举报已创建
+        description: 帖子被举报时触发自动化
       errors:
         custom_fields_or_user_profile_required: "必须提供至少一个 'custom_fields' 或 'user_profile'。"
       user_badge_granted:
@@ -74,8 +74,8 @@ zh_CN:
         title: 话题
         description: 关联的脚本将仅用于指定的话题，这对于执行验证的脚本十分有用
       topic_closed:
-        title: 主题已关闭
-        description: 当主题关闭时触发脚本。
+        title: 话题已关闭
+        description: 当话题关闭时触发脚本。
       after_post_cook:
         title: 处理帖子后
         description: 当帖子内容被处理时，将触发自动化
@@ -84,19 +84,19 @@ zh_CN:
         description: 当用户更新任何信息时，将触发自动操作
     scriptables:
       email_on_flagged_post:
-        title: 关于标记帖子的电子邮件
-        description: 在帖子上创建标志时发送自定义电子邮件
-        subject: "已标记帖子： %{topic_title} (%{flagger_username})"
+        title: 针对被举报帖子的电子邮件
+        description: 在帖子上创建举报时发送自定义电子邮件
+        subject: "被举报的帖子：%{topic_title} (%{flagger_username})"
         default_template: |-
-          帖子已被标记。
+          一个帖子已被举报。
 
-          主题： {{topic_title}} ({{topic_url}})
-          帖子： {{post_url}} (#{{post_number}})
-          标记类型： {{flag_type}}
-          标记用户： {{flagged_username}}
-          标记人： {{flagger_username}}
-          分类： {{category}}
-          标签： {{tags}}
+          话题：{{topic_title}} ({{topic_url}})
+          帖子：{{post_url}} (#{{post_number}})
+          举报类型：{{flag_type}}
+          被举报的用户：{{flagged_username}}
+          举报人：{{flagger_username}}
+          类别：{{category}}
+          标签：{{tags}}
 
           --------
           帖子摘要：
@@ -132,9 +132,9 @@ zh_CN:
         description: 允许以匿名方式配对群组中的用户以互相发送礼物。
         doc: 礼物交换需要一个至少包含 3 个用户的现有群组。在选定日期，该群组的每个用户都将与一名赠送者和一名受赠者配对。
       remove_upload_markup_from_deleted_posts:
-        title: 删除已删除帖子中的上传标记
-        description: 作为系统用户，为已删除的帖子添加修改，删除上传标记。结合 "清理上传 "工作，可永久删除已删除帖子中的上传内容。谨慎使用！
-        edit_reason: 自动化程序移除了已删除帖子中的上传标记
+        title: 移除已删除帖子中的上传标记
+        description: 作为系统用户，为上传标记已被移除的已删除帖子添加修订。结合 'clean up uploads' 作业，可以永久删除已删除帖子中的上传内容。谨慎使用！
+        edit_reason: 自动化移除了已删除帖子中的上传标记
       send_pms:
         title: 发送 PM
         description: 允许发送 PM（可能存在延迟）。
@@ -190,4 +190,4 @@ zh_CN:
         description: "向群组随机指定话题"
       set_topic_timer:
         title: "设置话题计时器"
-        description: "为主题设置主题计时器"
+        description: "为话题设置话题计时器"
diff --git a/plugins/chat/config/locales/client.ar.yml b/plugins/chat/config/locales/client.ar.yml
index 4c4faa349acd5..23ce28507321c 100644
--- a/plugins/chat/config/locales/client.ar.yml
+++ b/plugins/chat/config/locales/client.ar.yml
@@ -68,8 +68,13 @@ ar:
       cancel: "إلغاء"
       cancel_reply: "إلغاء الرد"
       chat_channels: "القنوات"
+      starred: "مميز بنجمة"
+      starred_channels: "القنوات المميزة بنجمة"
+      starred_channels_empty: "لا توجد قنوات مميّزة بنجمة حتى الآن. أضِف نجمة إلى القنوات التي تهمك لتظهر هنا ويسهل الوصول إليها."
+      pinned: "مثبَّت"
       browse_all_channels: "استعراض كل القنوات"
       see_in: "رؤيتها في"
+      open_channel_menu: "افتح قائمة القناة"
       move_to_channel:
         title: "نقل الرسائل إلى القناة"
         instructions:
@@ -92,6 +97,8 @@ ar:
         title: "إعدادات القناة"
         edit: "تعديل"
         add: "إضافة"
+        star_channel: "ميّز القناة بنجمة"
+        unstar_channel: "إزالة تمييز القناة"
         close_channel: "إغلاق القناة"
         open_channel: "فتح القناة"
         archive_channel: "أرشفة القناة"
@@ -99,6 +106,7 @@ ar:
         join_channel: "الانضمام إلى القناة"
         leave_channel: "مغادرة القناة"
         leave_groupchat_info: "بمغادرة هذه الدردشة الجماعية، ستفقد الوصول إليها إلى الأبد ولن تتلقى أي إشعارات متعلقة بها. للانضمام مرة أخرى، ستحتاج إلى إعادة دعوتك من قِبل أحد أعضاء الدردشة الجماعية."
+        notification_settings: "إعدادات الإشعارات"
         notification_settings_context: "الإشعارات"
         join: "الانضمام"
         leave: "مغادرة"
@@ -151,6 +159,7 @@ ar:
       email_frequency:
         description: "سنراسلك عبر البريد الإلكتروني فقط إذا لم نرك في آخر 15 دقيقة."
         never: "أبدًا"
+        title: "أرسل إليّ رسالة بريد إلكتروني عند استلام رسالة مباشرة أو رسالة في دردشة جماعية"
         when_away: "عندما أكون غائبًا فقط"
       header_indicator_preference:
         title: "إظهار مؤشر النشاط في الرأس"
@@ -161,6 +170,7 @@ ar:
       separate_sidebar_mode:
         title: "إظهار أوضاع الشريط الجانبي المنفصلة للمنتدى والدردشة"
       send_shortcut:
+        title: "إرسال اختصار"
         enter:
           label: "الإرسال بواسطة مفتاح Enter"
         meta_enter:
@@ -275,8 +285,10 @@ ar:
       no_public_channels: "لم تنضم إلى أي قنوات بعد‎!"
       no_public_channels_cta: "تصفح القنوات"
       kicked_from_channel: "لم يعُد بإمكانك الوصول إلى هذه القناة."
+      chat_notifications_title: "إشعارات الدردشة"
       only_chat_push_notifications:
         title: "إرسال الإشعارات الفورية للدردشة فقط"
+      personalization_title: "التخصيص"
       ignore_channel_wide_mention:
         title: "تجاهل الإشارات على مستوى القناة"
       show_thread_title_prompts:
@@ -370,6 +382,10 @@ ar:
         yesterday: الأمس
       search_view:
         filter_placeholder: البحث في الرسائل
+        message_result_label: "رسالة دردشة من %{username}: %{preview} %{threadInfo}"
+        in_thread: "ضمن الموضوع ‎%{title}‎"
+        sr_instructions: "اضغط على مفتاح Enter أو مفتاح المسافة لفتح الرسالة. استخدم مفتاح Tab للتنقّل بين النتائج."
+        results_list_label: "نتائج البحث في رسائل الدردشة"
       members_view:
         filter_placeholder: العثور على أعضاء
         add_member: إضافة عضو
@@ -412,6 +428,8 @@ ar:
         slug_description: يتم استخدام مسار للقناة في عنوان URL بدلًا من اسم القناة
         name: اسم القناة
         slug: مسار القناة (اختياري)
+        emoji: رمز تعبيري للقناة (اختياري)
+        reset_emoji: إعادة تعيين الرمز التعبيري
       channel_edit_description_modal:
         title: تعديل الوصف
         input_placeholder: أضِف وصفًا
@@ -496,6 +514,9 @@ ar:
         types:
           category: "الفئة"
           topic: "الموضوع"
+        emoji:
+          label: "رمز تعبيري للقناة (اختياري)"
+          reset: "إعادة تعيين الرمز التعبيري"
       reviewable:
         type: "رسالة دردشة"
         message_in_channel: "القناة"
@@ -546,6 +567,7 @@ ar:
         follow: "الانضمام"
         followed: "انضم"
         mute: "كتم القناة"
+        unmute: "إلغاء كتم صوت القناة"
         threading_enabled: "مفعَّلة"
         threading_disabled: "متوقفة"
         muted_on: "تشغيل"
@@ -571,6 +593,8 @@ ar:
           export_has_started: "بدأ التصدير. ستتلقى رسالة خاصة عندما يصبح جاهزًا."
       search:
         short_title: البحث
+        title: بحث في الدردشة
+        aria_label: "الانتقال إلى البحث في الدردشة"
         no_results: "لم يتم العثور على نتائج"
         sort:
           relevance: "مدى الصلة بالموضوع"
@@ -818,6 +842,7 @@ ar:
           composer_bold: "%{shortcut} غامق (أداة الإنشاء فقط)"
           composer_italic: "%{shortcut} مائل (أداة الإنشاء فقط)"
           composer_code: "%{shortcut} رمز برمجي (أداة الإنشاء فقط)"
+          drawer_toggle: "%{shortcut} لتبديل لوحة الدردشة"
           drawer_close: "%{shortcut} إغلاق درج الدردشة"
           mark_all_channels_read: "%{shortcut} وضع علامة \"مقروءة\" على كل القنوات"
     topic_statuses:
@@ -848,6 +873,7 @@ ar:
           title: الدردشة
     sidebar:
       start_new_dm:
+        text: بدء رسالة مباشرة جديدة
         title: إنشاء دردشة شخصية
       panels:
         chat:
diff --git a/plugins/chat/config/locales/client.be.yml b/plugins/chat/config/locales/client.be.yml
index 87dd0ddec7abb..cfbee854f558d 100644
--- a/plugins/chat/config/locales/client.be.yml
+++ b/plugins/chat/config/locales/client.be.yml
@@ -21,6 +21,7 @@ be:
         yesterday: "учора"
       create: "стварыць"
       cancel: "адмяніць"
+      pinned: "замацаваныя"
       channel_settings:
         edit: "рэдагаваць"
         add: "дадаць"
diff --git a/plugins/chat/config/locales/client.bg.yml b/plugins/chat/config/locales/client.bg.yml
index b8494829132a5..a5eaea2c7896f 100644
--- a/plugins/chat/config/locales/client.bg.yml
+++ b/plugins/chat/config/locales/client.bg.yml
@@ -44,6 +44,7 @@ bg:
       cancel: "Прекрати"
       cancel_reply: "Отмяна на отговора"
       chat_channels: "Канали"
+      pinned: "Закована"
       browse_all_channels: "Преглед на всички канали"
       move_to_channel:
         title: "Преместване на съобщенията в канал"
diff --git a/plugins/chat/config/locales/client.bs_BA.yml b/plugins/chat/config/locales/client.bs_BA.yml
index ba8b40e9e5448..fb8fc64bb5a3f 100644
--- a/plugins/chat/config/locales/client.bs_BA.yml
+++ b/plugins/chat/config/locales/client.bs_BA.yml
@@ -21,6 +21,7 @@ bs_BA:
         yesterday: "Yesterday"
       create: "napravi"
       cancel: "Odustani"
+      pinned: "Zakačena"
       channel_settings:
         edit: "Edit"
         add: "Add"
diff --git a/plugins/chat/config/locales/client.ca.yml b/plugins/chat/config/locales/client.ca.yml
index 0126cb1437d9b..d1c1c274243fb 100644
--- a/plugins/chat/config/locales/client.ca.yml
+++ b/plugins/chat/config/locales/client.ca.yml
@@ -22,6 +22,7 @@ ca:
         yesterday: "Ahir"
       create: "Crea"
       cancel: "Cancel·la"
+      pinned: "Afixat"
       channel_settings:
         edit: "Edita"
         add: "Afegeix"
diff --git a/plugins/chat/config/locales/client.cs.yml b/plugins/chat/config/locales/client.cs.yml
index b837df279652e..7983cac69e99b 100644
--- a/plugins/chat/config/locales/client.cs.yml
+++ b/plugins/chat/config/locales/client.cs.yml
@@ -69,6 +69,7 @@ cs:
       starred: "Oblíbené"
       starred_channels: "Oblíbené kanály"
       starred_channels_empty: "Zatím jste neoznačili žádné kanály jako oblíbené. Ty se zde objeví pro rychlejší přístup."
+      pinned: "Připnuto"
       browse_all_channels: "Procházet všechny kanály"
       see_in: "Zobrazit v"
       open_channel_menu: "Otevřít nabídku kanálu"
diff --git a/plugins/chat/config/locales/client.da.yml b/plugins/chat/config/locales/client.da.yml
index 48d59f3391eb4..2d16b85addf00 100644
--- a/plugins/chat/config/locales/client.da.yml
+++ b/plugins/chat/config/locales/client.da.yml
@@ -46,6 +46,7 @@ da:
       cancel: "Annuller"
       cancel_reply: "Annuller svar"
       chat_channels: "Kanaler"
+      pinned: "Fastgjort"
       browse_all_channels: "Gennemse alle kanaler"
       move_to_channel:
         title: "Flyt beskeder til kanal"
diff --git a/plugins/chat/config/locales/client.de.yml b/plugins/chat/config/locales/client.de.yml
index cc40a3cd0154d..6715f47c9c57a 100644
--- a/plugins/chat/config/locales/client.de.yml
+++ b/plugins/chat/config/locales/client.de.yml
@@ -50,6 +50,9 @@ de:
         description: "Beschreibung"
         actions: "Aktionen"
         settings: "Einstellungen"
+        no_channels: "Dieser Kategorie sind keine Chat-Kanäle zugeordnet"
+        no_channels_body: "Du kannst mehrere Kanäle pro Kategorie haben, die basierend auf den Sicherheitseinstellungen der Kategorie für dieselben Mitglieder zugänglich sind. <a href='%{chatBrowseUrl}'>Erstelle einen Chat-Kanal</a>."
+        include_subcategories: "Kanäle in Unterkategorien einbeziehen"
       text_copied: Text in die Zwischenablage kopiert
       link_copied: Link in die Zwischenablage kopiert
       back_to_forum: "Forum"
@@ -67,6 +70,15 @@ de:
       starred: "Mit Sternchen"
       starred_channels: "Kanäle mit Sternchen"
       starred_channels_empty: "Du hast noch keine Kanäle mit einem Sternchen versehen. Markiere Kanäle mit einem Sternchen, um sie hier für schnellen Zugriff zu sehen."
+      pinned_messages:
+        title: "Angeheftete Nachrichten"
+        close: "Angeheftete Nachrichten schließen"
+        pinned_by_you: "Angeheftet von dir"
+        pinned_by_user: "Angeheftet von %{username}"
+      no_pinned_messages: "Keine angehefteten Nachrichten in diesem Kanal."
+      pin_message: "Nachricht anheften"
+      unpin_message: "Nachricht loslösen"
+      pinned: "Angeheftet"
       browse_all_channels: "Alle Kanäle durchsuchen"
       see_in: "Ansehen in"
       open_channel_menu: "Kanalmenü öffnen"
@@ -608,9 +620,13 @@ de:
       retention_reminders:
         chat_settings: "Chat-Einstellungen"
         indefinitely_short: "unbestimmt"
+        indefinitely_long: "Die %{chatSettingsLink} wurden so eingestellt, dass Kanalnachrichten zeitlich unbegrenzt gespeichert werden."
         short:
           one: "%{count} Tag"
           other: "%{count} Tage"
+        long:
+          one: "Die %{chatSettingsLink} wurden so eingestellt, dass Kanalnachrichten für %{count} Tag aufbewahrt werden."
+          other: "Die %{chatSettingsLink} wurden so eingestellt, dass Kanalnachrichten für %{count} Tage aufbewahrt werden."
       flags:
         off_topic: "Diese Nachricht ist für die aktuelle Diskussion im Sinne des Kanaltitels nicht relevant und sollte wahrscheinlich an eine andere Stelle verschoben werden."
         inappropriate: "Diese Nachricht enthält Inhalte, die eine vernünftige Person als anstößig, beleidigend oder als Verstoß gegen <a href=\"%{basePath}/guidelines\">unsere Community-Richtlinien</a> ansehen würde."
diff --git a/plugins/chat/config/locales/client.el.yml b/plugins/chat/config/locales/client.el.yml
index 4fee7ea4e5fb3..c70e1d572e592 100644
--- a/plugins/chat/config/locales/client.el.yml
+++ b/plugins/chat/config/locales/client.el.yml
@@ -57,6 +57,7 @@ el:
       cancel: "Ακύρωση"
       cancel_reply: "Ακύρωση απάντησης"
       chat_channels: "Κανάλια"
+      pinned: "Καρφιτσωμένο"
       browse_all_channels: "Περιήγηση σε όλα τα κανάλια"
       see_in: "Δείτε σε"
       open_channel_menu: "Άνοιγμα μενού καναλιού"
@@ -119,10 +120,12 @@ el:
         title: "Δεν βρέθηκαν κανάλια"
         my_threads: "Δεν έχετε κανένα νήμα ακόμη. Τα νήματα στα οποία συμμετέχετε θα εμφανίζονται εδώ."
       email_frequency:
+        description: "Θα σου στείλουμε ηλεκτρονικό μήνυμα μόνο εάν δεν σε έχουμε δει τα τελευταία 15 λεπτά."
         never: "Ποτέ"
         when_away: "Μόνο όταν είμαι μακριά"
       header_indicator_preference:
         all_new: "Όλα Τα Νέα Μηνύματα"
+        dm_and_mentions: "Άμεσα Μηνύματα, Επισημάνσεις και Παρακολουθούμενα Θέματα"
         only_mentions: "Μόνο Επισημάνσεις"
         never: "Ποτέ"
       send_shortcut:
@@ -428,6 +431,7 @@ el:
         title: Τα νήματά μου
         aria_label: "Εναλλαγή στη λίστα νημάτων μου"
       direct_messages:
+        title: "ΑΜ"
         aria_label: "Εναλλαγή σε άμεσα μηνύματα"
         new: "Δημιουργήστε μια προσωπική συνομιλία"
         create: "Εμπρός"
@@ -565,10 +569,18 @@ el:
     discourse_automation:
       scriptables:
         send_chat_message:
+          title: Αποστολή μηνύματος συνομιλίας
           fields:
+            chat_channel_id:
+              label: ID καναλιού συνομιλίας
             message:
               label: Μήνυμα
+            sender:
+              label: Αποστολέας
+              description: Προεπιλέγεται στο σύστημα
     review:
+      transcript:
+        view: "Προβολή μεταγραφής προηγούμενων μηνυμάτων"
       types:
         chat_reviewable_message:
           title: "Αναφερόμενο μήνυμα συνομιλίας"
@@ -586,6 +598,7 @@ el:
           composer_bold: "%{shortcut} Έντονη γραφή (μόνο για συνθέτη)"
           composer_italic: "%{shortcut} Πλάγια γραφή (μόνο για συνθέτη)"
           composer_code: "%{shortcut} Κώδικας (μόνο για συνθέτη)"
+          drawer_toggle: "%{shortcut} Εναλλαγή συρταριού συνομιλίας"
           drawer_close: "%{shortcut} Κλείσιμο συρταριού συνομιλίας"
           mark_all_channels_read: "%{shortcut} Σήμανση όλων των καναλιών ως διαβασμένα"
     user_menu:
diff --git a/plugins/chat/config/locales/client.es.yml b/plugins/chat/config/locales/client.es.yml
index 418f45efc2f31..748ce2f048e05 100644
--- a/plugins/chat/config/locales/client.es.yml
+++ b/plugins/chat/config/locales/client.es.yml
@@ -50,6 +50,7 @@ es:
         description: "Descripción"
         actions: "Acciones"
         settings: "Ajustes"
+        no_channels: "No hay canales de chat asociados a esta categoría"
       text_copied: Texto copiado en el portapapeles
       link_copied: Enlace copiado en el portapapeles
       back_to_forum: "Foro"
@@ -64,6 +65,7 @@ es:
       cancel: "Cancelar"
       cancel_reply: "Cancelar respuesta"
       chat_channels: "Canales"
+      pinned: "Anclado"
       browse_all_channels: "Examinar todos los canales"
       see_in: "Ver en"
       move_to_channel:
@@ -584,7 +586,9 @@ es:
           one: "%{commaSeparatedUsernames} y %{count} más está escribiendo"
           other: "%{commaSeparatedUsernames} y %{count} más están escribiendo"
       retention_reminders:
+        chat_settings: "Los ajustes de chat"
         indefinitely_short: "indefinidamente"
+        indefinitely_long: "%{chatSettingsLink} están configurados para conservar los mensajes del canal indefinidamente."
         short:
           one: "%{count} día"
           other: "%{count} días"
diff --git a/plugins/chat/config/locales/client.et.yml b/plugins/chat/config/locales/client.et.yml
index 66f55d115139a..55c70b1e13425 100644
--- a/plugins/chat/config/locales/client.et.yml
+++ b/plugins/chat/config/locales/client.et.yml
@@ -37,6 +37,7 @@ et:
       cancel: "Tühista"
       cancel_reply: "Tühista vastus"
       chat_channels: "Kanalid"
+      pinned: "Esiletõstetud"
       browse_all_channels: "Sirvi kõiki kanaleid"
       channel_settings:
         edit: "Muuda"
diff --git a/plugins/chat/config/locales/client.fa_IR.yml b/plugins/chat/config/locales/client.fa_IR.yml
index f4af5dded44e6..9e9cc999cfa97 100644
--- a/plugins/chat/config/locales/client.fa_IR.yml
+++ b/plugins/chat/config/locales/client.fa_IR.yml
@@ -64,6 +64,7 @@ fa_IR:
       cancel: "انصراف"
       cancel_reply: "لغو پاسخ"
       chat_channels: "کانال‌ها"
+      pinned: "سنجاق شده"
       browse_all_channels: "مرور همه کانال‌ها"
       see_in: "ببینید در"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.fi.yml b/plugins/chat/config/locales/client.fi.yml
index f5a8e250bc1c8..66464764c1b2a 100644
--- a/plugins/chat/config/locales/client.fi.yml
+++ b/plugins/chat/config/locales/client.fi.yml
@@ -64,6 +64,7 @@ fi:
       cancel: "Peruuta"
       cancel_reply: "Peruuta vastaus"
       chat_channels: "Kanavat"
+      pinned: "Kiinnitetty"
       browse_all_channels: "Selaa kaikkia kanavia"
       see_in: "Katso:"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.fr.yml b/plugins/chat/config/locales/client.fr.yml
index 464e8aec35437..23376bbe0861a 100644
--- a/plugins/chat/config/locales/client.fr.yml
+++ b/plugins/chat/config/locales/client.fr.yml
@@ -64,6 +64,7 @@ fr:
       cancel: "Annuler"
       cancel_reply: "Annuler la réponse"
       chat_channels: "Canaux"
+      pinned: "Épinglé"
       browse_all_channels: "Parcourir tous les canaux"
       see_in: "Voir dans"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.gl.yml b/plugins/chat/config/locales/client.gl.yml
index efbce1dcdc82b..1f20b39d799bd 100644
--- a/plugins/chat/config/locales/client.gl.yml
+++ b/plugins/chat/config/locales/client.gl.yml
@@ -22,6 +22,7 @@ gl:
         yesterday: "Onte"
       create: "Crear"
       cancel: "Cancelar"
+      pinned: "Fixado"
       channel_settings:
         edit: "Editar"
         add: "Engadir"
diff --git a/plugins/chat/config/locales/client.he.yml b/plugins/chat/config/locales/client.he.yml
index ad5089369ba9f..c66a74b770c7b 100644
--- a/plugins/chat/config/locales/client.he.yml
+++ b/plugins/chat/config/locales/client.he.yml
@@ -67,6 +67,7 @@ he:
       cancel: "ביטול"
       cancel_reply: "ביטול תגובה"
       chat_channels: "ערוצים"
+      pinned: "נעוץ"
       browse_all_channels: "עיון בכל הערוצים"
       see_in: "לראות ב־"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.hr.yml b/plugins/chat/config/locales/client.hr.yml
index 8cbcd9c750e59..81ef0b8ed5620 100644
--- a/plugins/chat/config/locales/client.hr.yml
+++ b/plugins/chat/config/locales/client.hr.yml
@@ -45,6 +45,7 @@ hr:
       cancel: "Odustani"
       cancel_reply: "Otkaži odgovor"
       chat_channels: "Kanali"
+      pinned: "Zakvačeno"
       move_to_channel:
         title: "Premještanje poruka na kanal"
         instructions:
diff --git a/plugins/chat/config/locales/client.hu.yml b/plugins/chat/config/locales/client.hu.yml
index 4bb338d0124d6..bf078892a743d 100644
--- a/plugins/chat/config/locales/client.hu.yml
+++ b/plugins/chat/config/locales/client.hu.yml
@@ -67,6 +67,7 @@ hu:
       starred: "Csillagozott"
       starred_channels: "Csillagozott csatornák"
       starred_channels_empty: "Még nem csillagozott meg egyetlen csatornát sem. Csillagozd meg a csatornákat, hogy itt lásd őket a gyors hozzáférés érdekében."
+      pinned: "Kiemelt"
       browse_all_channels: "Összes csatorna tallózása"
       see_in: "Lásd itt"
       open_channel_menu: "Csatornamenü megnyitása"
diff --git a/plugins/chat/config/locales/client.hy.yml b/plugins/chat/config/locales/client.hy.yml
index c25796d8fcef1..4546dae463eab 100644
--- a/plugins/chat/config/locales/client.hy.yml
+++ b/plugins/chat/config/locales/client.hy.yml
@@ -22,6 +22,7 @@ hy:
         yesterday: "Երեկվա"
       create: "Ստեղծել"
       cancel: "Չեղարկել"
+      pinned: "Ամրակցված"
       channel_settings:
         edit: "Խմբագրել"
         add: "Ավելացնել"
diff --git a/plugins/chat/config/locales/client.it.yml b/plugins/chat/config/locales/client.it.yml
index 74404d821114e..ff5e54e7483cf 100644
--- a/plugins/chat/config/locales/client.it.yml
+++ b/plugins/chat/config/locales/client.it.yml
@@ -64,6 +64,7 @@ it:
       cancel: "Annulla"
       cancel_reply: "Annulla risposta"
       chat_channels: "Canali"
+      pinned: "Appuntato"
       browse_all_channels: "Sfoglia tutti i canali"
       see_in: "Da' un'occhiata"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.ja.yml b/plugins/chat/config/locales/client.ja.yml
index 6d173f4b22bbf..6aacf648d4bab 100644
--- a/plugins/chat/config/locales/client.ja.yml
+++ b/plugins/chat/config/locales/client.ja.yml
@@ -63,8 +63,13 @@ ja:
       cancel: "キャンセル"
       cancel_reply: "返信をキャンセルする"
       chat_channels: "チャンネル"
+      starred: "スター付き"
+      starred_channels: "スター付きのチャンネル"
+      starred_channels_empty: "まだどのチャンネルにもスターを設定していません。チャンネルにスターを設定すると、ここで素早くアクセスできます。"
+      pinned: "固定"
       browse_all_channels: "すべてのチャンネルを閲覧する"
       see_in: "表示:"
+      open_channel_menu: "チャンネルメニューを開く"
       move_to_channel:
         title: "メッセージをチャンネルに移動する"
         instructions:
@@ -77,6 +82,8 @@ ja:
         title: "チャンネルの設定"
         edit: "編集"
         add: "追加"
+        star_channel: "チャンネルにスターを設定する"
+        unstar_channel: "チャンネルのスターを解除する"
         close_channel: "チャンネルを閉鎖する"
         open_channel: "チャンネルを開く"
         archive_channel: "チャンネルをアーカイブする"
@@ -84,6 +91,7 @@ ja:
         join_channel: "チャンネルに参加する"
         leave_channel: "チャンネルから退出する"
         leave_groupchat_info: "このグループチャットから退出すると、それにアクセスできなくなり、そのチャットに関連する通知を受信しなくなります。もう一度参加するには、グループチャットのメンバーから招待を受ける必要があります。"
+        notification_settings: "通知設定"
         notification_settings_context: "通知"
         join: "参加"
         leave: "退出"
@@ -131,6 +139,7 @@ ja:
       email_frequency:
         description: "15 分以上アクセスがない場合にのみメールで通知します。"
         never: "なし"
+        title: "チャットダイレクトメッセージまたはグループチャットを受信したらメールで通知する"
         when_away: "退席中の時のみ"
       header_indicator_preference:
         title: "ヘッダーにアクティビティインジケーターを表示"
@@ -141,6 +150,7 @@ ja:
       separate_sidebar_mode:
         title: "フォーラムとチャットに個別のサイドバーモードを表示する"
       send_shortcut:
+        title: "送信ショートカット"
         enter:
           label: "Enter で送信"
         meta_enter:
@@ -232,6 +242,7 @@ ja:
       chat_notifications_title: "チャット通知"
       only_chat_push_notifications:
         title: "チャットのプッシュ通知のみ送信する"
+      personalization_title: "パーソナライズ"
       ignore_channel_wide_mention:
         title: "チャンネル全体のメンションを無視する"
       show_thread_title_prompts:
@@ -315,6 +326,10 @@ ja:
         yesterday: 昨日
       search_view:
         filter_placeholder: メッセージを検索
+        message_result_label: "%{username} からのチャットメッセージ: %{preview} %{threadInfo}"
+        in_thread: "スレッド %{title}"
+        sr_instructions: "Enter または Space キーを押してメッセージを開きます。Tab キーで結果間を移動します。"
+        results_list_label: "チャットメッセージの検索結果"
       members_view:
         filter_placeholder: メンバーを検索
         add_member: メンバーを追加
@@ -357,6 +372,8 @@ ja:
         slug_description: チャンネルスラグはチャンネル名の代わりに URL で使用されます
         name: チャンネル名
         slug: チャンネルスラグ (オプション)
+        emoji: チャンネル絵文字 (オプション)
+        reset_emoji: 絵文字をリセット
       channel_edit_description_modal:
         title: 説明を編集する
         input_placeholder: 説明を追加する
@@ -409,6 +426,9 @@ ja:
         types:
           category: "カテゴリ"
           topic: "トピック"
+        emoji:
+          label: "チャンネル絵文字 (オプション)"
+          reset: "絵文字をリセット"
       reviewable:
         type: "チャットメッセージ"
         message_in_channel: "チャンネル"
@@ -449,6 +469,7 @@ ja:
         follow: "参加"
         followed: "参加中"
         mute: "チャンネルをミュート"
+        unmute: "チャンネルのミュートを解除する"
         threading_enabled: "有効"
         threading_disabled: "無効"
         muted_on: "オン"
@@ -474,6 +495,9 @@ ja:
           export_has_started: "エクスポートが開始されました。準備ができたら PM が届きます。"
       search:
         short_title: 検索
+        title: チャットを検索
+        aria_label: "チャット検索に切り替える"
+        no_results: "何も見つかりませんでした"
         sort:
           relevance: "関連性の高い項目"
           latest: "最新"
@@ -680,6 +704,7 @@ ja:
           composer_bold: "%{shortcut} 太字 (作成ツールのみ)"
           composer_italic: "%{shortcut} 斜体 (作成ツールのみ)"
           composer_code: "%{shortcut} コード (作成ツールのみ)"
+          drawer_toggle: "%{shortcut} チャットドロワーを切り替える"
           drawer_close: "%{shortcut} チャットドロワーを閉じる"
           mark_all_channels_read: "%{shortcut} すべてのチャンネルを既読としてマークします"
     topic_statuses:
@@ -705,6 +730,7 @@ ja:
           title: チャット
     sidebar:
       start_new_dm:
+        text: 新しい DM を開始
         title: パーソナルチャットを作成
       panels:
         chat:
diff --git a/plugins/chat/config/locales/client.ko.yml b/plugins/chat/config/locales/client.ko.yml
index cd132ebe13500..a0f4f7b0c3ca5 100644
--- a/plugins/chat/config/locales/client.ko.yml
+++ b/plugins/chat/config/locales/client.ko.yml
@@ -37,6 +37,7 @@ ko:
       create: "글"
       cancel: "취소"
       chat_channels: "채널"
+      pinned: "핀 지정됨"
       move_to_channel:
         instructions:
           other: "<strong>%{count}개</strong>의 메시지를 옮기고 있습니다. 새로운 채널을 선택하세요. <strong>%{channelTitle}</strong>에 메시지가 이동되었다는 것이 표시될 것입니다. 답변된 메시지는 새로운 채널에 이동되지 않을 것이며, 기존 채널의 메시지는 답변하는 메시지로 표시되지 않을 것입니다."
diff --git a/plugins/chat/config/locales/client.lt.yml b/plugins/chat/config/locales/client.lt.yml
index 8993d7977c590..294792d52c1be 100644
--- a/plugins/chat/config/locales/client.lt.yml
+++ b/plugins/chat/config/locales/client.lt.yml
@@ -65,6 +65,7 @@ lt:
       cancel: "Atšaukti"
       cancel_reply: "Atšaukti atsakymą"
       chat_channels: "Kanalai"
+      pinned: "Prisegta"
       browse_all_channels: "Naršyti visus kanalus"
       see_in: "Žiūrėti"
       open_channel_menu: "Atidaryti kanalo meniu"
diff --git a/plugins/chat/config/locales/client.lv.yml b/plugins/chat/config/locales/client.lv.yml
index fc599da0a22be..c7684fdc04b43 100644
--- a/plugins/chat/config/locales/client.lv.yml
+++ b/plugins/chat/config/locales/client.lv.yml
@@ -21,6 +21,7 @@ lv:
         yesterday: "Vakar"
       create: "Izveidot"
       cancel: "Atcelt"
+      pinned: "Piesprausts"
       channel_settings:
         edit: "Rediģēt"
         add: "Pievienot"
diff --git a/plugins/chat/config/locales/client.nb_NO.yml b/plugins/chat/config/locales/client.nb_NO.yml
index da2592028bfd8..673c9eca3a847 100644
--- a/plugins/chat/config/locales/client.nb_NO.yml
+++ b/plugins/chat/config/locales/client.nb_NO.yml
@@ -22,6 +22,7 @@ nb_NO:
         yesterday: "I går"
       create: "Opprett"
       cancel: "Avbryt"
+      pinned: "Fastsatt"
       channel_settings:
         edit: "Endre"
         add: "Legg til"
diff --git a/plugins/chat/config/locales/client.nl.yml b/plugins/chat/config/locales/client.nl.yml
index f684b92dd1e9a..1e83523a50ea6 100644
--- a/plugins/chat/config/locales/client.nl.yml
+++ b/plugins/chat/config/locales/client.nl.yml
@@ -64,6 +64,7 @@ nl:
       cancel: "Annuleren"
       cancel_reply: "Antwoord annuleren"
       chat_channels: "Kanalen"
+      pinned: "Vastgemaakt"
       browse_all_channels: "Alle kanalen bekijken"
       see_in: "Bekijken in"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.pl_PL.yml b/plugins/chat/config/locales/client.pl_PL.yml
index b458db68226da..2a2e9e6cb1353 100644
--- a/plugins/chat/config/locales/client.pl_PL.yml
+++ b/plugins/chat/config/locales/client.pl_PL.yml
@@ -54,6 +54,7 @@ pl_PL:
         settings: "Ustawienia"
         no_channels: "Brak kanałów czatu powiązanych z tą kategorią"
         no_channels_body: "Możesz mieć wiele kanałów w każdej kategorii, dostępnych dla tych samych członków na podstawie ustawień bezpieczeństwa kategorii. <a href='%{chatBrowseUrl}'>Utwórz kanał czatu</a>."
+        include_subcategories: "Uwzględnij kanały podkategorii"
       text_copied: Tekst skopiowany do schowka
       link_copied: Link skopiowany do schowka
       back_to_forum: "Forum"
@@ -71,6 +72,15 @@ pl_PL:
       starred: "Wyróżnione"
       starred_channels: "Wyróżnione kanały"
       starred_channels_empty: "Nie wyróżniono jeszcze żadnego kanału. Wyróżnij kanały, aby je tu zobaczyć i mieć do nich szybki dostęp."
+      pinned_messages:
+        title: "Przypięte wiadomości"
+        close: "Zamknij przypięte wiadomości"
+        pinned_by_you: "Przypięte przez Ciebie"
+        pinned_by_user: "Przypięte przez %{username}"
+      no_pinned_messages: "Żadnych przypiętych wiadomości na tym kanale."
+      pin_message: "Przypnij wiadomość"
+      unpin_message: "Odepnij wiadomość"
+      pinned: "Przypięty"
       browse_all_channels: "Przeglądaj wszystkie kanały"
       see_in: "Zobacz w"
       open_channel_menu: "Otwórz menu kanału"
diff --git a/plugins/chat/config/locales/client.pt.yml b/plugins/chat/config/locales/client.pt.yml
index 0beaab003a3ec..07ce57e48f2c3 100644
--- a/plugins/chat/config/locales/client.pt.yml
+++ b/plugins/chat/config/locales/client.pt.yml
@@ -32,6 +32,7 @@ pt:
       cancel: "Cancelar"
       cancel_reply: "Cancelar resposta"
       chat_channels: "Canais"
+      pinned: "Fixado"
       browse_all_channels: "Navegar todos os canais"
       move_to_channel:
         title: "Mover mensagens para o canal"
diff --git a/plugins/chat/config/locales/client.pt_BR.yml b/plugins/chat/config/locales/client.pt_BR.yml
index bc4fdb6a148eb..1bc8260148008 100644
--- a/plugins/chat/config/locales/client.pt_BR.yml
+++ b/plugins/chat/config/locales/client.pt_BR.yml
@@ -64,6 +64,7 @@ pt_BR:
       cancel: "Cancelar"
       cancel_reply: "Cancelar resposta"
       chat_channels: "Canais"
+      pinned: "Fixado"
       browse_all_channels: "Navegar por todos os canais"
       see_in: "Veja em"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.ro.yml b/plugins/chat/config/locales/client.ro.yml
index 002e4f1677ec4..24f2dff906dd7 100644
--- a/plugins/chat/config/locales/client.ro.yml
+++ b/plugins/chat/config/locales/client.ro.yml
@@ -27,6 +27,7 @@ ro:
         yesterday: "Ieri"
       create: "Creează"
       cancel: "Anulează"
+      pinned: "Fixat"
       move_to_channel:
         instructions:
           one: "Mutați <strong>%{count}</strong> mesaj. Selectați un canal de destinație. Un mesaj placeholder va fi creat în canalul <strong>%{channelTitle}</strong> pentru a indica faptul că acest mesaj a fost mutat. Retineți că lanțurile de răspuns nu vor fi păstrate în noul canal, iar mesajele din vechiul canal nu vor mai apărea ca raspunsuri la mesajele mutate."
diff --git a/plugins/chat/config/locales/client.ru.yml b/plugins/chat/config/locales/client.ru.yml
index 22a13d05d7f12..d9de808e994c7 100644
--- a/plugins/chat/config/locales/client.ru.yml
+++ b/plugins/chat/config/locales/client.ru.yml
@@ -67,6 +67,7 @@ ru:
       cancel_reply: "Отменить ответ"
       chat_channels: "Каналы"
       starred: "Отмечено звездочкой"
+      pinned: "Закреплена"
       browse_all_channels: "Просмотреть все каналы"
       see_in: "Смотреть в:"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.sk.yml b/plugins/chat/config/locales/client.sk.yml
index 0b804bf911e29..6b22570b67ec0 100644
--- a/plugins/chat/config/locales/client.sk.yml
+++ b/plugins/chat/config/locales/client.sk.yml
@@ -66,6 +66,7 @@ sk:
       cancel: "Zrušiť"
       cancel_reply: "Zrušiť odpoveď"
       chat_channels: "Kanály"
+      pinned: "Pripnutý"
       browse_all_channels: "Prehľadávať všetky kanály"
       see_in: "Vidieť v"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.sl.yml b/plugins/chat/config/locales/client.sl.yml
index 985dcd3888f3f..7af1ba3c3a6b3 100644
--- a/plugins/chat/config/locales/client.sl.yml
+++ b/plugins/chat/config/locales/client.sl.yml
@@ -41,6 +41,7 @@ sl:
         yesterday: "Včeraj"
       create: "Ustvari"
       cancel: "Prekliči"
+      pinned: "Pripeto"
       channel_settings:
         edit: "Uredi"
         add: "Dodaj"
diff --git a/plugins/chat/config/locales/client.sq.yml b/plugins/chat/config/locales/client.sq.yml
index 13096d21ae620..96e2d87da497d 100644
--- a/plugins/chat/config/locales/client.sq.yml
+++ b/plugins/chat/config/locales/client.sq.yml
@@ -57,6 +57,7 @@ sq:
       bot: "bot"
       create: "Krijo"
       cancel: "Anulo"
+      pinned: "E përzgjedhur"
       channel_settings:
         edit: "Redakto"
         add: "Shto"
diff --git a/plugins/chat/config/locales/client.sr.yml b/plugins/chat/config/locales/client.sr.yml
index de686c2f22a2d..e05b64656293a 100644
--- a/plugins/chat/config/locales/client.sr.yml
+++ b/plugins/chat/config/locales/client.sr.yml
@@ -24,6 +24,7 @@ sr:
         yesterday: "Juče"
       all_loaded: "Prikaz svih poruka"
       cancel: "Odustani"
+      pinned: "Zakvačeno"
       channel_settings:
         edit: "Izmeni"
         add: "Dodaj"
diff --git a/plugins/chat/config/locales/client.sv.yml b/plugins/chat/config/locales/client.sv.yml
index c0ed2b383229a..3fd595e7cb470 100644
--- a/plugins/chat/config/locales/client.sv.yml
+++ b/plugins/chat/config/locales/client.sv.yml
@@ -60,6 +60,7 @@ sv:
       cancel: "Avbryt"
       cancel_reply: "Avbryt svar"
       chat_channels: "Kanaler"
+      pinned: "Fäst"
       browse_all_channels: "Bläddra bland alla kanaler"
       see_in: "Se i"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.sw.yml b/plugins/chat/config/locales/client.sw.yml
index 9e7cc1de3e306..7ee486cb8d5e6 100644
--- a/plugins/chat/config/locales/client.sw.yml
+++ b/plugins/chat/config/locales/client.sw.yml
@@ -22,6 +22,7 @@ sw:
         yesterday: "Jana"
       create: "Tengeneza"
       cancel: "Ghairi"
+      pinned: "Imebandikwa"
       channel_settings:
         edit: "Hariri"
         add: "ongeza"
diff --git a/plugins/chat/config/locales/client.te.yml b/plugins/chat/config/locales/client.te.yml
index d0185ced1803b..b3422b30c2e8d 100644
--- a/plugins/chat/config/locales/client.te.yml
+++ b/plugins/chat/config/locales/client.te.yml
@@ -22,6 +22,7 @@ te:
         yesterday: "నిన్న"
       create: "సృష్టించండి"
       cancel: "రద్దుచేయి"
+      pinned: "పిన్ చేయబడింది"
       channel_settings:
         edit: "సవరణ"
         add: "కలుపు"
diff --git a/plugins/chat/config/locales/client.th.yml b/plugins/chat/config/locales/client.th.yml
index bc2e813d24508..f3902033543e7 100644
--- a/plugins/chat/config/locales/client.th.yml
+++ b/plugins/chat/config/locales/client.th.yml
@@ -21,6 +21,7 @@ th:
         yesterday: "เมื่อวาน"
       create: "สร้าง"
       cancel: "ยกเลิก"
+      pinned: "ปักหมุดแล้ว"
       channel_settings:
         edit: "แก้ไข"
         add: "เพิ่ม"
diff --git a/plugins/chat/config/locales/client.tr_TR.yml b/plugins/chat/config/locales/client.tr_TR.yml
index 3451082c0ff20..ec588ad5dbaa0 100644
--- a/plugins/chat/config/locales/client.tr_TR.yml
+++ b/plugins/chat/config/locales/client.tr_TR.yml
@@ -64,6 +64,7 @@ tr_TR:
       cancel: "İptal et"
       cancel_reply: "Yanıtı iptal et"
       chat_channels: "Kanallar"
+      pinned: "Sabitlendi"
       browse_all_channels: "Tüm kanallara göz atın"
       see_in: "Şurada bak:"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.ug.yml b/plugins/chat/config/locales/client.ug.yml
index 941777794f147..ab404b19cadfc 100644
--- a/plugins/chat/config/locales/client.ug.yml
+++ b/plugins/chat/config/locales/client.ug.yml
@@ -65,6 +65,7 @@ ug:
       cancel_reply: "جاۋابتىن ۋازكەچ"
       chat_channels: "قانال"
       starred: "يۇلتۇزلانغان"
+      pinned: "چوققىلاندى"
       browse_all_channels: "بارلىق قانالغا كۆز يۈگۈرتىدۇ"
       see_in: "قاراڭ"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.uk.yml b/plugins/chat/config/locales/client.uk.yml
index 1e503699e0e6d..3247b515ffcc7 100644
--- a/plugins/chat/config/locales/client.uk.yml
+++ b/plugins/chat/config/locales/client.uk.yml
@@ -53,7 +53,6 @@ uk:
         actions: "Дії"
         settings: "Налаштування"
         no_channels: "З цією категорією не пов'язано жодного чат-каналу"
-        no_channels_body: "Ви можете мати кілька каналів у кожній категорії, доступних тим самим учасникам, залежно від налаштувань безпеки категорії. <a href='%{chatBrowseUrl}'>Створіть канал чату</a>."
       text_copied: Текст скопійовано в буфер обміну
       link_copied: Посилання скопійовано до буфера обміну
       back_to_forum: "Форум"
@@ -71,6 +70,7 @@ uk:
       starred: "Позначено зірочкою"
       starred_channels: "Позначені канали"
       starred_channels_empty: "Ви ще не позначили жодного каналу зірочкою. Позначте канали зірочкою, щоб побачити їх тут для швидкого доступу."
+      pinned: "Закріплені"
       browse_all_channels: "Переглянути всі канали"
       see_in: "Дивіться в"
       open_channel_menu: "Відкрити меню каналу"
diff --git a/plugins/chat/config/locales/client.ur.yml b/plugins/chat/config/locales/client.ur.yml
index 2a3a0cc268825..27af3ad6bf486 100644
--- a/plugins/chat/config/locales/client.ur.yml
+++ b/plugins/chat/config/locales/client.ur.yml
@@ -64,6 +64,7 @@ ur:
       cancel: "منسوخ"
       cancel_reply: "جواب منسوخ کریں"
       chat_channels: "چینلز"
+      pinned: "پِن ہوا"
       browse_all_channels: "تمام چینلز کو براؤز کریں"
       see_in: "میں دیکھیں"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.vi.yml b/plugins/chat/config/locales/client.vi.yml
index 59965f0c7ae93..e16f60d533fec 100644
--- a/plugins/chat/config/locales/client.vi.yml
+++ b/plugins/chat/config/locales/client.vi.yml
@@ -29,6 +29,7 @@ vi:
       create: "Tạo"
       cancel: "Hủy"
       chat_channels: "Các kênh"
+      pinned: "Đã ghim"
       browse_all_channels: "Xem tất cả kênh"
       channel_settings:
         edit: "Sửa"
diff --git a/plugins/chat/config/locales/client.zh_CN.yml b/plugins/chat/config/locales/client.zh_CN.yml
index 7e06a9b3755b2..bfcdea8265bf7 100644
--- a/plugins/chat/config/locales/client.zh_CN.yml
+++ b/plugins/chat/config/locales/client.zh_CN.yml
@@ -65,7 +65,8 @@ zh_CN:
       chat_channels: "频道"
       starred: "收藏"
       starred_channels: "收藏的频道"
-      starred_channels_empty: "您未收藏任何频道，收藏一些频道，以便在此快速访问它们。"
+      starred_channels_empty: "您未收藏任何频道。收藏一些频道，以便在此处快速访问它们。"
+      pinned: "已置顶"
       browse_all_channels: "浏览所有频道"
       see_in: "参见"
       open_channel_menu: "打开频道菜单"
@@ -82,7 +83,7 @@ zh_CN:
         edit: "编辑"
         add: "添加"
         star_channel: "收藏频道"
-        unstar_channel: "取消收藏"
+        unstar_channel: "取消收藏频道"
         close_channel: "关闭频道"
         open_channel: "打开频道"
         archive_channel: "归档频道"
@@ -138,7 +139,7 @@ zh_CN:
       email_frequency:
         description: "只有在过去 15 分钟内没有见到您，我们才会给您发送电子邮件。"
         never: "永不"
-        title: "向我发送聊天直通消息或群聊时向我发送电子邮件"
+        title: "当我收到聊天私信或群聊时向我发送电子邮件"
         when_away: "仅在离开时"
       header_indicator_preference:
         title: "在标题中显示活动指示器"
@@ -325,8 +326,8 @@ zh_CN:
         yesterday: 昨天
       search_view:
         filter_placeholder: 搜索消息
-        message_result_label: "来自 %{username}的聊天消息： %{preview} %{threadInfo}"
-        in_thread: "在线程 %{title}"
+        message_result_label: "来自 %{username} 的聊天消息：%{preview} %{threadInfo}"
+        in_thread: "位于对话 %{title} 中"
         sr_instructions: "按 Enter 或空格键打开消息。使用 Tab 在结果之间导航。"
         results_list_label: "聊天消息搜索结果"
       members_view:
@@ -468,7 +469,7 @@ zh_CN:
         follow: "加入"
         followed: "已加入"
         mute: "将频道设为免打扰"
-        unmute: "取消频道静音"
+        unmute: "取消将频道设为免打扰"
         threading_enabled: "已启用"
         threading_disabled: "已禁用"
         muted_on: "开"
@@ -496,7 +497,7 @@ zh_CN:
         short_title: 搜索
         title: 搜索聊天
         aria_label: "切换到聊天搜索"
-        no_results: "无搜索结果"
+        no_results: "找不到结果"
         sort:
           relevance: "相关性"
           latest: "最新"
diff --git a/plugins/chat/config/locales/client.zh_TW.yml b/plugins/chat/config/locales/client.zh_TW.yml
index 93f2926c2aeaa..2e285143da1e4 100644
--- a/plugins/chat/config/locales/client.zh_TW.yml
+++ b/plugins/chat/config/locales/client.zh_TW.yml
@@ -48,6 +48,7 @@ zh_TW:
       cancel: "取消"
       cancel_reply: "取消回覆"
       chat_channels: "頻道"
+      pinned: "已釘選"
       browse_all_channels: "瀏覽所有頻道"
       move_to_channel:
         title: "將訊息移至頻道"
diff --git a/plugins/chat/config/locales/server.ar.yml b/plugins/chat/config/locales/server.ar.yml
index aa4aa6a9008fa..3381d997cd1d8 100644
--- a/plugins/chat/config/locales/server.ar.yml
+++ b/plugins/chat/config/locales/server.ar.yml
@@ -31,6 +31,7 @@ ar:
     chat_editing_grace_period_max_diff_high_trust: "الحد الأقصى لعدد تغييرات الأحرف المسموح بها خلال فترة السماح بالتعديل في الدردشة، وعرض علامة (تم التعديل) بجانب رسالة الدردشة إذا تم تغيير المزيد (مستوى الثقة 2 وأعلى)."
     chat_preferred_index: "علامة التبويب المفضَّلة عند تحميل /chat."
     allow_chat_in_anonymous_mode: "فعّل هذا الإعداد للسماح للمستخدمين الذين يتصفحون موقعك بشكل مجهول باستخدام الدردشة. يتطلب هذا الإعداد تفعيل خيار \"السماح بالوضع المجهول\"."
+    chat_search_enabled: "فعّل هذا الإعداد للسماح للمستخدمين بالبحث في رسائل الدردشة."
     errors:
       chat_default_channel: "يجب أن تكون قناة الدردشة الافتراضية قناةً عامة."
       direct_message_enabled_groups_invalid: "يجب عليك تحديد مجموعة واحدة على الأقل لهذا الإعداد. إذا كنت لا تريد أن يقوم أي شخص باستثناء فريق العمل بإرسال رسائل مباشرة، فاختر مجموعة فريق العمل."
@@ -118,8 +119,17 @@ ar:
     reviewables:
       message_already_handled: "شكرًا، لكننا راجعنا هذه الرسالة بالفعل وقرَّرنا أنك لست بحاجة إلى الإبلاغ عنها مرة أخرى."
       actions:
+        message_actions:
+          bundle_title: "ماذا تريد أن تفعل بهذه الرسالة؟"
         no_action_message:
           title: "التي لم يتم اتخاذ إجراء بشأنها"
+          description: "لا تغيّر الرسالة."
+        delete_message:
+          title: "حذف الرسالة"
+          description: "حذف الرسالة نهائيًا"
+        restore_message:
+          title: "استعادة الرسالة"
+          description: "استعادة الرسالة ليتمكّن المستخدمون من رؤيتها."
         agree:
           title: "موافقة..."
         agree_and_keep_message:
@@ -141,10 +151,17 @@ ar:
           title: "حذف الرسالة"
           description: "يمكنك حذف الرسالة حتى لا يتمكن المستخدمون من رؤيتها."
         delete_and_agree:
+          title: "تجاهل البلاغ وحذف الرسالة"
           description: "تجاهل البلاغ بإزالته من قائمة الانتظار وحذف الرسالة."
         disagree_and_restore:
           title: "عدم الموافقة واستعادة الرسالة"
           description: "يمكنك استعادة الرسالة حتى يتمكن جميع المستخدمين من رؤيتها."
+        disagree:
+          title: "الاحتفاظ بالرسالة"
+          description: "رفض البلاغ وترك الرسالة كما هي."
+        ignore:
+          title: "تجاهل البلاغ"
+          description: "أزلها من قائمة الانتظار دون اتخاذ أي إجراء."
       direct_messages:
         transcript_title: "نص الرسائل السابقة في %{channel_name}"
         transcript_body: "لمنحك مزيدًا من السياق، فقد ضمَّنا نسخة من الرسائل السابقة في هذه المحادثة (حتى عشر رسائل):\n\n%{transcript}"
@@ -223,6 +240,9 @@ ar:
       errors:
         slug_contains_non_ascii_chars: "يتضمَّن حروفًا لا تنتمي إلى ترميز ASCII"
         is_already_in_use: "قيد الاستخدام بالفعل"
+    bookmarkable:
+      notification_title_channel: "رسالة في القناة %{channel_name}"
+      notification_title_direct_message: "رسالة مع القناة %{channel_name}"
     personal_chat: "الدردشة الشخصية"
     onebox:
       inline_to_message: "الرسالة #%{message_id} بواسطة %{username} - #%{chat_channel}"
@@ -300,13 +320,6 @@ ar:
           few: "[%{site_name}] سلاسل رسائل جديدة في %{channel}"
           many: "[%{site_name}] سلاسل رسائل جديدة في %{channel}"
           other: "[%{site_name}] سلاسل رسائل جديدة في %{channel}"
-        watched_threads:
-          zero: "[%{site_name}] سلسلة رسائل جديدة في %{channel} و%{count} آخرين"
-          one: "[%{site_name}] سلسلة رسائل جديدة في %{channel} و%{count} آخر"
-          two: "[%{site_name}] سلسلة رسائل جديدة في %{channel} و%{count} آخرين"
-          few: "[%{site_name}] سلسلة رسائل جديدة في %{channel} و%{count} آخرين"
-          many: "[%{site_name}] سلسلة رسائل جديدة في %{channel} و%{count} آخرين"
-          other: "[%{site_name}] سلسلة رسائل جديدة في %{channel} و%{count} آخرين"
         chat_dm_1:
           zero: "‎[%{site_name}] ‎ رسالة جديدة من %{name}"
           one: "‎[%{site_name}] ‎ رسالة جديدة من %{name}"
@@ -315,7 +328,6 @@ ar:
           many: "‎[%{site_name}] ‎ رسائل جديدة من ‎ %{name}"
           other: "‎ [%{site_name}] ‎رسائل جديدة من ‎ %{name}"
         chat_dm_2: "‎ [%{site_name}]رسائل جديدة من‎ %{name_1} ‎و‎%{name_2}"
-        chat_dm_3_or_more: "‎[%{site_name}] ‎ رسائل جديدة من‎ %{name} ‎و‎ %{count} ‎آخرين"
         chat_channel_1:
           zero: "‎[%{site_name}] رسالة جديدة في ‎ %{channel}"
           one: "‎[%{site_name}] رسالة جديدة في ‎ %{channel}"
@@ -324,7 +336,6 @@ ar:
           many: "‎[%{site_name}] رسالة جديدة في ‎ %{channel}"
           other: "‎[%{site_name}] رسالة جديدة في ‎ %{channel}"
         chat_channel_2: "‎[%{site_name}]‎ رسائل جديدة في‎ %{channel_1} ‎و‎%{channel_2}"
-        chat_channel_3_or_more: "‎[%{site_name}] رسائل جديدة في‎ %{channel} ‎و‎%{count} ‎آخرين"
         chat_channel_and_dm: "‎[%{site_name}] رسائل جديدة في‎ %{channel} ‎ومن‎ %{name}"
       unsubscribe: "يتم إرسال ملخص الدردشة هذا من %{site_link} عندما تكون غائبًا. غيِّر %{email_preferences_link} أو %{unsubscribe_link} لإلغاء الاشتراك."
       unsubscribe_no_link: "يتم إرسال ملخص الدردشة هذا من %{site_link} عندما تكون غائبًا. غيِّر %{email_preferences_link} لديك."
@@ -342,8 +353,10 @@ ar:
         few: "عرض %{count} رسائل إضافية"
         many: "عرض %{count} رسائل إضافية"
         other: "عرض %{count} رسائل إضافية"
+      your_chat_settings: "تفضيلات البريد الإلكتروني للدردشة"
   unsubscribe:
     chat_summary:
+      select_title: "حدد إعدادات الرسائل إلكترونية التلخيصية للدردشة إلى:"
       never: أبدًا
       when_away: عندما أكون غائبًا فقط
   category:
diff --git a/plugins/chat/config/locales/server.cs.yml b/plugins/chat/config/locales/server.cs.yml
index bfc9b167a5691..baf506199fdb8 100644
--- a/plugins/chat/config/locales/server.cs.yml
+++ b/plugins/chat/config/locales/server.cs.yml
@@ -289,25 +289,18 @@ cs:
           few: "[%{site_name}] Nové zprávy ve vlákně %{channel}"
           many: "[%{site_name}] Nové zprávy ve vlákně %{channel}"
           other: "[%{site_name}] Nové zprávy ve vlákně %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Nové zprávy ve vlákně %{channel} and %{count} dalším"
-          few: "[%{site_name}] Nové zprávy ve vlákně %{channel} and %{count} dalších"
-          many: "[%{site_name}] Nové zprávy ve vlákně %{channel} and %{count} dalších"
-          other: "[%{site_name}] Nové zprávy ve vlákně %{channel} and %{count} dalších"
         chat_dm_1:
           one: "[%{site_name}] Nová zpráva od %{name}"
           few: "[%{site_name}] Nové zprávy od %{name}"
           many: "[%{site_name}] Nové zprávy od %{name}"
           other: "[%{site_name}] Nové zprávy od %{name}"
         chat_dm_2: "[%{site_name}] Nové zprávy od %{name_1} a %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nové zprávy od %{name} a %{count} dalších"
         chat_channel_1:
           one: "[%{site_name}] Nová zpráva v %{channel}"
           few: "[%{site_name}] Nové zprávy v %{channel}"
           many: "[%{site_name}] Nové zprávy v %{channel}"
           other: "[%{site_name}] Nové zprávy v %{channel}"
         chat_channel_2: "[%{site_name}] Nové zprávy v %{channel_1} a %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nové zprávy v %{channel} a %{count} dalších"
         chat_channel_and_dm: "[%{site_name}] Nové zprávy v %{channel} a od %{name}"
       unsubscribe: "Tento souhrn chatu je odeslán z %{site_link}, když jste pryč. Změňte %{email_preferences_link} nebo %{unsubscribe_link} pro odhlášení."
       unsubscribe_no_link: "Tento souhrn chatu je odesílán ze stránky %{site_link}, když jste pryč. Změňte svůj %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.de.yml b/plugins/chat/config/locales/server.de.yml
index 2ccc2440e3604..afc5102c0b3d9 100644
--- a/plugins/chat/config/locales/server.de.yml
+++ b/plugins/chat/config/locales/server.de.yml
@@ -8,6 +8,7 @@ de:
   site_settings:
     chat_separate_sidebar_mode: "Zeige separate Seitenleisten-Modi für Forum und Chat."
     chat_enabled: "Chat aktivieren."
+    chat_pinned_messages: "Angeheftete Nachrichten in Chat-Kanälen aktivieren."
     enable_public_channels: "Öffentliche Kanäle basierend auf Kategorien aktivieren."
     chat_allowed_groups: "Benutzer in diesen Gruppen können chatten. Beachte, dass Administratoren und Moderatoren immer auf den Chat zugreifen können."
     chat_channel_retention_days: "Chat-Nachrichten in regulären Kanälen werden so viele Tage lang aufbewahrt. Auf „0“ setzen, um Nachrichten für immer aufzubewahren."
@@ -23,6 +24,7 @@ de:
     chat_archive_destination_topic_status: "Der Status, den das Zielthema haben soll, sobald eine Kanalarchivierung abgeschlossen ist. Dies gilt nur, wenn das Zielthema ein neues Thema ist und kein vorhandenes."
     direct_message_enabled_groups: "Benutzern in diesen Gruppen erlauben, persönliche Benutzer-zu-Benutzer-Chats zu erstellen. Hinweis: Teammitglieder können immer persönliche Chats erstellen und Benutzer können auf persönliche Chats antworten, die von Benutzern initiiert wurden, die die Berechtigung haben, sie zu erstellen."
     chat_message_flag_allowed_groups: "Benutzer in diesen Gruppen dürfen Chat-Nachrichten melden. Beachte, dass Administratoren und Moderatoren immer Chatnachrichten melden können."
+    chat_pinning_messages_allowed_groups: "Benutzer in diesen Gruppen dürfen Chatnachrichten in Kanälen, auf die sie Zugriff haben, anheften. Administratoren und Moderatoren können Chatnachrichten immer anheften. Jedes Mitglied eines Gruppenchats oder einer DN kann Nachrichten dort anheften."
     max_mentions_per_chat_message: "Maximale Anzahl von @name-Benachrichtigungen, die ein Benutzer in einer Chat-Nachricht verwenden kann."
     chat_max_direct_message_users: "Benutzer können nicht mehr als diese Anzahl anderer Benutzer hinzufügen, wenn sie eine neue Direktnachricht erstellen. Auf 0 setzen, um nur Nachrichten an sich selbst zuzulassen. Teammitglieder sind von dieser Einstellung ausgenommen."
     chat_allow_archiving_channels: "Dem Team erlauben, Nachrichten zu einem Thema zu archivieren, wenn sie einen Kanal schließen."
@@ -105,6 +107,9 @@ de:
       thread_invalid_for_channel: "Der Thread ist nicht Teil des bereitgestellten Kanals."
       thread_does_not_match_parent: "Der Thread stimmt nicht mit der übergeordneten Nachricht überein."
       invalid_direct_message: "Du bist nicht berechtigt, diese Direktnachricht zu erstellen."
+      pin_limit_reached: "Dieser Kanal hat die maximale Anzahl angehefteter Nachrichten erreicht (%{limit})."
+      message_already_pinned: "Diese Nachricht ist bereits angeheftet."
+      message_not_pinned: "Diese Nachricht ist nicht angeheftet."
     reviewables:
       message_already_handled: "Danke, aber wir haben diese Nachricht bereits überprüft und festgestellt, dass sie nicht erneut markiert werden muss."
       actions:
@@ -258,18 +263,18 @@ de:
           one: "[%{site_name}] Neue Thread-Nachricht in %{channel}"
           other: "[%{site_name}] Neue Thread-Nachrichten in %{channel}"
         watched_threads:
-          one: "[%{site_name}] Neue Thread-Nachrichten in %{channel} und %{count} anderen"
-          other: "[%{site_name}] Neue Thread-Nachrichten in %{channel} und %{count} anderen"
+          one: "[%{site_name}] Neue Thread-Nachrichten in %{channel} und %{count} anderen Kanal"
+          other: "[%{site_name}] Neue Thread-Nachrichten in %{channel} und %{count} anderen Kanälen"
         chat_dm_1:
           one: "[%{site_name}] Neue Nachricht von %{name}"
           other: "[%{site_name}] Neue Nachrichten von %{name}"
         chat_dm_2: "[%{site_name}] Neue Nachrichten von %{name_1} und %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Neue Nachrichten von %{name} und %{count} anderen"
+        chat_dm_3_or_more: "[%{site_name}] Neue Nachrichten von %{name} und in %{count} anderen Kanälen"
         chat_channel_1:
           one: "[%{site_name}] Neue Nachricht in %{channel}"
           other: "[%{site_name}] Neue Nachrichten in %{channel}"
         chat_channel_2: "[%{site_name}] Neue Nachrichten in %{channel_1} und %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Neue Nachrichten in %{channel} und %{count} anderen"
+        chat_channel_3_or_more: "[%{site_name}] Neue Nachrichten in %{channel} und %{count} anderen Kanälen"
         chat_channel_and_dm: "[%{site_name}] Neue Nachrichten in %{channel} und von %{name}"
       unsubscribe: "Diese Chat-Zusammenfassung wird dir von %{site_link} gesendet, wenn du abwesend bist. Ändere deine %{email_preferences_link} oder %{unsubscribe_link}, um dich abzumelden."
       unsubscribe_no_link: "Diese Chat-Zusammenfassung wird dir von %{site_link} gesendet, wenn du abwesend bist. Ändere deine %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.el.yml b/plugins/chat/config/locales/server.el.yml
index 4f5fe1c334163..8f494e017bb7b 100644
--- a/plugins/chat/config/locales/server.el.yml
+++ b/plugins/chat/config/locales/server.el.yml
@@ -21,6 +21,12 @@ el:
       channel_cannot_be_archived: "Δεν είναι δυνατή η αρχειοθέτηση του καναλιού αυτήν τη στιγμή. Πρέπει να είναι είτε κλειστό είτε ανοιχτό για αρχειοθέτηση."
       draft_too_long: "Το προσχέδιο είναι πολύ μεγάλο."
       not_accepting_dms: "Λυπούμαστε, ο/η %{username} δεν δέχεται μηνύματα αυτή τη στιγμή."
+      user_cannot_send_direct_messages: "Λυπούμαστε, δεν μπορείτε να στείλετε άμεσα μηνύματα."
+      over_chat_max_direct_message_users_allow_self: "Μπορείτε να δημιουργήσετε ένα άμεσο μήνυμα μόνο με τον εαυτό σας."
+      over_chat_max_direct_message_users:
+        one: "Δεν μπορείτε να δημιουργήσετε ένα άμεσο μήνυμα με περισσότερο από %{count} άλλον χρήστη."
+        other: "Δεν μπορείτε να δημιουργήσετε ένα άμεσο μήνυμα με περισσότερους από %{count} άλλους χρήστες."
+      invalid_direct_message: "Δεν επιτρέπεται να δημιουργήσετε αυτό το άμεσο μήνυμα."
     reviewables:
       message_already_handled: "Ευχαριστούμε, αλλά έχουμε ήδη αναθεωρήσει αυτό το μήνυμα και έχουμε διαπιστώσει ότι δεν χρειάζεται να αναφερθεί ξανά."
       actions:
@@ -63,10 +69,15 @@ el:
           description: "Διαφωνώ με την αναφορά και διατήρηση του μηνύματος χωρίς αλλαγή."
         ignore:
           title: "Αγνόηση επισήμανσης"
+      direct_messages:
+        transcript_title: "Μεταγραφή προηγούμενων μηνυμάτων στο %{channel_name}"
+        transcript_body: "Για να σας δώσουμε περισσότερες πληροφορίες, συμπεριλάβαμε μια μεταγραφή των προηγούμενων μηνυμάτων σε αυτήν τη συνομιλία (έως δέκα):\n\n%{transcript}"
     channel:
       users_invited_to_channel:
         one: "%{invited_users} έχει προσκληθεί από %{inviting_user}."
         other: "%{invited_users} έχουν προσκληθεί από %{inviting_user}."
+      archive:
+        first_post_raw: "Αυτό το θέμα είναι ένα αρχείο του καναλιού συνομιλίας [%{channel_name}](%{channel_url})."
       dm_title:
         single_user: "%{username}"
         multi_user_truncated:
@@ -113,6 +124,10 @@ el:
         direct: "%{username} σας επισήμανε σε προσωπική συνομιλία"
         other_type: "%{username} επισήμανε %{identifier} σε προσωπική συνομιλία"
       new_direct_chat_message: "%{username} έστειλε ένα μήνυμα σε προσωπική συνομιλία"
+  discourse_automation:
+    scriptables:
+      send_chat_message:
+        title: Αποστολή μηνύματος συνομιλίας
   reviewable_score_types:
     notify_user:
       chat_pm_body: "%{link}\n\n%{message}"
diff --git a/plugins/chat/config/locales/server.es.yml b/plugins/chat/config/locales/server.es.yml
index 6ceb58ed48bfc..427f2d1924c53 100644
--- a/plugins/chat/config/locales/server.es.yml
+++ b/plugins/chat/config/locales/server.es.yml
@@ -72,6 +72,7 @@ es:
         closed: "El canal está cerrado, no se pueden editar ni eliminar mensajes"
         read_only: "El canal es de solo lectura, no se pueden editar ni eliminar mensajes"
       user_cannot_send_message: "No puedes enviar mensajes en este momento."
+      user_not_in_channel: "Debes unirte a este canal."
       rate_limit_exceeded: "Se ha superado el límite de mensajes de chat que se pueden enviar en 30 segundos"
       auto_silence_from_flags: "Mensaje de chat marcado con una puntuación lo suficientemente alta como para silenciar al usuario."
       channel_cannot_be_archived: "El canal no se puede archivar en este momento, debe estar cerrado o abierto para ser archivado."
@@ -242,19 +243,14 @@ es:
         watched_thread:
           one: "[%{site_name}] Nuevo mensaje en un hilo en %{channel}"
           other: "[%{site_name}] Nuevos mensajes en un hilo en %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Nuevos mensajes en hilos en %{channel} y %{count} más"
-          other: "[%{site_name}] Nuevos mensajes en hilos en %{channel} y %{count} más"
         chat_dm_1:
           one: "[%{site_name}] Nuevo mensaje de %{name}"
           other: "[%{site_name}] Nuevos mensajes de %{name}"
         chat_dm_2: "[%{site_name}] Nuevos mensajes de %{name_1} y %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nuevos mensajes de %{name} y otros %{count}"
         chat_channel_1:
           one: "[%{site_name}] Nuevo mensaje en %{channel}"
           other: "[%{site_name}] Nuevos mensajes en %{channel}"
         chat_channel_2: "[%{site_name}] Nuevos mensajes en %{channel_1} y %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nuevos mensajes en %{channel} y otros %{count}"
         chat_channel_and_dm: "[%{site_name}] Nuevos mensajes en %{channel} y desde %{name}"
       unsubscribe: "Este resumen del chat se envía desde %{site_link} cuando estás fuera. Cambia tu %{email_preferences_link}, o %{unsubscribe_link} para darte de baja."
       unsubscribe_no_link: "Este resumen del chat se envía desde %{site_link} cuando estás fuera. Cambia tu %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.fi.yml b/plugins/chat/config/locales/server.fi.yml
index 3c5f4fcea028d..411f01030afdb 100644
--- a/plugins/chat/config/locales/server.fi.yml
+++ b/plugins/chat/config/locales/server.fi.yml
@@ -242,19 +242,14 @@ fi:
         watched_thread:
           one: "[%{site_name}] Uusi viesti kanavalla %{channel}"
           other: "[%{site_name}] Uusia viestejä kanavalla %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Uusia viestejä kanavalla %{channel} ja %{count} muussa"
-          other: "[%{site_name}] Uusia viestejä kanavalla %{channel} ja %{count} muussa"
         chat_dm_1:
           one: "[%{site_name}] Uusi viesti käyttäjältä %{name}"
           other: "[%{site_name}] Uusia viestejä käyttäjältä %{name}"
         chat_dm_2: "[%{site_name}] Uusia viestejä käyttäjältä %{name_1} ja %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Uusia viestejä käyttäjältä %{name} ja %{count} muulta"
         chat_channel_1:
           one: "[%{site_name}] Uusi viesti kanavalta %{channel}"
           other: "[%{site_name}] Uusia viestejä kanavalta %{channel}"
         chat_channel_2: "[%{site_name}] Uusia viestejä kanavalta %{channel_1} ja %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Uusia viestejä kanavalla %{channel} ja %{count} muulla"
         chat_channel_and_dm: "[%{site_name}] Uusia viestejä kanavalla %{channel} ja käyttäjältä %{name}"
       unsubscribe: "Tämä chat-yhteenveto lähetetään sivustolta %{site_link}, kun olet poissa. Määritä %{email_preferences_link} tai %{unsubscribe_link} peruuttaaksesi tilauksen."
       unsubscribe_no_link: "Tämä chat-yhteenveto lähetetään sivustolta %{site_link}, kun olet poissa. Määritä %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.fr.yml b/plugins/chat/config/locales/server.fr.yml
index 6665da17e616d..0be545607b38d 100644
--- a/plugins/chat/config/locales/server.fr.yml
+++ b/plugins/chat/config/locales/server.fr.yml
@@ -242,19 +242,14 @@ fr:
         watched_thread:
           one: "[%{site_name}] Nouveau message dans le fil %{channel}"
           other: "[%{site_name}] Nouveaux messages dans le fil %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Nouveaux messages dans %{channel} et %{count} autre canal"
-          other: "[%{site_name}] Nouveaux messages dans %{channel} et %{count} autres canaux"
         chat_dm_1:
           one: "[%{site_name}] Nouveau message de %{name}"
           other: "[%{site_name}] Nouveaux messages de %{name}"
         chat_dm_2: "[%{site_name}] Nouveaux messages de %{name_1} et de %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nouveaux messages de %{name} et de %{count} autres utilisateurs"
         chat_channel_1:
           one: "[%{site_name}] Nouveau message dans %{channel}"
           other: "[%{site_name}] Nouveaux messages dans %{channel}"
         chat_channel_2: "[%{site_name}] Nouveaux messages dans %{channel_1} et %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nouveaux messages dans %{channel} et %{count} autres chaînes"
         chat_channel_and_dm: "[%{site_name}] Nouveaux messages dans %{channel} de la part de %{name}"
       unsubscribe: "Ce résumé de discussion est envoyé à partir de %{site_link} lorsque vous vous absentez. Changez vos %{email_preferences_link} ou %{unsubscribe_link} pour vous désabonner."
       unsubscribe_no_link: "Ce résumé de discussion est envoyé à partir de %{site_link} lorsque vous vous absentez. Changez vos %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.he.yml b/plugins/chat/config/locales/server.he.yml
index 9fc0256850a39..d6339a70c9384 100644
--- a/plugins/chat/config/locales/server.he.yml
+++ b/plugins/chat/config/locales/server.he.yml
@@ -283,25 +283,18 @@ he:
           two: "[%{site_name}] הודעות שרשור חדשות תחת %{channel}"
           many: "[%{site_name}] הודעות שרשור חדשות תחת %{channel}"
           other: "[%{site_name}] הודעות שרשור חדשות תחת %{channel}"
-        watched_threads:
-          one: "[%{site_name}] הודעת שרשור חדשה בערוץ %{channel} ובעוד %{count}"
-          two: "[%{site_name}] הודעות שרשור חדשות בערוץ %{channel} ובעוד %{count}"
-          many: "[%{site_name}] הודעות שרשור חדשות בערוץ %{channel} ובעוד %{count}"
-          other: "[%{site_name}] הודעות שרשור חדשות בערוץ %{channel} ובעוד %{count}"
         chat_dm_1:
           one: "[%{site_name}] הודעה חדשה מאת %{name}"
           two: "[%{site_name}] הודעות חדשות מאת %{name}"
           many: "[%{site_name}] הודעות חדשות מאת %{name}"
           other: "[%{site_name}] הודעות חדשות מאת %{name}"
         chat_dm_2: "[%{site_name}] הודעות חדשות שנשלחות מאת %{name_1} וגם %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] הודעות חדשות מאת %{name} ועוד %{count}"
         chat_channel_1:
           one: "[%{site_name}] הודעה חדשה תחת %{channel}"
           two: "[%{site_name}] הודעות חדשות תחת %{channel}"
           many: "[%{site_name}] הודעות חדשות תחת %{channel}"
           other: "[%{site_name}] הודעות חדשות תחת %{channel}"
         chat_channel_2: "[%{site_name}] הודעה חדשה בערוץ %{channel_1} ובערוץ %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] הודעות חדשות בערוץ %{channel} ובעוד %{count}"
         chat_channel_and_dm: "[%{site_name}] הודעות חדשות בערוץ %{channel} וגם מאת %{name}"
       unsubscribe: "סיכום צ׳אט זה נשלח מהאתר %{site_link} כשנעדרת ממנו. ניתן לשנות את %{email_preferences_link} שלך או %{unsubscribe_link} כדי להפסיק לקבל הודעות."
       unsubscribe_no_link: "סיכום צ׳אט זה נשלח מהאתר %{site_link} כשנעדרת ממנו. ניתן לשנות את %{email_preferences_link} שלך."
diff --git a/plugins/chat/config/locales/server.hu.yml b/plugins/chat/config/locales/server.hu.yml
index 0f0560f292f33..d0f5bd97918ce 100644
--- a/plugins/chat/config/locales/server.hu.yml
+++ b/plugins/chat/config/locales/server.hu.yml
@@ -244,19 +244,14 @@ hu:
         watched_thread:
           one: "[%{site_name}] Új szálüzenet itt: %{channel}"
           other: "[%{site_name}] Új szálüzenetek itt: %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Új szálüzenet a(z) %{channel} és %{count} további csoportban"
-          other: "[%{site_name}] Új szálüzenet a(z) %{channel} és %{count} további csoportban"
         chat_dm_1:
           one: "[%{site_name}] Új üzenet tőle: %{name}"
           other: "[%{site_name}] Új üzenetek tőle: %{name}"
         chat_dm_2: "[%{site_name}] Új üzenetek tőlük: %{name_1} és %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Új üzenetek: %{name} és %{count} másik felhasználótól"
         chat_channel_1:
           one: "[%{site_name}] Új üzenet itt: %{channel}"
           other: "[%{site_name}] Új üzenetek itt: %{channel}"
         chat_channel_2: "[%{site_name}] Új üzenetek itt: %{channel_1} és %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Új üzenetek itt: %{channel} és %{count} további csoport"
         chat_channel_and_dm: "[%{site_name}] Új üzenetek itt: %{channel}, és tőle: %{name}"
       unsubscribe: "Ezt a csevegési összefoglalót %{site_link} küldi, amikor Ön távol van. A leiratkozáshoz módosítsa a %{email_preferences_link} vagy a %{unsubscribe_link} értéket."
       unsubscribe_no_link: "Ezt a csevegési összefoglalót %{site_link} küldi, amikor Ön távol van. Itt tudja módosítani: %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.it.yml b/plugins/chat/config/locales/server.it.yml
index b785cf0429ffa..7235a66ef4693 100644
--- a/plugins/chat/config/locales/server.it.yml
+++ b/plugins/chat/config/locales/server.it.yml
@@ -241,19 +241,14 @@ it:
         watched_thread:
           one: "[%{site_name}] Nuovo messaggio nel thread in %{channel}"
           other: "[%{site_name}] Nuovi messaggi nel thread in %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Nuovi messaggi nel thread in %{channel} e %{count} altro"
-          other: "[%{site_name}] Nuovi messaggi nel thread in %{channel} e altri %{count}"
         chat_dm_1:
           one: "[%{site_name}] Nuovo messaggio da %{name}"
           other: "[%{site_name}] Nuovi messaggi da %{name}"
         chat_dm_2: "[%{site_name}] Nuovi messaggi da %{name_1} e %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nuovi messaggi da %{name} e altri %{count}"
         chat_channel_1:
           one: "[%{site_name}] Nuovo messaggio in %{channel}"
           other: "[%{site_name}] Nuovi messaggi in %{channel}"
         chat_channel_2: "[%{site_name}] Nuovi messaggi in %{channel_1} e %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nuovi messaggi in %{channel} e altri %{count}"
         chat_channel_and_dm: "[%{site_name}] Nuovi messaggi in %{channel} e da %{name}"
       unsubscribe: "Questo riepilogo della chat viene inviato da %{site_link} quando non ci sei. Modifica %{email_preferences_link} o %{unsubscribe_link} per annullare l'iscrizione."
       unsubscribe_no_link: "Questo riepilogo della chat viene inviato da %{site_link} quando non ci sei. Modifica %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.ja.yml b/plugins/chat/config/locales/server.ja.yml
index ebedc022a9de5..a4b8f9e9de863 100644
--- a/plugins/chat/config/locales/server.ja.yml
+++ b/plugins/chat/config/locales/server.ja.yml
@@ -31,6 +31,7 @@ ja:
     chat_editing_grace_period_max_diff_high_trust: "チャットの編集猶予期間で変更が許可される最大文字数。これを超える変更が行われた場合は、チャットメッセージに (編集済み) タグが表示されます (信頼レベル 2 以上)。"
     chat_preferred_index: "/chat を読み込む際の優先タブ。"
     allow_chat_in_anonymous_mode: "この設定を有効にすると、匿名でサイトを閲覧しているユーザーがチャットを使用できるようになります。この設定には、`allow anonymous mode` を有効にする必要があります。"
+    chat_search_enabled: "この設定を有効にすると、ユーザーはチャットメッセージを検索できるようになります。"
     errors:
       chat_default_channel: "デフォルトのチャットチャンネルは公開チャンネルである必要があります。"
       direct_message_enabled_groups_invalid: "この設定には、少なくとも 1 つのグループを指定する必要があります。スタッフ以外がダイレクトメッセージを送れないようにするには、スタッフグループを選択します。"
@@ -103,9 +104,16 @@ ja:
     reviewables:
       message_already_handled: "ありがとうございます。ただ、このメッセージはすでにレビュー済みで、通報の必要がないと判断されています。"
       actions:
+        message_actions:
+          bundle_title: "メッセージをどうしますか？"
         no_action_message:
           title: "未対応"
+          description: "メッセージをそのままにします。"
+        delete_message:
+          title: "メッセージを削除する"
+          description: "メッセージを完全に削除します。"
         restore_message:
+          title: "メッセージを復元する"
           description: "ユーザーが閲覧できるようにメッセージを復元します。"
         agree:
           title: "同意…"
@@ -128,10 +136,17 @@ ja:
           title: "メッセージを削除"
           description: "ユーザーが閲覧できないようにメッセージを削除します。"
         delete_and_agree:
+          title: "通報を無視してメッセージを削除する"
           description: "キューから削除して通報を無視し、そのメッセージを削除します。"
         disagree_and_restore:
           title: "同意せずにメッセージを復元"
           description: "すべてのユーザーが閲覧できるようにメッセージを復元します。"
+        disagree:
+          title: "メッセージを保持する"
+          description: "通報を却下してメッセージを未変更のままにします。"
+        ignore:
+          title: "通報を無視する"
+          description: "対応せずにキューから削除します。"
       direct_messages:
         transcript_title: "%{channel_name} の過去のメッセージのトランスクリプト"
         transcript_body: "より文脈を掴みやすいように、この会話の過去のメッセージのトランスクリプトを含めました (最大 10 件)。\n\n%{transcript}"
@@ -172,6 +187,7 @@ ja:
         is_already_in_use: "はすでに使用されています"
     bookmarkable:
       notification_title_channel: "%{channel_name} のメッセージ"
+      notification_title_direct_message: "%{channel_name} のメッセージ"
     personal_chat: "パーソナルチャット"
     onebox:
       inline_to_message: "%{username} によるメッセージ #%{message_id} - #%{chat_channel}"
@@ -224,16 +240,12 @@ ja:
           other: "[%{site_name}] 新しいメッセージ"
         watched_thread:
           other: "[%{site_name}] %{channel} の新しいスレッドメッセージ"
-        watched_threads:
-          other: "[%{site_name}] %{channel} と他 %{count} 個のチャンネルの新しいスレッドメッセージ"
         chat_dm_1:
           other: "[%{site_name}] %{name} からの新しいメッセージ"
         chat_dm_2: "[%{site_name}] %{name_1} と %{name_2} からの新しいメッセージ"
-        chat_dm_3_or_more: "[%{site_name}] %{name} と他 %{count} 人からの新しいメッセージ"
         chat_channel_1:
           other: "[%{site_name}] %{channel} の新しいメッセージ"
         chat_channel_2: "[%{site_name}] %{channel_1} と%{channel_2} の新しいメッセージ"
-        chat_channel_3_or_more: "[%{site_name}] %{channel} と他 %{count} 個のチャンネルの新しいメッセージ"
         chat_channel_and_dm: "[%{site_name}] %{channel} に %{name} からの新しいメッセージがあります"
       unsubscribe: "このチャットの要約は、あなたが退席中のときに %{site_link} から送信されます。%{email_preferences_link} を変更するか、%{unsubscribe_link} から購読を停止します。"
       unsubscribe_no_link: "このチャットの要約は、あなたが退席中のときに %{site_link} から送信されます。%{email_preferences_link} を変更します。"
@@ -241,8 +253,10 @@ ja:
         other: "%{count} 件のメッセージを表示"
       view_more:
         other: "さらに %{count} 件のメッセージを表示"
+      your_chat_settings: "チャットメールの設定"
   unsubscribe:
     chat_summary:
+      select_title: "チャット要約メールを設定する:"
       never: なし
       when_away: 退席中の時のみ
   category:
diff --git a/plugins/chat/config/locales/server.nl.yml b/plugins/chat/config/locales/server.nl.yml
index 451f4e972884c..a0a67815c7e11 100644
--- a/plugins/chat/config/locales/server.nl.yml
+++ b/plugins/chat/config/locales/server.nl.yml
@@ -242,19 +242,14 @@ nl:
         watched_thread:
           one: "[%{site_name}] Nieuw threadbericht in %{channel}"
           other: "[%{site_name}] Nieuwe threadberichten in %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Nieuwe threadberichten in %{channel} en %{count} andere groep"
-          other: "[%{site_name}] Nieuwe threadberichten in %{channel} en %{count} andere groepen"
         chat_dm_1:
           one: "[%{site_name}] Nieuw bericht van %{name}"
           other: "[%{site_name}] Nieuw berichten van %{name}"
         chat_dm_2: "[%{site_name}] Nieuwe berichten van %{name_1} en %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nieuwe berichten van %{name} en %{count} anderen"
         chat_channel_1:
           one: "[%{site_name}] Nieuw bericht in %{channel}"
           other: "[%{site_name}] Nieuwe berichten in %{channel}"
         chat_channel_2: "[%{site_name}] Nieuwe berichten in %{channel_1} en %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nieuwe berichten in %{channel} en %{count} andere groepen"
         chat_channel_and_dm: "[%{site_name}] Nieuwe berichten in %{channel} en van %{name}"
       unsubscribe: "Deze chatsamenvatting wordt verzonden van %{site_link} wanneer je afwezig bent. Wijzig je %{email_preferences_link}, of %{unsubscribe_link} om je af te melden."
       unsubscribe_no_link: "Deze chatsamenvatting wordt verzonden van %{site_link} wanneer je afwezig bent. Wijzig je %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.pl_PL.yml b/plugins/chat/config/locales/server.pl_PL.yml
index 93716e54df179..072c8009a873a 100644
--- a/plugins/chat/config/locales/server.pl_PL.yml
+++ b/plugins/chat/config/locales/server.pl_PL.yml
@@ -8,6 +8,7 @@ pl_PL:
   site_settings:
     chat_separate_sidebar_mode: "Pokaż oddzielne tryby paska bocznego dla forum i czatu."
     chat_enabled: "Włącz czat."
+    chat_pinned_messages: "Włącz przypinanie wiadomości na kanałach czatu."
     enable_public_channels: "Włącz kanały publiczne na podstawie kategorii."
     chat_allowed_groups: "Użytkownicy w tych grupach mogą czatować. Pamiętaj, że administratorzy i moderatorzy zawsze mają dostęp do czatu."
     chat_channel_retention_days: "Wiadomości czatu w zwykłych kanałach będą przechowywane przez tyle dni. Ustaw '0', aby zachować wiadomości na zawsze."
@@ -23,6 +24,7 @@ pl_PL:
     chat_archive_destination_topic_status: "Status, jaki powinien mieć temat docelowy po zakończeniu archiwizacji kanału. Dotyczy to tylko sytuacji, gdy temat docelowy jest nowym tematem, a nie istniejącym."
     direct_message_enabled_groups: "Zezwól użytkownikom w tych grupach na tworzenie czatów osobistych między użytkownikami. Uwaga: personel zawsze może tworzyć czaty osobiste, a użytkownicy będą mogli odpowiadać na czaty osobiste inicjowane przez użytkowników, którzy mają uprawnienia do ich tworzenia."
     chat_message_flag_allowed_groups: "Użytkownicy w tych grupach mogą oznaczać flagami wiadomości czatu. Należy pamiętać, że administratorzy i moderatorzy zawsze mogą oznaczać flagami wiadomości czatu."
+    chat_pinning_messages_allowed_groups: "Użytkownicy w tych grupach mogą przypinać wiadomości czatu w kanałach, do których mają dostęp. Pamiętaj, że administratorzy i moderatorzy zawsze mogą przypinać wiadomości czatu. Każdy członek czatu grupowego lub wiadomości prywatnej może przypinać tam wiadomości."
     max_mentions_per_chat_message: "Maksymalna liczba powiadomień @name, których użytkownik może użyć w wiadomości na czacie."
     chat_max_direct_message_users: "Użytkownicy nie mogą dodać więcej niż ta liczba innych użytkowników podczas tworzenia nowej wiadomości bezpośredniej. Ustaw na 0, aby zezwolić na wysyłanie wiadomości tylko do siebie. Personel jest zwolniony z tego ustawienia."
     chat_allow_archiving_channels: "Zezwól personelowi na archiwizowanie wiadomości w temacie podczas zamykania kanału."
@@ -111,6 +113,9 @@ pl_PL:
       thread_invalid_for_channel: "Wątek nie jest częścią udostępnionego kanału."
       thread_does_not_match_parent: "Wątek nie pasuje do wiadomości nadrzędnej."
       invalid_direct_message: "Nie możesz utworzyć tej wiadomości bezpośredniej."
+      pin_limit_reached: "Ten kanał osiągnął maksymalną liczbę przypiętych wiadomości (%{limit})."
+      message_already_pinned: "Ta wiadomość jest już przypięta."
+      message_not_pinned: "Ta wiadomość nie jest przypięta."
     reviewables:
       message_already_handled: "Dziękujemy, ale sprawdziliśmy już tę wiadomość i ustaliliśmy, że nie trzeba jej ponownie oznaczać."
       actions:
@@ -290,24 +295,24 @@ pl_PL:
           many: "[%{site_name}] Nowe wiadomość wątku w %{channel}"
           other: "[%{site_name}] Nowe wiadomość wątku w %{channel}"
         watched_threads:
-          one: "[%{site_name}] Nowe wiadomości wątku w %{channel} i %{count} innym"
-          few: "[%{site_name}] Nowe wiadomości wątku w %{channel} i %{count} innych"
-          many: "[%{site_name}] Nowe wiadomości wątku w %{channel} i %{count} innych"
-          other: "[%{site_name}] Nowe wiadomości wątku w %{channel} i %{count} innych"
+          one: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innym kanale"
+          few: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innych kanałach"
+          many: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innych kanałach"
+          other: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innych kanałach"
         chat_dm_1:
           one: "[%{site_name}] Nowa wiadomość od %{name}"
           few: "[%{site_name}] Nowe wiadomości od %{name}"
           many: "[%{site_name}] Nowe wiadomości od %{name}"
           other: "[%{site_name}] Nowe wiadomości od %{name}"
         chat_dm_2: "[%{site_name}] Nowe wiadomości od %{name_1} i %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nowe wiadomości od %{name} i %{count} innych"
+        chat_dm_3_or_more: "[%{site_name}] Nowe wiadomości z %{name} i %{count} innych kanałów wiadomości bezpośrednich"
         chat_channel_1:
           one: "[%{site_name}] Nowa wiadomość w %{channel}"
           few: "[%{site_name}] Nowe wiadomości w %{channel}"
           many: "[%{site_name}] Nowe wiadomości w %{channel}"
           other: "[%{site_name}] Nowe wiadomości w %{channel}"
         chat_channel_2: "[%{site_name}] Nowe wiadomości w %{channel_1} i %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nowe wiadomości w %{channel} i %{count} inne"
+        chat_channel_3_or_more: "[%{site_name}] Nowe wiadomości na %{channel} i %{count} innych kanałach"
         chat_channel_and_dm: "[%{site_name}] Nowe wiadomości w %{channel} i od %{name}"
       unsubscribe: "To podsumowanie czatu jest wysyłane z %{site_link} kiedy cię nie ma. Zmień swoje %{email_preferences_link}, lub %{unsubscribe_link}, aby zrezygnować z subskrypcji."
       unsubscribe_no_link: "To podsumowanie czatu jest wysyłane z %{site_link} kiedy cię nie ma. Zmień swoje %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.pt_BR.yml b/plugins/chat/config/locales/server.pt_BR.yml
index 90b7500ea1687..d7567459cb859 100644
--- a/plugins/chat/config/locales/server.pt_BR.yml
+++ b/plugins/chat/config/locales/server.pt_BR.yml
@@ -243,19 +243,14 @@ pt_BR:
         watched_thread:
           one: "[%{site_name}] Nova mensagem de thread em %{channel}"
           other: "[%{site_name}] Novas mensagens de thread em %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Novas mensagens de thread em %{channel} e mais %{count}"
-          other: "[%{site_name}] Novas mensagens de thread em %{channel} e mais %{count}"
         chat_dm_1:
           one: "[%{site_name}] Nova mensagem de %{name}"
           other: "[%{site_name}] Novas mensagens de %{name}"
         chat_dm_2: "[%{site_name}] Novas mensagens de %{name_1} e %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Novas mensagens de %{name} e mais %{count}"
         chat_channel_1:
           one: "[%{site_name}] Nova mensagem de %{channel}"
           other: "[%{site_name}] Novas mensagens de %{channel}"
         chat_channel_2: "[%{site_name}] Novas mensagens em %{channel_1} e %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nova mensagem em %{channel} e mais %{count}"
         chat_channel_and_dm: "[%{site_name}] Novas mensagens em %{channel} e de %{name}"
       unsubscribe: "Este resumo do chat será enviado de %{site_link} quando você estiver ausente. Altere seu %{email_preferences_link}, ou %{unsubscribe_link} para cancelar a inscrição."
       unsubscribe_no_link: "Este resumo do chat será enviado de %{site_link} quando você estiver ausente. Altere seu %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.ru.yml b/plugins/chat/config/locales/server.ru.yml
index 0b3263484e6eb..0edec0969278b 100644
--- a/plugins/chat/config/locales/server.ru.yml
+++ b/plugins/chat/config/locales/server.ru.yml
@@ -283,25 +283,18 @@ ru:
           few: "[%{site_name}] Новые сообщения ветки в канале %{channel}"
           many: "[%{site_name}] Новые сообщения ветки в канале %{channel}"
           other: "[%{site_name}] Новые сообщения ветки в канале %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Новое сообщение ветки в канале %{channel} и еще в %{count}"
-          few: "[%{site_name}] Новые сообщения ветки в канале %{channel} и еще в %{count}"
-          many: "[%{site_name}] Новые сообщения ветки в канале %{channel} и еще в %{count}"
-          other: "[%{site_name}] Новые сообщения ветки в канале %{channel} и еще в %{count}"
         chat_dm_1:
           one: "[%{site_name}] Новое сообщение от пользователя %{name}"
           few: "[%{site_name}] Новые сообщения от пользователя %{name}"
           many: "[%{site_name}] Новые сообщения от пользователя %{name}"
           other: "[%{site_name}] Новые сообщения от пользователя %{name}"
         chat_dm_2: "[%{site_name}] Новые сообщения от пользователей %{name_1} и %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Новые сообщения от пользователя %{name} и еще %{count}"
         chat_channel_1:
           one: "[%{site_name}] Новое сообщение в канале «%{channel}»"
           few: "[%{site_name}] Новые сообщения в канале «%{channel}»"
           many: "[%{site_name}] Новые сообщения в канале «%{channel}»"
           other: "[%{site_name}] Новые сообщения в канале «%{channel}»"
         chat_channel_2: "[%{site_name}] Новые сообщения в каналах «%{channel_1}» и «%{channel_2}»"
-        chat_channel_3_or_more: "[%{site_name}] Новые сообщения в канале «%{channel}» и еще %{count}"
         chat_channel_and_dm: "[%{site_name}] Новые сообщения в канале «%{channel}» и от пользователя %{name}"
       unsubscribe: "Эта сводка чата рассылается с сайта %{site_link} в период вашего отсутствия на форуме. Для отмены подписки измените %{email_preferences_link} или %{unsubscribe_link}."
       unsubscribe_no_link: "Эта сводка чата рассылается с сайта %{site_link} в период вашего отсутствия на форуме. Настройка рассылки: %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.sk.yml b/plugins/chat/config/locales/server.sk.yml
index 344befeb0cfcf..139988a906875 100644
--- a/plugins/chat/config/locales/server.sk.yml
+++ b/plugins/chat/config/locales/server.sk.yml
@@ -271,25 +271,18 @@ sk:
           few: "[%{site_name}] Nové správy na %{channel}"
           many: "[%{site_name}] Nových správ na %{channel}"
           other: "[%{site_name}] Nové správy na %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Nová správa vlákna v %{channel} a %{count} iné"
-          few: "[%{site_name}] Nových správ vlákna v %{channel} a %{count} iné"
-          many: "[%{site_name}] Nových správ vlákna v %{channel} a %{count} iné"
-          other: "[%{site_name}] Nové správy vlákna v %{channel} a %{count} iné"
         chat_dm_1:
           one: "[%{site_name}] Nová správa od %{name}"
           few: "[%{site_name}] Nových správ od %{name}"
           many: "[%{site_name}] Nových správ od %{name}"
           other: "[%{site_name}] Nové správy od %{name}"
         chat_dm_2: "[%{site_name}] Nové správy od %{name_1} a %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nové správy od %{name} a %{count} ďalších"
         chat_channel_1:
           one: "[%{site_name}] Nová správa v %{channel}"
           few: "[%{site_name}] Nových správ v %{channel}"
           many: "[%{site_name}] Nových správ v %{channel}"
           other: "[%{site_name}] Nové správy v %{channel}"
         chat_channel_2: "[%{site_name}] Nové správy v %{channel_1} a %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nové správy v %{channel} a %{count} ďalšie"
         chat_channel_and_dm: "[%{site_name}] Nové správy v %{channel} a od %{name}"
       unsubscribe: "Tento súhrn chatu sa odosiela zo stránky %{site_link} , keď ste preč. Zmeňte adresu %{email_preferences_link}, alebo %{unsubscribe_link} a odhláste sa z odberu."
       unsubscribe_no_link: "Tento súhrn chatu sa odosiela zo stránky %{site_link} , keď ste preč. Zmeňte si stránku %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.sq.yml b/plugins/chat/config/locales/server.sq.yml
index 8b9e80a046582..4a9aed87943e5 100644
--- a/plugins/chat/config/locales/server.sq.yml
+++ b/plugins/chat/config/locales/server.sq.yml
@@ -219,12 +219,10 @@ sq:
           one: "[%{site_name}] Mesazh i ri nga %{name}"
           other: "[%{site_name}] Mesazhe të reja nga %{name}"
         chat_dm_2: "[%{site_name}] Mesazhe të reja nga %{name_1} dhe %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Mesazhe të reja nga %{name} dhe %{count} të tjerë"
         chat_channel_1:
           one: "[%{site_name}] Mesazh i ri në %{channel}"
           other: "[%{site_name}] Mesazhe të reja në %{channel}"
         chat_channel_2: "[%{site_name}] Mesazhe të reja në %{channel_1} dhe %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Mesazhe të reja në %{channel} dhe %{count} të tjerë"
         chat_channel_and_dm: "[%{site_name}] Mesazhe të reja në %{channel} dhe nga %{name}"
       unsubscribe: "Kjo përmbledhje bisede dërgohet nga %{site_link} kur nuk jeni në kanal. Ndrysho %{email_preferences_link}, ose %{unsubscribe_link} për t'u çregjistruar."
       unsubscribe_no_link: "Kjo përmbledhje bisede dërgohet nga %{site_link} kur jeni në kanal. Ndryshoni %{email_preferences_link}tuaj."
diff --git a/plugins/chat/config/locales/server.tr_TR.yml b/plugins/chat/config/locales/server.tr_TR.yml
index b774a56661e9c..acc1e9598496a 100644
--- a/plugins/chat/config/locales/server.tr_TR.yml
+++ b/plugins/chat/config/locales/server.tr_TR.yml
@@ -242,19 +242,14 @@ tr_TR:
         watched_thread:
           one: "[%{site_name}] %{channel} adlı kanalda yeni ileti dizisi mesajı"
           other: "[%{site_name}] %{channel} adlı kanalda yeni ileti dizisi mesajları"
-        watched_threads:
-          one: "[%{site_name}] %{channel} ve %{count} kanaldan daha yeni ileti dizisi mesajları"
-          other: "[%{site_name}] %{channel} ve %{count} kanaldan daha yeni ileti dizisi mesajları"
         chat_dm_1:
           one: "[%{site_name}] %{name} adlı kullanıcıdan yeni mesaj"
           other: "[%{site_name}] %{name} adlı kullanıcıdan yeni mesajlar"
         chat_dm_2: "[%{site_name}] %{name_1} ve %{name_2} kişiden daha yeni mesajlar"
-        chat_dm_3_or_more: "[%{site_name}] %{name} ve %{count} kişiden daha yeni mesajlar"
         chat_channel_1:
           one: "[%{site_name}] %{channel} adlı kanalda yeni mesaj"
           other: "[%{site_name}] %{channel} adlı kanalda yeni mesajlar"
         chat_channel_2: "[%{site_name}] %{channel_1} ve %{channel_2} kanallarında yeni mesajlar"
-        chat_channel_3_or_more: "[%{site_name}] %{channel} ve %{count} kanaldan daha yeni mesajlar"
         chat_channel_and_dm: "[%{site_name}] %{channel} adlı kanalda ve %{name} adlı kişiden yeni mesajlar"
       unsubscribe: "Bu sohbet özeti siz yokken %{site_link} tarafından gönderildi. %{email_preferences_link} değiştirin veya abonelikten çıkmak için %{unsubscribe_link} bağlantısını kullanın."
       unsubscribe_no_link: "Bu sohbet özeti, siz yokken %{site_link} tarafından gönderildi. %{email_preferences_link} değiştirin."
diff --git a/plugins/chat/config/locales/server.ug.yml b/plugins/chat/config/locales/server.ug.yml
index 181a7a47cbc55..56956b1cbb67f 100644
--- a/plugins/chat/config/locales/server.ug.yml
+++ b/plugins/chat/config/locales/server.ug.yml
@@ -243,19 +243,14 @@ ug:
         watched_thread:
           one: "[%{site_name}] نىڭ %{channel} دىكى يېڭى سۆزلىشىش ئۇچۇرى"
           other: "[%{site_name}] نىڭ %{channel} دىكى يېڭى سۆزلىشىش ئۇچۇرى"
-        watched_threads:
-          one: "%{site_name} تىكى %{channel} ۋە باشقا %{count} يېڭى تېما ئۇچۇرى"
-          other: "%{site_name} تىكى %{channel} ۋە باشقا %{count} يېڭى تېما ئۇچۇرى"
         chat_dm_1:
           one: "[%{site_name}] %{name} دىن كەلگەن يېڭى ئۇچۇر"
           other: "[%{site_name}] %{name} دىن كەلگەن يېڭى ئۇچۇر"
         chat_dm_2: "[%{site_name}] %{name_1} ۋە %{name_2} دىن كەلگەن يېڭى ئۇچۇر"
-        chat_dm_3_or_more: "[%{site_name}] %{name} ۋە باشقا %{count} ئىشلەتكۈچىدىن كەلگەن يېڭى ئۇچۇر"
         chat_channel_1:
           one: "[%{site_name}] %{channel} دىكى يېڭى ئۇچۇر"
           other: "[%{site_name}] %{channel} دىكى يېڭى ئۇچۇر"
         chat_channel_2: "[%{site_name}] %{channel_1} ۋە %{channel_2} دىكى يېڭى ئۇچۇر"
-        chat_channel_3_or_more: "[%{site_name}] %{channel} ۋە باشقا %{count} دىكى يېڭى ئۇچۇر"
         chat_channel_and_dm: "[%{site_name}] %{channel} ۋە %{name} دىن كەلگەن يېڭى ئۇچۇر"
       unsubscribe: "سىز ئايرىلغاندا %{site_link} دىن بۇ سۆھبەتنىڭ خۇلاسىسى ئەۋەتىلدى. %{email_preferences_link} نى ئۆزگەرتىڭ ياكى %{unsubscribe_link} مۇشتەرىلىكتىن چېكىنىڭ."
       unsubscribe_no_link: "سىز ئايرىلغاندا %{site_link} دىن بۇ سۆھبەتنىڭ خۇلاسىسى ئەۋەتىلدى. %{email_preferences_link} نى ئۆزگەرتىڭ."
diff --git a/plugins/chat/config/locales/server.uk.yml b/plugins/chat/config/locales/server.uk.yml
index d40cc1a6c9f13..716ff73d1de1b 100644
--- a/plugins/chat/config/locales/server.uk.yml
+++ b/plugins/chat/config/locales/server.uk.yml
@@ -289,25 +289,18 @@ uk:
           few: "[%{site_name}] Нові повідомлення в темі %{channel}"
           many: "[%{site_name}] Нові повідомлення в темі %{channel}"
           other: "[%{site_name}] Нові повідомлення в темі %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Нові повідомлення теми в %{channel} і %{count} інше"
-          few: "[%{site_name}] Нові повідомлення теми в %{channel} і %{count} інших"
-          many: "[%{site_name}] Нові повідомлення теми в %{channel} і %{count} інших"
-          other: "[%{site_name}] Нові повідомлення теми в %{channel} і %{count} інших"
         chat_dm_1:
           one: "[%{site_name}] Нове повідомлення від %{name}"
           few: "[%{site_name}] Нове повідомлення від %{name}"
           many: "[%{site_name}] Нове повідомлення від %{name}"
           other: "[%{site_name}] Нове повідомлення від %{name}"
         chat_dm_2: "[%{site_name}] Нові повідомлення від %{name_1} та %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Нові повідомлення від %{name} та %{count} інших"
         chat_channel_1:
           one: "[%{site_name}] Нове повідомлення в %{channel}"
           few: "[%{site_name}] Нове повідомлення в %{channel}"
           many: "[%{site_name}] Нове повідомлення в %{channel}"
           other: "[%{site_name}] Нове повідомлення в %{channel}"
         chat_channel_2: "[%{site_name}] Нові повідомлення в %{channel_1} та %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Нові повідомлення в %{channel} та %{count} інших"
         chat_channel_and_dm: "[%{site_name}] Нові повідомлення в %{channel} та від %{name}"
       unsubscribe: "Цей підсумок чату надсилається з %{site_link} , коли вас немає. Змініть %{email_preferences_link} або %{unsubscribe_link} , щоб скасувати підписку."
       unsubscribe_no_link: "Цей звіт про чат надсилається від %{site_link} , коли вас немає. Змінити налаштування %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.ur.yml b/plugins/chat/config/locales/server.ur.yml
index 0161222e9aaeb..ee5d247c18f37 100644
--- a/plugins/chat/config/locales/server.ur.yml
+++ b/plugins/chat/config/locales/server.ur.yml
@@ -54,12 +54,6 @@ ur:
     notify_moderators:
       chat_pm_title: '"%{channel_name}" میں ایک گپ شپ کے پیغام کو عملے کی توجہ کی ضرورت ہے۔'
       chat_pm_body: "%{link}\n\n%{message}"
-  user_notifications:
-    chat_summary:
-      subject:
-        watched_threads:
-          one: "[%{site_name}] %{channel} اور %{count} دیگر میں نئے دھاگوں کے پیغامات"
-          other: "[%{site_name}] %{channel} اور %{count} دیگر میں نئے دھاگوں کے پیغامات"
   unsubscribe:
     chat_summary:
       never: کبھی نہیں
diff --git a/plugins/chat/config/locales/server.zh_CN.yml b/plugins/chat/config/locales/server.zh_CN.yml
index 1768b6580367f..c39c5b3aa73d9 100644
--- a/plugins/chat/config/locales/server.zh_CN.yml
+++ b/plugins/chat/config/locales/server.zh_CN.yml
@@ -31,7 +31,7 @@ zh_CN:
     chat_editing_grace_period_max_diff_high_trust: "聊天编辑宽限期内允许的最大字符更改数，超过此值将在聊天消息旁边显示（已编辑）标签（信任级别 2 及以上）。"
     chat_preferred_index: "加载/聊天时的首选项标签页。"
     allow_chat_in_anonymous_mode: "启用此设置以允许匿名浏览您网站的用户使用聊天。此设置需要启用 `allow anonymous mode` 设置。"
-    chat_search_enabled: "启用该设置以允许用户搜索聊天信息。"
+    chat_search_enabled: "启用此设置以允许用户搜索聊天消息。"
     errors:
       chat_default_channel: "默认聊天频道必须是公共频道。"
       direct_message_enabled_groups_invalid: "您必须为此设置至少指定一个群组。如果您不希望管理人员以外的任何人发送直接消息，请选择管理人员群组。"
@@ -106,9 +106,9 @@ zh_CN:
       message_already_handled: "谢谢，但我们已经审核此消息，并确定它不需要被再次举报。"
       actions:
         message_actions:
-          bundle_title: "您想如何处理这条信息？"
+          bundle_title: "您想如何处理该消息？"
         no_action_message:
-          title: "无行动"
+          title: "无措施"
           description: "保持消息原样。"
         delete_message:
           title: "删除消息"
@@ -144,10 +144,10 @@ zh_CN:
           description: "恢复消息，以便所有用户都可以看到。"
         disagree:
           title: "保留消息"
-          description: "不同意举报，消息内容不变。"
+          description: "不同意举报，并保持消息内容不变。"
         ignore:
           title: "忽略举报"
-          description: "将其从审核队列中移除，不采取任何措施"
+          description: "将其从队列中移除，不采取任何措施。"
       direct_messages:
         transcript_title: "%{channel_name}中以前消息的副本"
         transcript_body: "为了向您提供更多背景，我们在此对话中包含了以前消息的副本（最多十条）：\n\n%{transcript}"
@@ -187,8 +187,8 @@ zh_CN:
         slug_contains_non_ascii_chars: "包含非 ASCII 字符"
         is_already_in_use: "已在使用中"
     bookmarkable:
-      notification_title_channel: "%{channel_name}中的消息"
-      notification_title_direct_message: "%{channel_name} 中的消息"
+      notification_title_channel: "%{channel_name} 中的消息"
+      notification_title_direct_message: "包含 %{channel_name} 的消息"
     personal_chat: "个人聊天"
     onebox:
       inline_to_message: "消息 #%{message_id}，来自%{username} – #%{chat_channel}"
@@ -242,15 +242,13 @@ zh_CN:
         watched_thread:
           other: "[%{site_name}] %{channel} 中有新对话消息"
         watched_threads:
-          other: "[%{site_name}] %{channel} 和其他 %{count} 个频道中有新对话消息"
+          other: "[%{site_name}] %{channel} 和其他 %{count} 个频道中的新对话消息"
         chat_dm_1:
           other: "[%{site_name}] 来自 %{name} 的新消息"
         chat_dm_2: "[%{site_name}] 来自 %{name_1} 和 %{name_2} 的新消息"
-        chat_dm_3_or_more: "[%{site_name}] 来自 %{name} 和其他 %{count} 人的新消息"
         chat_channel_1:
           other: "[%{site_name}] %{channel} 中的新消息"
         chat_channel_2: "[%{site_name}] %{channel_1} 和 %{channel_2} 中的新消息"
-        chat_channel_3_or_more: "[%{site_name}] %{channel} 和其他 %{count} 个频道中的新消息"
         chat_channel_and_dm: "[%{site_name}] %{channel} 中和来自 %{name} 的新消息"
       unsubscribe: "此聊天总结在您离开时从%{site_link}发送。更改您的%{email_preferences_link}，或者%{unsubscribe_link}以退订。"
       unsubscribe_no_link: "此聊天总结在您离开时从%{site_link}发送。更改您的%{email_preferences_link}。"
@@ -258,10 +256,10 @@ zh_CN:
         other: "查看 %{count} 条消息"
       view_more:
         other: "查看其他 %{count} 条消息"
-      your_chat_settings: "聊天邮件偏好设置"
+      your_chat_settings: "聊天电子邮件偏好设置"
   unsubscribe:
     chat_summary:
-      select_title: "设置聊天摘要电子邮件为："
+      select_title: "将聊天摘要电子邮件设置为："
       never: 永不
       when_away: 仅在离开时
   category:
diff --git a/plugins/discourse-adplugin/config/locales/client.ar.yml b/plugins/discourse-adplugin/config/locales/client.ar.yml
index 6e221fdc1ca27..a94a54355b409 100644
--- a/plugins/discourse-adplugin/config/locales/client.ar.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ar.yml
@@ -18,6 +18,17 @@ ar:
           amazon_plugin: "Amazon"
           carbonads_plugin: "Carbon Ads"
           adbutler_plugin: "AdButler"
+      dashboard:
+        reports:
+          filters:
+            ad_type:
+              label: "نوع الإعلان"
+            house_ad_name:
+              label: "اسم HouseAd"
+            ad_placement:
+              label: "موقع الإعلان"
+            user_type:
+              label: "نوع المستخدم"
       adplugin:
         house_ads:
           title: "House Ads"
@@ -34,6 +45,8 @@ ar:
           show_to_anons: "العرض للمستخدمين المجهولين"
           show_to_logged_in_users: "العرض للمستخدمين الذين سجَّلوا الدخول"
           category_chooser_description: "اختر الفئات التي سيتم عرض هذا الإعلان فيها أو اتركها فارغة لعرض الإعلان في كل مكان. يحظى إعداد الموقع `no_ads_for_categories` بالأولوية على هذا الإعداد."
+          category_chooser_description_with_routes: "اختر الفئات التي يجب عرض هذا الإعلان فيها. اترك هذا الخيار واختيارات المسار فارغة لعرض الإعلان في كل مكان. يحظى إعداد الموقع `no_ads_for_categories` بالأولوية على هذا الإعداد."
+          route_chooser_description: "اختر الصفحات أو المسارات التي يجب عرض هذا الإعلان فيها. اترك هذا الخيار واختيارات الفئات فارغة لعرض الإعلان في كل مكان."
           group_chooser_description: "اختر المجموعات التي يمكنها عرض هذا الإعلان أو اتركها فارغة لعرض الإعلان لجميع المستخدمين الذين سجَّلوا الدخول."
           preview: "معاينة"
           back: "House Ads"
diff --git a/plugins/discourse-adplugin/config/locales/client.de.yml b/plugins/discourse-adplugin/config/locales/client.de.yml
index 9fe49ed595ad6..a6222bc83c8bd 100644
--- a/plugins/discourse-adplugin/config/locales/client.de.yml
+++ b/plugins/discourse-adplugin/config/locales/client.de.yml
@@ -37,9 +37,13 @@ de:
           new_name: "Neue Eigenanzeige"
           save: "Speichern"
           delete: "Löschen"
+          confirm_delete: "Bist du sicher, dass du diese Anzeige löschen möchtest?"
           html: "HTML"
           categories: "Kategorien"
+          routes: "Routen"
           groups: "Gruppen"
+          description: "Erstelle und verwalte deine eigenen Anzeigen, die du auf deiner Website an verschiedenen Positionen einblenden kannst."
+          get_started: "Es wurden noch keine Eigenanzeigen erstellt."
           filter_placeholder: "Anzeigen auswählen …"
           more_settings: "Weitere Einstellungen"
           show_to_anons: "Für anonyme Benutzer anzeigen"
@@ -53,6 +57,7 @@ de:
           name: "Name"
           edit: "Bearbeiten"
           tabs:
+            ads: "Anzeigen"
             settings: "Einstellungen"
           topic_list_top:
             title: "Anzeigen oben bei der Themenliste"
diff --git a/plugins/discourse-adplugin/config/locales/client.el.yml b/plugins/discourse-adplugin/config/locales/client.el.yml
index a0ee1fc2eda53..66ae51c36f1c2 100644
--- a/plugins/discourse-adplugin/config/locales/client.el.yml
+++ b/plugins/discourse-adplugin/config/locales/client.el.yml
@@ -9,7 +9,12 @@ el:
     admin:
       site_settings:
         categories:
+          ad_plugin: "Πρόσθετο διαφήμισης"
+          dfp_plugin: "DFP/Ad Manager"
+          adsense_plugin: "AdSense"
           amazon_plugin: "Amazon"
+          carbonads_plugin: "Carbon Ads"
+          adbutler_plugin: "AdButler"
       adplugin:
         house_ads:
           new: "Νέο"
@@ -19,6 +24,7 @@ el:
           html: "HTML"
           categories: "Κατηγορίες"
           groups: "Ομάδες"
+          filter_placeholder: "Επιλέξτε διαφημίσεις..."
           show_to_anons: "Εμφάνιση σε ανώνυμους χρήστες"
           preview: "Προεπισκόπηση"
           name: "Όνομα"
diff --git a/plugins/discourse-adplugin/config/locales/client.ja.yml b/plugins/discourse-adplugin/config/locales/client.ja.yml
index ea5faeb54e1f3..5e4df4d8eefd4 100644
--- a/plugins/discourse-adplugin/config/locales/client.ja.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ja.yml
@@ -18,6 +18,17 @@ ja:
           amazon_plugin: "Amazon"
           carbonads_plugin: "Carbon Ads"
           adbutler_plugin: "AdButler"
+      dashboard:
+        reports:
+          filters:
+            ad_type:
+              label: "広告タイプ"
+            house_ad_name:
+              label: "自社広告名"
+            ad_placement:
+              label: "広告プレースメント"
+            user_type:
+              label: "ユーザータイプ"
       adplugin:
         house_ads:
           title: "自社広告"
@@ -34,6 +45,8 @@ ja:
           show_to_anons: "匿名ユーザーに表示する"
           show_to_logged_in_users: "ログインユーザーに表示する"
           category_chooser_description: "この広告が表示されるカテゴリを選択するか、すべての場所に広告を表示する場合には空白のままにします。`no_ads_for_categories` サイト設定はこの設定より優先されます。"
+          category_chooser_description_with_routes: "この広告が表示されるカテゴリを選択します。すべての場所に広告を表示する場合にはこの設定とルート選択を空白のままにします。`no_ads_for_categories` サイト設定はこの設定より優先されます。"
+          route_chooser_description: "この広告が表示されるページ/ルートを選択します。すべての場所の広告を表示する場合は、この設定とカテゴリの選択を空白のままにします。"
           group_chooser_description: "この広告を表示できるグループを選択するか、サインイン中のすべてのユーザーに広告を表示するには空白のままにします。"
           preview: "プレビュー"
           back: "自社広告"
diff --git a/plugins/discourse-adplugin/config/locales/client.pl_PL.yml b/plugins/discourse-adplugin/config/locales/client.pl_PL.yml
index d2e05500839ff..b66153968348b 100644
--- a/plugins/discourse-adplugin/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-adplugin/config/locales/client.pl_PL.yml
@@ -58,7 +58,7 @@ pl_PL:
           edit: "Edytuj"
           tabs:
             ads: "Reklamy"
-            settings: "Ustawień"
+            settings: "Ustawienia"
           topic_list_top:
             title: "Reklama nad listą tematów"
             description: "Reklamy do wyświetlania na górze listy tematów."
diff --git a/plugins/discourse-adplugin/config/locales/client.zh_CN.yml b/plugins/discourse-adplugin/config/locales/client.zh_CN.yml
index fcdd249ed234f..1bbe60e8bda20 100644
--- a/plugins/discourse-adplugin/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-adplugin/config/locales/client.zh_CN.yml
@@ -24,9 +24,9 @@ zh_CN:
             ad_type:
               label: "广告类型"
             house_ad_name:
-              label: "房屋广告名称"
+              label: "自家广告名称"
             ad_placement:
-              label: "广告位投放"
+              label: "广告展示位置"
             user_type:
               label: "用户类型"
       adplugin:
@@ -45,8 +45,8 @@ zh_CN:
           show_to_anons: "向匿名用户显示"
           show_to_logged_in_users: "向登录用户显示"
           category_chooser_description: "选择应显示此广告的类别，或留空以在任何地方显示广告。`no_ads_for_categories` 网站设置优先于此设置。"
-          category_chooser_description_with_routes: "选择要显示此广告的类别。留空，路由选择将在任何地方显示广告。 `no_ads_for_categories` 网站设置优先于此设置。"
-          route_chooser_description: "选择要显示此广告的页面/路由。留空此项和类别选择以便在任何地方显示广告。"
+          category_chooser_description_with_routes: "选择应显示此广告的类别。将此设置和路由选择留空会在任何地方显示广告。`no_ads_for_categories` 站点设置优先于此设置。"
+          route_chooser_description: "选择应显示此广告的页面/路由。将此设置和类别选择留空会在任何地方显示广告。"
           group_chooser_description: "选择可以查看此广告的群组或留空以向所有登录用户显示广告。"
           preview: "预览"
           back: "自家广告"
diff --git a/plugins/discourse-adplugin/config/locales/server.ar.yml b/plugins/discourse-adplugin/config/locales/server.ar.yml
index c656bec0eae0c..fc09f58483c2f 100644
--- a/plugins/discourse-adplugin/config/locales/server.ar.yml
+++ b/plugins/discourse-adplugin/config/locales/server.ar.yml
@@ -5,6 +5,27 @@
 # https://translate.discourse.org/
 
 ar:
+  reports:
+    ad_plugin_house_ads_performance:
+      title: عدد مرات ظهور إعلانات House Ads في Adplugin
+      description: "تقرير مرات ظهور إعلانات House Ads"
+    ad_plugin_ad_impressions:
+      title: عدد مرات ظهور الإعلانات في Adplugin
+      description: "تقرير مرات ظهور الإعلانات"
+    ad_plugin_impressions_by_user:
+      title: مرات ظهور الإعلانات عبر المكون الإضافي حسب المستخدم
+      description: "مرات ظهور الإعلانات مجمّعة حسب المستخدم"
+    ad_plugin_click_through_rate:
+      title: أداء التحويلات في Adplugin
+      description: "تقرير أداء الإعلانات حسب الإعلان وموضع العرض"
+    ad_plugin_click_through_rate_by_placement:
+      title: أداء Adplugin حسب موضع العرض
+      description: "تقرير أداء الإعلانات حسب موضع العرض"
+    ad_plugin_click_through_rate_by_ad_type:
+      title: أداء Adplugin حسب نوع الإعلان
+      description: "تقرير أداء الإعلانات حسب نوع الإعلان"
+  errors:
+    already_clicked: "النقر مسجّل مسبقًا"
   site_settings:
     discourse_adplugin_enabled: تفعيل discourse-adplugin
     no_ads_for_personal_messages: "عدم عرض الإعلانات عند عرض الرسائل الشخصية"
diff --git a/plugins/discourse-adplugin/config/locales/server.ja.yml b/plugins/discourse-adplugin/config/locales/server.ja.yml
index b40a81adb27a7..abed0c463186f 100644
--- a/plugins/discourse-adplugin/config/locales/server.ja.yml
+++ b/plugins/discourse-adplugin/config/locales/server.ja.yml
@@ -5,6 +5,27 @@
 # https://translate.discourse.org/
 
 ja:
+  reports:
+    ad_plugin_house_ads_performance:
+      title: Adplugin の自社広告インプレッション
+      description: "自社広告インプレッションレポート"
+    ad_plugin_ad_impressions:
+      title: Adplugin の広告インプレッション
+      description: "広告インプレッションレポート"
+    ad_plugin_impressions_by_user:
+      title: 広告プラグインのユーザー別インプレッション
+      description: "ユーザー別にグループ化された広告インプレッション"
+    ad_plugin_click_through_rate:
+      title: Adplugin のコンバージョンパフォーマンス
+      description: "広告およびプレースメント別の広告パフォーマンスレポート"
+    ad_plugin_click_through_rate_by_placement:
+      title: Adplugin のプレースメント別パフォーマンス
+      description: "プレースメント別の広告パフォーマンスレポート"
+    ad_plugin_click_through_rate_by_ad_type:
+      title: Adplugin の広告タイプ別パフォーマンス
+      description: "広告タイプ別の広告パフォーマンスレポート"
+  errors:
+    already_clicked: "クリックはすでに記録済みです"
   site_settings:
     discourse_adplugin_enabled: discourse-adplugin を有効にします。
     no_ads_for_personal_messages: "個人メッセージを表示するときに広告を表示しない"
diff --git a/plugins/discourse-adplugin/config/locales/server.zh_CN.yml b/plugins/discourse-adplugin/config/locales/server.zh_CN.yml
index 8b5232cf2cf2f..051f3c4d036b8 100644
--- a/plugins/discourse-adplugin/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-adplugin/config/locales/server.zh_CN.yml
@@ -7,23 +7,23 @@
 zh_CN:
   reports:
     ad_plugin_house_ads_performance:
-      title: 广告插件房屋广告展示次数
-      description: "房屋广告展示次数报告"
+      title: 广告插件自家广告展示次数
+      description: "自家广告展示次数报告"
     ad_plugin_ad_impressions:
       title: 广告插件广告展示次数
       description: "广告展示次数报告"
     ad_plugin_impressions_by_user:
-      title: 用户的广告插件曝光量
-      description: "按用户分组的广告曝光量"
+      title: 按用户的广告插件展示次数
+      description: "按用户分组的广告展示次数"
     ad_plugin_click_through_rate:
-      title: 广告插件转化率
-      description: "按广告和位置分列的广告效果报告"
+      title: 广告插件转化效果
+      description: "按广告和展示位置的广告效果报告"
     ad_plugin_click_through_rate_by_placement:
-      title: 按展示位置划分的广告效果
-      description: "按展示位置划分的广告效果报告"
+      title: 按展示位置的广告插件效果
+      description: "按展示位置的广告效果报告"
     ad_plugin_click_through_rate_by_ad_type:
-      title: 按广告类型划分的广告效果
-      description: "按广告类型划分的广告效果报告"
+      title: 按广告类型的广告插件效果
+      description: "按广告类型的广告效果报告"
   errors:
     already_clicked: "点击已录制"
   site_settings:
@@ -114,7 +114,7 @@ zh_CN:
     amazon_mobile_post_bottom_ad_height_code: "输入广告高度（移动版）"
     amazon_nth_post_code: "每 N 条帖子后显示一个广告，其中 N 是此值。"
     carbonads_serve_id: "您的 Carbon Ads 投放 ID"
-    carbonads_placement: "您的 Carbon Ads 展示位置"
+    carbonads_placement: "您的 Carbon 广告展示位置"
     carbonads_through_trust_level: "按照信任级别向用户展示广告。信任级别高于此值的用户不会看到广告。"
     carbonads_exclude_groups: "广告将不会向这些群组的成员显示"
     carbonads_topic_list_top_enabled: "在话题列表上方显示广告"
diff --git a/plugins/discourse-affiliate/config/locales/client.de.yml b/plugins/discourse-affiliate/config/locales/client.de.yml
index 3f67b68d33c16..6315f82113e39 100644
--- a/plugins/discourse-affiliate/config/locales/client.de.yml
+++ b/plugins/discourse-affiliate/config/locales/client.de.yml
@@ -9,4 +9,4 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_affiliate: "Discourse – Affiliate"
+          discourse_affiliate: "Discourse Affiliate"
diff --git a/plugins/discourse-ai/config/locales/client.ar.yml b/plugins/discourse-ai/config/locales/client.ar.yml
index 9d82834087382..403082936b82a 100644
--- a/plugins/discourse-ai/config/locales/client.ar.yml
+++ b/plugins/discourse-ai/config/locales/client.ar.yml
@@ -113,6 +113,14 @@ ar:
             persona_id:
               label: "الشخصية"
               description: "شخصية الذكاء الاصطناعي المستخدمة لإنشاء التقرير"
+        ai_tool_action:
+          fields:
+            tool:
+              label: "أداة الذكاء الاصطناعي"
+              description: "تحديد أداة الذكاء الاصطناعي التي سيتم تنفيذها عند تفعيل الأتمتة"
+            llm_model:
+              label: "نموذج اللغة الكبير (LLM)"
+              description: "نموذج اللغة للأدوات التي تستخدم llm.generate() (اختياري)"
         llm_persona_triage:
           fields:
             persona:
@@ -159,6 +167,15 @@ ar:
             flag_post:
               label: "الإبلاغ عن المنشور"
               description: "الإبلاغ عن المنشور (سواءً كان عشوائيًا أو للمراجعة)"
+            notify_author_pm:
+              label: "إرسال إشعار للمؤلف برسالة خاصة"
+              description: "أرسل رسالة خاصة إلى مؤلف المنشور عند وضع منشوره في قائمة الانتظار وحذفه"
+            notify_author_pm_user:
+              label: "مرسل الرسائل الخاصة"
+              description: "المستخدم المسؤول عن إرسال الرسالة الخاصة (النظام هو الإعداد الافتراضي)"
+            notify_author_pm_message:
+              label: "محتوى الرسالة الخاصة"
+              description: "رسالة مخصصة اختيارية لإرسالها إلى مؤلف المنشور"
             include_personal_messages:
               label: "تضمين الرسائل الشخصية"
               description: "افحص الرسائل الشخصية وافرزها أيضًا"
@@ -171,6 +188,38 @@ ar:
             max_output_tokens:
               label: "الحد الأقصى لعدد الرموز في المخرجات"
               description: "عند تحديده، يضع حدًا أقصى لعدد الرموز التي يمكن للنموذج توليدها، مع الالتزام بالحد الأقصى لرموز المخرجات في نموذج اللغة الكبير (LLM)"
+        llm_tagger:
+          tag_mode:
+            manual: "اعتمد على قائمة وسوم محددة (مُعدّة أدناه)"
+            discover: "دع الذكاء الاصطناعي يكتشف أي وسوم في الموقع ويستخدمها"
+          fields:
+            tagger_persona:
+              label: "شخصية الذكاء الاصطناعي"
+              description: "شخصية الذكاء الاصطناعي المستخدمة لتحليل الموضوعات ووضع الوسوم عليها"
+            tag_mode:
+              label: "وضع تحديد الوسوم"
+              description: "اختر الطريقة التي يستخدمها الذكاء الاصطناعي لاختيار الوسوم"
+            available_tags:
+              label: "الوسوم المتاحة"
+              description: "الوسوم التي يمكن للذكاء الاصطناعي اختيارها (تُستخدم فقط في الوضع اليدوي)"
+            confidence_threshold:
+              label: "مستوى الثقة المطلوب"
+              description: "الحد الأدنى لنسبة الثقة (0-100) المطلوبة لتطبيق الوسوم المقترحة"
+            max_tags_per_post:
+              label: "الحد الأقصى للوسوم لكل منشور"
+              description: "أقصى عدد من الوسوم يمكن تطبيقه على منشور واحد"
+            max_post_tokens:
+              label: "الحد الأقصى لعدد الرموز لكل منشور"
+              description: "العدد الأقصى للرموز المأخوذة من محتوى المنشور لتحليلها"
+            allow_restricted_tags:
+              label: "السماح بالوسوم المقيدة"
+              description: "السماح للذكاء الاصطناعي باقتراح الوسوم وتطبيقها التي تتمتع بأذونات أو مستوى رؤية مقيد ضمن النظام."
+            max_posts_for_context:
+              label: "الحد الأقصى للمنشورات المستخدمة لتوفير السياق"
+              description: "العدد الأقصى للمنشورات من الموضوع التي سيتم تضمينها لتوفير سياق التحليل (القيمة الافتراضية: 5)"
+            allow_system_posts:
+              label: "تمكين منشورات النظام"
+              description: "السماح بوضع الوسوم على المنشورات التي ينشئها مستخدم النظام."
     discourse_ai:
       title: "الذكاء الاصطناعي"
       default_llm:
@@ -182,6 +231,7 @@ ar:
         short_title: "الميزات"
         description: "هذه الميزات تمثل وظائف الذكاء الاصطناعي المتاحة للزوار على موقعك. يمكن تكوينها لاستخدام شخصيات ونماذج لغة كبيرة محددة، كما يمكن التحكم في الوصول إليها حسب المجموعات."
         back: "رجوع"
+        settings_save_error: "تعذّر حفظ بعض الإعدادات."
         disabled: "(متوقفة)"
         persona:
           zero: "الشخصيات:"
@@ -214,6 +264,11 @@ ar:
           bot: "روبوت الدردشة"
           name: "روبوت"
           description: "روبوت الدردشة قادر على الرد على الاستفسارات ومساعدة المستخدمين عبر الرسائل الشخصية، والمنتدى، وقنوات الدردشة"
+          setting_groups:
+            settings: "الإعدادات الأساسية"
+            access_control: "التحكم في الوصول"
+            ui_settings: "إعدادات واجهة الاستخدام"
+            integrations: "التكاملات"
         nav:
           configured: "مُهيأ"
           unconfigured: "غير مُهيأ"
@@ -228,20 +283,31 @@ ar:
           description: "يتيح زرًا للتلخيص يمكن للزوار استخدامه لتلخيص الموضوعات"
           topic_summaries: "ملخصات الموضوع"
           gists: "ملخصات قصيرة لقائمة الموضوعات"
+          setting_groups:
+            settings: "الإعدادات الأساسية"
+            gists: "ملخصات"
+            backfill: "ملء البيانات السابقة"
         search:
           name: "البحث"
           description: "يحسّن تجربة البحث من خلال تقديم إجابات مولّدة بواسطة الذكاء الاصطناعي للاستفسارات"
           discoveries: "الاكتشافات"
+          setting_groups:
+            settings: "الإعدادات الأساسية"
         embeddings:
           name: "التضمينات"
           description: "يدعم ميزات مثل الموضوعات ذات الصلة والبحث بالذكاء الاصطناعي عن طريق إنشاء تمثيلات دلالية للنصوص"
           hyde: "HyDE"
           setting_groups:
+            model_settings: "إعدادات النموذج"
             related_topics: "الموضوعات ذات الصلة"
+            semantic_search: "البحث الدلالي"
         discord:
           name: "التكامل مع Discord"
           description: "يُمكّن من إجراء عمليات البحث داخل قنوات Discord"
           search: "البحث في Discord"
+          setting_groups:
+            settings: "الإعدادات الأساسية"
+            discord_configuration: "إعدادات Discord"
         inference:
           name: "المفاهيم المستنتجة"
           description: "يصنّف الموضوعات والمنشورات ضمن مجالات الاهتمام أو التصنيفات."
@@ -249,6 +315,9 @@ ar:
           match_concepts: "مطابقة المفاهيم"
           deduplicate_concepts: "إزالة التكرارات بين المفاهيم"
           setting_groups:
+            settings: "الإعدادات الأساسية"
+            topic_criteria: "معايير الموضوع"
+            post_criteria: "معايير المنشور"
             personas: "الشخصيات"
         ai_helper:
           name: "المساعد"
@@ -265,6 +334,8 @@ ar:
           translator: "مترجم"
           post_illustrator: "مُوضِّح المنشورات"
           setting_groups:
+            access_permissions: "الوصول والأذونات"
+            enabled_features: "الميزات المُفعّلة"
             automation: "الأتمتة"
             personas: "الشخصيات"
         translation:
@@ -274,8 +345,19 @@ ar:
           post_raw_translator: "مترجم المنشور الخام"
           topic_title_translator: "مترجم عنوان الموضوع"
           short_text_translator: "مترجم النصوص القصيرة"
+          schedule_untranslated: "جدولة الترجمات"
+          schedule_topic_success:
+            zero: "الترجمة المجدولة لعدد %{count} من المنشورات غير المترجمة."
+            one: "الترجمة المجدولة لمنشور واحد غير مترجم."
+            two: "الترجمة المجدولة لمنشورين غير مترجمين."
+            few: "الترجمة المجدولة لعدد %{count} منشورات غير مترجمة."
+            many: "الترجمة المجدولة لعدد %{count} منشورًا غير مترجم."
+            other: "الترجمة المجدولة لعدد %{count} منشور غير مترجم."
+          schedule_topic_error: "فشل جدولة الترجمات. الرجاء المحاولة مرة أخرى."
           setting_groups:
+            settings: "الإعدادات الأساسية"
             personas: "الشخصيات"
+            backfill_and_limits: "ملء البيانات السابقة والحدود"
         spam:
           name: "عشوائي"
           description: "يحدِّد المحتوى العشوائي المُحتمَل باستخدام نموذج اللغة الكبير المُحدَّد، ويبلغ عنه مشرفو الموقع لفحصه في قائمة انتظار المراجعة"
@@ -293,36 +375,59 @@ ar:
         card: "بطاقة"
       translations:
         title: "الترجمات"
+        description: "تمكين الترجمة التلقائية لجميع محتويات المنتدى وفقًا للغة المفضلة لدى كل مستخدم"
+        supported_locales: "اللغات المدعومة"
+        supported_locales_description: "يتيح هذا الإعداد أيضًا للزوار المساهمة بترجمة المنشورات."
+        admin_actions:
+          translation_settings: "إعدادات الترجمة"
+          localization_settings: "إعدادات التوطين"
+          enable_translations: "تمكين الترجمات الآلية"
         stats:
+          title: "إحصائيات الترجمة"
+          complete_language_detection_description: "تم اكتشاف لغة جميع المنشورات المؤهلة والبالغ عددها %{total}."
+          incomplete_language_detection_description: "تم اكتشاف لغة %{done} من المنشورات المؤهلة والبالغ عددها %{total}."
+          backfill_disabled: "تم تعطيل ميزة الترجمة الرجعية، ولن تتم ترجمة سوى المنشورات الجديدة."
+          backfill_message: "تم تكوين <a href='%{settingsUrl}'>إعدادات الترجمة الرجعية</a> بحيث تتم ترجمة جميع المنشورات التي نُشرت بعد %{date} — من المتوقع أن يستغرق ذلك %{eta}."
           eta_minutes:
-            zero: "دقيقتان (%{count})"
+            zero: "%{count} من الدقائق"
             one: "دقيقة واحدة (%{count})"
             two: "دقيقتان (%{count})"
             few: "%{count} دقائق"
             many: "%{count} دقيقة"
-            other: "دقيقتان (%{count})"
+            other: "%{count} دقيقة"
           eta_hours:
-            zero: "ساعتان (%{count})"
+            zero: "%{count} من الساعات"
             one: "ساعة واحدة (%{count})"
             two: "ساعتان (%{count})"
-            few: "ساعتان (%{count})"
-            many: "ساعتان (%{count})"
-            other: "ساعتان (%{count})"
+            few: "%{count} ساعات"
+            many: "%{count} ساعة"
+            other: "%{count} ساعة"
           eta_days:
-            zero: "%{count} يومًا"
+            zero: "%{count} من الأيام"
             one: "يوم واحد (%{count})"
-            two: "%{count} يومًا"
-            few: "%{count} يومًا"
-            many: "%{count} أيام"
-            other: "%{count} يومًا"
+            two: "يومان (%{count})"
+            few: "%{count} أيام"
+            many: "%{count} يومًا"
+            other: "%{count} يوم"
         progress_chart:
+          title: "الترجمة قيد التقدم"
+          data_label: "%{percentage}%"
+          tooltip_translated: "تمت ترجمة %{done} من أصل %{total} منشور غير %{language}"
           bar_done:
-            zero: "%{count} منشور"
-            one: "منشور %{count}"
-            two: "منشوران %{count}"
-            few: "%{count} منشور"
-            many: "%{count} منشور"
-            other: "%{count} منشورات"
+            zero: "%{count} من المنشورات"
+            one: "منشور واحد (%{count})"
+            two: "منشوران %{count})"
+            few: "%{count} منشورات"
+            many: "%{count} منشورًا"
+            other: "%{count} منشور"
+        translations_menu:
+          translate:
+            label: "ترجمة المنشور"
+            title: "يترجم هذا المنشور إلى جميع اللغات المدعومة"
+            confirm: "سيؤدي هذا إلى تحديث الترجمات الحالية على هذا المنشور. هل ترغب بالمتابعة؟"
+            success: "تم إرسال المنشور للترجمة"
+        credit_limit_warning: "تم إيقاف الترجمات مؤقتًا بسبب قيود استخدام الرصيد. وسوف تُستأنف عند إعادة تعيين الأرصدة في %{reset_time}."
+        credit_limit_warning_no_time: "تم إيقاف الترجمات مؤقتًا بسبب قيود استخدام الرصيد. وسوف تُستأنف عند إعادة تعيين الأرصدة."
       spam:
         short_title: "عشوائي"
         title: "إعدادات التعامل مع المحتوى العشوائي"
@@ -348,7 +453,10 @@ ar:
           post_url_label: "عنوان URL أو مُعرِّف المنشور"
           post_url_placeholder: "https://your-forum.com/t/topic/123/4 أو مُعرِّف المنشور"
           result: "النتيجة"
+          reason: "الاستدلال"
           llm: "نموذج اللغة الكبير"
+          scan_history: "سجل المسح"
+          sent_message: "رسالة مرسلة"
           system_prompt: "رسالة مطالبة النظام"
           scan_log: "سجل الفحص"
           run: "تشغيل الاختبار"
@@ -371,6 +479,7 @@ ar:
         feature: "الميزة"
         usage_count: "عدد مرات الاستخدام"
         model: "النموذج"
+        credits_remaining: "الأرصدة المتبقية"
         models_breakdown: "الاستخدام لكل نموذج"
         users_breakdown: "الاستخدام لكل مستخدم"
         all_features: "كل الميزات"
@@ -380,6 +489,8 @@ ar:
         request_tokens: "رموز الطلب"
         response_tokens: "رموز الرد"
         net_request_tokens: "صافي رموز الطلب"
+        cache_read_tokens: "تخزين الرموز المقروءة مؤقتًا"
+        cache_write_tokens: "تخزين الرموز المكتوبة مؤقتًا"
         cached_tokens: "الرموز المخزَّنة مؤقتًا"
         cached_request_tokens: "رموز الطلب المُخزَّنة مؤقتًا"
         total_spending: "التكلفة المقدرة"
@@ -387,12 +498,18 @@ ar:
         no_models: "لم يتم العثور على بيانات استخدام نموذجية"
         no_features: "لم يتم العثور على بيانات استخدام الميزات"
         total: "الإجمالي"
+        included_in_plan: "مشمول في الخطة"
+        included_models: "الاستخدام المشمول"
+        billed_models: "الاستخدام المفوتر"
+        cost: "التكلفة"
         subheader_description: "الرموز هي الوحدات الأساسية التي تستخدمها نماذج اللغة الكبيرة لفهم النصوص وتوليدها، وقد تؤثر بيانات الاستخدام في التكاليف"
         stat_tooltips:
           total_requests: "جميع الطلبات المُقدَّمة إلى نماذج اللغة الكبيرة من خلال Discourse"
           total_tokens: "جميع الرموز المُستخدَمة عند توجيه طلب إلى نموذج اللغة الكبير"
           request_tokens: "الرموز المستخدمة عندما يحاول نموذج اللغة الكبير فهم ما تقوله"
           response_tokens: "الرموز المستخدمة عندما يرد نموذج اللغة الكبير على طلبك"
+          cache_read_tokens: "رموز الطلب التي تمت معالجتها مسبقًا والتي يعيد نموذج اللغة الكبير استخدامها من ذاكرة التخزين المؤقت لتحسين الأداء والتكلفة"
+          cache_write_tokens: "رموز الطلب التي تمت كتابتها في ذاكرة التخزين المؤقت لإعادة استخدامها مستقبلاً"
           cached_tokens: "رموز الطلب التي تمت معالجتها مسبقًا والتي يعيد نموذج اللغة الكبير استخدامها لتحسين الأداء والتكلفة"
           total_spending: "التكلفة التراكمية لجميع الرموز المستخدمة من قبل نماذج اللغة الكبيرة وفقًا لمقاييس التكلفة المحددة المُضافة إلى إعدادات تكوين النماذج"
         periods:
@@ -400,6 +517,7 @@ ar:
           last_week: "الأسبوع الماضي"
           last_month: "الشهر الماضي"
           custom: "مُخصَّص..."
+        credit_allocations: "تخصيص الاعتمادات المالية"
       ai_persona:
         ai_tools: "الأدوات"
         tool_strategies:
@@ -420,7 +538,6 @@ ar:
         overwrite: "استبدال"
         description: "الوصف"
         no_llm_selected: "لم يتم تحديد نموذج لغة"
-        use_parent_llm: "استخدم نموذج اللغة الخاص بالشخصية"
         max_context_posts: "أقصى عدد من المنشورات في السياق"
         max_context_posts_help: "الحد الأقصى لعدد المنشورات التي سيتم استخدامها كسياق للذكاء الاصطناعي عند الرد على مستخدم. (اترك القيمة فارغة للإعداد الافتراضي)"
         vision_enabled: تفعيل الرؤية
@@ -430,6 +547,8 @@ ar:
           low: جودة منخفضة - الأرخص (256 × 256)
           medium: جودة متوسطة (512 × 512)
           high: جودة عالية - الأبطأ (1024 × 1024)
+        show_thinking: عرض طريقة التفكير
+        show_thinking_help: سيُظهر للمستخدمين النهائيين عملية التفكير الداخلية واستدعاءات الأدوات الخاصة بنموذج اللغة.
         mentionable: السماح بالإشارات
         mentionable_help: إذا تم تفعيله، يمكن للمستخدمين في المجموعات المسموح بها الإشارة إلى هذا المستخدم في المنشورات، وسيرد الذكاء الاصطناعي باعتباره هذا الشخص.
         user: المستخدم
@@ -557,8 +676,9 @@ ar:
         parameter_description: "وصف المعلمة"
         enum_value: "قيمة التعداد"
         add_enum_value: "إضافة قيمة التعداد"
+        credential_not_set: "(غير معيَّن)"
         edit: "تعديل"
-        test: "تشغيل الاختبار"
+        test: "اختبار"
         delete: "حذف"
         saved: "تم حفظ الأداة"
         confirm_delete: "هل تريد بالتأكيد حذف هذه الأداة؟"
@@ -575,6 +695,7 @@ ar:
         edit: "تعديل"
         delete: "حذف"
         embedding: "التضمين"
+        tool: "أداة"
       llms:
         short_title: "نماذج اللغة الكبيرة"
         no_llms: "لا توجد نماذج لغة كبيرة بعد"
@@ -588,9 +709,12 @@ ar:
         url: "عنوان URL لخدمة استضافة النموذج"
         api_key: "مفتاح API لخدمة استضافة النموذج"
         vision_enabled: "تفعيل الرؤية"
+        allowed_attachment_types: "المرفقات المسموح بها"
+        attachment_types_placeholder: "حدد الامتدادات (مثل pdf أو txt أو docx) أو اكتبها"
         ai_bot_user: "مستخدم روبوت الذكاء الاصطناعي"
         cost_input: "تكلفة الإدخال"
         cost_cached_input: "تكلفة الإدخال المخزنة مؤقتًا"
+        cost_cache_write: "تكلفة كتابة ذاكرة التخزين المؤقت"
         cost_output: "تكلفة الإخراج"
         save: "حفظ"
         edit: "تعديل"
@@ -618,6 +742,11 @@ ar:
           max_tokens_required: "يجب تعيينه إذا لم يتم تحديد الحد الأقصى للاستخدامات"
           max_usages_help: "الحد الأقصى لعدد المرات التي يمكن لكل مستخدم في هذه المجموعة استخدام نموذج الذكاء الاصطناعي فيها خلال المدة المُحدَّدة. يتم تتبع هذه الحصة لكل مستخدم على حدة، ولا تتم مشاركتها عبر المجموعة."
           max_usages_required: "يجب تعيينه إذا لم يتم تحديد الحد الأقصى للرموز"
+        credit_allocation:
+          credits_remaining: "تبقى %{remaining} من أصل %{total} رصيد (%{percentage}%)"
+          soft_limit_warning: "متبقي اليوم %{percentage}% من أرصدة الذكاء الاصطناعي لهذا النموذج"
+          hard_limit_warning: "نفدت أرصدة الذكاء الاصطناعي لهذا النموذج. ستكون ميزات الذكاء الاصطناعي التي تَستخدم هذا النموذج غير متاحة حتى %{reset_date}"
+          next_reset: "يُعاد تعيين الأرصدة في %{time}"
         usage:
           ai_bot: "روبوت الذكاء الاصطناعي"
           ai_helper: "مساعد (%{persona})"
@@ -636,9 +765,10 @@ ar:
           other: "هذا النموذج مُستخدَم حاليًا من قِبل %{settings}. إذا تم تكوينه بشكلٍ خاطئ، فلن تعمل الميزات كما هو متوقَّع. "
         model_description:
           none: "الإعدادات العامة التي تعمل مع معظم نماذج اللغة"
-          anthropic-claude-opus-4-5: "النموذج الأكثر ذكاءً لدى Anthropic"
-          anthropic-claude-sonnet-4-5: "التوازن الأمثل بين السرعة والتكلفة"
+          anthropic-claude-opus-4-6: "النموذج الأكثر ذكاءً لدى Anthropic"
+          anthropic-claude-sonnet-4-6: "التوازن الأمثل بين السرعة والتكلفة"
           anthropic-claude-haiku-4-5: "سريع وفعَّال من حيث التكلفة"
+          google-gemini-3-pro: "النموذج الأكثر ذكاءً لدى Google"
           open_ai-gpt-5-nano: "أسرع وأوفر نموذج GPT-5 من حيث التكلفة"
         preseeded_model_description: "نموذج مفتوح المصدر تم تكوينه مسبقًا باستخدام %{model}"
         configured:
@@ -656,6 +786,7 @@ ar:
           title: "تشغيل الاختبار"
           running: "جارٍ تشغيل الاختبار..."
           success: "تم بنجاح!"
+          invalid_config: "يرجى تصحيح الأخطاء التالية في إعداداتك أولاً:"
           failure: "أرجعت محاولة التواصل مع النموذج هذا الخطأ: %{error}"
         hints:
           max_prompt_tokens: "أقصى عدد من الرموز التي يمكن للنموذج معالجتها في طلب واحد"
@@ -663,7 +794,10 @@ ar:
           display_name: "الاسم المستخدم للإشارة إلى هذا النموذج في واجهة موقعك."
           name: "نُدرج هذا في استدعاء API لتحديد النموذج الذي سنستخدمه"
           vision_enabled: "إذا تم تفعيله، سيحاول الذكاء الاصطناعي فهم الصور. إنه يعتمد على النموذج المُستخدَم لدعم الرؤية. هذه الميزة مدعومة بأحدث النماذج من Anthropic وGoogle وOpenAI."
+          allowed_attachment_types: "\"اختر أنواع المرفقات التي يتم إرسالها إلى النموذج. اترك الحقل فارغًا إذا كنت لا تريد إرسال أي مرفقات. يتم التحكم بالصور عبر الرؤية."
           cost_input: "تكلفة الإدخال لكل مليون رمز لهذا النموذج"
+          cost_cached_input: "تكلفة الإدخالات المخزنة مؤقتًا لكل مليون رمز لهذا النموذج (عند القراءة من ذاكرة التخزين المؤقت للمطالبة)"
+          cost_cache_write: "تكلفة كتابة البيانات في التخزين المؤقت لكل مليون رمز لهذا النموذج (عند الكتابة إلى ذاكرة التخزين المؤقت للمطالبة)"
           cost_output: "تكلفة الإخراج لكل مليون رمز لهذا النموذج"
           cost_measure: "دولار لكل مليون رمز"
         providers:
@@ -680,9 +814,11 @@ ar:
           samba_nova: "SambaNova"
           mistral: "Mistral"
           open_router: "OpenRouter"
+          groq: "Groq"
           fake: "مخصَّصة"
         provider_fields:
           access_key_id: "معرِّف مفتاح الوصول إلى AWS Bedrock"
+          role_arn: "معرّف المورد الموحد (ARN) لدور AWS Bedrock"
           region: "منطقة AWS Bedrock"
           organization: "معرِّف مؤسسة OpenAI الاختياري"
           disable_system_prompt: "إيقاف رسالة النظام في رسائل المطالبة"
@@ -698,6 +834,10 @@ ar:
           reasoning_tokens: "عدد الرموز المستخدمة في الاستدلال"
           disable_temperature: "تعطيل ميزة الحرارة (بعض نماذج التفكير لا تدعم هذه الميزة)"
           disable_top_p: "تعطيل ميزة Top P (بعض نماذج التفكير لا تدعم هذه الميزة)"
+          prompt_caching: "وضع التخزين المؤقت للمطالبة"
+          prompt_caching_never: "أبدًا - لا تستخدم التخزين المؤقت للمطالبة"
+          prompt_caching_tool_results: "نتائج الأدوات - التخزين المؤقت عند وجود نتائج للأدوات (موصى به)"
+          prompt_caching_always: "دائمًا - استخدم التخزين المؤقت للمطالبة دائمًا"
       related_topics:
         title: "الموضوعات ذات الصلة"
         pill: "ذات صلة"
@@ -753,6 +893,13 @@ ar:
           credits: "تم إنشاء التسمية التوضيحية بالذكاء الاصطناعي"
           save_caption: "حفظ"
         no_content_error: "ينبغي إضافة المحتوى أولًا لتنفيذ إجراءات الذكاء الاصطناعي عليه"
+      errors:
+        credit_limit_dialog:
+          title: "لقد وصلت إلى الحد الأقصى لرصيد الذكاء الاصطناعي المتاح لك"
+          message_user: "لقد تم استنفاد حد رصيد الذكاء الاصطناعي لهذا اليوم في هذا المجتمع. يمكنك المحاولة مجددًا بعد %{reset_time}، أو التواصل مع مسؤول الموقع لمزيد من المعلومات."
+          message_without_time_user: "لقد تم استنفاد حد رصيد الذكاء الاصطناعي لهذا اليوم في هذا المجتمع. لن تتمكن من الحصول على استجابات حتى إعادة تعيين الحد. يمكنك التواصل مع مسؤول الموقع لمزيد من المعلومات."
+          message_admin: "لقد بلغت الحد الأقصى لرصيد الذكاء الاصطناعي المتاح ضمن خطتك. ستتوقف الاستجابات إلى أن يُعاد تعيين الحد عند %{reset_time}."
+          message_without_time_admin: "لقد بلغت الحد الأقصى لرصيد الذكاء الاصطناعي المتاح ضمن خطتك. ستتوقف الاستجابات إلى أن يُعاد تعيين الحد."
       reviewables:
         model_used: "النموذج المستخدم:"
         accuracy: "الدقة:"
@@ -806,13 +953,9 @@ ar:
         provider_fields:
           model_name: "اسم النموذج"
         semantic_search: "الموضوعات (دلالية)"
-        semantic_search_loading: "جارٍ البحث عن المزيد من النتائج باستخدام الذكاء الاصطناعي"
         semantic_search_results:
-          toggle: "جارٍ عرض %{count} من النتائج التي تم العثور عليها باستخدام الذكاء الاصطناعي"
-          toggle_hidden: "جارٍ إخفاء %{count} من النتائج التي تم العثور عليها باستخدام الذكاء الاصطناعي"
-          none: "عذرًا، لم يعثر بحث الذكاء الاصطناعي لدينا على أي موضوعات مطابقة"
-          new: "اضغط على \"بحث\" لبدء البحث عن نتائج جديدة باستخدام الذكاء الاصطناعي"
           unavailable: "نتائج الذكاء الاصطناعي غير متوفرة"
+          zero_results_expanded: "لم نعثر على نتائج، لذلك نعرض لك %{count} من نتائج الذكاء الاصطناعي"
         semantic_search_tooltips:
           results_explanation: "عند التفعيل، سيتم إضافة نتائج بحث الذكاء الاصطناعي الإضافية أدناه."
           invalid_sort: "يجب فرز نتائج البحث حسب الصلة لعرض نتائج الذكاء الاصطناعي"
@@ -845,6 +988,8 @@ ar:
           copy_response: "رد النسخة"
           request_tokens: "رموز الطلب:"
           response_tokens: "رموز الرد:"
+          cache_read_tokens: "تخزين الرموز المقروءة مؤقتًا:"
+          cache_write_tokens: "تخزين الرموز المكتوبة مؤقتًا:"
           request: "طلب"
           response: "الرد"
           next_log: "التالي"
@@ -936,7 +1081,39 @@ ar:
         topic:
           title: "ملخص الموضوع"
           close: "إغلاق لوحة الملخص"
+          regenerate_ai_summaries: "إعادة إنشاء ملخصات الذكاء الاصطناعي"
+          regen_modal_description: "اختر نوع ملخص الذكاء الاصطناعي الذي ترغب في إعادة إنشائه لهذا الموضوع."
+          bulk_regen_description: "اختر نوع ملخص الذكاء الاصطناعي الذي ترغب في إعادة إنشائه للموضوعات المحددة."
+          regenerate_gists_option: "ملخصات قصيرة (لمحة سريعة)"
           regenerate_summaries_option: "ملخصات الموضوع"
+          regenerate_gists_success:
+            zero: "تمت إعادة إنشاء الملخص المختصر بنجاح"
+            one: "تمت إعادة إنشاء ملخص مختصر بنجاح"
+            two: "تمت إعادة إنشاء ملخصين مختصرين بنجاح"
+            few: "تمت إعادة إنشاء %{count} ملخصات مختصرة بنجاح"
+            many: "تمت إعادة إنشاء %{count} ملخصًا مختصرًا بنجاح"
+            other: "تمت إعادة إنشاء %{count} ملخص مختصر بنجاح"
+          regenerate_gists_error:
+            zero: "تعذرت إعادة إنشاء الملخص المختصر"
+            one: "تعذرت إعادة إنشاء الملخص المختصر"
+            two: "تعذرت إعادة إنشاء ملخصين مختصرين"
+            few: "تعذرت إعادة إنشاء %{count} ملخصات مختصرة"
+            many: "تعذرت إعادة إنشاء %{count} ملخصًا مختصرًا"
+            other: "تعذرت إعادة إنشاء %{count} ملخص مختصر"
+          regenerate_topic_summary_success:
+            zero: "تمت إعادة إنشاء ملخص الموضوع بنجاح"
+            one: "تمت إعادة إنشاء ملخص الموضوع بنجاح"
+            two: "تمت إعادة إنشاء ملخص لموضوعين بنجاح"
+            few: "تمت إعادة إنشاء %{count} ملخصات موضوعات بنجاح"
+            many: "تمت إعادة إنشاء %{count} ملخص موضوعات بنجاح"
+            other: "تمت إعادة إنشاء %{count} ملخص موضوعات بنجاح"
+          regenerate_topic_summary_error:
+            zero: "تعذرت إعادة إنشاء ملخص الموضوع بنجاح"
+            one: "تعذرت إعادة إنشاء ملخص الموضوع بنجاح"
+            two: "تعذرت إعادة إنشاء ملخص لموضوعين بنجاح"
+            few: "تعذرت إعادة إنشاء %{count} ملخصات موضوعات بنجاح"
+            many: "تعذرت إعادة إنشاء %{count} ملخص موضوعات بنجاح"
+            other: "تعذرت إعادة إنشاء %{count} ملخص موضوعات بنجاح"
         topic_list_layout:
           button:
             compact: "مضغوط"
@@ -950,6 +1127,7 @@ ar:
         loading_convo: "تحميل المحادثة"
         collapse: "طي"
         timed_out: "يتعذر على Discobot العثور على أي استكشافات. هناك خطأ ما."
+        user_setting: "فعّل ميزة اكتشاف نتائج بحث مدعومة بالذكاء الاصطناعي"
         tooltip:
           header: "البحث المدعوم بالذكاء الاصطناعي"
           content: "البحث باللغة الطبيعية مدعوم بواسطة %{model}"
diff --git a/plugins/discourse-ai/config/locales/client.bg.yml b/plugins/discourse-ai/config/locales/client.bg.yml
index 8f1cba6a679fd..868c2d492d0aa 100644
--- a/plugins/discourse-ai/config/locales/client.bg.yml
+++ b/plugins/discourse-ai/config/locales/client.bg.yml
@@ -115,6 +115,7 @@ bg:
         save: "Запази"
         remove_parameter: "Премахване"
         parameter_required: "Задъжителни"
+        credential_not_set: "(не е зададено)"
         edit: "Редактирай"
         delete: "Изтрий"
       secrets:
diff --git a/plugins/discourse-ai/config/locales/client.ca.yml b/plugins/discourse-ai/config/locales/client.ca.yml
index a07f873d32882..6a3ec5afec86a 100644
--- a/plugins/discourse-ai/config/locales/client.ca.yml
+++ b/plugins/discourse-ai/config/locales/client.ca.yml
@@ -115,6 +115,7 @@ ca:
         remove_parameter: "Elimina"
         parameter_required: "Necessari"
         edit: "Edita"
+        test: "Test"
         delete: "Suprimeix"
       secrets:
         short_title: "Credencials"
diff --git a/plugins/discourse-ai/config/locales/client.cs.yml b/plugins/discourse-ai/config/locales/client.cs.yml
index d7760ef331dcc..ee57cc1f07a3a 100644
--- a/plugins/discourse-ai/config/locales/client.cs.yml
+++ b/plugins/discourse-ai/config/locales/client.cs.yml
@@ -144,8 +144,9 @@ cs:
         save: "Uložit"
         remove_parameter: "Smazat"
         parameter_required: "Povinné"
+        credential_not_set: "(nenastaveno)"
         edit: "Upravit"
-        test: "Spustit test"
+        test: "Test"
         delete: "Smazat"
         test_modal:
           run: "Spustit test"
@@ -158,6 +159,7 @@ cs:
         edit: "Upravit"
         delete: "Smazat"
         embedding: "Zabudování"
+        tool: "Nástroj"
       llms:
         display_name: "Název"
         save: "Uložit"
@@ -178,6 +180,9 @@ cs:
         usage:
           ai_summarization: "Shrnout"
           ai_spam: "Spam"
+        model_description:
+          anthropic-claude-opus-4-6: "Nejinteligentnější model společnosti Anthropic"
+          anthropic-claude-sonnet-4-6: "Optimální poměr rychlosti a nákladů"
         next:
           title: "Další"
         tests:
@@ -267,10 +272,6 @@ cs:
           CDCK: "CDCK"
           fake: "Přizpůsobené"
         semantic_search_results:
-          toggle: "Zobrazeno %{count} výsledků nalezených pomocí AI"
-          toggle_hidden: "Skryto %{count} výsledků nalezených pomocí AI"
-          none: "Je nám líto, naše vyhledávání AI nenalezlo žádná odpovídající témata"
-          new: "Stisknutím tlačítka „hledat“ začněte hledat nové výsledky pomocí AI"
           unavailable: "Výsledky AI nejsou k dispozici"
         semantic_search_tooltips:
           results_explanation: "Pokud je tato funkce povolena, budou níže přidány další výsledky vyhledávání pomocí umělé inteligence."
diff --git a/plugins/discourse-ai/config/locales/client.da.yml b/plugins/discourse-ai/config/locales/client.da.yml
index fc745b8a4a046..f3cd1032f0762 100644
--- a/plugins/discourse-ai/config/locales/client.da.yml
+++ b/plugins/discourse-ai/config/locales/client.da.yml
@@ -130,8 +130,9 @@ da:
         save: "Gem"
         remove_parameter: "Fjern"
         parameter_required: "Obligatoriske"
+        credential_not_set: "(ikke indstillet)"
         edit: "Rediger"
-        test: "Kør test"
+        test: "Test"
         delete: "Slet"
         test_modal:
           run: "Kør test"
diff --git a/plugins/discourse-ai/config/locales/client.de.yml b/plugins/discourse-ai/config/locales/client.de.yml
index d72a683466837..38ea30067e48d 100644
--- a/plugins/discourse-ai/config/locales/client.de.yml
+++ b/plugins/discourse-ai/config/locales/client.de.yml
@@ -14,9 +14,10 @@ de:
               search: "Ermöglicht KI-Suche"
               stream_completion: "Ermöglicht das Streamen von KI-Persona-Vervollständigungen"
               update_personas: "Ermöglicht die Aktualisierung von KI-Personas"
+              manage_artifacts: "Ermöglicht die Verwaltung von KI-Artefakten (auflisten, anzeigen, erstellen, aktualisieren, löschen)"
       site_settings:
         categories:
-          discourse_ai: "Discourse-KI"
+          discourse_ai: "Discourse KI"
       dashboard:
         emotion:
           title: "Emotion"
@@ -44,6 +45,9 @@ de:
             create_ai_embedding: "KI-Einbettung erstellen"
             update_ai_embedding: "KI-Einbettung aktualisieren"
             delete_ai_embedding: "KI-Einbettung löschen"
+            create_ai_secret: "KI-Geheimschlüssel erstellen"
+            update_ai_secret: "KI-Geheimschlüssel aktualisieren"
+            delete_ai_secret: "KI-Geheimschlüssel löschen"
             update_ai_spam_settings: "KI-Spam-Einstellungen aktualisieren"
   js:
     discourse_automation:
@@ -210,7 +214,7 @@ de:
               description: "Maximale Anzahl an Schlagwörtern, mit denen ein einzelner Beitrag versehen werden kann"
             max_post_tokens:
               label: "Maximale Beitrags-Token"
-              description: "Maximale Anzahl von Token aus dem Beitrags-Inhalt, die analysiert werden sollen"
+              description: "Maximale Anzahl von Token aus dem Beitragsinhalt, die analysiert werden sollen"
             allow_restricted_tags:
               label: "Eingeschränkte Schlagwörter zulassen"
               description: "Erlaube der KI, Schlagwörter mit eingeschränkten Berechtigungen oder Sichtbarkeit vorzuschlagen und anzuwenden."
@@ -227,6 +231,7 @@ de:
         description: "Das Standard-LLM-Modell für alle KI-Funktionen. Dieses wird verwendet, wenn in der Funktionskonfiguration oder Persona kein LLM angegeben ist. Wenn kein Standard-LLM angegeben ist, wird das zuletzt erstellte LLM verwendet."
       llm_selector:
         none: "Keiner"
+        saved: "Standard-LLM-Modell erfolgreich aktualisiert"
       features:
         short_title: "Funktionen"
         description: "Dies sind die KI-Funktionen, die den Besuchern deiner Website zur Verfügung stehen. Sie können so konfiguriert werden, dass sie bestimmte Personas und LLM verwenden, und der Zugriff kann mithilfe von Gruppen gesteuert werden."
@@ -295,7 +300,7 @@ de:
           search: "Discord-Suche"
           setting_groups:
             settings: "Grundlegende Einstellungen"
-            discord_configuration: "Discord Konfiguration"
+            discord_configuration: "Discord-Konfiguration"
         inference:
           name: "Abgeleitete Konzepte"
           description: "Ordnet Themen und Beiträge in Interessensgebiete/Labels."
@@ -384,7 +389,7 @@ de:
             other: "%{count} Tage"
         progress_chart:
           title: "Übersetzungsfortschritt"
-          data_label: "%{percentage}%"
+          data_label: "%{percentage} %"
           tooltip_translated: "%{done} von %{total} nicht-%{language}en Beiträgen übersetzt"
           bar_done:
             one: "%{count} Beitrag"
@@ -395,7 +400,7 @@ de:
             title: "Übersetzt diesen Beitrag in alle unterstützten Sprachen"
             confirm: "Dadurch werden alle vorhandenen Übersetzungen in diesem Beitrag aktualisiert. Bist du sicher?"
             success: "Der Beitrag wurde zur Übersetzung gesendet"
-        credit_limit_warning: "Die Übersetzungen sind pausiert, weil das Guthabenlimit erreicht wurde. Sie werden fortgesetzt, wenn das Guthaben um %{reset_time} zurückgesetzt wird."
+        credit_limit_warning: "Die Übersetzungen sind pausiert, weil das Guthabenlimit erreicht wurde. Sie werden fortgesetzt, wenn das Guthaben am %{reset_time} zurückgesetzt wird."
         credit_limit_warning_no_time: "Die Übersetzungen sind pausiert, weil das Guthabenlimit erreicht wurde. Sie werden fortgesetzt, wenn das Guthaben zurückgesetzt wird."
       spam:
         short_title: "Spam"
@@ -503,7 +508,7 @@ de:
         overwrite: "Überschreiben"
         description: "Beschreibung"
         no_llm_selected: "Kein Sprachmodell ausgewählt"
-        use_parent_llm: "Persona-Sprachmodell verwenden"
+        use_parent_llm: "Verwende das Sprachmodell der Persona"
         max_context_posts: "Max. Kontext-Beiträge"
         max_context_posts_help: "Die maximale Anzahl von Beiträgen, die die KI als Kontext für die Antwort auf einen Nutzer verwenden soll (leer für Standardwert)."
         vision_enabled: Sehen aktiviert
@@ -638,8 +643,14 @@ de:
         parameter_description: "Parameterbeschreibung"
         enum_value: "Aufzählungswert"
         add_enum_value: "Aufzählungswert hinzufügen"
+        secret_alias: "Alias für Anmeldedaten"
+        secret_alias_help: "Alias, auf den in Skripten über secrets.get(\"alias_name\") verwiesen wird. Verwende Buchstaben, Zahlen und Unterstriche."
+        secret_credential: "Anmeldedaten"
+        add_secret_contract: "Anmeldedaten hinzufügen"
+        remove_secret_contract: "Anmeldedaten entfernen"
+        credential_not_set: "(nicht festgelegt)"
         edit: "Bearbeiten"
-        test: "Test ausführen"
+        test: "Testen"
         delete: "Löschen"
         saved: "Tool gespeichert"
         confirm_delete: "Bist du sicher, dass du dieses Tool löschen willst?"
@@ -649,13 +660,29 @@ de:
           result: "Testergebnis"
       secrets:
         short_title: "Anmeldedaten"
+        description: "Verwalte Authentifizierungsdaten, die von allen LLMs, Einbettungen und Tools gemeinsam genutzt werden."
         name: "Name"
         secret: "Wert"
+        select_secret: "Wähle Anmeldedaten aus …"
+        create_new: "Neue Anmeldedaten"
+        add_secret: "Anmeldedaten hinzufügen"
+        saved: "Anmeldedaten gespeichert"
+        confirm_delete: "Bist du sicher, dass du diese Anmeldedaten löschen möchtest?"
+        delete_failed_in_use: "Diese Anmeldedaten werden derzeit verwendet und können nicht gelöscht werden."
+        no_secrets: "Noch keine Anmeldedaten"
+        new_title: "Neue Anmeldedaten"
+        edit_title: "Anmeldedaten bearbeiten"
         back: "Zurück"
         save: "Speichern"
         edit: "Bearbeiten"
         delete: "Löschen"
+        used_by: "Verwendet von"
+        not_used: "Nicht in Verwendung"
         embedding: "Einbettung"
+        cannot_delete_in_use: "Diese Anmeldedaten können nicht gelöscht werden. Sie werden verwendet von:"
+        tool: "Tool"
+        modal:
+          title: "Neue Anmeldedaten erstellen"
       llms:
         short_title: "LLM"
         no_llms: "Noch keine LLM"
@@ -704,8 +731,8 @@ de:
           max_usages_required: "Muss gesetzt werden, wenn die maximale Anzahl an Tokens nicht gesetzt ist"
         credit_allocation:
           credits_remaining: "Verbleibendes Guthaben: %{remaining} von %{total} (%{percentage} %)"
-          soft_limit_warning: "Für dieses Modell sind heute noch %{percentage}% des KI-Guthabens übrig."
-          hard_limit_warning: "Du hast keine KI-Guthaben mehr für dieses Modell. Die KI-Funktionen, die dieses Modell nutzen, sind bis %{reset_date} nicht mehr verfügbar."
+          soft_limit_warning: "Für dieses Modell sind heute noch %{percentage} % des KI-Guthabens übrig."
+          hard_limit_warning: "Du hast kein KI-Guthaben mehr für dieses Modell. Die KI-Funktionen, die dieses Modell nutzen, sind bis %{reset_date} nicht mehr verfügbar."
           next_reset: "Guthaben wird am %{time} Uhr zurückgesetzt"
         usage:
           ai_bot: "KI-Bot"
@@ -721,8 +748,8 @@ de:
           other: "Dieses Modell wird derzeit verwendet von: %{settings}. Wenn es falsch konfiguriert ist, werden die Funktionen nicht wie erwartet funktionieren. "
         model_description:
           none: "Allgemeine Einstellungen, die für die meisten Sprachmodelle funktionieren"
-          anthropic-claude-opus-4-5: "Das intelligenteste Modell von Anthropic"
-          anthropic-claude-sonnet-4-5: "Optimales Gleichgewicht zwischen Geschwindigkeit und Kosten"
+          anthropic-claude-opus-4-6: "Das intelligenteste Modell von Anthropic"
+          anthropic-claude-sonnet-4-6: "Optimales Gleichgewicht zwischen Geschwindigkeit und Kosten"
           anthropic-claude-haiku-4-5: "Schnell und kosteneffizient"
           google-gemini-3-pro: "Googles intelligentestes Modell"
           google-gemini-3-flash: "Schnell und kosteneffizient mit multimodaler Argumentation"
@@ -732,8 +759,8 @@ de:
           open_router-deepseek-deepseek-v3-2: "DeepSeeks neuestes Hochleistungsmodell"
           open_router-moonshotai-kimi-k2-5: "Moonshots multimodales Modell mit Bildverarbeitungsfunktionen"
           open_router-x-ai-grok-4-fast: "Das Vorzeigemodell von xAI mit Bildverarbeitung"
-          open_router-minimax-minimax-m2-1: "Das multimodale Modell von MiniMax mit großem Kontext"
-          open_router-z-ai-glm-4-7: "Das multimodale Modell von Z-AI mit Bildverarbeitung"
+          open_router-minimax-minimax-m2-5: "Das multimodale Modell von MiniMax mit großem Kontext"
+          open_router-z-ai-glm-5: "Das multimodale Modell von Z-AI mit Bildverarbeitung"
           open_router-arcee-ai-trinity-large-preview-free: "Kostenloses Open-Source-Modell von Arcee AI"
         preseeded_model_description: "Vorkonfiguriertes Open-Source-Modell unter Verwendung von %{model}"
         configured:
@@ -789,6 +816,7 @@ de:
           disable_system_prompt: "Systemmeldung in Eingabeaufforderungen deaktivieren"
           enable_native_tool: "Aktiviere native Tool-Unterstützung"
           disable_native_tools: "Native Tool-Unterstützung deaktivieren (XML-basierte Tools verwenden)"
+          disable_native_structured_output: "Deaktiviere die native strukturierte Ausgabe (verwende stattdessen das Vorausfüllen von Assistenznachrichten, erforderlich für Claude 3.x und älter)"
           provider_order: "Anbieterreihenfolge (kommagetrennte Liste)"
           provider_quantizations: "Reihenfolge der Provider-Quantisierungen (kommagetrennte Liste, z. B.: fp16,fp8)"
           disable_streaming: "Streaming-Vervollständigung deaktivieren (Streaming-Anfragen in Nicht-Streaming-Anfragen umwandeln)"
@@ -800,10 +828,10 @@ de:
           disable_temperature: "Temperatur deaktivieren (einige Denkmodelle unterstützen keine Temperatur)"
           disable_top_p: "Top P deaktivieren (einige Denkmodelle unterstützen Top P nicht)"
           prompt_caching: "Aufforderung-Zwischenspeichern-Modus"
-          prompt_caching_never: "Niemals - Verwende keine zwischengespeicherten Aufforderungen"
+          prompt_caching_never: "Niemals - Keine zwischengespeicherten Aufforderungen verwenden"
           prompt_caching_tool_results: "Tool-Ergebnisse - Zwischenspeichern, wenn Tool-Ergebnisse vorhanden sind (empfohlen)"
           prompt_caching_always: "Immer - Immer zwischengespeicherte Aufforderungen verwenden"
-          effort: "Anstrengungsgrad (nur Claude Opus 4.5)"
+          effort: "Anstrengungsgrad"
       related_topics:
         title: "Verwandte Themen"
         pill: "Verwandt"
@@ -915,17 +943,15 @@ de:
         provider_fields:
           model_name: "Modellname"
         semantic_search: "Themen (semantisch)"
-        semantic_search_loading: "Suche mehr Ergebnisse mithilfe der KI"
         semantic_search_results:
-          toggle: "%{count} Ergebnisse, die mit KI gefunden wurden, werden angezeigt"
-          toggle_hidden: "%{count} mit KI gefundene Ergebnisse werden ausgeblendet"
-          none: "Entschuldigung, unsere KI-Suche hat keine passenden Themen gefunden"
-          new: "Drücke auf „Suchen“, um mit der KI nach neuen Ergebnissen zu suchen"
+          toggle: "KI-Ergebnisse"
           unavailable: "KI-Ergebnisse nicht verfügbar"
           zero_results_expanded: "Keine Ergebnisse gefunden, es werden %{count} KI-Ergebnisse angezeigt"
         semantic_search_tooltips:
           results_explanation: "Wenn diese Funktion aktiviert ist, werden zusätzliche KI-Suchergebnisse unten hinzugefügt."
           invalid_sort: "Die Suchergebnisse müssen nach Relevanz sortiert werden, um KI-Ergebnisse anzuzeigen"
+          not_submitted: "Führe eine Suche aus, um KI-Ergebnisse zu sehen."
+          no_results: "Für diese Suche wurden keine KI-Ergebnisse gefunden."
         semantic_search_unavailable_tooltip: "Die Suchergebnisse müssen nach Relevanz sortiert werden, um KI-Ergebnisse anzuzeigen"
         ai_generated_result: "Suchergebnis mit KI gefunden"
         quick_search:
diff --git a/plugins/discourse-ai/config/locales/client.el.yml b/plugins/discourse-ai/config/locales/client.el.yml
index a043bb24333a7..dd030a998e066 100644
--- a/plugins/discourse-ai/config/locales/client.el.yml
+++ b/plugins/discourse-ai/config/locales/client.el.yml
@@ -60,6 +60,13 @@ el:
               label: "Κατηγορίες"
             tags:
               label: "Ετικέτες"
+            debug_mode:
+              label: "Λειτουργία Αποσφαλμάτωσης"
+              description: "Ενεργοποιήστε τη λειτουργία αποσφαλμάτωσης για να δείτε την ακατέργαστη είσοδο και έξοδο του LLM"
+        ai_tool_action:
+          fields:
+            tool:
+              description: "Το εργαλείο AI που θα εκτελείται όταν πυροδοτείται ο αυτοματισμός"
         llm_triage:
           fields:
             category:
@@ -68,6 +75,7 @@ el:
               label: "Ετικέτες"
             canned_reply:
               label: "Απάντηση"
+              description: "Ακατέργαστο κείμενο της έτοιμης απάντησης που θα δημοσιευτεί στο θέμα"
             flag_type:
               label: "Τύπος αναφοράς"
               description: "Τύπος σημαίας που θα εφαρμοστεί στην ανάρτηση (ανεπιθύμητο ή απλώς αναγγελία για έλεγχο)"
@@ -108,6 +116,8 @@ el:
         ai_helper:
           setting_groups:
             automation: "Αυτοματισμός"
+        translation:
+          post_raw_translator: "Μεταφραστής ακατέργαστης ανάρτησης"
         spam:
           name: "Ανεπιθύμητα"
       modals:
@@ -155,6 +165,8 @@ el:
         description: "Περιγραφή"
         mentionable: Να επιτρέπονται επισημάνσεις
         user: Χρήστης
+        allow_chat_direct_messages: "Να επιτρέπονται τα άμεσα μηνύματα συνομιλίας"
+        allow_chat_direct_messages_help: "Εάν είναι ενεργοποιημένη, οι χρήστες σε επιτρεπόμενες ομάδες μπορούν να στέλνουν άμεσα μηνύματα σε αυτήν την περσόνα."
         allow_chat_channel_mentions: "Να επιτρέπονται επισημάνσεις καναλιών συνομιλίας"
         allow_topic_mentions: "Να επιτρέπονται επισημάνσεις θεμάτων"
         save: "Αποθήκευση"
@@ -183,7 +195,9 @@ el:
         save: "Αποθήκευση"
         remove_parameter: "Αφαίρεση"
         parameter_required: "Απαιτείται"
+        credential_not_set: "(δεν έχει οριστεί)"
         edit: "Επεξεργασία"
+        test: "Δοκιμή"
         delete: "Σβήσιμο"
       secrets:
         short_title: "Διαπιστευτήρια"
@@ -197,6 +211,7 @@ el:
       llms:
         no_llms: "Κανένα LLM ακόμη"
         display_name: "Όνομα"
+        attachment_types_placeholder: "Επιλέξτε ή πληκτρολογήστε επεκτάσεις (π.χ., pdf, txt, docx)"
         save: "Αποθήκευση"
         edit: "Επεξεργασία"
         back: "Πίσω"
@@ -250,13 +265,20 @@ el:
         providers:
           google: "Google"
           fake: "Προσαρμοσμένο"
-        semantic_search_loading: "Γίνεται αναζήτηση περισσότερων αποτελεσμάτων χρησιμοποιώντας AI"
       ai_bot:
         llm: "Μοντέλο"
         try_again: "Δοκιμάστε ξανά"
         shortcut_title: "Ξεκινήστε ένα ΠΜ με ένα AI bot"
         shortcut_link: "AI bot"
+        debug_ai: "Προβολή ακατέργαστου AI αιτήματος και απάντησης"
         debug_ai_modal:
+          title: "Προβολή αλληλεπίδρασης AI"
+          copy_request: "Αντιγραφή αιτήματος"
+          copy_response: "Αντιγραφή απάντησης"
+          request_tokens: "Διακριτικά αιτήματος:"
+          response_tokens: "Διακριτικά απάντησης:"
+          cache_read_tokens: "Διακριτικά ανάγνωσης προσωρινής μνήμης:"
+          cache_write_tokens: "Διακριτικά εγγραφής προσωρινής μνήμης:"
           request: "Αίτημα"
           response: "Απάντηση"
           next_log: "Επόμενο"
@@ -266,6 +288,7 @@ el:
         share_modal:
           copy: "Αντιγραφή"
         conversations:
+          placeholder: "Κάντε μια ερώτηση..."
           messages_sidebar_title: "Συζητήσεις"
           today: "Σήμερα"
           last_7_days: "Τελευταίες 7 ημέρες"
diff --git a/plugins/discourse-ai/config/locales/client.es.yml b/plugins/discourse-ai/config/locales/client.es.yml
index c9a3817b9bc6f..44671a3ddd9c1 100644
--- a/plugins/discourse-ai/config/locales/client.es.yml
+++ b/plugins/discourse-ai/config/locales/client.es.yml
@@ -396,7 +396,6 @@ es:
         overwrite: "Sobrescribir"
         description: "Descripción"
         no_llm_selected: "No se seleccionó ningún modelo de idioma"
-        use_parent_llm: "Usar modelo de idioma de personas"
         max_context_posts: "Número máximo de publicaciones contextuales"
         max_context_posts_help: "El número máximo de mensajes a utilizar como contexto para la IA cuando responda a un usuario. (vacío por defecto)"
         vision_enabled: Visión activada
@@ -529,8 +528,9 @@ es:
         parameter_description: "Descripción del parámetro"
         enum_value: "Valor de enumeración"
         add_enum_value: "Añadir valor de enumeración"
+        credential_not_set: "(no establecido)"
         edit: "Editar"
-        test: "Ejecutar prueba"
+        test: "Probar"
         delete: "Eliminar"
         saved: "Herramienta guardada"
         confirm_delete: "¿Seguro que quieres eliminar esta herramienta?"
@@ -547,6 +547,7 @@ es:
         edit: "Editar"
         delete: "Eliminar"
         embedding: "Incrustado"
+        tool: "Herramienta"
       llms:
         short_title: "LLM"
         no_llms: "Aún no hay LLM"
@@ -604,8 +605,8 @@ es:
           other: "Este modelo lo utilizan actualmente las siguientes %{settings}. Si está mal configurado, las características no funcionarán como se espera."
         model_description:
           none: "Ajustes generales que funcionan para la mayoría de los modelos lingüísticos"
-          anthropic-claude-opus-4-5: "El modelo antrópico más inteligente"
-          anthropic-claude-sonnet-4-5: "Equilibrio óptimo entre velocidad y coste"
+          anthropic-claude-opus-4-6: "El modelo antrópico más inteligente"
+          anthropic-claude-sonnet-4-6: "Equilibrio óptimo entre velocidad y coste"
           anthropic-claude-haiku-4-5: "Rápido y rentable"
           open_ai-gpt-5-nano: "El modelo GPT-5 más rápido y rentable"
         preseeded_model_description: "Modelo de código abierto preconfigurado que utiliza %{model}"
@@ -770,12 +771,7 @@ es:
         provider_fields:
           model_name: "Nombre del modelo"
         semantic_search: "Temas (semánticos)"
-        semantic_search_loading: "Buscando más resultados usando IA"
         semantic_search_results:
-          toggle: "Mostrando %{count} resultados encontrados usando IA"
-          toggle_hidden: "Ocultando %{count} resultados encontrados usando IA"
-          none: "Lo sentimos, nuestra búsqueda mediante IA no ha encontrado temas coincidentes"
-          new: "Pulsa «Buscar» para empezar a buscar nuevos resultados con IA"
           unavailable: "Resultados de IA no disponibles"
         semantic_search_tooltips:
           results_explanation: "Cuando esté activada, se añadirán resultados de búsqueda de IA adicionales a continuación."
diff --git a/plugins/discourse-ai/config/locales/client.et.yml b/plugins/discourse-ai/config/locales/client.et.yml
index a85f3f1b15b31..183f8a6c527e9 100644
--- a/plugins/discourse-ai/config/locales/client.et.yml
+++ b/plugins/discourse-ai/config/locales/client.et.yml
@@ -109,6 +109,7 @@ et:
         remove_parameter: "Eemalda"
         parameter_required: "Nõutud"
         edit: "Muuda"
+        test: "Proovi"
         delete: "Kustuta"
       secrets:
         name: "Nimi"
diff --git a/plugins/discourse-ai/config/locales/client.fa_IR.yml b/plugins/discourse-ai/config/locales/client.fa_IR.yml
index d88a61aae3c33..3adf8bc473ca5 100644
--- a/plugins/discourse-ai/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-ai/config/locales/client.fa_IR.yml
@@ -150,8 +150,9 @@ fa_IR:
         save: "ذخیره"
         remove_parameter: "پاک کردن"
         parameter_required: "مورد نیاز"
+        credential_not_set: "(تنظیم نشده)"
         edit: "ویرایش"
-        test: "اجرا کردن تست"
+        test: "آزمایش کردن"
         delete: "حذف"
         test_modal:
           run: "اجرا کردن تست"
@@ -164,6 +165,7 @@ fa_IR:
         edit: "ویرایش"
         delete: "حذف"
         embedding: "جاسازی"
+        tool: "ابزار"
       llms:
         display_name: "نام"
         provider: "ارائه‌دهنده"
diff --git a/plugins/discourse-ai/config/locales/client.fi.yml b/plugins/discourse-ai/config/locales/client.fi.yml
index 70cba202dcb52..524d535faae11 100644
--- a/plugins/discourse-ai/config/locales/client.fi.yml
+++ b/plugins/discourse-ai/config/locales/client.fi.yml
@@ -388,7 +388,6 @@ fi:
         overwrite: "Korvaa"
         description: "Kuvaus"
         no_llm_selected: "Kielimallia ei ole valittu"
-        use_parent_llm: "Käytä persoonan kielimallia"
         max_context_posts: "Kontekstiviestien enimmäismäärä"
         max_context_posts_help: "Kontekstina käytettävien viestien enimmäismäärä, kun tekoäly vastaa käyttäjälle (käytä oletusta jättämällä tyhjäksi)"
         vision_enabled: Näkö käytössä
@@ -521,8 +520,9 @@ fi:
         parameter_description: "Parametrin kuvaus"
         enum_value: "Enum-arvo"
         add_enum_value: "Lisää enum-arvo"
+        credential_not_set: "(ei asetettu)"
         edit: "Muokkaa"
-        test: "Suorita testi"
+        test: "Testi"
         delete: "Poista"
         saved: "Työkalu tallennettu"
         confirm_delete: "Oletko varma, että haluat poistaa tämän työkalun?"
@@ -539,6 +539,7 @@ fi:
         edit: "Muokkaa"
         delete: "Poista"
         embedding: "Upottaminen"
+        tool: "Työkalu"
       llms:
         short_title: "LLM:t"
         no_llms: "LLM:iä ei ole vielä"
@@ -596,8 +597,8 @@ fi:
           other: "Tätä mallia käyttää tällä hetkellä seuraavat: %{settings}. Jos se on määritetty väärin, ominaisuus ei toimi odotetulla tavalla. "
         model_description:
           none: "Yleiset asetukset, jotka toimivat useimmissa kielimalleissa"
-          anthropic-claude-opus-4-5: "Anthropicin älykkäin malli"
-          anthropic-claude-sonnet-4-5: "Optimaalinen tasapaino nopeuden ja kustannusten välillä"
+          anthropic-claude-opus-4-6: "Anthropicin älykkäin malli"
+          anthropic-claude-sonnet-4-6: "Optimaalinen tasapaino nopeuden ja kustannusten välillä"
           anthropic-claude-haiku-4-5: "Nopea ja kustannustehokas"
           open_ai-gpt-5-nano: "Nopein ja kustannustehokkain GPT-5-malli"
         preseeded_model_description: "Ennalta määritetty avoimen lähdekoodin malli, joka käyttää mallia %{model}"
@@ -762,12 +763,7 @@ fi:
         provider_fields:
           model_name: "Mallin nimi"
         semantic_search: "Ketjut (semanttinen)"
-        semantic_search_loading: "Haetaan lisää tuloksia tekoälyllä"
         semantic_search_results:
-          toggle: "Näytetään %{count} tulosta, jotka löydettiin tekoälyllä"
-          toggle_hidden: "Piilotetaan %{count} tulosta, jotka löydettiin tekoälyllä"
-          none: "Tekoälyhakumme ei valitettavasti löytänyt vastaavia aiheita"
-          new: "Aloita uusien tulosten etsiminen tekoälyllä painamalla hakupainiketta"
           unavailable: "Tekoälytuloksia ei ole saatavilla"
         semantic_search_tooltips:
           results_explanation: "Kun tämä on käytössä, alle lisätään ylimääräisiä tekoälyhakutuloksia."
diff --git a/plugins/discourse-ai/config/locales/client.fr.yml b/plugins/discourse-ai/config/locales/client.fr.yml
index 4dde73bfd6e80..6fdd8510879d1 100644
--- a/plugins/discourse-ai/config/locales/client.fr.yml
+++ b/plugins/discourse-ai/config/locales/client.fr.yml
@@ -388,7 +388,6 @@ fr:
         overwrite: "Remplacer"
         description: "Description"
         no_llm_selected: "Aucun modèle linguistique sélectionné"
-        use_parent_llm: "Utiliser le modèle linguistique du personnage"
         max_context_posts: "Nombre maximal de publications contextuelles"
         max_context_posts_help: "Le nombre maximal de publications à utiliser comme contexte pour l'IA lorsqu'elle répond à un utilisateur. (vide par défaut)"
         vision_enabled: Vision activée
@@ -521,8 +520,9 @@ fr:
         parameter_description: "Description du paramètre"
         enum_value: "Valeur d'énumération"
         add_enum_value: "Ajouter une valeur d'énumération"
+        credential_not_set: "(non défini)"
         edit: "Modifier"
-        test: "Lancer le test"
+        test: "Test"
         delete: "Supprimer"
         saved: "Outil enregistré"
         confirm_delete: "Voulez-vous vraiment supprimer cet outil ?"
@@ -539,6 +539,7 @@ fr:
         edit: "Modifier"
         delete: "Supprimer"
         embedding: "Intégration"
+        tool: "Outil"
       llms:
         short_title: "LLM"
         no_llms: "Pas encore de LLM"
@@ -596,8 +597,8 @@ fr:
           other: "Ce modèle est actuellement utilisé par %{settings}. Si la configuration est incorrecte, les fonctionnalités ne fonctionneront pas comme prévu. "
         model_description:
           none: "Paramètres généraux qui fonctionnent pour la plupart des modèles linguistiques"
-          anthropic-claude-opus-4-5: "Le modèle le plus intelligent d'Anthropic"
-          anthropic-claude-sonnet-4-5: "Équilibre optimal entre vitesse et coût"
+          anthropic-claude-opus-4-6: "Le modèle le plus intelligent d'Anthropic"
+          anthropic-claude-sonnet-4-6: "Équilibre optimal entre vitesse et coût"
           anthropic-claude-haiku-4-5: "Rapide et économique"
           open_ai-gpt-5-nano: "Le modèle GPT-5 le plus rapide et le plus économique"
         preseeded_model_description: "Modèle open source préconfiguré utilisant %{model}"
@@ -762,12 +763,7 @@ fr:
         provider_fields:
           model_name: "Nom du modèle"
         semantic_search: "Sujets (sémantiques)"
-        semantic_search_loading: "Rechercher plus de résultats à l'aide de l'IA"
         semantic_search_results:
-          toggle: "Affichage de %{count} résultats trouvés en utilisant l'IA"
-          toggle_hidden: "Masquer %{count} résultats trouvés à l’aide de l'IA"
-          none: "Nous sommes désolés, notre recherche par IA n'a trouvé aucun sujet correspondant"
-          new: "Appuyez sur « Rechercher » pour commencer à rechercher de nouveaux résultats avec l'IA"
           unavailable: "Résultats de l'IA indisponibles"
         semantic_search_tooltips:
           results_explanation: "Lorsque cette option est activée, des résultats de recherche IA supplémentaires seront ajoutés ci-dessous."
diff --git a/plugins/discourse-ai/config/locales/client.gl.yml b/plugins/discourse-ai/config/locales/client.gl.yml
index 7f369a3d61bb5..115965a6d2a31 100644
--- a/plugins/discourse-ai/config/locales/client.gl.yml
+++ b/plugins/discourse-ai/config/locales/client.gl.yml
@@ -117,6 +117,7 @@ gl:
         remove_parameter: "Retirar"
         parameter_required: "Obrigatorio"
         edit: "Editar"
+        test: "Proba"
         delete: "Eliminar"
       secrets:
         short_title: "Acreditacións"
diff --git a/plugins/discourse-ai/config/locales/client.he.yml b/plugins/discourse-ai/config/locales/client.he.yml
index b6e8267336118..c7ad07ccc18e0 100644
--- a/plugins/discourse-ai/config/locales/client.he.yml
+++ b/plugins/discourse-ai/config/locales/client.he.yml
@@ -467,7 +467,6 @@ he:
         overwrite: "לדרוס"
         description: "תיאור"
         no_llm_selected: "לא נבחר דגם שפה"
-        use_parent_llm: "להשתמש במודל שפה עם פיצול אישיות"
         max_context_posts: "כמות מרבית של פוסטים להקשר"
         max_context_posts_help: "הכמות המרבית של פוסטים לשימוש כהקשר לבינה המלאכותית בעת מענה למשתמש (ריק לברירת מחדל)"
         vision_enabled: ראייה מופעלת
@@ -601,8 +600,9 @@ he:
         parameter_description: "תיאור משתנה"
         enum_value: "ערך מונה"
         add_enum_value: "הוספת ערך מונה"
+        credential_not_set: "(לא מוגדר)"
         edit: "עריכה"
-        test: "הרצת בדיקה"
+        test: "נסיון"
         delete: "מחיקה"
         saved: "הכלי נשמר"
         confirm_delete: "למחוק את הכלי הזה?"
@@ -619,6 +619,7 @@ he:
         edit: "עריכה"
         delete: "מחיקה"
         embedding: "שילוב (embedding)"
+        tool: "כלי"
       llms:
         short_title: "LLMים"
         no_llms: "אין LLMים עדיין"
@@ -679,8 +680,8 @@ he:
           other: "המודל הזה משמש את: %{settings}. אם ההגדרות שגויות היכולת לא תעבודנה כמצופה."
         model_description:
           none: "הגדרות כלליות שעובדות עבור רוב המודלים של השפות"
-          anthropic-claude-opus-4-5: "המודל החכם ביותר של Anthropic"
-          anthropic-claude-sonnet-4-5: "איזון מיטבי בין מהירות לעלות"
+          anthropic-claude-opus-4-6: "המודל החכם ביותר של Anthropic"
+          anthropic-claude-sonnet-4-6: "איזון מיטבי בין מהירות לעלות"
           anthropic-claude-haiku-4-5: "מהיר וחסכוני"
           google-gemini-3-pro: "המודל החכם ביותר של Google"
           open_ai-gpt-5-nano: "מודל GPT-5 החסכוני והמהיר ביותר"
@@ -744,7 +745,6 @@ he:
           thinking_tokens: "כמות אסימונים המשמשים לחשיבה"
           reasoning_tokens: "כמות אסימונים המשמשים לנימוק"
           disable_temperature: "השבתת טמפרטורה (חלק ממודלי החשיבה אינם תומכים בטמפרטורה)"
-          effort: "רמת מאמץ (Claude Opus 4.5 בלבד)"
       related_topics:
         title: "נושאים קשורים"
         pill: "קשורים"
@@ -848,12 +848,7 @@ he:
         provider_fields:
           model_name: "שם המודל"
         semantic_search: "נושאים (סמנטיקה)"
-        semantic_search_loading: "מתבצע חיפוש אחר תוצאות נוספות עם בינה מלאכותית"
         semantic_search_results:
-          toggle: "מוצגות %{count} תוצאות שנמצאו באמצעות בינה מלאכותית"
-          toggle_hidden: "מוסתרות %{count} תוצאות שנמצאו באמצעות בינה מלאכותית"
-          none: "חיפוש הבינה המלאכותית שלנו לא מצא נושאים, עמך הסליחה"
-          new: "יש ללחוץ על ‚חיפוש’ כדי להתחיל לחפש תוצאות חדשות עם בינה מלאכותית"
           unavailable: "תוצאות בינה מלאכותית לא זמינות"
         semantic_search_tooltips:
           invalid_sort: "יש לסדר את תוצאות החיפוש לפי רלוונטיות להצגת תוצאות בינה מלאכותית"
diff --git a/plugins/discourse-ai/config/locales/client.hr.yml b/plugins/discourse-ai/config/locales/client.hr.yml
index 6516eff2992e3..1febcdd3c7f85 100644
--- a/plugins/discourse-ai/config/locales/client.hr.yml
+++ b/plugins/discourse-ai/config/locales/client.hr.yml
@@ -123,7 +123,9 @@ hr:
         save: "Spremi"
         remove_parameter: "Ukloni"
         parameter_required: "Potrebno"
+        credential_not_set: "(nije postavljeno)"
         edit: "Uredi"
+        test: "Test"
         delete: "Izbriši"
       secrets:
         short_title: "Vjerodajnice"
diff --git a/plugins/discourse-ai/config/locales/client.hu.yml b/plugins/discourse-ai/config/locales/client.hu.yml
index 5dbd33a156abe..942e0e472eb9f 100644
--- a/plugins/discourse-ai/config/locales/client.hu.yml
+++ b/plugins/discourse-ai/config/locales/client.hu.yml
@@ -131,8 +131,9 @@ hu:
         save: "Mentés"
         remove_parameter: "Eltávolítás"
         parameter_required: "Kötelező"
+        credential_not_set: "(nincs beállítva)"
         edit: "Szerkesztés"
-        test: "Teszt futtatása"
+        test: "Teszt"
         delete: "Törlés"
         test_modal:
           run: "Teszt futtatása"
diff --git a/plugins/discourse-ai/config/locales/client.hy.yml b/plugins/discourse-ai/config/locales/client.hy.yml
index c9b61aa9c17d1..dd45b168a8e1f 100644
--- a/plugins/discourse-ai/config/locales/client.hy.yml
+++ b/plugins/discourse-ai/config/locales/client.hy.yml
@@ -113,6 +113,7 @@ hy:
         remove_parameter: "Հեռացնել"
         parameter_required: "Պարտադիր"
         edit: "Խմբագրել"
+        test: "Փորձարկել"
         delete: "Ջնջել"
       secrets:
         short_title: "Հավատարմագրեր"
diff --git a/plugins/discourse-ai/config/locales/client.id.yml b/plugins/discourse-ai/config/locales/client.id.yml
index e009354a10a00..d1c138ebb96fc 100644
--- a/plugins/discourse-ai/config/locales/client.id.yml
+++ b/plugins/discourse-ai/config/locales/client.id.yml
@@ -235,11 +235,6 @@ id:
         providers:
           google: "Google"
         semantic_search: "Topik (Semantik)"
-        semantic_search_loading: "Mencari hasil lebih banyak menggunakan AI"
-        semantic_search_results:
-          toggle: "Menampilkan %{count} hasil yang ditemukan menggunakan AI"
-          toggle_hidden: "Menyembunyikan %{count} hasil yang ditemukan menggunakan AI"
-          none: "Maaf, pencarian AI kami tidak menemukan topik yang cocok"
         ai_generated_result: "Hasil pencarian ditemukan menggunakan AI"
         quick_search:
           suffix: "di semua topik dan posting dengan AI"
diff --git a/plugins/discourse-ai/config/locales/client.it.yml b/plugins/discourse-ai/config/locales/client.it.yml
index b12e75176a583..6f9e237ee336a 100644
--- a/plugins/discourse-ai/config/locales/client.it.yml
+++ b/plugins/discourse-ai/config/locales/client.it.yml
@@ -388,7 +388,6 @@ it:
         overwrite: "Sovrascrivi"
         description: "Descrizione"
         no_llm_selected: "Nessun modello linguistico selezionato"
-        use_parent_llm: "Usa modello linguistico personaggi"
         max_context_posts: "Numero massimo di messaggi di contesto"
         max_context_posts_help: "Il numero massimo di post da utilizzare come contesto per l'IA quando si risponde a un utente. (vuoto per impostazione predefinita)"
         vision_enabled: Visione abilitata
@@ -521,8 +520,9 @@ it:
         parameter_description: "Descrizione del parametro"
         enum_value: "Valore enumerativo"
         add_enum_value: "Aggiungi valore enumerativo"
+        credential_not_set: "(non impostato)"
         edit: "Modifica"
-        test: "Esegui test"
+        test: "Test"
         delete: "Elimina"
         saved: "Strumento salvato"
         confirm_delete: "Vuoi davvero eliminare questo strumento?"
@@ -539,6 +539,7 @@ it:
         edit: "Modifica"
         delete: "Elimina"
         embedding: "Integrazione"
+        tool: "Strumento"
       llms:
         short_title: "LLM"
         no_llms: "Ancora nessun LLM"
@@ -596,8 +597,8 @@ it:
           other: "Questo modello è attualmente utilizzato dai seguenti elementi: %{settings}. Se configurato in modo errato, le funzionalità non funzioneranno come previsto. "
         model_description:
           none: "Impostazioni generali che vanno bene per la maggior parte dei modelli linguistici"
-          anthropic-claude-opus-4-5: "Il modello più intelligente di Anthropic"
-          anthropic-claude-sonnet-4-5: "Equilibrio ottimale tra velocità e costi"
+          anthropic-claude-opus-4-6: "Il modello più intelligente di Anthropic"
+          anthropic-claude-sonnet-4-6: "Equilibrio ottimale tra velocità e costi"
           anthropic-claude-haiku-4-5: "Veloce e conveniente"
           open_ai-gpt-5-nano: "Il modello GPT-5 più veloce ed economicamente efficiente"
         preseeded_model_description: "Modello open source preconfigurato che utilizza %{model}"
@@ -762,12 +763,7 @@ it:
         provider_fields:
           model_name: "Nome del modello"
         semantic_search: "Argomenti (semantici)"
-        semantic_search_loading: "Ricerca di altri risultati tramite intelligenza artificiale"
         semantic_search_results:
-          toggle: "Stai vedendo %{count} risultati trovati utilizzando l'IA"
-          toggle_hidden: "%{count} risultati trovati utilizzando l'IA sono stati nascosti"
-          none: "Spiacenti, la nostra ricerca IA non ha trovato argomenti corrispondenti"
-          new: "Premi \"cerca\" per iniziare a cercare nuovi risultati con l'intelligenza artificiale"
           unavailable: "Risultati IA non disponibili"
         semantic_search_tooltips:
           results_explanation: "Se abilitata, verranno aggiunti ulteriori risultati di ricerca IA di seguito."
diff --git a/plugins/discourse-ai/config/locales/client.ja.yml b/plugins/discourse-ai/config/locales/client.ja.yml
index ed3692d980422..b2abf21a56350 100644
--- a/plugins/discourse-ai/config/locales/client.ja.yml
+++ b/plugins/discourse-ai/config/locales/client.ja.yml
@@ -113,6 +113,14 @@ ja:
             persona_id:
               label: "ペルソナ"
               description: "レポートの生成に使用する AI ペルソナ"
+        ai_tool_action:
+          fields:
+            tool:
+              label: "AI ツール"
+              description: "自動化がトリガーされたときに実行する AI ツール"
+            llm_model:
+              label: "LLM モデル"
+              description: "llm.generate() を使用するツールの言語モデル (オプション)"
         llm_persona_triage:
           fields:
             persona:
@@ -159,6 +167,15 @@ ja:
             flag_post:
               label: "投稿を通報"
               description: "投稿を通報 (迷惑またはレビュー対象)"
+            notify_author_pm:
+              label: "PM で作成者に通知する"
+              description: "作成者の投稿がキューに追加されて削除された場合に、その作成者に個人メッセージを送信します"
+            notify_author_pm_user:
+              label: "PM 送信者"
+              description: "PM を送信するユーザー (デフォルトはシステム)"
+            notify_author_pm_message:
+              label: "PM の内容"
+              description: "作成者に送信するオプションのカスタムメッセージ"
             include_personal_messages:
               label: "個人メッセージを含める"
               description: "個人メッセージのスキャンとトリアージも行う"
@@ -171,6 +188,38 @@ ja:
             max_output_tokens:
               label: "最大出力トークン"
               description: "指定すると、モデルが生成できるトークンの最大数に上限が設定されます。LLM の最大出力トークン制限に従います。"
+        llm_tagger:
+          tag_mode:
+            manual: "特定のタグリストを使用する (下で構成)"
+            discover: "AI にあらゆるサイトタグの発見と使用を任せる"
+          fields:
+            tagger_persona:
+              label: "AI ペルソナ"
+              description: "トピックの分析とタグ付けに使用する AI ペルソナ"
+            tag_mode:
+              label: "タグ選択モード"
+              description: "AI によるタグの選択方法を選択します"
+            available_tags:
+              label: "利用可能なタグ"
+              description: "AI が選択できるタグ (手動モードでのみ使用)"
+            confidence_threshold:
+              label: "信頼しきい値"
+              description: "提案タグを適用するために必要な最低信頼度 (0～100)"
+            max_tags_per_post:
+              label: "投稿当たりの最大タグ数"
+              description: "1 つの投稿に適用可能なタグの最大数"
+            max_post_tokens:
+              label: "最大投稿トークン"
+              description: "分析する投稿コンテンツのトークンの最大数"
+            allow_restricted_tags:
+              label: "制限されたタグを許可する"
+              description: "権限や表示状態が制限されたタグを AI が提案して適用することを許可します。"
+            max_posts_for_context:
+              label: "コンテキストの最大投稿数"
+              description: "分析コンテキストに含めるトピックの最大投稿数 (デフォルト: 5)"
+            allow_system_posts:
+              label: "システム投稿を許可する"
+              description: "システムユーザーが作成した投稿のタグ付けを許可します。"
     discourse_ai:
       title: "AI"
       default_llm:
@@ -182,6 +231,7 @@ ja:
         short_title: "機能"
         description: "これらは、サイトの訪問者が使用できる AI 機能です。これらは、特定のペルソナと LLM を使用するために構成することができ、グループごとにアクセスを制御できます。"
         back: "戻る"
+        settings_save_error: "一部の設定を保存できませんでした。"
         disabled: "(無効)"
         persona:
           other: "ペルソナ:"
@@ -199,6 +249,11 @@ ja:
           bot: "チャットボット"
           name: "ボット"
           description: "個人メッセージ、フォーラム、およびチャットで質問への回答とユーザーの支援を行えるチャットボット"
+          setting_groups:
+            settings: "基本設定"
+            access_control: "アクセス制御"
+            ui_settings: "UI 設定"
+            integrations: "統合"
         nav:
           configured: "構成済み"
           unconfigured: "未構成"
@@ -213,20 +268,31 @@ ja:
           description: "訪問者がトピックを要約できる要約ボタンを使用可能にします"
           topic_summaries: "トピックの要約"
           gists: "トピックリストの短い要約"
+          setting_groups:
+            settings: "基本設定"
+            gists: "要点"
+            backfill: "バックフィル"
         search:
           name: "検索"
           description: "クエリに対して AI が生成した回答を提供することで、検索エクスペリエンスを強化します"
           discoveries: "発見"
+          setting_groups:
+            settings: "基本設定"
         embeddings:
           name: "埋め込み"
           description: "テキストのセマンティック表現を生成することで、関連トピックや AI 検索などの機能を強化します"
           hyde: "HyDE"
           setting_groups:
+            model_settings: "モデル設定"
             related_topics: "関連トピック"
+            semantic_search: "セマンティック検索"
         discord:
           name: "Discord 統合"
           description: "Discord チャンネルを検索する機能を追加します"
           search: "Discord 検索"
+          setting_groups:
+            settings: "基本設定"
+            discord_configuration: "Discord の構成"
         inference:
           name: "推論された概念"
           description: "トピックと投稿を関心分野 / ラベルに分類します。"
@@ -234,6 +300,9 @@ ja:
           match_concepts: "概念の照合"
           deduplicate_concepts: "概念の重複排除"
           setting_groups:
+            settings: "基本設定"
+            topic_criteria: "トピック基準"
+            post_criteria: "投稿基準"
             personas: "ペルソナ"
         ai_helper:
           name: "ヘルパー"
@@ -250,6 +319,8 @@ ja:
           translator: "翻訳ツール"
           post_illustrator: "イラスト投稿ツール"
           setting_groups:
+            access_permissions: "アクセスと権限"
+            enabled_features: "有効な機能"
             automation: "自動化"
             personas: "ペルソナ"
         translation:
@@ -259,8 +330,14 @@ ja:
           post_raw_translator: "投稿の生の翻訳ツール"
           topic_title_translator: "トピックタイトルの翻訳ツール"
           short_text_translator: "短いテキストの翻訳ツール"
+          schedule_untranslated: "翻訳スケジュール"
+          schedule_topic_success:
+            other: "%{count} 件の未翻訳投稿の翻訳をスケジュールしました。"
+          schedule_topic_error: "翻訳をスケジュールできませんでした。もう一度お試しください。"
           setting_groups:
+            settings: "基本設定"
             personas: "ペルソナ"
+            backfill_and_limits: "バックフィルと制限"
         spam:
           name: "迷惑"
           description: "選択された LLM を使って潜在的な迷惑行為を識別し、サイトモデレーターがレビューキューで調査できるように通報します"
@@ -279,10 +356,18 @@ ja:
       translations:
         title: "翻訳"
         description: "フォーラムのすべてのコンテンツをユーザーの優先言語に自動的に翻訳します"
+        supported_locales: "サポートされている言語"
+        supported_locales_description: "このサイト設定では、訪問者も投稿の翻訳に貢献できます。"
         admin_actions:
           translation_settings: "翻訳の設定"
           localization_settings: "ローカリゼーションの設定"
+          enable_translations: "自動翻訳を有効にする"
         stats:
+          title: "翻訳の統計"
+          complete_language_detection_description: "全 %{total} 件の対象投稿の言語が検出されました。"
+          incomplete_language_detection_description: "全 %{total} 件中 %{done} 件の対象投稿の言語が検出されました。"
+          backfill_disabled: "バックフィルは無効です。新しい投稿のみが翻訳されます。"
+          backfill_message: "%{date} 以降のすべての投稿を翻訳するように<a href='%{settingsUrl}'>バックフィル設定</a>が構成されています。これには %{eta} かかることが予測されます。"
           eta_minutes:
             other: "%{count} 分"
           eta_hours:
@@ -290,8 +375,19 @@ ja:
           eta_days:
             other: "%{count} 日"
         progress_chart:
+          title: "翻訳の進捗状況"
+          data_label: "%{percentage}%"
+          tooltip_translated: "全 %{total} 件中 %{done} 件の %{language} 以外の投稿が翻訳されました"
           bar_done:
             other: "投稿 %{count} 件"
+        translations_menu:
+          translate:
+            label: "投稿を翻訳する"
+            title: "この投稿をサポートされているすべての言語に翻訳する"
+            confirm: "これにより、この投稿の既存の翻訳が更新されます。よろしいですか？"
+            success: "投稿は翻訳に送信されました"
+        credit_limit_warning: "クレジット制限により翻訳は一時停止されています。クレジットが %{reset_time} にリセットされたら再開します。"
+        credit_limit_warning_no_time: "クレジット制限により翻訳は一時停止されています。クレジットがリセットされたら再開します。"
       spam:
         short_title: "迷惑"
         title: "迷惑処理の構成"
@@ -317,7 +413,10 @@ ja:
           post_url_label: "投稿の URL または ID"
           post_url_placeholder: "https://your-forum.com/t/topic/123/4 または投稿 ID"
           result: "結果"
+          reason: "推論"
           llm: "LLM"
+          scan_history: "スキャン履歴"
+          sent_message: "送信したメッセージ"
           system_prompt: "システムプロンプト"
           scan_log: "スキャンログ"
           run: "テストを実行"
@@ -340,6 +439,7 @@ ja:
         feature: "機能"
         usage_count: "使用回数"
         model: "モデル"
+        credits_remaining: "クレジット残量"
         models_breakdown: "モデルごとの使用状況"
         users_breakdown: "ユーザーごとの使用状況"
         all_features: "すべての機能"
@@ -349,6 +449,8 @@ ja:
         request_tokens: "リクエストトークン"
         response_tokens: "レスポンストークン"
         net_request_tokens: "ネットリクエストトークン"
+        cache_read_tokens: "キャッシュ読み取りトークン"
+        cache_write_tokens: "キャッシュ書き込みトークン"
         cached_tokens: "キャッシュされたトークン"
         cached_request_tokens: "キャッシュされたリクエストトークン"
         total_spending: "推定コスト"
@@ -356,12 +458,18 @@ ja:
         no_models: "モデル使用状況データが見つかりません"
         no_features: "機能使用状況データが見つかりません"
         total: "総合"
+        included_in_plan: "プランに含まれる"
+        included_models: "含まれる使用量"
+        billed_models: "請求される使用量"
+        cost: "料金"
         subheader_description: "トークンは、LLM がテキストを理解して生成するために使用する基本単位であり、使用状況データがコストに影響する可能性があります"
         stat_tooltips:
           total_requests: "Discourse を通じて LLM に行われたすべてのリクエスト"
           total_tokens: "LLM のプロンプトに使用されるすべてのトークン"
           request_tokens: "ユーザーが述べることを LLM が理解しようとする際に使用されるトークン"
           response_tokens: "LLM がプロンプトに応答する際に使用されるトークン"
+          cache_read_tokens: "LLM がパフォーマンスとコストを最適化するためにキャッシュから再利用する、過去に処理されたリクエストトークン"
+          cache_write_tokens: "以降での再利用に備えてキャッシュに書き込まれたリクエストトークン"
           cached_tokens: "LLM がパフォーマンスとコストを最適化するために再利用する、過去に処理されたリクエストトークン"
           total_spending: "LLM 構成設定に追加された指定のコストメトリクスに基づいて LLM が使用する全トークンの累積コスト"
         periods:
@@ -369,6 +477,7 @@ ja:
           last_week: "先週"
           last_month: "先月"
           custom: "カスタム..."
+        credit_allocations: "クレジットの割り当て"
       ai_persona:
         ai_tools: "ツール"
         tool_strategies:
@@ -384,7 +493,6 @@ ja:
         overwrite: "上書き"
         description: "説明"
         no_llm_selected: "言語モデルは選択されていません"
-        use_parent_llm: "ペルソナの言語モデルを使用する"
         max_context_posts: "最大コンテキスト投稿数"
         max_context_posts_help: "AI がユーザーに返答するときにコンテキストとして使用する投稿の最大数。(デフォルトの場合は空白)"
         vision_enabled: ビジョン対応
@@ -394,6 +502,8 @@ ja:
           low: 低品質 - 最も安い (256x256)
           medium: 中品質 (512x512)
           high: 高品質 - 最も遅い (1024x1024)
+        show_thinking: 思考中を示す
+        show_thinking_help: エンドユーザーに言語モデルの内部的な思考とツールの呼び出しを表示します。
         mentionable: メンションを許可
         mentionable_help: 有効にすると、許可されているグループのユーザーは投稿内でこのユーザーをメンションでき、AI はこのペルソナとして返答します。
         user: ユーザー
@@ -516,8 +626,9 @@ ja:
         parameter_description: "パラメーターの説明"
         enum_value: "列挙型値"
         add_enum_value: "列挙型値を追加"
+        credential_not_set: "(未設定)"
         edit: "編集"
-        test: "テストを実行"
+        test: "テスト"
         delete: "削除"
         saved: "ツールが保存されました"
         confirm_delete: "このツールを削除してもよろしいですか？"
@@ -534,6 +645,7 @@ ja:
         edit: "編集"
         delete: "削除"
         embedding: "埋め込み"
+        tool: "ツール"
       llms:
         short_title: "LLM"
         no_llms: "まだ LLM がありません"
@@ -547,9 +659,12 @@ ja:
         url: "モデルをホストするサービスの URL"
         api_key: "モデルをホストするサービスの API キー"
         vision_enabled: "ビジョン対応"
+        allowed_attachment_types: "許可される添付ファイル"
+        attachment_types_placeholder: "拡張子を選択または入力 (pdf、txt、docxなど)"
         ai_bot_user: "AI ボットユーザー"
         cost_input: "入力コスト"
         cost_cached_input: "キャッシュ入力コスト"
+        cost_cache_write: "キャッシュ書き込みコスト"
         cost_output: "出力コスト"
         save: "保存"
         edit: "編集"
@@ -577,6 +692,11 @@ ja:
           max_tokens_required: "最大使用量が設定されていない場合は設定する必要があります"
           max_usages_help: "このグループの各ユーザーが指定された期間内に AI モデルを使用できる最大回数。この使用量制限はグループ全体で共有されるのではなく、ユーザーごとに追跡されます。"
           max_usages_required: "最大トークンが設定されていない場合は設定する必要があります"
+        credit_allocation:
+          credits_remaining: "クレジット残り %{remaining} / %{total} (%{percentage}%)"
+          soft_limit_warning: "このモデルの今日の AI クレジット残量は %{percentage}% です"
+          hard_limit_warning: "このモデルの AI クレジットがなくなりました。このモデルを使用する AI 機能は %{reset_date} まで利用できません"
+          next_reset: "クレジットは %{time} にリセットされます"
         usage:
           ai_bot: "AI ボット"
           ai_helper: "ヘルパー (%{persona})"
@@ -590,9 +710,10 @@ ja:
           other: "このモデルは現在次によって使用されています: %{settings}。誤って構成されると、機能は期待どおりに動作しなくなります。 "
         model_description:
           none: "ほとんどの言語モデルで機能する一般的な設定"
-          anthropic-claude-opus-4-5: "Anthropic の最もインテリジェントなモデル"
-          anthropic-claude-sonnet-4-5: "速度とコストの最適なバランス"
+          anthropic-claude-opus-4-6: "Anthropic の最もインテリジェントなモデル"
+          anthropic-claude-sonnet-4-6: "速度とコストの最適なバランス"
           anthropic-claude-haiku-4-5: "高速でコスト効率に優れています"
+          google-gemini-3-pro: "Google の最もインテリジェントなモデル"
         preseeded_model_description: "%{model} を利用する事前構成済みのオープンソースモデル"
         configured:
           title: "構成済みの LLM"
@@ -609,6 +730,7 @@ ja:
           title: "テストを実行"
           running: "テストを実行中…"
           success: "成功！"
+          invalid_config: "まず構成内の次のエラーを修正します:"
           failure: "モデルに接続しようとした際に、次のエラーが返されました: %{error}"
         hints:
           max_prompt_tokens: "1 つのリクエストでモデルが処理できるトークンの最大数"
@@ -616,7 +738,10 @@ ja:
           display_name: "サイトのインターフェース全体でこのモデルを参照するために使用される名前。"
           name: "これを API 呼び出しに含めて、使用するモデルを指定します"
           vision_enabled: "有効にすると、AI は画像を理解しようとします。ビジョンのサポートに使用されているモデルに応じます。Anthropic、Google、および OpenAI の最新モデルでサポートされています。"
+          allowed_attachment_types: "モデルに転送する添付ファイルの種類を選択します。添付ファイルを許可しない場合は空白のままにします。画像はビジョンで制御されます。"
           cost_input: "このモデルの 100 万トークン当たりの入力コスト"
+          cost_cached_input: "このモデルの 100 万トークン当たりのキャッシュされた入力コスト (プロンプトキャッシュから読み取る場合)"
+          cost_cache_write: "このモデルの 100 万トークン当たりのキャッシュ書き込みコスト (プロンプトキャッシュから書き込む場合)"
           cost_output: "このモデルの 100 万トークン当たりの出力コスト"
           cost_measure: "$/100 万トークン"
         providers:
@@ -633,9 +758,11 @@ ja:
           samba_nova: "SambaNova"
           mistral: "Mistral"
           open_router: "OpenRouter"
+          groq: "Groq"
           fake: "カスタム"
         provider_fields:
           access_key_id: "AWS Bedrock アクセスキー ID"
+          role_arn: "AWS Bedrock のロール ARN"
           region: "AWS Bedrock リージョン"
           organization: "オプションの OpenAI 組織 ID"
           disable_system_prompt: "プロンプトでシステムメッセージを無効にする"
@@ -651,6 +778,10 @@ ja:
           reasoning_tokens: "推論に使用されるトークンの数"
           disable_temperature: "Temperature を無効にする (一部の試行モデルは Temperature をサポートしていません)"
           disable_top_p: "Top P を無効にする (一部の試行モデルは Top P をサポートしていません)"
+          prompt_caching: "プロンプトキャッシュモード"
+          prompt_caching_never: "なし - プロンプトキャッシュを使用しない"
+          prompt_caching_tool_results: "ツールの結果 - ツールの結果が存在する場合にキャッシュする (推奨)"
+          prompt_caching_always: "常時 - 常にプロンプトキャッシュを使用する"
       related_topics:
         title: "関連トピック"
         pill: "関連"
@@ -701,6 +832,13 @@ ja:
           credits: "AI によるキャプション"
           save_caption: "保存"
         no_content_error: "先に AI アクションを実行するコンテンツを追加してください"
+      errors:
+        credit_limit_dialog:
+          title: "AI クレジットの上限に達しました"
+          message_user: "このコミュニティーは今日の AI クレジット上限に達しました。%{reset_time} 以降にもう一度お試しいただくか、詳細についてサイト管理者にお問い合わせください。"
+          message_without_time_user: "このコミュニティーは今日の AI クレジット上限に達しました。上限がリセットされるまで応答を利用できません。詳細についてサイト管理者にお問い合わせください。"
+          message_admin: "ご利用のプランの AI クレジット上限に達しました。%{reset_time} に上限がリセットされるまで応答は利用できません。"
+          message_without_time_admin: "ご利用のプランの AI クレジット上限に達しました。 上限がリセットされるまで応答は利用できません。"
       reviewables:
         model_used: "使用モデル:"
         accuracy: "精度:"
@@ -754,13 +892,9 @@ ja:
         provider_fields:
           model_name: "モデル名"
         semantic_search: "トピック (セマンティック)"
-        semantic_search_loading: "AI を使ってさらに多くの結果を検索中"
         semantic_search_results:
-          toggle: "AI で見つかった %{count} 件の結果を表示中"
-          toggle_hidden: "AI で見つかった %{count} 件の結果を非表示"
-          none: "AI 検索ではどのトピックも一致しませんでした"
-          new: "「検索」を押すと、AI が新しい結果を検索し始めます"
           unavailable: "AI の結果は利用できません"
+          zero_results_expanded: "結果は見つかりませんでした。%{count} 件の AI 結果が表示されています"
         semantic_search_tooltips:
           results_explanation: "有効にすると、追加の AI 検索結果が下に追加されます。"
           invalid_sort: "AI 結果を表示するには、検索結果を関連性で並べ替える必要があります"
@@ -793,6 +927,8 @@ ja:
           copy_response: "返答をコピー"
           request_tokens: "リクエストトークン:"
           response_tokens: "レスポンストークン:"
+          cache_read_tokens: "キャッシュ読み取りトークン:"
+          cache_write_tokens: "キャッシュ書き込みトークン:"
           request: "リクエスト"
           response: "応答"
           next_log: "次へ"
@@ -874,7 +1010,19 @@ ja:
         topic:
           title: "トピックの要約"
           close: "要約パネルを閉じる"
+          regenerate_ai_summaries: "AI 要約を再生成する"
+          regen_modal_description: "このトピックに対して再生成する AI 要約の種類を選択します。"
+          bulk_regen_description: "選択されたトピックに対して再生成する AI 要約の種類を選択します。"
+          regenerate_gists_option: "短い要約 (要点)"
           regenerate_summaries_option: "トピックの要約"
+          regenerate_gists_success:
+            other: "%{count} 件の短い要約を再生成しました"
+          regenerate_gists_error:
+            other: "%{count} 件の短い要約の再生成に失敗しました"
+          regenerate_topic_summary_success:
+            other: "%{count} 件のトピック要約を再生成しました"
+          regenerate_topic_summary_error:
+            other: "%{count} 件のトピック要約の再生成に失敗しました"
         topic_list_layout:
           button:
             compact: "コンパクト"
@@ -888,6 +1036,7 @@ ja:
         loading_convo: "会話を読み込み中"
         collapse: "折りたたむ"
         timed_out: "Discobot は発見を見つけられませんでした。問題が発生しました。"
+        user_setting: "発見の AI 検索を有効にする"
         tooltip:
           header: "AI 搭載の検索"
           content: "%{model} による自然言語検索"
diff --git a/plugins/discourse-ai/config/locales/client.ko.yml b/plugins/discourse-ai/config/locales/client.ko.yml
index c116e8a27769d..512bdae816206 100644
--- a/plugins/discourse-ai/config/locales/client.ko.yml
+++ b/plugins/discourse-ai/config/locales/client.ko.yml
@@ -133,6 +133,7 @@ ko:
         remove_parameter: "제거"
         parameter_required: "필수"
         edit: "편집"
+        test: "테스트"
         delete: "삭제"
       secrets:
         short_title: "자격 증명"
diff --git a/plugins/discourse-ai/config/locales/client.lt.yml b/plugins/discourse-ai/config/locales/client.lt.yml
index a9fa3108087fe..674b9806cdb4b 100644
--- a/plugins/discourse-ai/config/locales/client.lt.yml
+++ b/plugins/discourse-ai/config/locales/client.lt.yml
@@ -327,6 +327,7 @@ lt:
         remove_parameter: "Pašalinti"
         parameter_required: "Privalomi"
         edit: "Redaguoti"
+        test: "Bandymas"
         delete: "Pašalinti"
       secrets:
         short_title: "Įgaliojimai"
@@ -337,6 +338,7 @@ lt:
         edit: "Redaguoti"
         delete: "Pašalinti"
         embedding: "Įterpimai"
+        tool: "Įrankis"
       llms:
         display_name: "Vardas"
         save: "Saugoti"
diff --git a/plugins/discourse-ai/config/locales/client.nb_NO.yml b/plugins/discourse-ai/config/locales/client.nb_NO.yml
index eb10482c07a16..5d7defc58cdb4 100644
--- a/plugins/discourse-ai/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-ai/config/locales/client.nb_NO.yml
@@ -114,7 +114,9 @@ nb_NO:
         save: "Lagre"
         remove_parameter: "Fjern"
         parameter_required: "Påkrevd"
+        credential_not_set: "(ikke angitt)"
         edit: "Rediger"
+        test: "Test"
         delete: "Slett"
       secrets:
         short_title: "Legitimasjon"
diff --git a/plugins/discourse-ai/config/locales/client.nl.yml b/plugins/discourse-ai/config/locales/client.nl.yml
index 78d364ccf6692..4bff30d0ca90b 100644
--- a/plugins/discourse-ai/config/locales/client.nl.yml
+++ b/plugins/discourse-ai/config/locales/client.nl.yml
@@ -388,7 +388,6 @@ nl:
         overwrite: "Overschrijven"
         description: "Beschrijving"
         no_llm_selected: "Geen taalmodel geselecteerd"
-        use_parent_llm: "Taalmodel van persona gebruiken"
         max_context_posts: "Maximaal aantal contextberichten"
         max_context_posts_help: "Het maximale aantal berichten dat als context voor de AI kan worden gebruikt bij het reageren op een gebruiker. (Leeg voor standaardinstelling)"
         vision_enabled: Zicht ingeschakeld
@@ -521,8 +520,9 @@ nl:
         parameter_description: "Parameterbeschrijving"
         enum_value: "Enumwaarde"
         add_enum_value: "Enumwaarde toevoegen"
+        credential_not_set: "(niet ingesteld)"
         edit: "Bewerken"
-        test: "Test uitvoeren"
+        test: "Testen"
         delete: "Verwijderen"
         saved: "Tool opgeslagen"
         confirm_delete: "Weet je zeker dat je deze tool wilt verwijderen?"
@@ -539,6 +539,7 @@ nl:
         edit: "Bewerken"
         delete: "Verwijderen"
         embedding: "Insluiting"
+        tool: "Tool"
       llms:
         short_title: "LLM's"
         no_llms: "Nog geen LLM's"
@@ -596,8 +597,8 @@ nl:
           other: "Dit model wordt momenteel gebruikt door de volgende: %{settings}. Als het onjuist is geconfigureerd, werken functies niet zoals verwacht. "
         model_description:
           none: "Algemene instellingen die werken voor de meeste taalmodellen"
-          anthropic-claude-opus-4-5: "Het intelligentste model van Antropic"
-          anthropic-claude-sonnet-4-5: "Optimale balans tussen snelheid en kosten"
+          anthropic-claude-opus-4-6: "Het intelligentste model van Antropic"
+          anthropic-claude-sonnet-4-6: "Optimale balans tussen snelheid en kosten"
           anthropic-claude-haiku-4-5: "Snel en kosteneffectief"
           open_ai-gpt-5-nano: "Snelste en meest kostenefficiënte GPT-5-model"
         preseeded_model_description: "Voorgeconfigureerd open-source model met %{model}"
@@ -762,12 +763,7 @@ nl:
         provider_fields:
           model_name: "Modelnaam"
         semantic_search: "Topics (semantisch)"
-        semantic_search_loading: "Zoeken naar meer resultaten met behulp van AI"
         semantic_search_results:
-          toggle: "%{count} resultaten gevonden met AI worden weergegeven"
-          toggle_hidden: "%{count} resultaten gevonden met AI zijn verborgen"
-          none: "Sorry, AI zoeken heeft geen overeenkomende topics gevonden"
-          new: "Druk op 'Zoeken' om nieuwe resultaten te zoeken met AI"
           unavailable: "AI-resultaten niet beschikbaar"
         semantic_search_tooltips:
           results_explanation: "Als dit is ingeschakeld, worden hieronder extra AI-zoekresultaten toegevoegd."
diff --git a/plugins/discourse-ai/config/locales/client.pl_PL.yml b/plugins/discourse-ai/config/locales/client.pl_PL.yml
index 7449982a0863e..8b6a7b162c80d 100644
--- a/plugins/discourse-ai/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-ai/config/locales/client.pl_PL.yml
@@ -526,7 +526,7 @@ pl_PL:
         overwrite: "Zastąp"
         description: "Opis"
         no_llm_selected: "Nie wybrano modelu językowego"
-        use_parent_llm: "Użyj modelu językowego person"
+        use_parent_llm: "Użyj modelu językowego persony"
         max_context_posts: "Maksymalny kontekst postów"
         max_context_posts_help: "Maksymalna liczba postów do wykorzystania jako kontekst dla sztucznej inteligencji podczas odpowiadania użytkownikowi. (domyślnie puste)"
         vision_enabled: Wizja włączona
@@ -663,8 +663,14 @@ pl_PL:
         parameter_description: "Opis parametru"
         enum_value: "Wartość enum"
         add_enum_value: "Dodaj wartość enum"
+        secret_alias: "Alias poświadczeń"
+        secret_alias_help: "Alias odwoływany ze skryptów za pomocą secrets.get(\"alias_name\"). Użyj liter, cyfr i podkreśleń."
+        secret_credential: "Poświadczenie"
+        add_secret_contract: "Dodaj poświadczenie"
+        remove_secret_contract: "Usuń poświadczenie"
+        credential_not_set: "(nie ustawiono)"
         edit: "Edytuj"
-        test: "Przeprowadź test"
+        test: "Sprawdź"
         delete: "Usuń"
         saved: "Narzędzie zapisane"
         confirm_delete: "Czy na pewno chcesz usunąć to narzędzie?"
@@ -674,7 +680,7 @@ pl_PL:
           result: "Wynik testu"
       secrets:
         short_title: "Poświadczenia"
-        description: "Zarządzaj danymi uwierzytelniającymi współdzielonymi w ramach LLM i osadzeń."
+        description: "Zarządzaj poświadczeniami uwierzytelniania współdzielonymi przez LLM, osadzenia i narzędzia."
         name: "Nazwa"
         secret: "Wartość"
         select_secret: "Wybierz poświadczenie..."
@@ -694,6 +700,7 @@ pl_PL:
         not_used: "Nieużywane"
         embedding: "Osadzanie"
         cannot_delete_in_use: "Tego poświadczenia nie można usunąć, ponieważ jest ono używane przez:"
+        tool: "Narzędzie"
         modal:
           title: "Utwórz nowe poświadczenie"
       llms:
@@ -763,8 +770,8 @@ pl_PL:
           other: "Ten model jest obecnie używany przez: %{settings}. W przypadku nieprawidłowej konfiguracji funkcje nie będą działać zgodnie z oczekiwaniami. "
         model_description:
           none: "Ogólne ustawienia, które działają dla większości modeli językowych"
-          anthropic-claude-opus-4-5: "Najbardziej inteligentny model Anthropic"
-          anthropic-claude-sonnet-4-5: "Optymalna równowaga między szybkością a kosztami"
+          anthropic-claude-opus-4-6: "Najbardziej inteligentny model Anthropic"
+          anthropic-claude-sonnet-4-6: "Optymalna równowaga między szybkością a kosztami"
           anthropic-claude-haiku-4-5: "Szybki i opłacalny"
           google-gemini-3-pro: "Najinteligentniejszy model Google"
           google-gemini-3-flash: "Szybki i ekonomiczny dzięki rozumowaniu multimodalnemu"
@@ -774,8 +781,8 @@ pl_PL:
           open_router-deepseek-deepseek-v3-2: "Najnowszy, wysokowydajny model firmy DeepSeek"
           open_router-moonshotai-kimi-k2-5: "Multimodalny model Moonshot z funkcjami wizyjnymi"
           open_router-x-ai-grok-4-fast: "Flagowy model xAI z wizją"
-          open_router-minimax-minimax-m2-1: "Multimodalny model MiniMax z dużym kontekstem"
-          open_router-z-ai-glm-4-7: "Multimodalny model Z-AI z wizją"
+          open_router-minimax-minimax-m2-5: "Multimodalny model MiniMax z dużym kontekstem"
+          open_router-z-ai-glm-5: "Multimodalny model Z-AI z wizją"
           open_router-arcee-ai-trinity-large-preview-free: "Darmowy model open-source od Arcee AI"
         preseeded_model_description: "Wstępnie skonfigurowany model open-source wykorzystujący %{model}"
         configured:
@@ -831,6 +838,7 @@ pl_PL:
           disable_system_prompt: "Wyłącz wiadomość systemową w promptach"
           enable_native_tool: "Włącz obsługę natywnych narzędzi"
           disable_native_tools: "Wyłącz obsługę narzędzi natywnych (użyj narzędzi opartych na XML)"
+          disable_native_structured_output: "Wyłącz natywne, strukturalne wyjście (zamiast tego użyj funkcji wstępnego wypełniania wiadomości asystenta, wymaganej w przypadku Claude 3.x i starszych wersji)"
           provider_order: "Kolejność dostawców (lista rozdzielona przecinkami)"
           provider_quantizations: "Kolejność kwantyzacji dostawców (lista rozdzielona przecinkami, np.: fp16,fp8)"
           disable_streaming: "Wyłącz uzupełnianie strumieniowania (zmień żądania strumieniowe na żądania niestrumieniowe)"
@@ -845,7 +853,7 @@ pl_PL:
           prompt_caching_never: "Nigdy – nie używaj buforowania błyskawicznego"
           prompt_caching_tool_results: "Wyniki narzędzi – pamięć podręczna, gdy dostępne są wyniki narzędzi (zalecane)"
           prompt_caching_always: "Zawsze – zawsze używaj szybkiego buforowania"
-          effort: "Poziom wysiłku (tylko Claude Opus 4.5)"
+          effort: "Poziom wysiłku"
       related_topics:
         title: "Powiązane tematy"
         pill: "Powiązane"
@@ -959,17 +967,15 @@ pl_PL:
         provider_fields:
           model_name: "Nazwa modelu"
         semantic_search: "Tematy (semantyczne)"
-        semantic_search_loading: "Wyszukiwanie większej liczby wyników przy użyciu AI"
         semantic_search_results:
-          toggle: "Wyświetlanie %{count} wyników znalezionych przy użyciu AI"
-          toggle_hidden: "Ukrywanie %{count} wyników znalezionych przy użyciu AI"
-          none: "Przepraszamy, nasze wyszukiwanie AI nie znalazło pasujących tematów"
-          new: "Naciśnij „Szukaj”, aby rozpocząć wyszukiwanie nowych wyników za pomocą sztucznej inteligencji"
+          toggle: "Wyniki AI"
           unavailable: "Wyniki AI są niedostępne"
           zero_results_expanded: "Znaleziono zero wyników, pokazano %{count} wyników AI"
         semantic_search_tooltips:
           results_explanation: "Po włączeniu tej opcji poniżej zostaną dodane dodatkowe wyniki wyszukiwania AI."
           invalid_sort: "Aby wyświetlić wyniki AI, wyniki wyszukiwania muszą być sortowane według trafności"
+          not_submitted: "Prześlij wyszukiwanie, aby włączyć wyniki AI"
+          no_results: "Nie znaleziono wyników AI dla tego wyszukiwania"
         semantic_search_unavailable_tooltip: "Aby wyświetlić wyniki AI, wyniki wyszukiwania muszą być sortowane według trafności"
         ai_generated_result: "Wynik wyszukiwania znaleziony przy użyciu AI"
         quick_search:
diff --git a/plugins/discourse-ai/config/locales/client.pt.yml b/plugins/discourse-ai/config/locales/client.pt.yml
index 14ef7c5d3b136..783b223c74fe6 100644
--- a/plugins/discourse-ai/config/locales/client.pt.yml
+++ b/plugins/discourse-ai/config/locales/client.pt.yml
@@ -205,7 +205,9 @@ pt:
         save: "Guardar"
         remove_parameter: "Remover"
         parameter_required: "Necessário"
+        credential_not_set: "(não definido)"
         edit: "Editar"
+        test: "Testar"
         delete: "Eliminar"
       secrets:
         short_title: "Credenciais"
@@ -238,7 +240,7 @@ pt:
           ai_summarization: "Resumir"
           ai_spam: "Spam"
         model_description:
-          anthropic-claude-opus-4-5: "O modelo mais inteligente da Anthropic"
+          anthropic-claude-opus-4-6: "O modelo mais inteligente da Anthropic"
         next:
           title: "Próximo"
         tests:
@@ -246,8 +248,6 @@ pt:
         providers:
           google: "Google"
           fake: "Personalizar"
-        provider_fields:
-          effort: "Nível de esforço (apenas Claude Opus 4.5)"
       ai_helper:
         context_menu:
           cancel: "Cancelar"
diff --git a/plugins/discourse-ai/config/locales/client.pt_BR.yml b/plugins/discourse-ai/config/locales/client.pt_BR.yml
index eee0a21498662..3a62711e0f40f 100644
--- a/plugins/discourse-ai/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-ai/config/locales/client.pt_BR.yml
@@ -419,7 +419,6 @@ pt_BR:
         overwrite: "Sobrescrever"
         description: "Descrição"
         no_llm_selected: "Nenhum modelo de linguagem selecionado"
-        use_parent_llm: "Usar modelo de linguagem de personas"
         max_context_posts: "Máximo de postagens de contexto"
         max_context_posts_help: "A quantidade máxima de postagens para usar como contexto para a IA ao responder ao(à) usuário(a). (deixar vazio para padrão)"
         vision_enabled: Visão ativada
@@ -552,8 +551,9 @@ pt_BR:
         parameter_description: "Descrição do parâmetro"
         enum_value: "Valor da enumeração"
         add_enum_value: "Adicionar valor da enumeração"
+        credential_not_set: "(não configurado)"
         edit: "Editar"
-        test: "Executar teste"
+        test: "Testar"
         delete: "Excluir"
         saved: "Ferramenta salva"
         confirm_delete: "Tem certeza de que deseja excluir esta ferramenta?"
@@ -570,6 +570,7 @@ pt_BR:
         edit: "Editar"
         delete: "Excluir"
         embedding: "Incorporar"
+        tool: "Ferramenta"
       llms:
         short_title: "LLMs"
         no_llms: "Nenhum LLM ainda"
@@ -627,8 +628,8 @@ pt_BR:
           other: "Este modelo é usado atualmente por %{settings}. Se for configurado incorretamente, os recursos não funcionarão como esperado. "
         model_description:
           none: "Configurações gerais que funcionam com a maioria dos modelos de linguagens"
-          anthropic-claude-opus-4-5: "Modelo mais inteligente da Anthropic"
-          anthropic-claude-sonnet-4-5: "Equilíbrio ideal entre custo e velocidade"
+          anthropic-claude-opus-4-6: "Modelo mais inteligente da Anthropic"
+          anthropic-claude-sonnet-4-6: "Equilíbrio ideal entre custo e velocidade"
           anthropic-claude-haiku-4-5: "Rápido e econômico"
           open_ai-gpt-5-nano: "O modelo do GPT-5 mais rápido e econômico"
         preseeded_model_description: "Modelo de código aberto pré-configurado que utiliza %{model}"
@@ -793,12 +794,7 @@ pt_BR:
         provider_fields:
           model_name: "Nome do modelo"
         semantic_search: "Tópicos (semântica)"
-        semantic_search_loading: "Pesquisando mais resultados usando IA"
         semantic_search_results:
-          toggle: "Mostrando %{count} resultados encontrados usando IA"
-          toggle_hidden: "Ocultando %{count} resultados encontrados usando IA"
-          none: "Desculpe, nossa Pesquisa com IA não achou tópicos correspondentes"
-          new: "Aperte \"Pesquisar\"' para começar a procurar resultados novos com a IA"
           unavailable: "Resultados de IA indisponíveis"
         semantic_search_tooltips:
           results_explanation: "Ao ativar esta opção, os resultados de pesquisa com IA são adicionados abaixo."
diff --git a/plugins/discourse-ai/config/locales/client.ro.yml b/plugins/discourse-ai/config/locales/client.ro.yml
index 342d460d971b2..a8b3ff657fa65 100644
--- a/plugins/discourse-ai/config/locales/client.ro.yml
+++ b/plugins/discourse-ai/config/locales/client.ro.yml
@@ -165,7 +165,7 @@ ro:
         remove_parameter: "Elimină"
         parameter_required: "Necesare"
         edit: "Editează"
-        test: "Rulează test"
+        test: "Test"
         delete: "Șterge"
         test_modal:
           run: "Rulează test"
@@ -202,7 +202,7 @@ ro:
           ai_summarization: "Rezumat"
           ai_spam: "Spam"
         model_description:
-          anthropic-claude-opus-4-5: "Cel mai inteligent model de la Anthropic"
+          anthropic-claude-opus-4-6: "Cel mai inteligent model de la Anthropic"
           open_ai-gpt-5-nano: "Cel mai rapid și mai rentabil model GPT-5"
         next:
           title: "Următorul"
@@ -215,7 +215,6 @@ ro:
           fake: "Personalizat"
         provider_fields:
           role_arn: "Rol ARN AWS Bedrock"
-          effort: "Nivel de efort (doar Claude Opus 4.5)"
       ai_helper:
         context_menu:
           cancel: "Anulează"
diff --git a/plugins/discourse-ai/config/locales/client.ru.yml b/plugins/discourse-ai/config/locales/client.ru.yml
index dfe1fc5110fc1..b9c7f5cc0f988 100644
--- a/plugins/discourse-ai/config/locales/client.ru.yml
+++ b/plugins/discourse-ai/config/locales/client.ru.yml
@@ -446,7 +446,6 @@ ru:
         overwrite: "Перезаписать"
         description: "Описание"
         no_llm_selected: "Языковая модель не выбрана"
-        use_parent_llm: "Использовать языковую модель персоны"
         max_context_posts: "Максимум публикаций для учета в контексте"
         max_context_posts_help: "Максимальное количество публикаций, которое будет использоваться в качестве контекста для AI при ответе пользователю. (Пусто по умолчанию)"
         vision_enabled: Визуальное распознавание включено
@@ -581,8 +580,9 @@ ru:
         parameter_description: "Описание параметра"
         enum_value: "Значение перечисления"
         add_enum_value: "Добавить значение перечисления"
+        credential_not_set: "(не установлено)"
         edit: "Изменить"
-        test: "Выполнить тест"
+        test: "Тест"
         delete: "Удалить"
         saved: "Инструмент сохранен"
         confirm_delete: "Действительно удалить этот инструмент?"
@@ -599,6 +599,7 @@ ru:
         edit: "Изменить"
         delete: "Удалить"
         embedding: "Встраивание"
+        tool: "Инструмент"
       llms:
         short_title: "Большие языковые модели"
         no_llms: "Еще нет LLM"
@@ -658,8 +659,8 @@ ru:
           other: "Эта модель сейчас используется в следующих параметрах: %{settings}. В случае неправильной настройки функции не будут работать должным образом. "
         model_description:
           none: "Общие настройки, подходящие для большинства языковых моделей"
-          anthropic-claude-opus-4-5: "Самая интеллектуальная модель Anthropic"
-          anthropic-claude-sonnet-4-5: "Оптимальный баланс скорости и стоимости"
+          anthropic-claude-opus-4-6: "Самая интеллектуальная модель Anthropic"
+          anthropic-claude-sonnet-4-6: "Оптимальный баланс скорости и стоимости"
           anthropic-claude-haiku-4-5: "Быстрая и экономически эффективная модель"
           open_ai-gpt-5-nano: "Самая быстрая и экономичная модель GPT-5"
         preseeded_model_description: "Предварительно настроенная модель с открытым исходным кодом, использующая %{model}"
@@ -827,12 +828,7 @@ ru:
         provider_fields:
           model_name: "Название модели"
         semantic_search: "Темы (семантика)"
-        semantic_search_loading: "Поиск дополнительных результатов с помощью AI"
         semantic_search_results:
-          toggle: "Показать результаты (%{count}), найденные с помощью AI"
-          toggle_hidden: "Скрыть результаты (%{count}), найденные с помощью AI"
-          none: "К сожалению, AI-поиск не нашел подходящих тем"
-          new: "Нажмите «Поиск», чтобы начать поиск новых результатов с помощью AI"
           unavailable: "Результаты AI недоступны"
         semantic_search_tooltips:
           results_explanation: "Если параметр включен, дополнительные результаты AI-поиска будут добавлены ниже."
diff --git a/plugins/discourse-ai/config/locales/client.sk.yml b/plugins/discourse-ai/config/locales/client.sk.yml
index d0e55f0f4c10c..e7bbe077e29f4 100644
--- a/plugins/discourse-ai/config/locales/client.sk.yml
+++ b/plugins/discourse-ai/config/locales/client.sk.yml
@@ -391,7 +391,6 @@ sk:
         overwrite: "Prepísať"
         description: "Popis"
         no_llm_selected: "Nie je vybraný žiadny jazykový model"
-        use_parent_llm: "Použiť jazykový model personas"
         max_context_posts: "Maximálny počet kontextových príspevkov"
         max_context_posts_help: "Maximálny počet príspevkov, ktoré sa majú použiť ako kontext pre AI pri odpovedi používateľovi. (predvolene prázdne)"
         vision_enabled: Videnie povolené
@@ -526,8 +525,9 @@ sk:
         parameter_description: "Popis parametra"
         enum_value: "Hodnota enumu"
         add_enum_value: "Pridať enum hodnotu"
+        credential_not_set: "(nie je nastavené)"
         edit: "Upraviť"
-        test: "Spustiť test"
+        test: "Test"
         delete: "Odstrániť"
         saved: "Nástroj uložený"
         confirm_delete: "Naozaj chcete tento nástroj odstrániť?"
@@ -544,6 +544,7 @@ sk:
         edit: "Upraviť"
         delete: "Odstrániť"
         embedding: "Vkladám"
+        tool: "Nástroj"
       llms:
         short_title: "LLM"
         no_llms: "Zatiaľ žiadne LLM"
@@ -602,8 +603,8 @@ sk:
           other: "Tento model momentálne používa nasledovné %{settings}. Ak je nesprávne nakonfigurovaný, funkcia nebude fungovať podľa očakávania. "
         model_description:
           none: "Všeobecné nastavenia, ktoré fungujú pre väčšinu jazykových modelov"
-          anthropic-claude-opus-4-5: "Najinteligentnejší model spoločnosti Anthropic"
-          anthropic-claude-sonnet-4-5: "Optimálna rovnováha medzi rýchlosťou a cenou"
+          anthropic-claude-opus-4-6: "Najinteligentnejší model spoločnosti Anthropic"
+          anthropic-claude-sonnet-4-6: "Optimálna rovnováha medzi rýchlosťou a cenou"
           anthropic-claude-haiku-4-5: "Rýchle a cenovo výhodné"
           open_ai-gpt-5-nano: "Najrýchlejší, cenovo najefektívnejší model GPT-5"
         preseeded_model_description: "Predkonfigurovaný model s otvoreným zdrojovým kódom využívajúci %{model}"
@@ -770,12 +771,7 @@ sk:
         provider_fields:
           model_name: "Názov modelu"
         semantic_search: "Témy (sémantické)"
-        semantic_search_loading: "Vyhľadávanie ďalších výsledkov pomocou AI"
         semantic_search_results:
-          toggle: "Zobrazuje sa %{count} nájdených výsledkov pomocou AI"
-          toggle_hidden: "Skrytie výsledkov %{count} nájdených pomocou AI"
-          none: "Je nám ľúto, naša AI nenašla žiadne zodpovedajúce témy"
-          new: "Stlačením tlačidla \"hľadať\" začnete vyhľadávať nové výsledky pomocou AI"
           unavailable: "Výsledky AI nie sú k dispozícii"
         semantic_search_tooltips:
           results_explanation: "Ak je táto funkcia povolená, pod ňu sa pridajú ďalšie výsledky vyhľadávania s AI."
diff --git a/plugins/discourse-ai/config/locales/client.sl.yml b/plugins/discourse-ai/config/locales/client.sl.yml
index c2cf89edb2e73..ee3a98d405d73 100644
--- a/plugins/discourse-ai/config/locales/client.sl.yml
+++ b/plugins/discourse-ai/config/locales/client.sl.yml
@@ -126,6 +126,7 @@ sl:
         save: "Shrani"
         remove_parameter: "Odstrani"
         parameter_required: "Zahtevano"
+        credential_not_set: "(ni nastavljeno)"
         edit: "Uredi"
         delete: "Izbriši"
       secrets:
diff --git a/plugins/discourse-ai/config/locales/client.sq.yml b/plugins/discourse-ai/config/locales/client.sq.yml
index 260e661b1de5e..6cd15361b1f55 100644
--- a/plugins/discourse-ai/config/locales/client.sq.yml
+++ b/plugins/discourse-ai/config/locales/client.sq.yml
@@ -111,6 +111,7 @@ sq:
         save: "Ruani"
         remove_parameter: "Hiq"
         parameter_required: "E nevojshme"
+        credential_not_set: "(nuk është vendosur)"
         edit: "Redaktoni"
         delete: "Fshij"
       secrets:
diff --git a/plugins/discourse-ai/config/locales/client.sv.yml b/plugins/discourse-ai/config/locales/client.sv.yml
index 813082cf272f7..f842143349378 100644
--- a/plugins/discourse-ai/config/locales/client.sv.yml
+++ b/plugins/discourse-ai/config/locales/client.sv.yml
@@ -123,7 +123,9 @@ sv:
         save: "Spara"
         remove_parameter: "Ta bort"
         parameter_required: "Krävs"
+        credential_not_set: "(inte inställd)"
         edit: "Redigera"
+        test: "Testa"
         delete: "Ta bort"
       secrets:
         short_title: "Kontouppgifter"
diff --git a/plugins/discourse-ai/config/locales/client.sw.yml b/plugins/discourse-ai/config/locales/client.sw.yml
index 6f0259567aa5c..40a3abbf00c3e 100644
--- a/plugins/discourse-ai/config/locales/client.sw.yml
+++ b/plugins/discourse-ai/config/locales/client.sw.yml
@@ -103,6 +103,7 @@ sw:
         remove_parameter: "Ondoa"
         parameter_required: "Muhimu na Inahitajika"
         edit: "Hariri"
+        test: "Majaribio"
         delete: "Futa"
       secrets:
         name: "Jina"
diff --git a/plugins/discourse-ai/config/locales/client.te.yml b/plugins/discourse-ai/config/locales/client.te.yml
index 39fcc9a5c7ba9..9f5b755684a53 100644
--- a/plugins/discourse-ai/config/locales/client.te.yml
+++ b/plugins/discourse-ai/config/locales/client.te.yml
@@ -109,6 +109,7 @@ te:
         remove_parameter: "తీసివేయండి"
         parameter_required: "అవసరం"
         edit: "సవరించండి"
+        test: "పరీక్షించండి"
         delete: "తొలగించండి"
       secrets:
         short_title: "ఆధారాలు"
diff --git a/plugins/discourse-ai/config/locales/client.tr_TR.yml b/plugins/discourse-ai/config/locales/client.tr_TR.yml
index fe55265539935..054e194dcaa81 100644
--- a/plugins/discourse-ai/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-ai/config/locales/client.tr_TR.yml
@@ -388,7 +388,6 @@ tr_TR:
         overwrite: "Üzerine yaz"
         description: "Açıklama"
         no_llm_selected: "Dil modeli seçilmedi"
-        use_parent_llm: "Kişilik dil modelini kullan"
         max_context_posts: "Maksimum bağlam gönderisi sayısı"
         max_context_posts_help: "Bir kullanıcıya yanıt verirken YZ için bağlam olarak kullanılacak maksimum gönderi sayısı. (varsayılan için boş)"
         vision_enabled: Vizyon etkin
@@ -521,8 +520,9 @@ tr_TR:
         parameter_description: "Parametre açıklaması"
         enum_value: "Numaralandırma değeri"
         add_enum_value: "Numaralandırma değeri ekle"
+        credential_not_set: "(ayarlanmamış)"
         edit: "Düzenle"
-        test: "Testi çalıştır"
+        test: "Test"
         delete: "Sil"
         saved: "Araç kaydedildi"
         confirm_delete: "Bu aracı silmek istediğinizden emin misiniz?"
@@ -539,6 +539,7 @@ tr_TR:
         edit: "Düzenle"
         delete: "Sil"
         embedding: "Gömme"
+        tool: "Araç"
       llms:
         short_title: "LLM'ler"
         no_llms: "Henüz LLM yok"
@@ -596,8 +597,8 @@ tr_TR:
           other: "Bu model şu anda şunlar tarafından kullanılıyor: %{settings}. Yanlış yapılandırılırsa özellikler beklendiği gibi çalışmaz. "
         model_description:
           none: "Çoğu dil modeli için çalışan genel ayarlar"
-          anthropic-claude-opus-4-5: "Antropic'in en akıllı modeli"
-          anthropic-claude-sonnet-4-5: "Hız ve maliyetin optimum dengesi"
+          anthropic-claude-opus-4-6: "Antropic'in en akıllı modeli"
+          anthropic-claude-sonnet-4-6: "Hız ve maliyetin optimum dengesi"
           anthropic-claude-haiku-4-5: "Hızlı ve uygun maliyetli"
           open_ai-gpt-5-nano: "En hızlı ve en uygun maliyetli GPT-5 modeli"
         preseeded_model_description: "%{model} kullanan önceden yapılandırılmış açık kaynaklı model"
@@ -762,12 +763,7 @@ tr_TR:
         provider_fields:
           model_name: "Model adı"
         semantic_search: "Konular (Semantik)"
-        semantic_search_loading: "YZ kullanarak daha fazla sonuç arama"
         semantic_search_results:
-          toggle: "YZ kullanılarak bulunan %{count} sonuç gösteriliyor"
-          toggle_hidden: "YZ kullanılarak bulunan %{count} sonuç gizleniyor"
-          none: "Üzgünüz, YZ aramamız eşleşen konu bulamadı"
-          new: "YZ ile yeni sonuçlar aramaya başlamak için \"ara\" seçeneğine basın"
           unavailable: "YZ sonuçları kullanılamıyor"
         semantic_search_tooltips:
           results_explanation: "Etkinleştirildiğinde ek YZ arama sonuçları aşağıya eklenir."
diff --git a/plugins/discourse-ai/config/locales/client.ug.yml b/plugins/discourse-ai/config/locales/client.ug.yml
index ac47cd9cecbd0..d3b97c1d3d222 100644
--- a/plugins/discourse-ai/config/locales/client.ug.yml
+++ b/plugins/discourse-ai/config/locales/client.ug.yml
@@ -134,8 +134,9 @@ ug:
         save: "ساقلا"
         remove_parameter: "چىقىرىۋەت"
         parameter_required: "زۆرۈر"
+        credential_not_set: "(تەڭشەلمىدى)"
         edit: "تەھرىر"
-        test: "سىناقنى ئىجرا قىل"
+        test: "سىنا"
         delete: "ئۆچۈر"
         test_modal:
           run: "سىناقنى ئىجرا قىل"
diff --git a/plugins/discourse-ai/config/locales/client.uk.yml b/plugins/discourse-ai/config/locales/client.uk.yml
index 044eeb7bc6ed9..ee20641e9616b 100644
--- a/plugins/discourse-ai/config/locales/client.uk.yml
+++ b/plugins/discourse-ai/config/locales/client.uk.yml
@@ -526,7 +526,6 @@ uk:
         overwrite: "Перезаписати"
         description: "Опис"
         no_llm_selected: "Мовну модель не вибрано"
-        use_parent_llm: "Використовувати мовну модель персон"
         max_context_posts: "Максимальна кількість контекстних повідомлень"
         max_context_posts_help: "Максимальна кількість дописів, які ШІ буде використовувати як контекст для відповіді користувачеві. (за замовчуванням порожньо)"
         vision_enabled: Візуальне розпізнавання увімкнено
@@ -663,8 +662,14 @@ uk:
         parameter_description: "Опис параметра"
         enum_value: "Значення переліку"
         add_enum_value: "Додати значення переліку"
+        secret_alias: "Псевдонім облікових даних"
+        secret_alias_help: "Псевдонім, на який посилаються зі скриптів через secrets.get(\"alias_name\"). Використовуйте літери, цифри та символи підкреслення."
+        secret_credential: "Облікові дані"
+        add_secret_contract: "Додати облікові дані"
+        remove_secret_contract: "Видалити облікові дані"
+        credential_not_set: "(не встановлено)"
         edit: "Редагувати"
-        test: "Запустити тест"
+        test: "Тест"
         delete: "Видалити"
         saved: "Інструмент збережено"
         confirm_delete: "Ви впевнені, що хочете видалити цей інструмент?"
@@ -674,7 +679,7 @@ uk:
           result: "Результат тесту"
       secrets:
         short_title: "Дані доступу"
-        description: "Керуйте обліковими даними автентифікації, що спільно використовуються в LLM та вбудованих системах."
+        description: "Керуйте обліковими даними автентифікації, що спільно використовуються в LLM, вбудованих системах та інструментах."
         name: "Імʼя"
         secret: "Значення"
         select_secret: "Виберіть обліковий запис..."
@@ -694,6 +699,7 @@ uk:
         not_used: "Не використовується"
         embedding: "Взаємодія"
         cannot_delete_in_use: "Ці облікові дані не можна видалити, оскільки вони використовуються:"
+        tool: "Інструмент"
         modal:
           title: "Створити нові облікові дані"
       llms:
@@ -763,8 +769,8 @@ uk:
           other: "Ця модель зараз використовується: %{settings}. У разі неправильного налаштування функція не працюватиме належним чином. "
         model_description:
           none: "Загальні налаштування, що працюють для більшості мовних моделей"
-          anthropic-claude-opus-4-5: "Найрозумніша модель Anthropic"
-          anthropic-claude-sonnet-4-5: "Оптимальний баланс швидкості та витрат"
+          anthropic-claude-opus-4-6: "Найрозумніша модель Anthropic"
+          anthropic-claude-sonnet-4-6: "Оптимальний баланс швидкості та витрат"
           anthropic-claude-haiku-4-5: "Швидко та економічно ефективно"
           google-gemini-3-pro: "Найрозумніша модель Google"
           google-gemini-3-flash: "Швидко та економічно ефективно з мультимодальним мисленням"
@@ -774,8 +780,8 @@ uk:
           open_router-deepseek-deepseek-v3-2: "Остання високопродуктивна модель DeepSeek"
           open_router-moonshotai-kimi-k2-5: "Мультимодальна модель Moonshot з можливостями технічного зору"
           open_router-x-ai-grok-4-fast: "Флагманська модель xAI з функцією бачення"
-          open_router-minimax-minimax-m2-1: "Мультимодальна модель MiniMax з широким контекстом"
-          open_router-z-ai-glm-4-7: "Мультимодальна модель Z-AI із баченням"
+          open_router-minimax-minimax-m2-5: "Мультимодальна модель MiniMax з широким контекстом"
+          open_router-z-ai-glm-5: "Мультимодальна модель Z-AI із баченням"
           open_router-arcee-ai-trinity-large-preview-free: "Безкоштовна модель з відкритим вихідним кодом від Arcee AI"
         preseeded_model_description: "Попередньо налаштована модель з відкритим кодом, що використовує %{model}"
         configured:
@@ -845,7 +851,7 @@ uk:
           prompt_caching_never: "Ніколи – не використовувати кешування запитів"
           prompt_caching_tool_results: "Результати інструментів – кешувати, коли результати інструментів присутні (рекомендовано)"
           prompt_caching_always: "Завжди – завжди використовувати кешування запитів"
-          effort: "Рівень складності (тільки для Claude Opus 4.5)"
+          effort: "Рівень зусиль"
       related_topics:
         title: "Пов'язані теми"
         pill: "Пов'язані"
@@ -959,17 +965,15 @@ uk:
         provider_fields:
           model_name: "Назва моделі"
         semantic_search: "Теми (семантикв)"
-        semantic_search_loading: "Пошук більшої кількості результатів за допомогою ШІ"
         semantic_search_results:
-          toggle: "Показати результати %{count} , знайдені за допомогою ШІ"
-          toggle_hidden: "Приховати %{count} результатів, знайдених за допомогою ШІ"
-          none: "Вибачте, наш пошук ШІ не знайшов відповідних тем"
-          new: "Натисніть \"пошук\", щоб почати пошук нових результатів за допомогою ШІ"
+          toggle: "Результати ШІ"
           unavailable: "Результати ШІ недоступні"
           zero_results_expanded: "Не знайдено жодного результату, показано %{count} результатів ШІ"
         semantic_search_tooltips:
           results_explanation: "Якщо увімкнено, нижче будуть додані додаткові результати пошуку ШІ."
           invalid_sort: "Результати пошуку повинні бути відсортовані за релевантністю для відображення результатів ШІ"
+          not_submitted: "Надішліть пошуковий запит, щоб увімкнути результати штучного інтелекту"
+          no_results: "За цим пошуковим запитом не знайдено результатів ШІ"
         semantic_search_unavailable_tooltip: "Результати пошуку повинні бути відсортовані за релевантністю для відображення результатів ШІ"
         ai_generated_result: "Результат пошуку знайдено за допомогою ШІ"
         quick_search:
diff --git a/plugins/discourse-ai/config/locales/client.ur.yml b/plugins/discourse-ai/config/locales/client.ur.yml
index 799d76b88d190..9261d180dcccf 100644
--- a/plugins/discourse-ai/config/locales/client.ur.yml
+++ b/plugins/discourse-ai/config/locales/client.ur.yml
@@ -157,7 +157,9 @@ ur:
         save: "محفوظ کریں"
         remove_parameter: "خارج کریں"
         parameter_required: "درکار"
+        credential_not_set: "(سیٹ نہیں)"
         edit: "ترمیم کریں"
+        test: "ٹیسٹ"
         delete: "مٹائیں"
       secrets:
         short_title: "شہادت"
diff --git a/plugins/discourse-ai/config/locales/client.vi.yml b/plugins/discourse-ai/config/locales/client.vi.yml
index 1d8de3d09fda0..4f8d4c802dae5 100644
--- a/plugins/discourse-ai/config/locales/client.vi.yml
+++ b/plugins/discourse-ai/config/locales/client.vi.yml
@@ -121,7 +121,9 @@ vi:
         save: "Lưu lại"
         remove_parameter: "Xóa"
         parameter_required: "Bắt buộc"
+        credential_not_set: "(chưa đặt)"
         edit: "Sửa"
+        test: "Kiểm tra"
         delete: "Xóa"
       secrets:
         short_title: "Thông tin đăng nhập"
@@ -202,12 +204,7 @@ vi:
         providers:
           google: "G"
           fake: "Tùy biến"
-        semantic_search_loading: "Tìm kiếm thêm kết quả bằng AI"
         semantic_search_results:
-          toggle: "Xem %{count} kết quả tìm thấy bằng AI"
-          toggle_hidden: "Đang ẩn %{count} kết quả tìm thấy bằng AI"
-          none: "Rất tiếc, tìm kiếm AI của chúng tôi không tìm thấy chủ đề phù hợp"
-          new: "Nhấn 'Tìm' để bắt đầu tìm kiếm kết quả mới bằng AI."
           unavailable: "Kết quả AI không khả dụng"
           zero_results_expanded: "Không tìm thấy kết quả, hiển thị %{count} kết quả AI"
         semantic_search_tooltips:
diff --git a/plugins/discourse-ai/config/locales/client.zh_CN.yml b/plugins/discourse-ai/config/locales/client.zh_CN.yml
index f51dcf6e2c057..396941e6a870e 100644
--- a/plugins/discourse-ai/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-ai/config/locales/client.zh_CN.yml
@@ -121,7 +121,7 @@ zh_CN:
           fields:
             tool:
               label: "AI 工具"
-              description: "当自动化触发时，要执行的 AI 工具"
+              description: "当自动化触发时要执行的 AI 工具"
             llm_model:
               label: "LLM 模型"
               description: "使用 llm.generate() 的工具的语言模型（可选）"
@@ -173,13 +173,13 @@ zh_CN:
               description: "标记帖子（垃圾信息或请求审核）"
             notify_author_pm:
               label: "通过 PM 通知作者"
-              description: "当帖子排队并删除时，向帖子作者发送个人消息"
+              description: "当帖子加入队列和删除时，向帖子作者发送个人消息"
             notify_author_pm_user:
               label: "PM 发送者"
               description: "发送 PM 的用户（默认为系统）"
             notify_author_pm_message:
               label: "PM 内容"
-              description: "可选发送给作者的自定义消息"
+              description: "发送给作者的可选自定义消息"
             include_personal_messages:
               label: "包括个人消息"
               description: "同时扫描个人消息并对其进行分类"
@@ -195,35 +195,35 @@ zh_CN:
         llm_tagger:
           tag_mode:
             manual: "使用特定标签列表（配置如下）"
-            discover: "让 AI 发现并使用任何网站标签"
+            discover: "让 AI 发现并使用任何站点标签"
           fields:
             tagger_persona:
               label: "AI 角色"
               description: "用于分析和标记话题的 AI 角色"
             tag_mode:
               label: "标签选择模式"
-              description: "选择 AI 如何选取标签"
+              description: "选择 AI 如何选择标签"
             available_tags:
               label: "可用标签"
-              description: "AI 可选择的标签（仅在手动模式下使用）"
+              description: "AI 可以选择的标签（仅在手动模式下使用）"
             confidence_threshold:
               label: "置信度阈值"
               description: "应用建议标签所需的最低置信度百分比 (0-100)"
             max_tags_per_post:
               label: "每个帖子的最大标签数"
-              description: "单个帖子可应用的标签数量上限"
+              description: "单个帖子可以应用的标签数量上限"
             max_post_tokens:
               label: "帖子最大词元数"
-              description: "要分析的帖子内容中可使用的最大词元数"
+              description: "要分析的帖子内容中的最大词元数"
             allow_restricted_tags:
-              label: "允许受限标签"
-              description: "允许 AI 建议并应用受限权限或可见性的标签。"
+              label: "允许限制标签"
+              description: "允许 AI 建议并应用权限或公开范围受限的标签。"
             max_posts_for_context:
               label: "用于上下文的最大帖子数量"
-              description: "用于分析上下文时可包含的话题帖子数量上限（默认：5）"
+              description: "用于分析上下文时可以包含的话题帖子数量上限（默认：5）"
             allow_system_posts:
               label: "允许系统帖子"
-              description: "允许系统用户为创建的帖子添加标签。"
+              description: "允许为系统用户创建的帖子添加标签。"
     discourse_ai:
       title: "AI"
       default_llm:
@@ -236,7 +236,7 @@ zh_CN:
         short_title: "功能"
         description: "这些是您网站的访客可以使用的 AI 功能。可以将这些功能配置为使用特定的角色和 LLM，并按群组控制访问权限。"
         back: "返回"
-        settings_save_error: "部分设置无法保存。"
+        settings_save_error: "某些设置无法保存。"
         disabled: "（已禁用）"
         persona:
           other: "角色："
@@ -325,8 +325,8 @@ zh_CN:
           post_illustrator: "帖子插图创建器"
           chat_thread_titles: "聊天主题标题"
           setting_groups:
-            access_permissions: "访问 & 权限"
-            enabled_features: "已启用功能"
+            access_permissions: "访问与权限"
+            enabled_features: "启用的功能"
             automation: "自动化"
             personas: "角色"
         translation:
@@ -336,14 +336,14 @@ zh_CN:
           post_raw_translator: "帖子原始翻译器"
           topic_title_translator: "话题标题翻译器"
           short_text_translator: "短文本翻译器"
-          schedule_untranslated: "定时翻译"
+          schedule_untranslated: "安排翻译"
           schedule_topic_success:
-            other: "已定时翻译 %{count} 未翻译的帖子。"
-          schedule_topic_error: "定时翻译失败。请重试。"
+            other: "已安排翻译 %{count} 个未翻译的帖子。"
+          schedule_topic_error: "无法安排翻译。请重试。"
           setting_groups:
             settings: "基本设置"
             personas: "角色"
-            backfill_and_limits: "回填 & 限制"
+            backfill_and_limits: "回填与限制"
         spam:
           name: "垃圾信息"
           description: "使用所选 LLM 识别潜在垃圾信息，并进行标记，使其进入审核队列，以便站点版主可以进行检查"
@@ -363,17 +363,17 @@ zh_CN:
         title: "翻译"
         description: "自动将论坛上的所有内容翻译成用户的首选语言"
         supported_locales: "支持的语言"
-        supported_locales_description: "该网站的设置还允许游客提供帖子翻译。"
+        supported_locales_description: "此站点设置还允许访客为帖子翻译做贡献。"
         admin_actions:
           translation_settings: "翻译设置"
           localization_settings: "本地化设置"
           enable_translations: "启用自动翻译"
         stats:
           title: "翻译统计"
-          complete_language_detection_description: "所有符合 %{total} 条件的帖子均已检测到其语言。"
-          incomplete_language_detection_description: "%{done} 个符合条件的帖子中的 %{total} 个已检测到其语言。"
+          complete_language_detection_description: "所有符合条件的 %{total} 个帖子均已检测到其语言。"
+          incomplete_language_detection_description: "%{total} 个符合条件的帖子中的 %{done} 个已检测到其语言。"
           backfill_disabled: "回填功能已禁用，仅翻译新帖子。"
-          backfill_message: "<a href='%{settingsUrl}'> Backfill 设置</a> 为翻译 %{date} 之后的所有帖子 — — 预计需要 %{eta}。"
+          backfill_message: "<a href='%{settingsUrl}'>回填设置</a>配置为翻译 %{date} 后的所有帖子 – 预计需要 %{eta}。"
           eta_minutes:
             other: "%{count} 分钟"
           eta_hours:
@@ -383,17 +383,17 @@ zh_CN:
         progress_chart:
           title: "翻译进度"
           data_label: "%{percentage}%"
-          tooltip_translated: "%{done} 篇非 %{language} 篇帖子已翻译，共 %{total} 篇"
+          tooltip_translated: "%{done} 个非%{language}帖子已翻译，共 %{total} 个"
           bar_done:
             other: "%{count} 个帖子"
         translations_menu:
           translate:
             label: "翻译帖子"
-            title: "将这篇帖子翻译成所有支持的语言"
-            confirm: "这将更新此帖子的所有现有翻译。你确定吗？"
-            success: "帖子已发送供翻译"
-        credit_limit_warning: "由于额度限制，翻译已暂停。额度重置后将自动恢复 (%{reset_time})。"
-        credit_limit_warning_no_time: "由于额度限制，翻译已暂停。额度重置后将自动恢复。"
+            title: "将此帖子翻译成所有支持的语言"
+            confirm: "这将更新此帖子的所有现有翻译。确定吗？"
+            success: "帖子已发送进行翻译"
+        credit_limit_warning: "由于点数限制，翻译已暂停。点数将在 %{reset_time} 重置，届时将恢复翻译。"
+        credit_limit_warning_no_time: "由于点数限制，翻译已暂停。点数重置后将自动恢复。"
       spam:
         short_title: "垃圾信息"
         title: "配置垃圾信息处理"
@@ -445,7 +445,7 @@ zh_CN:
         feature: "功能"
         usage_count: "使用次数"
         model: "模型"
-        credits_remaining: "剩余额度"
+        credits_remaining: "剩余点数"
         models_breakdown: "按模型的使用量"
         users_breakdown: "按用户的使用量"
         all_features: "所有功能"
@@ -464,17 +464,17 @@ zh_CN:
         no_models: "找不到模型使用数据"
         no_features: "找不到功能使用数据"
         total: "总计"
-        included_in_plan: "包含在计划中"
+        included_in_plan: "包含在方案中"
         included_models: "包含使用量"
         billed_models: "计费用量"
-        cost: "费用"
+        cost: "成本"
         subheader_description: "词元是 LLM 用来理解和生成文本的基本单位，使用数据可能会影响成本"
         stat_tooltips:
           total_requests: "通过 Discourse 向 LLM 提出的所有请求"
           total_tokens: "提示 LLM 时使用的所有词元"
           request_tokens: "LLM 试图理解您所说的话时使用的词元"
           response_tokens: "LLM 回答您的提示时使用的词元"
-          cache_read_tokens: "从缓存中复用的、先前处理过的请求词元，LLM 会重复使用这些词元优化性能和成本"
+          cache_read_tokens: "从缓存中复用的先前处理过的请求词元，LLM 会重复使用这些词元优化性能和成本"
           cache_write_tokens: "写入缓存，以便将来重复使用的请求词元数"
           cached_tokens: "先前处理过的请求词元，LLM 会重复使用这些词元优化性能和成本"
           total_spending: "根据添加到 LLM 配置设置中的指定成本指标，LLM 使用的所有词元的累计成本"
@@ -483,7 +483,7 @@ zh_CN:
           last_week: "过去一周"
           last_month: "过去一个月"
           custom: "自定义…"
-        credit_allocations: "额度分配"
+        credit_allocations: "点数分配"
       ai_persona:
         ai_tools: "工具"
         tool_strategies:
@@ -499,7 +499,6 @@ zh_CN:
         overwrite: "覆盖"
         description: "描述"
         no_llm_selected: "未选择语言模型"
-        use_parent_llm: "使用角色语言模型"
         max_context_posts: "最大上下文帖子数"
         max_context_posts_help: "AI 在回复用户时用作上下文的最大帖子数。（默认为空）"
         vision_enabled: 启用视觉
@@ -633,8 +632,10 @@ zh_CN:
         parameter_description: "参数描述"
         enum_value: "枚举值"
         add_enum_value: "添加枚举值"
+        add_secret_contract: "添加凭证"
+        credential_not_set: "(未设置)"
         edit: "编辑"
-        test: "运行测试"
+        test: "测试"
         delete: "删除"
         saved: "工具已保存"
         confirm_delete: "确定要删除此工具吗？"
@@ -644,7 +645,6 @@ zh_CN:
           result: "测试结果"
       secrets:
         short_title: "凭据"
-        description: "管理在 LLM 和嵌入式系统之间共享的身份验证凭据。"
         name: "名称"
         secret: "值"
         select_secret: "选择凭证..."
@@ -664,6 +664,7 @@ zh_CN:
         not_used: "未使用"
         embedding: "嵌入"
         cannot_delete_in_use: "此凭证无法删除，因为它正被以下用户使用："
+        tool: "工具"
         modal:
           title: "创建新凭证"
       llms:
@@ -680,7 +681,7 @@ zh_CN:
         api_key: "托管模型的服务的 API 密钥"
         vision_enabled: "启用视觉"
         allowed_attachment_types: "允许的附件"
-        attachment_types_placeholder: "选择或输入文件扩展名（例如，pdf、txt、docx）"
+        attachment_types_placeholder: "选择或输入扩展名（例如，pdf、txt、docx）"
         ai_bot_user: "AI 机器人用户"
         cost_input: "输入成本"
         cost_cached_input: "缓存输入成本"
@@ -713,10 +714,10 @@ zh_CN:
           max_usages_help: "此群组中每个用户在指定时长内可以使用 AI 模型的最大次数。此配额按个别用户进行跟踪，不在整个群组中共享。"
           max_usages_required: "如果未设置最大词元数，则必须设置"
         credit_allocation:
-          credits_remaining: "剩余 %{remaining} / %{total} 额度（%{percentage}%）"
-          soft_limit_warning: "该模型今天剩余 %{percentage}% 的 AI 额度"
-          hard_limit_warning: "您已用完此模型的 AI 额度。使用该模型的 AI 功能将暂停使用，直至 %{reset_date}。"
-          next_reset: "额度重置于 %{time}"
+          credits_remaining: "剩余 %{remaining}/%{total} 点数 (%{percentage}%)"
+          soft_limit_warning: "此模型今天剩余 %{percentage}% 的 AI 点数"
+          hard_limit_warning: "您已用完此模型的 AI 点数。使用此模型的 AI 功能将暂停使用，直至 %{reset_date}。"
+          next_reset: "点数将于 %{time} 重置"
         usage:
           ai_bot: "AI 机器人"
           ai_helper: "助手 (%{persona})"
@@ -730,10 +731,10 @@ zh_CN:
           other: "此模型目前的使用者为 %{settings}。如果配置错误，功能将无法按预期运行。"
         model_description:
           none: "适用于大多数语言模型的常规设置"
-          anthropic-claude-opus-4-5: "Anthropic 最聪明的模型"
-          anthropic-claude-sonnet-4-5: "速度与成本的最佳平衡"
+          anthropic-claude-opus-4-6: "Anthropic 最智能的模型"
+          anthropic-claude-sonnet-4-6: "速度与成本的最佳平衡"
           anthropic-claude-haiku-4-5: "快速、经济高效"
-          google-gemini-3-pro: "谷歌最智能的模型"
+          google-gemini-3-pro: "Google 最智能的模型"
           google-gemini-3-flash: "快速高效且经济实惠，并具备多模态推理能力"
           open_ai-gpt-5-2: "OpenAI 的旗舰模型，非常适合跨领域问题解决"
           open_ai-gpt-5-mini: "在智能、速度和成本之间取得平衡"
@@ -741,8 +742,8 @@ zh_CN:
           open_router-deepseek-deepseek-v3-2: "DeepSeek 最新高性能模型"
           open_router-moonshotai-kimi-k2-5: "具有视觉功能的 Moonshot 多模态模型"
           open_router-x-ai-grok-4-fast: "xAI 的旗舰视觉模型"
-          open_router-minimax-minimax-m2-1: "MiniMax 带大上下文的多模态模型"
-          open_router-z-ai-glm-4-7: "Z-AI 的多模态视觉模型"
+          open_router-minimax-minimax-m2-5: "MiniMax 带大上下文的多模态模型"
+          open_router-z-ai-glm-5: "Z-AI 的多模态视觉模型"
           open_router-arcee-ai-trinity-large-preview-free: "来自 Arcee AI 的免费开源模型"
         preseeded_model_description: "利用 %{model} 的预配置开源模型"
         configured:
@@ -768,10 +769,10 @@ zh_CN:
           display_name: "用于在您的站点界面上引用此模型的名称。"
           name: "我们将其包含在 API 调用中以指定我们将使用哪个模型"
           vision_enabled: "如果启用，AI 将尝试理解图片，这取决于使用的模型是否支持视觉。Anthropic、Google 和 OpenAI 的最新模型支持该功能。"
-          allowed_attachment_types: "选择要转发给模型的附件类型。留空则禁止附件。图像通过视觉控制。"
+          allowed_attachment_types: "选择要转发给模型的附件类型。留空则禁止附件。图片通过视觉进行控制。"
           cost_input: "此模型每 100 万个词元的输入成本"
-          cost_cached_input: "该模型每 100 万个词元的缓存输入成本（从提示缓存读取时）"
-          cost_cache_write: "该模型每写入 100 万个词元的缓存写入成本（从提示缓存写入时）"
+          cost_cached_input: "此模型每 100 万个词元的缓存输入成本（从提示缓存读取时）"
+          cost_cache_write: "此模型每 100 万个词元的缓存写入成本（从提示缓存写入时）"
           cost_output: "此模型每 100 万个词元的输出成本"
           cost_measure: "$/100 万个词元"
         providers:
@@ -792,7 +793,7 @@ zh_CN:
           fake: "自定义"
         provider_fields:
           access_key_id: "AWS Bedrock 访问密钥 ID"
-          role_arn: "AWS Bedrock Role ARN"
+          role_arn: "AWS Bedrock 角色 ARN"
           region: "AWS Bedrock 区域"
           organization: "可选 OpenAI 组织 ID"
           disable_system_prompt: "在提示中禁用系统消息"
@@ -810,9 +811,8 @@ zh_CN:
           disable_top_p: "禁用 Top P（某些思考模型不支持 Top P）"
           prompt_caching: "提示缓存模式"
           prompt_caching_never: "从不 - 不使用提示缓存"
-          prompt_caching_tool_results: "工具结果 - 出现工具结果时进行缓存（推荐）"
-          prompt_caching_always: "总是-总是使用提示缓存"
-          effort: "推理强度（仅适用于 Claude Opus 4.5）"
+          prompt_caching_tool_results: "工具结果 - 存在工具结果时进行缓存（推荐）"
+          prompt_caching_always: "始终 - 始终使用提示缓存"
       related_topics:
         title: "相关话题"
         pill: "相关"
@@ -865,11 +865,11 @@ zh_CN:
         no_content_error: "先添加内容，然后对其执行 AI 操作"
       errors:
         credit_limit_dialog:
-          title: "已达到 AI 额度限制"
-          message_user: "该社区今天已达到其AI信用额度。请在 %{reset_time} 之后重试或联系您的站点管理员以获取更多信息。"
-          message_without_time_user: "该社区已达到今天的人工智能信用上限。在您的限额重置之前，将无法回复。更多信息请联系您的网站管理员。"
-          message_admin: "您已达到当前方案的 AI 额度上限。在额度于 %{reset_time} 重置之前，系统将无法提供回复。"
-          message_without_time_admin: "您已达到当前方案的 AI 额度上限。在额度重置之前，系统将无法提供回复。"
+          title: "已达到 AI 点数上限"
+          message_user: "此社区今天已达到其 AI 点数上限。请在 %{reset_time} 后重试或联系您的站点管理员获取更多信息。"
+          message_without_time_user: "此社区今天已达到其 AI 点数上限。在您的点数重置之前，模型将无法提供回答。请联系您的站点管理员获取更多信息。"
+          message_admin: "您已达到方案的 AI 点数上限。在点数于 %{reset_time} 重置之前，模型将无法提供回答。"
+          message_without_time_admin: "您已达到方案的 AI 点数上限。在点数重置之前，模型将无法提供回答。"
       reviewables:
         model_used: "使用的模型："
         accuracy: "准确性："
@@ -923,14 +923,9 @@ zh_CN:
         provider_fields:
           model_name: "模型名称"
         semantic_search: "话题（语义）"
-        semantic_search_loading: "正在使用 AI 搜索更多结果"
         semantic_search_results:
-          toggle: "显示使用 AI 找到的 %{count} 个结果"
-          toggle_hidden: "隐藏使用 AI 找到的 %{count} 个结果"
-          none: "抱歉，我们的 AI 搜索没有找到匹配的话题"
-          new: "按“搜索”开始使用 AI 查找新结果"
           unavailable: "AI 结果不可用"
-          zero_results_expanded: "未找到任何结果，显示 %{count} AI 结果"
+          zero_results_expanded: "找不到任何结果，正在显示 %{count} 个 AI 结果"
         semantic_search_tooltips:
           results_explanation: "启用后，将在下方添加更多 AI 搜索结果。"
           invalid_sort: "搜索结果必须按相关性排序才能显示 AI 结果"
@@ -963,8 +958,8 @@ zh_CN:
           copy_response: "复制回答"
           request_tokens: "请求词元："
           response_tokens: "回答词元："
-          cache_read_tokens: "缓存读取词元数:"
-          cache_write_tokens: "缓存写入词元数:"
+          cache_read_tokens: "缓存读取词元数："
+          cache_write_tokens: "缓存写入词元数："
           request: "请求"
           response: "回答"
           next_log: "下一步"
@@ -1050,7 +1045,7 @@ zh_CN:
           regen_modal_description: "选择要为此话题重新生成的 AI 摘要类型。"
           bulk_regen_description: "选择要为所选话题重新生成的 AI 摘要类型。"
           regenerate_gists_option: "简短摘要（要点）"
-          regenerate_summaries_option: "话题总结"
+          regenerate_summaries_option: "话题摘要"
           regenerate_gists_success:
             other: "%{count} 条简短摘要已成功重新生成"
           regenerate_gists_error:
diff --git a/plugins/discourse-ai/config/locales/client.zh_TW.yml b/plugins/discourse-ai/config/locales/client.zh_TW.yml
index e12dd2d69bced..1621f127d681a 100644
--- a/plugins/discourse-ai/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-ai/config/locales/client.zh_TW.yml
@@ -114,8 +114,9 @@ zh_TW:
         save: "儲存"
         remove_parameter: "移除"
         parameter_required: "必要設定"
+        credential_not_set: "(未設定)"
         edit: "編輯"
-        test: "執行測試"
+        test: "測試"
         delete: "刪除"
         test_modal:
           run: "執行測試"
diff --git a/plugins/discourse-ai/config/locales/server.ar.yml b/plugins/discourse-ai/config/locales/server.ar.yml
index 2f31595123648..2d48c5f9a76e2 100644
--- a/plugins/discourse-ai/config/locales/server.ar.yml
+++ b/plugins/discourse-ai/config/locales/server.ar.yml
@@ -8,24 +8,56 @@ ar:
   activerecord:
     attributes:
       llm_model:
+        name: "معرِّف النموذج"
         max_prompt_tokens: "نافذة السياق"
+  dashboard:
+    problem:
+      ai_llm_status:
+        zero: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> بحاجة إلى الاهتمام. في آخر ساعة، تعذر الرد في %{failed_calls} من أصل %{total_calls} من المرات."
+        one: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> بحاجة إلى الاهتمام. في آخر ساعة، تعذر الرد في %{failed_calls} من أصل %{total_calls} من المرات."
+        two: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> بحاجة إلى الاهتمام. في آخر ساعتين، تعذر الرد في %{failed_calls} من أصل %{total_calls} من المرات."
+        few: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> بحاجة إلى الاهتمام. في آخر %{count} ساعات، تعذر الرد في %{failed_calls} من أصل %{total_calls} من المرات."
+        many: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> بحاجة إلى الاهتمام. في آخر %{count} ساعة، تعذر الرد في %{failed_calls} من أصل %{total_calls} من المرات."
+        other: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> بحاجة إلى الاهتمام. في آخر %{count} ساعة، تعذر الرد في %{failed_calls} من أصل %{total_calls} من المرات."
+      ai_credit_soft_limit: "يتبقى لنموذج %{model_name} نسبة %{percentage_remaining}% فقط من الرصيد. سيتم إعادة تعيين الرصيد في %{reset_date}. <a href='%{url}'>عرض نماذج الذكاء الاصطناعي</a>"
+      ai_credit_hard_limit: "استُنفد رصيد الذكاء الاصطناعي لنموذج %{model_name}. ستصبح ميزات الذكاء الاصطناعي غير متاحة حتى %{reset_date}. <a href='%{url}'>عرض نماذج الذكاء الاصطناعي</a>"
   discourse_automation:
     ai:
       flag_types:
         review: "إضافة المنشور إلى قائمة انتظار المراجعة"
         review_hide: "إضافة منشور إلى قائمة انتظار المراجعة وإخفاء منشور"
+        review_delete: "إضافة المنشور إلى قائمة انتظار المراجعة وحذف المنشور"
+        review_delete_silence: "إضافة المنشور إلى قائمة انتظار المراجعة، وحذف المنشور، وكتم المستخدم"
         spam: "الإبلاغ كمحتوى عشوائي وإخفاء المنشور"
         spam_silence: "الإبلاغ عن المحتوى العشوائي، إخفاء المنشور وكتم المستخدم"
     scriptables:
+      ai_tool_action:
+        title: إجراء أداة الذكاء الاصطناعي
+        description: تشغيل أداة الذكاء الاصطناعي عند تفعيل الأتمتة
       llm_persona_triage:
         title: فرز المنشورات باستخدام شخصيات الذكاء الاصطناعي
         description: "الرد على المنشورات باستخدام شخصية محددة من شخصيات الذكاء الاصطناعي"
       llm_triage:
         title: فرز المنشورات باستخدام الذكاء الاصطناعي
         description: "فرز المنشورات باستخدام نموذج اللغة الكبير"
+        flagged_post: |
+          <div>الاستجابة من النموذج:</div>
+          <p>%{llm_response}</p>
+          <b>تم تفعيلها بواسطة قاعدة <a href="%{base_path}/admin/plugins/automation/%{automation_id}">%{automation_name}</a> .</b>
+        notify_author_pm:
+          subject: "تمت إزالة منشورك مؤقتًا للمراجعة."
+          body: |
+            مرحبًا @%{username}،
+
+            تم إزالة منشورك في "%{topic_title}" مؤقتًا ووضعه في قائمة انتظار المراجعة ليطلع عليه أحد المشرفين. إذا تم الموافقة عليه، سيتم استعادته تلقائيًا.
+
+            المرجع: %{post_url}
       llm_report:
         title: التقرير الدوري باستخدام الذكاء الاصطناعي
         description: "تقرير دوري قائم على نموذج اللغة الكبير"
+      llm_tagger:
+        title: وسم الموضوعات باستخدام الذكاء الاصطناعي
+        description: "وسم الموضوعات تلقائيًا باستخدام الذكاء الاصطناعي"
   site_settings:
     discourse_ai_enabled: "تفعيل المكوِّن الإضافي Discourse AI."
     ai_default_llm_model: "نموذج اللغة الكبير الافتراضي المستخدم لجميع ميزات الذكاء الاصطناعي"
@@ -58,6 +90,8 @@ ar:
     ai_nsfw_flag_threshold_sexy: "الحد الأدنى للصورة المصنَّفة كمحتوى جنسي ليتم اعتبارها غير آمنة لبيئة العمل."
     ai_nsfw_models: "النماذج المراد استخدامها في الاستدلال على المحتوى غير الآمن لبيئة العمل."
     ai_spam_detection_enabled: "تفعيل وحدة اكتشاف المحتوى العشوائي بالذكاء الاصطناعي"
+    ai_spam_detection_max_post_count: "الحد الأقصى لعدد المنشورات التي يمكن للمستخدم نشرها قبل أن يتوقف فحصها للكشف عن البريد العشوائي"
+    ai_spam_detection_max_trust_level: "الحد الأعلى لمستوى ثقة المستخدمين الذي تُجرى عنده مراقبة البريد العشوائي"
     ai_openai_api_key: "مفتاح API الخاص بـ OpenAI. يُستخدم فقط لإنشاء الصور وتحريرها. لاستخدام GPT، استخدم تبويب إعدادات نموذج اللغة الكبير"
     ai_helper_enabled: "تفعيل مساعد الذكاء الاصطناعي"
     composer_ai_helper_allowed_groups: "سيرى المستخدمون في هذه المجموعات زر مساعد الذكاء الاصطناعي في أداة الإنشاء."
@@ -66,6 +100,7 @@ ar:
     ai_helper_automatic_chat_thread_title: "تعيين عناوين سلسلة الدردشة تلقائيًا بناءً على محتويات السلسلة."
     ai_helper_enabled_features: "حدِّد الميزات التي تريد تفعيلها في مساعد الذكاء الاصطناعي."
     post_ai_helper_allowed_groups: "مجموعات المستخدمين المسموح لها بالوصول إلى ميزات مساعد الذكاء الاصطناعي في المنشورات"
+    ai_helper_post_illustrator_persona: "الشخصية المراد استخدامها لميزة توضيح المنشور الخاصة بمساعد الذكاء الاصطناعي. ملاحظة: يجب عليك أيضًا إنشاء أداة لإنشاء الصور (المسؤول > المكوّنات الإضافية > Discourse AI > الأدوات) لكي تعمل هذه الميزة."
     ai_embeddings_selected_model: "استخدم النموذج المُحدَّد لتوليد التضمينات."
     ai_embeddings_generate_for_pms: "إنشاء تضمينات للرسائل الشخصية."
     ai_embeddings_semantic_related_topics_enabled: "استخدام البحث الدلالي للموضوعات ذات الصلة."
@@ -75,6 +110,8 @@ ar:
     ai_embeddings_semantic_search_use_hyde: "استخدم HyDE للبحث الدلالي الكامل للصفحة. يقوم نموذج اللغة الكبير (LLM) بإنشاء منشور افتراضي من مصطلح البحث الذي أدخله المستخدم للمساعدة على إيجاد التطابقات."
     ai_embeddings_semantic_quick_search_enabled: "تفعيل خيار البحث الدلالي في قائمة البحث المنبثقة."
     ai_embeddings_semantic_related_include_closed_topics: "تضمين الموضوعات المغلقة في نتائج البحث الدلالي"
+    ai_embeddings_semantic_related_age_penalty: "طبق معامل خفض القيمة بناءً على العمر الأسي للمواضيع ضمن نتائج البحث الدلالي؛ علمًا بأن القيمة 0.0 ترمز لغياب الخفض، والقيمة 0.3 تعكس ميلًا هينًا للمحتوى الذي نُشر حديثًا، في حين تشير القيمة 1.0 وما فوقها إلى ميل شديد نحو الحداثة."
+    ai_embeddings_semantic_related_age_time_scale: "النطاق الزمني المقدر بالأيام والمستخدم في احتساب معامل خفض القيمة بناءً على العمر؛ فالمواضيع التي تظل غير نشطة طوال هذه المدة تخضع لخفض قدره 50% تقريبًا في حال ضبط الخفض عند 1.0. يمكن تعيين القيمة 365 لاعتماد مقياس سنوي، أو القيمة 90 لاعتماد مقياس ربع سنوي."
     ai_embeddings_per_post_enabled: إنشاء التضمينات لكل منشور
     ai_summarization_enabled: "تفعيل ميزة التلخيص"
     ai_summarization_persona: "الشخصية المستخدمة لميزة التلخيص"
@@ -82,10 +119,15 @@ ar:
     ai_summary_gists_enabled: "إنشاء ملخصات قصيرة لأحدث الردود في الموضوعات تلقائيًا"
     ai_summary_backfill_maximum_topics_per_hour: "عدد ملخصات الموضوعات المطلوب ملؤها في الساعة."
     ai_bot_enabled: "تفعيل وحدة روبوت الذكاء الاصطناعي"
+    ai_bot_enabled_llms: "نماذج اللغات الكبيرة المتوفرة للاختيار لإدارة محادثات روبوتات الذكاء الاصطناعي"
     ai_bot_allowed_groups: "عندما يتمكن GPT Bot من الوصول إلى الرسالة الخاصة، فإنه سيرد على أعضاء هذه المجموعات."
     ai_bot_debugging_allowed_groups: "السماح لهذه المجموعات برؤية زر تصحيح الأخطاء في المنشورات التي تعرض طلب الذكاء الاصطناعي الأولي والرد"
     ai_bot_public_sharing_allowed_groups: "السماح لهذه المجموعات بمشاركة رسائل الذكاء الاصطناعي الشخصية مع العامة عبر رابط فريد متاح بشكلٍ علني. ملاحظة: إذا كان موقعك يتطلَّب تسجيل الدخول، فستتطلب المشاركة تسجيل الدخول أيضًا."
+    ai_bot_add_to_header: "عرض زر في الرأس لبدء رسالة خاصة مع روبوت ذكاء اصطناعي"
+    ai_bot_add_to_community_section: "عرض رابط في قسم المجتمع في الشريط الجانبي لبدء رسالة خاصة مع روبوت ذكاء اصطناعي"
     ai_bot_github_access_token: "رمز وصول GitHub للاستخدام مع أدوات الذكاء الاصطناعي من GitHub (مطلوب لدعم البحث)"
+    ai_discover_enabled: "تفعيل ميزة البحث الاكتشافي"
+    ai_discover_persona: "الشخصية المستخدمة في ميزة البحث الاكتشافي"
     ai_google_custom_search_api_key: "مفتاح API لواجهة API الخاصة ببحث Google المخصَّص، راجع: https://developers.google.com/custom-search"
     ai_google_custom_search_cx: "معرّف CX لواجهة برمجة تطبيقات البحث المخصص من Google"
     ai_discord_search_enabled: "تفعيل ميزة البحث في Discord"
@@ -94,8 +136,15 @@ ar:
     ai_discord_search_mode: "حدد وضع البحث الذي تريد استخدامه للبحث في Discord"
     ai_discord_search_persona: "الشخصية المستخدمة في بحث Discord."
     ai_discord_allowed_guilds: "مجتمعات (خوادم) Discord التي يُصرح للروبوت بالبحث فيها"
+    ai_translation_enabled: "تفعيل ميزة الترجمة بالذكاء الاصطناعي"
     ai_translation_backfill_limit_to_public_content: "عند التفعيل، سيتم ترجمة المحتوى في الفئات العامة فقط. عند التعطيل، سيتم أيضًا إرسال المحتوى في الرسائل الجماعية الخاصة والفئات الخاصة للترجمة."
+    ai_translation_include_bot_content: "عند التفعيل، سيتم أيضًا إرسال المحتوى المكتوب بواسطة الروبوتات (معرفات المستخدم أقل من 0) للترجمة."
+    ai_translation_max_post_length: "الحد الأقصى لعدد الأحرف في المنشور ليتم ترجمته. المنشورات التي تتجاوز هذا الحد لن تُترجم."
     ai_translation_backfill_max_age_days: "الحد الأقصى لعمر المنشور والموضوع الذي سيتم ترجمته. المنشورات والموضوعات الأقدم من ذلك لن تُترجم. القيمة 0 تمنع الترجمة الرجعية، لكنها لن تمنع ترجمة المنشورات الجديدة."
+    ai_translation_backfill_hourly_rate: "يحدد هذا الخيار عدد المنشورات والموضوعات التي تُترجم كل ساعة أثناء إعادة ملء البيانات السابقة. ضع القيمة 0 لإيقاف الترجمة التلقائية للمحتوى الحالي."
+    ai_translation_max_tokens_multiplier: "مُضاعف تحديد الحد الأقصى لعدد الرموز المخصصة للاستخدام في الترجمة؛ حيث يتم ضبط الحد الأقصى لعدد الرموز تلقائيًا ليعادل من مرتين إلى خمس مراتٍ عدد حروف المنشور تقريبًا، علمًا بأنه يمكن موازنة هذا المُضاعف لإتاحة المجال لنماذج التفكير أو الاستدلال التي تتطلب استهلاك قدر أكبر من الرموز."
+    ai_usage_rollup_after_days: "المدة الزمنية بالأيام للاحتفاظ ببيانات استهلاك الذكاء الاصطناعي التفصيلية لكل طلب قبل تحويلها إلى ملخصات يومية مجمعة؛ علمًا بأن تعيين القيمة عند 0 سيؤدي إلى إيقاف ميزة التجميع."
+    ai_audit_logs_purge_after_days: "حذف سجلات تدقيق واجهة AI API الأقدم من هذه المدة المحددة بالأيام؛ حيث يتم تعيين المهلة تلقائيًا عند 6 أشهر تقريبًا، ويمكنك وضع القيمة 0 لضمان بقاء السجلات مخزنة دائمًا."
   reviewables:
     reasons:
       flagged_by_toxicity: أبلغ المكوِّن الإضافي الذي يعمل بالذكاء الاصطناعي عن هذا بعد تصنيفه كمحتوى مسيء.
@@ -219,10 +268,18 @@ ar:
           name: "سعر الصرف"
         stock_quote:
           name: "أسعار الأسهم (AlphaVantage)"
+        image_generation_category:
+          name: "جارٍ إنشاء الصورة..."
         image_generation_custom:
           name: "مخصَّصة"
         image_generation_openai:
           name: "OpenAI"
+        image_generation_gemini:
+          name: "Nano Banana"
+        image_generation_flux:
+          name: "FLUX 1.1 Pro"
+        image_generation_flux2:
+          name: "FLUX 2 Pro"
         empty_tool:
           name: "ابدأ من لا شيء..."
       name:
@@ -230,6 +287,11 @@ ar:
     ai_helper:
       errors:
         completion_request_failed: "حدث خطأ في أثناء محاولة تقديم اقتراحات. يُرجى إعادة المحاولة."
+        no_illustrator_persona: "لم يتم تكوين شخصية مُوضِّح المنشورات. يرجى التحقق من إعدادات موقعك."
+        no_image_generation_tool: "يجب أن تتضمن شخصية مُوضِّح المنشورات أداة لإنشاء الصور. يرجى تكوين أداة إنشاء الصور لهذه الشخصية في لوحة المسؤول."
+        no_image_generated: "فشل إنشاء الصورة. يرجى المحاولة مرة أخرى أو التحقق من إعدادات الأداة."
+        llm_model_not_configured: "لا يوجد نموذج لغة مُهيأ لإنشاء الصور. يرجى إعداد نموذج لغة افتراضي في إعدادات الموقع."
+        unknown_error: "حدث خطأ غير متوقع أثناء إنشاء الصور المصغرة. يرجى المحاولة مرة أخرى."
       prompts:
         translate: الترجمة إلى %{language}
         generate_titles: اقتراح عناوين للموضوعات
@@ -262,6 +324,7 @@ ar:
     ai_bot:
       reply_error: "عذرًا، يبدو أن نظامنا واجه مشكلة غير متوقعة أثناء محاولة الرد.\n\n[details='Error details']\n%{details}\n[/details]"
       default_pm_prefix: "[رسالة خاصة دون عنوان من روبوت ذكاء اصطناعي]"
+      thinking: "التفكير"
       personas:
         default_llm_required: "نموذج اللغة الكبير الافتراضي مطلوب قبل تفعيل الدردشة"
         cannot_delete_system_persona: "لا يمكن حذف شخصيات النظام، يُرجى إيقافها بدلًا من ذلك"
@@ -329,6 +392,7 @@ ar:
           description: "الشخصية الافتراضية المسؤولة عن ميزة المساعد في إنشاء جداول Markdown"
         post_illustrator:
           name: "مُوضِّح المنشورات"
+          description: "تنشئ صورًا بغرض توضيح المنشورات باستخدام أدوات إنشاء الصور المتاحة"
         proofreader:
           name: "مدقق لغوي"
           description: "الشخصية الافتراضية المسؤولة عن ميزة المساعد في تدقيق النصوص"
@@ -365,12 +429,16 @@ ar:
         report_runner:
           name: "مشغّل التقارير"
           description: "الشخصية الافتراضية المستخدمة في البرنامج النصي لأتمتة التقارير"
+        discover:
+          name: "اكتشف"
+          description: "الشخصية الافتراضية المستخدمة في ميزة الاكتشافات (البحث التكميلي)"
       topic_not_found: "الملخص غير متوفر، الموضوع غير موجود!"
       summarizing: "جارٍ تلخيص الموضوع"
       searching: "جارٍ البحث عن: '%{query}'"
       tool_options:
         researcher:
           researcher_llm:
+            name: "نموذج اللغة الكبير"
             description: "نموذج اللغة المستخدم في البحث (افتراضيًا يستخدم نموذج اللغة الكبير الخاص بالشخصية الحالية)"
           max_tokens_per_batch:
             name: "الحد الأقصى من الرموز لكل دفعة"
@@ -416,6 +484,10 @@ ar:
           base_query:
             name: "استعلام البحث الأساسي"
             description: "استعلام أساسي لاستخدامه عند البحث. على سبيل المثال، #urgent سيضيف #urgent إلى استعلام البحث ويقتصر على الموضوعات التي تحتوي على الفئة أو الوسم العاجل."
+        flag_post:
+          flag_type:
+            name: "نوع البلاغ"
+            description: "يتحكم فيما إذا كان سيتم مراجعة المنشور، أو إخفاؤه، أو حذفه، أو اعتباره بريدًا عشوائيًا."
       tool_summary:
         read_artifact: "قراءة أداة ويب"
         update_artifact: "تحديث أداة ويب"
@@ -424,6 +496,7 @@ ar:
         github_search_files: "ملفات بحث GitHub"
         github_search_code: "البحث عن رمز برمجي على GitHub"
         github_file_content: "محتوى ملف GitHub"
+        github_diff: "الفروقات في GitHub"
         random_picker: "منتقي عشوائي"
         categories: "إدراج الفئات"
         flag_post: "الإبلاغ عن المنشور"
@@ -452,8 +525,10 @@ ar:
         github_search_code: "البحث عن رمز برمجي في مستودع GitHub"
         github_search_files: "البحث عن ملفات في مستودع GitHub"
         github_file_content: "استعادة محتوى ملفات من مستودع GitHub"
+        github_diff: "استرجاع فروقات طلب سحب أو التزام في GitHub"
         random_picker: "اختر رقمًا عشوائيًا أو عنصرًا عشوائيًا من القائمة"
         categories: "إدراج جميع الفئات المرئية بشكلٍ عام في المنتدى"
+        flag_post: "أبلغ عن المنشور الحالي لمراجعته من قبل فريق العمل"
         search: "البحث في جميع الموضوعات العامة في المنتدى"
         tags: "إدراج جميع الوسوم في المنتدى"
         time: "البحث عن الوقت في مناطق زمنية مختلفة"
@@ -480,6 +555,7 @@ ar:
         github_diff: "<a href='%{url}'>%{repo} %{ref}</a>"
         github_file_content: "تم استعادة محتوى %{file_paths} من %{repo_name}@%{branch}"
         random_picker: "الاختيار من %{options}، تم اختيار: %{result}"
+        flag_post: "الإبلاغ عن المنشور %{post_id} (flag_post: %{flag_post})"
         read: "القراءة: <a href='%{url}'>%{title}</a>"
         time: "الوقت في المنطقة الزمنية %{timezone} هو %{time}"
         summarize: "تم تلخيص <a href='%{url}'>%{title}</a>"
@@ -549,6 +625,15 @@ ar:
         continue_conversation:
           title: "محادثة الاستكشاف: البحث عن %{query}"
           raw: "في أثناء بحثي عن %{query}، قدّمت لي المعلومات التالية:\n\n%{context}\n\nدعنا نُتابع المحادثة."
+      flag_post:
+        errors:
+          no_context: "لا يتوفر سياق للمنشور لتقديم بلاغ عنه."
+          no_reason: "يجب تحديد سبب للإبلاغ عن المنشور."
+          invalid_flag_type: "نوع البلاغ الذي اخترته غير صالح."
+        skipped: "كان الحكم خاطئًا؛ لم يتم إنشاء أي بلاغ."
+        already_flagged: "تم الإبلاغ عن المنشور بالفعل وهو قيد المراجعة."
+        flagged: "تم الإبلاغ عن المنشور للمراجعة."
+        reason: "قام روبوت الذكاء الاصطناعي بالإبلاغ عن هذا المنشور.\n\nالسبب: %{reason}"
     summarization:
       configuration_hint:
         zero: "قم بتكوين هذه الإعدادات أولًا: %{settings}"
@@ -608,13 +693,22 @@ ar:
       configuration:
         disable_embeddings: "يجب عليك إيقاف 'ai embeddings enabled' أولًا."
         choose_model: "قم بتعيين 'ai embeddings selected model' أولًا."
+        model_test_failed: "لقد فشلنا في إنشاء اختبار تضمين باستخدام هذا النموذج. تأكَّد من صحة إعداداته."
     llm_models:
       missing_provider_param: "لا يمكن ترك %{param} فارغة"
       bedrock_invalid_url: "يُرجى ملء جميع الحقول لاستخدام هذا النموذج."
+      bedrock_missing_auth: "يتطلب AWS Bedrock إما تكوين معرّف مفتاح الوصول أو معرّف ARN للدور"
     ai_staff_action_logger:
       updated: "تاريخ التحديث"
       set: "تعيين"
       removed: "تمت إزالتها"
+    translation:
+      errors:
+        disabled: "لم يتم تكوين ميزة الترجمة بالذكاء الاصطناعي بالكامل بعد."
+        all_posts_translated: "تمت ترجمة جميع المنشورات في هذا الموضوع مسبقًا."
+    llm_credit_allocation:
+      limit_exceeded_user: "لقد تم استنفاد حد رصيد الذكاء الاصطناعي لهذا اليوم في هذا المجتمع. يمكنك المحاولة مجددًا بعد %{reset_time}، أو التواصل مع مسؤول الموقع لمزيد من المعلومات."
+      limit_exceeded_admin: "لقد وصلت إلى حد رصيد الذكاء الاصطناعي المخصص لك. يرجى المحاولة مرة أخرى بعد %{reset_time}."
     errors:
       quota_exceeded: "لقد تجاوزت الحصة المُخصَّصة لهذا النموذج. يُرجى إعادة المحاولة بعد %{relative_time}."
       quota_required: "يجب عليك تحديد الحد الأقصى للرموز أو الاستخدامات لهذا النموذج"
diff --git a/plugins/discourse-ai/config/locales/server.de.yml b/plugins/discourse-ai/config/locales/server.de.yml
index 6ecfd1bacc12d..d3fe478caa8ee 100644
--- a/plugins/discourse-ai/config/locales/server.de.yml
+++ b/plugins/discourse-ai/config/locales/server.de.yml
@@ -15,8 +15,8 @@ de:
       ai_llm_status:
         one: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> benötigt Aufmerksamkeit. In der letzten Stunde hat es %{failed_calls} von %{total_calls} Mal nicht reagiert."
         other: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> benötigt Aufmerksamkeit. In den letzten %{count} Stunden hat es %{failed_calls} von %{total_calls} Mal nicht reagiert."
-      ai_credit_soft_limit: "Für %{model_name} sind nur noch %{percentage_remaining}% des Guthuabens übrig.Das Guthaben wird um %{reset_date} zurückgesetzt. <a href='%{url}'>KI-Modelle ansehen</a>"
-      ai_credit_hard_limit: "Du hast keine KI-Guthaben mehr für %{model_name}. Die KI-Funktionen sind bis %{reset_date} nicht mehr verfügbar. <a href='%{url}'>KI-Modelle ansehen</a>"
+      ai_credit_soft_limit: "Für %{model_name} sind nur noch %{percentage_remaining} % des Guthabens übrig. Das Guthaben wird am %{reset_date} zurückgesetzt. <a href='%{url}'>KI-Modelle ansehen</a>"
+      ai_credit_hard_limit: "Du hast kein KI-Guthaben mehr für %{model_name}. Die KI-Funktionen sind bis %{reset_date} nicht mehr verfügbar. <a href='%{url}'>KI-Modelle ansehen</a>"
   discourse_automation:
     ai:
       flag_types:
@@ -45,7 +45,7 @@ de:
           body: |
             Hallo @%{username},
 
-            Dein Beitrag in „%{topic_title}“ wurde vorübergehend entfernt und zu unserer Überprüfungswarteschlange hinzugefügt, damit ein Moderator ihn prüfen kann. Nach der Genehmigung wird er automatisch wiederhergestellt.
+            dein Beitrag in „%{topic_title}“ wurde vorübergehend entfernt und zu unserer Überprüfungswarteschlange hinzugefügt, damit ein Moderator ihn prüfen kann. Nach der Genehmigung wird er automatisch wiederhergestellt.
 
             Referenz: %{post_url}
       llm_report:
@@ -122,9 +122,9 @@ de:
     ai_bot_debugging_allowed_groups: "Erlaube diesen Gruppen, eine Debug-Schaltfläche in Beiträgen zu sehen, der die rohe KI-Anfrage und -Antwort anzeigt."
     ai_bot_public_sharing_allowed_groups: "Erlaube diesen Gruppen, persönliche KI-Nachrichten über einen eindeutigen, öffentlich zugänglichen Link mit der Öffentlichkeit zu teilen. Hinweis: Wenn für deine Website eine Anmeldung erforderlich ist, ist auch zum Ansehen des geteilten Inhalts eine Anmeldung erforderlich."
     ai_bot_add_to_header: "Eine Schaltfläche in der Kopfzeile anzeigen, um eine PN mit einem KI-Bot zu starten"
-    ai_bot_add_to_community_section: "Zeige einen Link im Community-Bereich der Seitenleiste an, um eine PN mit einem KI-Bot zu starten"
+    ai_bot_add_to_community_section: "Einen Link im Community-Bereich der Seitenleiste anzeigen, um eine PN mit einem KI-Bot zu starten"
     ai_bot_github_access_token: "GitHub-Zugangstoken für die Verwendung mit den GitHub-KI-Tools (erforderlich für die Suchunterstützung)"
-    ai_discover_enabled: "Aktivieren Sie die Entdeckungs-Suchfunktion"
+    ai_discover_enabled: "Entdeckungs-Suchfunktion aktivieren"
     ai_discover_persona: "Persona, die für die Entdeckungsfunktion verwendet werden soll"
     ai_google_custom_search_api_key: "API-Schlüssel für die Google Custom Search API, siehe: https://developers.google.com/custom-search"
     ai_google_custom_search_cx: "CX für Google Custom Search API"
@@ -134,7 +134,7 @@ de:
     ai_discord_search_mode: "Wähle den Suchmodus für die Discord-Suche aus"
     ai_discord_search_persona: "Die Persona, die für die Discord-Suche verwendet wird."
     ai_discord_allowed_guilds: "Discord-Gilden (Server), auf denen der Bot suchen darf"
-    ai_translation_enabled: "Aktiviere die KI-Übersetzungsfunktion"
+    ai_translation_enabled: "KI-Übersetzungsfunktion aktivieren"
     ai_translation_backfill_limit_to_public_content: "Wenn diese Option aktiviert ist, werden nur Inhalte in öffentlichen Kategorien übersetzt. Wenn sie deaktiviert ist, werden auch Inhalte in Gruppen-PMs und privaten Kategorien zur Übersetzung gesendet."
     ai_translation_include_bot_content: "Wenn diese Option aktiviert ist, werden auch Inhalte, die von Bots (Benutzer-IDs unter 0) geschrieben wurden, zur Übersetzung gesendet."
     ai_translation_max_post_length: "Die maximale Zeichenanzahl eines zu übersetzenden Beitrags. Längere Beiträge werden nicht übersetzt."
@@ -263,7 +263,7 @@ de:
         stock_quote:
           name: "Aktienkurs (AlphaVantage)"
         image_generation_category:
-          name: "Bilderzeugung..."
+          name: "Bilderzeugung …"
         image_generation_custom:
           name: "Benutzerdefiniert"
         image_generation_openai:
@@ -278,11 +278,19 @@ de:
           name: "Von vorne beginnen …"
       name:
         characters: "darf nur Zahlen, Buchstaben und Unterstriche enthalten"
+      secret_bindings:
+        secret_not_found: "Die ausgewählten Anmeldedaten existieren nicht."
+      secret_runtime:
+        alias_not_declared: "Der Alias „%{alias}“ ist für dieses Tool nicht definiert."
+        missing_binding: "Der Alias „%{alias}“ ist erforderlich, aber nicht mit Anmeldedaten verknüpft."
+        missing_required_aliases: "Für folgende Aliase fehlen erforderliche Verknüpfungen zu Anmeldedaten: %{aliases}."
+        secret_not_found: "Der Alias \"%{alias}\" ist mit nicht vorhandenen Anmeldedaten verknüpft."
+        unknown_error: "Die angeforderte Anmeldedaten konnten nicht ermittelt werden."
     ai_helper:
       errors:
         completion_request_failed: "Beim Versuch, Vorschläge zu machen, ist etwas schiefgelaufen. Bitte versuche es noch einmal."
         no_illustrator_persona: "Die Beitragsillustrator-Persona ist nicht konfiguriert. Bitte überprüfe deine Website-Einstellungen."
-        no_image_generation_tool: "Für die Persona „Beitragsillustrator“ muss ein Bilderzeugungstool verknüpft sein. Bitte konfiguriere im Administrationsbereich ein Bilderzeugungstool für diese Persona."
+        no_image_generation_tool: "Für die Beitragsillustrator-Persona muss ein Bilderzeugungstool verknüpft sein. Bitte konfiguriere im Administrationsbereich ein Bilderzeugungstool für diese Persona."
         no_image_generated: "Das Bild konnte nicht erstellt werden. Bitte versuche es erneut oder überprüfe die Konfiguration deines Tools."
         llm_model_not_configured: "Es ist kein Sprachmodell für die Bilderzeugung konfiguriert. Bitte konfiguriere ein Standard-Sprachmodell in deinen Website-Einstellungen."
         unknown_error: "Beim Erzeugen der Vorschaubilder ist ein unerwarteter Fehler aufgetreten. Bitte versuche es erneut."
@@ -630,6 +638,7 @@ de:
         invalid_seeded_model: "Du kannst dieses Modell nicht mit dieser Funktion verwenden"
         invalid_persona_response_format: "Die ausgewählte Persona muss ein Antwortformat mit einem booleschen Feld namens „spam“ haben."
         must_select_model: "Du musst zuerst ein LLM auswählen"
+        invalid_llm_id: "Das ausgewählte LLM-Modell ist nicht gültig"
       endpoints:
         not_configured: "%{display_name} (nicht konfiguriert)"
         configuration_hint:
@@ -644,12 +653,18 @@ de:
     embeddings:
       delete_failed: "Dieses Modell wird derzeit verwendet. Aktualisiere zuerst `ai embeddings selected model`."
       cannot_edit_builtin: "Du kannst ein integriertes Modell nicht bearbeiten."
+      secret_required: "Es müssen Anmeldedaten gewählt werden"
+      secret_not_found: "Die ausgewählten Anmeldedaten existieren nicht"
       configuration:
         disable_embeddings: "Du musst zuerst „KI-Einbettungen aktiviert“ deaktivieren."
         choose_model: "Lege zuerst „ausgewähltes KI-Einbettungsmodell“ fest."
         model_test_failed: "Es ist uns nicht gelungen, mit diesem Modell eine Testeinbettung zu generieren. Überprüfe, ob es richtig konfiguriert ist."
+    secrets:
+      delete_failed_in_use: "Diese Anmeldedaten werden derzeit von einem oder mehreren LLM, Einbettungen oder Tools verwendet und können nicht gelöscht werden."
     llm_models:
       missing_provider_param: "%{param} darf nicht leer sein"
+      secret_required: "Es müssen Anmeldedaten gewählt werden"
+      secret_not_found: "Die ausgewählten Anmeldedaten existieren nicht"
       bedrock_invalid_url: "Bitte fülle alle Felder aus, um dieses Modell zu verwenden."
       bedrock_missing_auth: "Für AWS Bedrock muss entweder die Zugangsschlüssel-ID oder die Rollen ARN konfiguriert werden"
     ai_staff_action_logger:
@@ -674,6 +689,13 @@ de:
       persona_disabled: Die angegebene Persona ist deaktiviert. Überprüfe die Parameter persona_name oder persona_id.
       no_default_llm: Die Persona muss eine default_llm definiert haben.
       user_not_allowed: Der Benutzer darf nicht am Thema teilnehmen.
+      custom_tool_definition_too_large: "Jede benutzerdefinierte Werkzeugdefinition darf höchstens %{max} Bytes groß sein."
+      invalid_stream_param: "Der Parameter %{key} ist ungültig: %{details}"
+      expected_array: "erwartet ein Array"
+      expected_object: "erwartet ein Objekt"
+      stream_reply_max_resume_rounds_reached: Die maximale Anzahl an Wiederholungsrunden mit benutzerdefinierten Werkzeugen wurde erreicht (%{max}).
+      stream_reply_state_too_large: "Der Stream-Zustand ist zu groß, um ihn zu behalten (maximal %{max} Bytes)."
+      stream_reply_unexpected_error: Beim Streaming der Antwort ist ein unerwarteter Fehler aufgetreten.
       prompt_message_length: Die Nachricht %{idx} hat die 1000-Zeichen-Grenze überschritten.
       persona_already_exists: Eine Persona mit dem Namen %{name} existiert bereits.
       custom_tool_exists:
diff --git a/plugins/discourse-ai/config/locales/server.el.yml b/plugins/discourse-ai/config/locales/server.el.yml
index ef8750207f12a..1799b03a027a1 100644
--- a/plugins/discourse-ai/config/locales/server.el.yml
+++ b/plugins/discourse-ai/config/locales/server.el.yml
@@ -12,6 +12,8 @@ el:
         other: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> χρειάζεται έλεγχο. Εντός των τελευταίων %{count} ωρών, απέτυχε να ανταποκριθεί %{failed_calls} από τις %{total_calls} φορές."
   discourse_automation:
     scriptables:
+      ai_tool_action:
+        description: Εκτέλεση ενός εργαλείου AI όταν πυροδοτείται ο αυτοματισμός
       llm_triage:
         notify_author_pm:
           subject: "Η ανάρτησή σας αφαιρέθηκε προσωρινά για έλεγχο."
@@ -22,6 +24,8 @@ el:
 
             Παραπομπή: %{post_url}
   site_settings:
+    ai_nsfw_flag_threshold_drawings: "Όριο για να θεωρηθεί ένα σχέδιο NSFW."
+    ai_bot_debugging_allowed_groups: "Να επιτρέπεται σε αυτές τις ομάδες να βλέπουν ένα κουμπί αποσφαλμάτωσης σε αναρτήσεις που εμφανίζει το ακατέργαστο AI αίτημα και απάντηση"
     ai_translation_max_post_length: "Ο μέγιστος αριθμός χαρακτήρων για τη μετάφραση μιας ανάρτησης. Οι αναρτήσεις που είναι μεγαλύτερες από αυτόν τον αριθμό δεν θα μεταφράζονται."
     ai_translation_backfill_max_age_days: "Η μέγιστη ηλικία μιας ανάρτησης και ενός θέματος που θα μεταφραστεί. Οι αναρτήσεις και τα θέματα που είναι παλαιότερα από αυτό δεν θα μεταφράζονται. Το 0 απενεργοποιεί την συμπλήρωση, αλλά δεν θα απενεργοποιήσει τη μετάφραση νέων αναρτήσεων."
   reports:
@@ -35,6 +39,10 @@ el:
     spam_detection:
       flag_reason: "Αναφέρθηκε ως ανεπιθύμητο από <a href='%{url}'>Discourse AI</a>"
     ai_bot:
+      personas:
+        post_raw_translator:
+          name: "Μεταφραστής ανάρτησης"
+          description: "Ενισχύει τη λειτουργία μετάφρασης μεταφράζοντας αναρτήσεις που περιέχουν Discourse Markdown"
       tool_summary:
         flag_post: "Αναφορά ανάρτησης"
         search: "Αναζήτηση"
@@ -42,6 +50,9 @@ el:
         summarize: "Συνοψίστε"
       tool_description:
         web_browser: "Γίνεται ανάγνωση <a href='%{url}'>%{url}</a>"
+      discoveries:
+        continue_conversation:
+          raw: "Στην αναζήτησή μου για %{query}, μου δείξατε τις ακόλουθες πληροφορίες:\n\n%{context}\n\nΑς συνεχίσουμε τη συζήτηση."
     ai_staff_action_logger:
       updated: "ενημερώθηκε"
       removed: "αφαιρέθηκε"
diff --git a/plugins/discourse-ai/config/locales/server.ja.yml b/plugins/discourse-ai/config/locales/server.ja.yml
index 4b8d0af3fc188..0719ecb752fe3 100644
--- a/plugins/discourse-ai/config/locales/server.ja.yml
+++ b/plugins/discourse-ai/config/locales/server.ja.yml
@@ -8,24 +8,51 @@ ja:
   activerecord:
     attributes:
       llm_model:
+        name: "モデル ID"
         max_prompt_tokens: "コンテキストウィンドウ"
+  dashboard:
+    problem:
+      ai_llm_status:
+        other: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> に注意が必要です。過去 %{count} 時間で、%{total_calls} 回中 %{failed_calls} 回応答できませんでした。"
+      ai_credit_soft_limit: "%{model_name} のクレジット残量がわずか %{percentage_remaining}% になりました。クレジットは %{reset_date} にリセットされます。<a href='%{url}'>AI モデルを見る</a>"
+      ai_credit_hard_limit: "%{model_name} の AI クレジットがなくなりました。%{reset_date} まで AI 機能を利用できません。<a href='%{url}'>AI モデルを見る</a>"
   discourse_automation:
     ai:
       flag_types:
         review: "レビューキューに投稿を追加する"
         review_hide: "投稿をレビューキューに追加して非表示にする"
+        review_delete: "投稿をレビューキューに追加して削除する"
+        review_delete_silence: "投稿をレビューキューに追加して削除し、ユーザーを投稿禁止にする"
         spam: "迷惑として通報して投稿を非表示にする"
         spam_silence: "迷惑として通報し、投稿を非表示にしてユーザーを投稿禁止にする"
     scriptables:
+      ai_tool_action:
+        title: AI ツールアクション
+        description: 自動化がトリガーされたら AI ツールを実行します
       llm_persona_triage:
         title: AI ペルソナを使った投稿のトリアージ
         description: "特定の AI ペルソナを使って投稿に返信します"
       llm_triage:
         title: AI を使った投稿のトリアージ
         description: "大規模言語モデルを使って投稿に優先順位を付けます"
+        flagged_post: |
+          <div>モデルからの応答:</div>
+          <p>%{llm_response}</p>
+          <b><a href="%{base_path}/admin/plugins/automation/%{automation_id}">%{automation_name}</a> ルールによってトリガーされました。</b>
+        notify_author_pm:
+          subject: "投稿はレビューのため、一時的に削除されました"
+          body: |
+            @%{username}、こんにちは。
+
+            「%{topic_title}」のあなたの投稿は一時的に削除され、モデレーターによるレビュー待ちとなっています。承認されると、自動的に復元されます。
+
+            参照: %{post_url}
       llm_report:
         title: AI を使った定期レポート
         description: "大規模言語モデルに基づく定期レポート"
+      llm_tagger:
+        title: AI を使用してトピックにタグを付ける
+        description: "AI を使用してトピックを自動的にタグ付けします"
   site_settings:
     discourse_ai_enabled: "Discourse AI プラグインを有効にします。"
     ai_default_llm_model: "すべての AI 機能に使用するデフォルトの LLM モデル"
@@ -58,6 +85,8 @@ ja:
     ai_nsfw_flag_threshold_sexy: "官能的として分類された画像が NSFW として見なされるためのしきい値。"
     ai_nsfw_models: "NSFW 推論に使用するモデル。"
     ai_spam_detection_enabled: "AI 迷惑行為検出モジュールを有効にする"
+    ai_spam_detection_max_post_count: "迷惑行為をスキャンされなくなるまでにユーザーが投稿できる最大投稿数"
+    ai_spam_detection_max_trust_level: "迷惑行為をスキャンするユーザーの最大信頼レベル"
     ai_openai_api_key: "OpenAI API の API キー。画像の作成と編集のみに使用されます。GPT の場合は、LLM 構成タブを使用します"
     ai_helper_enabled: "AI ヘルパーを有効にします。"
     composer_ai_helper_allowed_groups: "これらのグループのユーザーの作成ツールには、AI ヘルパーボタンが表示されます。"
@@ -66,6 +95,7 @@ ja:
     ai_helper_automatic_chat_thread_title: "スレッドのコンテンツに基づいてチャットスレッドのタイトルを自動的に設定する。"
     ai_helper_enabled_features: "AI ヘルパーで有効にする機能を選択します。"
     post_ai_helper_allowed_groups: "投稿内で AI ヘルパー機能にアクセスできるユーザーグループ"
+    ai_helper_post_illustrator_persona: "AI ヘルパーのイラスト投稿機能に使用するペルソナ。注意: この機能を使用するには、画像生成ツールも作成する必要があります (管理 > プラグイン > Discourse AI > ツール)。"
     ai_embeddings_selected_model: "選択したモデルを使用して、埋め込みを生成します。"
     ai_embeddings_generate_for_pms: "個人メッセージの埋め込みを生成します。"
     ai_embeddings_semantic_related_topics_enabled: "関連トピックのセマンティック検索を使用します。"
@@ -75,6 +105,8 @@ ja:
     ai_embeddings_semantic_search_use_hyde: "セマンティック前ページ検索に HyDE を使用する。LLM を使って、ユーザーの検索語句から仮定される投稿を作成し、一致検索を支援します。"
     ai_embeddings_semantic_quick_search_enabled: "検索メニューポップアップのセマンティック検索オプションを有効にする。"
     ai_embeddings_semantic_related_include_closed_topics: "閉鎖トピックをセマンティック検索結果に含める"
+    ai_embeddings_semantic_related_age_penalty: "セマンティック検索結果のトピックに指数年齢ペナルティを適用する。0.0 = ペナルティなし、0.3 = 最近のアクティブなコンテンツに対する緩いバイアス、1.0+ = 強い最新性バイアス。"
+    ai_embeddings_semantic_related_age_time_scale: "年齢ペナルティ計算に使用する時間スケール (日数)。この日数以上非アクティブなトピックには penalty-1.0 で約 50% のペナルティが適用されます。年間スケールには 365、四半期スケールには 90 を使用します。"
     ai_embeddings_per_post_enabled: 各投稿の埋め込みを生成する
     ai_summarization_enabled: "要約機能を有効にする"
     ai_summarization_persona: "要約機能に使用するペルソナ"
@@ -82,10 +114,15 @@ ja:
     ai_summary_gists_enabled: "トピック内の最新の返信の簡単な要約を自動的に生成する"
     ai_summary_backfill_maximum_topics_per_hour: "1 時間あたりにバックフィルするトピック要約の数。"
     ai_bot_enabled: "AI ボットモジュールを有効にします。"
+    ai_bot_enabled_llms: "AI ボット会話に選択できる LLM"
     ai_bot_allowed_groups: "GPT ボットが PM にアクセスできる場合、これらのグループのメンバーに返信します。"
     ai_bot_debugging_allowed_groups: "これらのグループが生の AI リクエストと応答を表示するデバッグボタンを投稿に表示することを許可する"
     ai_bot_public_sharing_allowed_groups: "これらのグループが、一意の公開リンクを介して AI 個人メッセージを公開共有することを許可する。注意: サイトにログインが必要な場合、共有にもログインが必要です。"
+    ai_bot_add_to_header: "AI ボットとの PM を開始するためのボタンをヘッダーに表示する"
+    ai_bot_add_to_community_section: "サイドバーのコミュニティーセクションに、AI ボットとの PM を開始するためのリンクを表示する"
     ai_bot_github_access_token: "GitHub AI ツールで使用する GitHub アクセストークン (検索サポートに必要)"
+    ai_discover_enabled: "発見検索機能を有効にする"
+    ai_discover_persona: "発見検索機能に使用するペルソナ"
     ai_google_custom_search_api_key: "Google カスタム検索 API の API キーは https://developers.google.com/custom-search を参照してください"
     ai_google_custom_search_cx: "Google カスタム検索 API の CX"
     ai_discord_search_enabled: "Discord 検索機能を有効にします"
@@ -94,8 +131,15 @@ ja:
     ai_discord_search_mode: "Discord 検索に使用する検索モードを選択する"
     ai_discord_search_persona: "Discord 検索に使用するペルソナ。"
     ai_discord_allowed_guilds: "ボットが検索できる Discord ギルド (サーバー)"
+    ai_translation_enabled: "AI 翻訳機能を有効にする"
     ai_translation_backfill_limit_to_public_content: "有効にすると、公開カテゴリのコンテンツのみが翻訳されます。無効にすると、グループ PM と非公開カテゴリのコンテンツも翻訳対象として送信されます。"
+    ai_translation_include_bot_content: "有効にすると、ボット (0 未満のユーザー ID) が書き込んだコンテンツも翻訳に送信されます。"
+    ai_translation_max_post_length: "翻訳される投稿の最大文字数。これより長い投稿は翻訳されません。"
     ai_translation_backfill_max_age_days: "翻訳する投稿とトピックの最大経過日数。これより古い投稿とトピックは翻訳されません。0 にするとバックファイルは無効になりますが、新しい投稿の翻訳は無効になりません。"
+    ai_translation_backfill_hourly_rate: "バックフィル操作中に 1 時間あたりに翻訳する投稿とトピックの数。既存のコンテンツの翻訳の自動バックフィルを無効にする場合は 0 に設定します。"
+    ai_translation_max_tokens_multiplier: "翻訳に使用するトークンの最大数を決定する乗数。デフォルトでは、最大トークンは投稿の文字数の 2～5 倍に設定されています。この乗数は、トークンをより多く使用する思考や推論モデルを可能にするために調整できます。"
+    ai_usage_rollup_after_days: "日次集計にロールアップするまでに、リクエストごとの AI 使用統計を保持する日数。ロールアップを無効にする場合は 0 に設定します。"
+    ai_audit_logs_purge_after_days: "この日数より古い AI API 監査ログを削除します。デフォルトは約 6 か月です。無期限に保持する場合は 0 に設定します。"
   reviewables:
     reasons:
       flagged_by_toxicity: AI プラグインは、これを毒コメントとして分類した後に通報しました。
@@ -214,10 +258,18 @@ ja:
           name: "為替レート"
         stock_quote:
           name: "株価 (AlphaVantage)"
+        image_generation_category:
+          name: "画像の生成..."
         image_generation_custom:
           name: "カスタム"
         image_generation_openai:
           name: "OpenAI"
+        image_generation_gemini:
+          name: "Nano Banana"
+        image_generation_flux:
+          name: "FLUX 1.1 Pro"
+        image_generation_flux2:
+          name: "FLUX 2 Pro"
         empty_tool:
           name: "空白から始める..."
       name:
@@ -225,6 +277,11 @@ ja:
     ai_helper:
       errors:
         completion_request_failed: "提案しようとしたときに問題が発生しました。もう一度お試しください。"
+        no_illustrator_persona: "投稿のイラストレーターペルソナが構成されていません。サイト設定を確認してください。"
+        no_image_generation_tool: "投稿のイラストレーターペルソナには画像生成ツールが接続されている必要があります。管理パネルでこのペルソナの画像生成ツールを構成してください。"
+        no_image_generated: "画像の生成に失敗しまっした。もう一度お試しになるか、ツールの構成を確認してください。"
+        llm_model_not_configured: "画像生成用の言語モデルが構成されていません。サイト設定でデフォルトの言語モデルを構成してください。"
+        unknown_error: "サムネイルの生成中に予期しないエラーが発生しました。もう一度お試しください。"
       prompts:
         translate: '%{language} に翻訳する'
         generate_titles: トピックのタイトルを提案
@@ -257,6 +314,7 @@ ja:
     ai_bot:
       reply_error: "返信中に予期しない問題が発生したようです。\n\n\n[details='エラーの詳細']\n%{details}\n[/details]"
       default_pm_prefix: "[無題の AI ボット PM]"
+      thinking: "思考中"
       personas:
         default_llm_required: "チャットを有効にする前に、デフォルトの LLM モデルが必要です"
         cannot_delete_system_persona: "システムペルソナは削除できません。代わりに無効にしてください"
@@ -324,6 +382,7 @@ ja:
           description: "ヘルパーの Markdown テーブルの生成機能を強化するデフォルトのペルソナ"
         post_illustrator:
           name: "イラスト投稿ツール"
+          description: "利用可能な画像生成ツールを使用してイラスト投稿の画像を生成します"
         proofreader:
           name: "校正ツール"
           description: "ヘルパーのテキストの校正機能を強化するデフォルトのペルソナ"
@@ -360,6 +419,9 @@ ja:
         report_runner:
           name: "レポートランナー"
           description: "レポートの自動化スクリプトで使用されるデフォルトのペルソナ"
+        discover:
+          name: "発見"
+          description: "発見機能に使用されるデフォルトのペルソナ (無料検索)"
       topic_not_found: "要約がありません。トピックが見つかりません！"
       summarizing: "トピックの要約を生成中"
       searching: "検索中: '%{query}'"
@@ -412,6 +474,10 @@ ja:
           base_query:
             name: "ベース検索クエリ"
             description: "検索時に使用するベースクエリ。例: '#urgent' は検索クエリの先頭に '#urgent' を追加し、緊急のカテゴリまたはタグを持つトピックのみが含まれます。"
+        flag_post:
+          flag_type:
+            name: "通報タイプ"
+            description: "投稿がレビュー、非表示、削除されるか、迷惑行為として扱われるかを制御します。"
       tool_summary:
         read_artifact: "ウェブアーティファクトを読み取る"
         update_artifact: "ウェブアーティファクトを更新"
@@ -420,6 +486,7 @@ ja:
         github_search_files: "GitHub 検索ファイル"
         github_search_code: "GitHub コード検索"
         github_file_content: "GitHub ファイルコンテンツ"
+        github_diff: "GitHub の差分"
         random_picker: "ランダムピッカー"
         categories: "カテゴリをリスト表示"
         flag_post: "投稿を通報"
@@ -448,8 +515,10 @@ ja:
         github_search_code: "GitHub リポジトリでコードを検索する"
         github_search_files: "GitHub リポジトリでファイルを検索する"
         github_file_content: "GitHub リポジトリからファイルのコンテンツを取得する"
+        github_diff: "GitHub プルリクエストまたはコミットの差分を取得する"
         random_picker: "ランダムな数字またはリストのランダムな要素を選択する"
         categories: "フォーラムのすべての公開カテゴリをリストする"
+        flag_post: "現在の投稿をスタッフによるレビュー対象として通報する"
         search: "フォーラムのすべての公開トピックを検索する"
         tags: "フォーラムのすべてのタグをリストする"
         time: "様々なタイムゾーンの時間を調べる"
@@ -476,6 +545,7 @@ ja:
         github_diff: "<a href='%{url}'>%{repo} %{ref}</a>"
         github_file_content: "%{repo_name}@%{branch} から %{file_paths} のコンテンツを取得しました"
         random_picker: "%{options} から選択中。選択: %{result}"
+        flag_post: "投稿 %{post_id} を通報中 (flag_post: %{flag_post})"
         read: "読み取り中: <a href='%{url}'>%{title}</a>"
         time: "%{timezone} の時刻は %{time} です"
         summarize: "<a href='%{url}'>%{title}</a> の要約"
@@ -505,6 +575,15 @@ ja:
         continue_conversation:
           title: "発見の会話: %{query} を検索"
           raw: "%{query} の検索において、次の情報を提供してくれました:\n\n%{context}\n\n会話を続けましょう。"
+      flag_post:
+        errors:
+          no_context: "通報できる投稿コンテンツがありません。"
+          no_reason: "投稿の通報には理由が必要です。"
+          invalid_flag_type: "通報タイプが無効です。"
+        skipped: "判定は false でした。通報は作成されませんでした。"
+        already_flagged: "投稿はすでにレビュー対象として通報されています。"
+        flagged: "投稿はレビュー対象として通報されました。"
+        reason: "AI ボットはこの投稿を通報しまっした。\n\n理由: %{reason}"
     summarization:
       configuration_hint:
         other: "先に次の設定を構成します: %{settings}"
@@ -549,13 +628,22 @@ ja:
       configuration:
         disable_embeddings: "先に 'ai embeddings enabled' を無効にしてください。"
         choose_model: "先に 'ai embeddings selected model' を設定してください。"
+        model_test_failed: "このモデルでテスト埋め込みを生成できませんでした。正しく構成されていることを確認してください。"
     llm_models:
       missing_provider_param: "%{param} は空白にできません"
       bedrock_invalid_url: "このモデルを使用するには、すべてのフィールドに入力してください。"
+      bedrock_missing_auth: "AWS Bedrock では、アクセスキー ID またはロール ARN の構成が必要です"
     ai_staff_action_logger:
       updated: "更新"
       set: "設定"
       removed: "削除"
+    translation:
+      errors:
+        disabled: "AI 翻訳機能が完全に構成されていません。"
+        all_posts_translated: "このトピックの投稿はすべて翻訳済みです。"
+    llm_credit_allocation:
+      limit_exceeded_user: "このコミュニティーは今日の AI クレジット上限に達しました。%{reset_time} 以降にもう一度お試しいただくか、詳細についてサイト管理者にお問い合わせください。"
+      limit_exceeded_admin: "AI クレジットの上限に達しました。%{reset_time} 以降にもう一度お試しください。"
     errors:
       quota_exceeded: "このモデルの使用量制限を超過しました。%{relative_time}後にもう一度お試しください。"
       quota_required: "このモデルのトークンまたは使用量の上限を指定する必要があります"
diff --git a/plugins/discourse-ai/config/locales/server.pl_PL.yml b/plugins/discourse-ai/config/locales/server.pl_PL.yml
index 4546600e5cf06..c59405a81ebf1 100644
--- a/plugins/discourse-ai/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-ai/config/locales/server.pl_PL.yml
@@ -282,6 +282,23 @@ pl_PL:
           name: "Zacznij od zera..."
       name:
         characters: "może zawierać tylko cyfry, litery i podkreślenia"
+      secret_contracts:
+        invalid_payload: "Sekretne kontrakty muszą być tablicą."
+        invalid_contract: "Sekretny kontrakt o indeksie %{index} jest nieprawidłowy."
+        alias_required: "Sekretny kontrakt o indeksie %{index} musi zawierać alias."
+        alias_too_long: "Sekretny alias `%{alias}` jest za długi."
+        alias_invalid: "Sekretny alias `%{alias}` może zawierać tylko cyfry, litery i podkreślenia."
+        alias_not_unique: "Sekretny alias `%{alias}` jest zduplikowany."
+      secret_bindings:
+        invalid_payload: "Sekretne powiązania muszą być tablicą."
+        secret_not_found: "Wybrane poświadczenie nie istnieje."
+        alias_not_declared: "Alias `%{alias}` nie jest zadeklarowany w tym narzędziu."
+      secret_runtime:
+        alias_not_declared: "Alias poświadczeń `%{alias}` nie jest zadeklarowany dla tego narzędzia."
+        missing_binding: "Alias poświadczeń `%{alias}` jest wymagany, ale nie jest powiązany."
+        missing_required_aliases: "Brak wymaganych powiązań poświadczeń dla aliasów: %{aliases}."
+        secret_not_found: "Alias poświadczeń `%{alias}` jest powiązany z brakującymi poświadczeniami."
+        unknown_error: "Nie można rozwiązać żądanego poświadczenia."
     ai_helper:
       errors:
         completion_request_failed: "Coś poszło nie tak podczas próby przedstawienia sugestii. Spróbuj ponownie."
@@ -678,7 +695,7 @@ pl_PL:
         choose_model: "Najpierw ustaw „osadzenia sztucznej inteligencji wybrane modele”."
         model_test_failed: "Nie udało nam się wygenerować testowego osadzenia z tym modelem. Sprawdź, czy jest poprawnie skonfigurowany."
     secrets:
-      delete_failed_in_use: "To poświadczenie jest obecnie używane przez co najmniej jeden program LLM lub osadzenia i nie można go usunąć."
+      delete_failed_in_use: "To poświadczenie jest obecnie używane przez jedno lub więcej LLM, osadzeń lub narzędzi i nie może zostać usunięte."
     llm_models:
       missing_provider_param: "%{param} nie może być pusty"
       secret_required: "Należy wybrać poświadczenie"
@@ -707,6 +724,26 @@ pl_PL:
       persona_disabled: Podana osobowość jest wyłączona. Sprawdź parametry persona_name lub persona_id.
       no_default_llm: Osobowość musi mieć zdefiniowany parametr default_llm.
       user_not_allowed: Użytkownik nie ma prawa brać udziału w dyskusji na ten temat.
+      invalid_stream_resume_token: Token resume_token jest nieprawidłowy lub wygasł.
+      no_tool_results_specified: Parametr tool_results jest wymagany przy wznawianiu strumienia.
+      invalid_custom_tools: "Parametr custom_tools jest nieprawidłowy: %{details}"
+      duplicate_custom_tools: "Parametr custom_tools zawiera zduplikowane nazwy narzędzi: %{names}"
+      too_many_custom_tools: "Parametr custom_tools może zawierać maksymalnie %{max} narzędzi."
+      custom_tool_definition_too_large: "Każda definicja narzędzia niestandardowego może mieć maksymalnie %{max} bajtów."
+      invalid_stream_param: "Parametr %{key} jest nieprawidłowy: %{details}"
+      expected_array: "oczekiwano tablicy"
+      expected_object: "oczekiwano obiektu"
+      ambiguous_tool_results: "Podaj albo tool_results albo tool_result, nie obydwa."
+      invalid_tool_results: "Parametr tool_results jest nieprawidłowy: %{details}"
+      too_many_tool_results: "Parametr tool_results może zawierać maksymalnie %{max} elementów."
+      no_pending_tool_calls: Nie ma żadnych oczekujących wywołań narzędzi dla tego tokena CV.
+      missing_tool_results: "Brak wyników wyszukiwania dla identyfikatorów wywołań narzędzi: %{ids}"
+      unexpected_tool_results: "Nieoczekiwane wyniki narzędzia dla identyfikatorów wywołań narzędzia: %{ids}"
+      invalid_tool_result_content: "Wynik narzędzia dla %{id} musi zawierać treść"
+      tool_result_content_too_large: "Każdy ładunek zawartości wyniku narzędzia musi mieć maksymalnie %{max} bajtów."
+      stream_reply_max_resume_rounds_reached: Osiągnięto maksymalną liczbę rund wznawiania używania niestandardowych narzędzi (%{max}).
+      stream_reply_state_too_large: "Stan strumienia jest zbyt duży, aby go zachować (maks. %{max} bajtów)."
+      stream_reply_unexpected_error: Podczas przesyłania odpowiedzi wystąpił nieoczekiwany błąd.
       prompt_message_length: Wiadomość %{idx} przekracza limit 1000 znaków.
       persona_already_exists: Osobowość o nazwie %{name} już istnieje.
       custom_tool_exists:
diff --git a/plugins/discourse-ai/config/locales/server.uk.yml b/plugins/discourse-ai/config/locales/server.uk.yml
index 2fffbed08152a..383c080c73d00 100644
--- a/plugins/discourse-ai/config/locales/server.uk.yml
+++ b/plugins/discourse-ai/config/locales/server.uk.yml
@@ -282,6 +282,16 @@ uk:
           name: "Почніть з чистого аркуша..."
       name:
         characters: "повинні містити тільки цифри, літери та підкреслення"
+      secret_contracts:
+        invalid_payload: "Таємні контракти повинні бути масивом."
+        invalid_contract: "Секретний контракт за індексом %{index} недійсний."
+        alias_required: "Секретний контракт за індексом %{index} повинен містити псевдонім."
+        alias_too_long: "Секретний псевдонім `%{alias}` занадто довгий."
+        alias_invalid: "Секретний псевдонім `%{alias}` має містити лише цифри, літери та символи підкреслення."
+        alias_not_unique: "Секретний псевдонім `%{alias}` дублюється."
+      secret_bindings:
+        invalid_payload: "Секретні зв'язки повинні бути масивом."
+        secret_not_found: "Вибраний обліковий запис не існує."
     ai_helper:
       errors:
         completion_request_failed: "Щось пішло не так під час спроби надати пропозиції. Будь ласка, спробуйте ще раз."
@@ -677,8 +687,6 @@ uk:
         disable_embeddings: "Спершу потрібно вимкнути функцію «AI embeddings enabled»."
         choose_model: "Спочатку встановіть 'ai embeddings selected model'."
         model_test_failed: "Нам не вдалося створити тестове вбудовування з цією моделлю. Перевірте, чи правильно налаштовано."
-    secrets:
-      delete_failed_in_use: "Цей обліковий запис наразі використовується одним або кількома LLM або вбудовуваннями і не може бути видалений."
     llm_models:
       missing_provider_param: "%{param} не може бути пустим"
       secret_required: "Необхідно вибрати обліковий запис"
diff --git a/plugins/discourse-ai/config/locales/server.zh_CN.yml b/plugins/discourse-ai/config/locales/server.zh_CN.yml
index 9b31e366fe716..acdf809bc1cf1 100644
--- a/plugins/discourse-ai/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-ai/config/locales/server.zh_CN.yml
@@ -13,16 +13,16 @@ zh_CN:
   dashboard:
     problem:
       ai_llm_status:
-        other: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> 需要注意。在过去的 %{count} 小时里，它在 %{total_calls} 次中没有回复 %{failed_calls} 次。"
-      ai_credit_soft_limit: "%{model_name} 仅剩余 %{percentage_remaining}% 的积分。积分将在 %{reset_date}时重置。 <a href='%{url}'>查看 AI 模型</a>"
-      ai_credit_hard_limit: "您的 %{model_name}AI 积分已经用完了。AI 功能将在 %{reset_date}之前不可用。 <a href='%{url}'>查看 AI 模型</a>"
+        other: "<a href='%{base_path}/admin/plugins/discourse-ai/ai-llms/%{target}/edit'>%{model_name}</a> 需要注意。在过去的 %{count} 小时，它在 %{total_calls} 次请求中有 %{failed_calls} 次没有响应。"
+      ai_credit_soft_limit: "%{model_name} 仅剩余 %{percentage_remaining}% 的点数。点数将在 %{reset_date} 重置。<a href='%{url}'>查看 AI 模型</a>"
+      ai_credit_hard_limit: "您的 %{model_name} AI 点数已用完。AI 功能将在 %{reset_date} 之前不可用。<a href='%{url}'>查看 AI 模型</a>"
   discourse_automation:
     ai:
       flag_types:
         review: "将帖子添加到审核队列"
         review_hide: "将帖子添加到审核队列并隐藏帖子"
         review_delete: "将帖子添加到审核队列并删除帖子"
-        review_delete_silence: "将帖子加入审核队列、删除帖子并将用户设为静音。"
+        review_delete_silence: "将帖子加入审核队列、删除帖子并将用户禁言"
         spam: "标记为垃圾信息并隐藏帖子"
         spam_silence: "标记为垃圾信息，隐藏帖子并将用户禁言"
     scriptables:
@@ -38,15 +38,15 @@ zh_CN:
         flagged_post: |
           <div>模型的回答：</div>
           <p>%{llm_response}</p>
-          <b>由 <a href="%{base_path}/admin/plugins/automation/%{automation_id}">%{automation_name}</a>规则触发。</b>
+          <b>由 <a href="%{base_path}/admin/plugins/automation/%{automation_id}">%{automation_name}</a> 规则触发。</b>
         notify_author_pm:
           subject: "您的帖子已暂时移除供审核"
           body: |
-            你好 @%{username},
+            @%{username}，您好！
 
-            你在 “%{topic_title}” 中的帖子已被暂时删除并放入我们的审阅队列中供版主查看。如果获得批准，它将自动恢复。
+            您在“%{topic_title}”中的帖子已被暂时移除并放入我们的审核队列中供版主查看。如果获得批准，它将自动恢复。
 
-            参考： %{post_url}
+            参考：%{post_url}
       llm_report:
         title: 使用 AI 的定期报告
         description: "基于大语言模型的定期报告"
@@ -85,8 +85,8 @@ zh_CN:
     ai_nsfw_flag_threshold_sexy: "分类为性感的图片被视为 NSFW 的阈值。"
     ai_nsfw_models: "用于 NSFW 推断的模型。"
     ai_spam_detection_enabled: "启用 AI 垃圾信息检测模块"
-    ai_spam_detection_max_post_count: "用户在不再被扫描为垃圾邮件之前可发表帖子的最大数量"
-    ai_spam_detection_max_trust_level: "用户扫描垃圾邮件的最大信任级别"
+    ai_spam_detection_max_post_count: "用户在不再被扫描为垃圾信息之前可以拥有的最大帖子数量"
+    ai_spam_detection_max_trust_level: "用户扫描垃圾信息的最大信任级别"
     ai_openai_api_key: "OpenAI API 的 API 密钥。仅用于图片创建和编辑。对于 GPT，请使用 LLM 配置标签页"
     ai_helper_enabled: "启用 AI 助手。"
     composer_ai_helper_allowed_groups: "这些群组中的用户将在编辑器中看到 AI 助手按钮。"
@@ -95,7 +95,7 @@ zh_CN:
     ai_helper_automatic_chat_thread_title: "根据话题内容自动设置聊天对话标题。"
     ai_helper_enabled_features: "选择要在 AI 助手中启用的功能。"
     post_ai_helper_allowed_groups: "能够在帖子中访问 AI 助手功能的用户群组"
-    ai_helper_post_illustrator_persona: "用于 AI 助手“帖子插图”功能的角色。注意：要使此功能生效，您还必须创建一个图像生成工具（Admin > Plugins > Discourse AI > Tools）。"
+    ai_helper_post_illustrator_persona: "用于 AI 助手的帖子插图功能的角色。注意：要使此功能正常运行，您还必须创建一个图片生成工具（管理员 > 插件 > Discourse AI > 工具）。"
     ai_helper_chat_thread_title_persona: "用于生成聊天主题标题的角色。"
     ai_embeddings_selected_model: "使用所选模型生成嵌入向量。"
     ai_embeddings_generate_for_pms: "为个人消息生成嵌入向量。"
@@ -106,8 +106,8 @@ zh_CN:
     ai_embeddings_semantic_search_use_hyde: "使用 HyDE 进行语义全页搜索。使用 LLM 可以根据用户搜索词创建一个假设的帖子来帮助匹配。"
     ai_embeddings_semantic_quick_search_enabled: "在搜索菜单弹出窗口中启用语义搜索选项。"
     ai_embeddings_semantic_related_include_closed_topics: "在语义搜索结果中包含已关闭话题"
-    ai_embeddings_semantic_related_age_penalty: "对语义搜索结果中的话题适用指数式的年龄惩罚。0.0 = 无惩罚，0.3 = gentle 偏向于近期活跃的内容，1.0+ = 强烈的偏向近期内容。"
-    ai_embeddings_semantic_related_age_time_scale: "计算年龄惩罚的时间尺度，以天为单位。话题在此时间范围内未活跃，将受到约50%的惩罚，惩罚系数为1.0。使用365表示年度尺度，90表示季度尺度。"
+    ai_embeddings_semantic_related_age_penalty: "对语义搜索结果中的话题应用指数式期限惩罚。0.0 = 无惩罚，0.3 = 轻微偏向于近期活跃的内容，1.0+ = 强烈偏向于活跃的内容。"
+    ai_embeddings_semantic_related_age_time_scale: "计算期限惩罚的时间尺度，以天为单位。不活跃时长达到此天数的话题将受到约 50% 的惩罚，惩罚系数为1.0。使用 365 表示年度尺度，使用 90 表示季度尺度。"
     ai_embeddings_per_post_enabled: 为每个帖子生成嵌入向量
     ai_summarization_enabled: "启用总结功能"
     ai_summarization_persona: "用于总结功能的角色"
@@ -115,16 +115,16 @@ zh_CN:
     ai_summary_gists_enabled: "自动生成话题中最新回复的简要总结"
     ai_summary_backfill_maximum_topics_per_hour: "每小时回填的话题摘要数。"
     ai_bot_enabled: "启用 AI 机器人模块。"
-    ai_bot_enabled_llms: "用于选择 AI bot 对话的 LLM"
+    ai_bot_enabled_llms: "用于选择 AI 机器人对话的 LLM"
     ai_bot_enable_chat_warning: "启动私信聊天时显示警告。可以通过编辑翻译字符串进行覆盖：discourse_ai.ai_bot.pm_warning"
     ai_bot_allowed_groups: "当 GPT 机器人可以访问私信时，它将回复这些群组的成员。"
     ai_bot_debugging_allowed_groups: "允许这些群组在帖子上看到显示原始 AI 请求和回答的调试按钮"
     ai_bot_public_sharing_allowed_groups: "允许这些群组通过唯一的公开链接与公众分享 AI 个人消息。注意：如果您的站点需要登录，分享时也需要登录。"
-    ai_bot_add_to_header: "在标题中显示按钮以使用 AI 机器人启动 PM"
-    ai_bot_add_to_community_section: "在侧边栏社区版块显示一个链接，以开始使用 AI 机器人启动 PM。"
+    ai_bot_add_to_header: "在标题中显示按钮以使用 AI 机器人开始 PM"
+    ai_bot_add_to_community_section: "在边栏社区版块中显示一个链接，以使用 AI 机器人开始 PM"
     ai_bot_github_access_token: "搭配使用 GitHub AI 工具所需的 GitHub 访问令牌（搜索支持需要）"
     ai_discover_enabled: "启用发现搜索功能"
-    ai_discover_persona: "用于发现搜索功能的 Persona"
+    ai_discover_persona: "用于发现搜索功能的角色"
     ai_google_custom_search_api_key: "Google 自定义搜索 API 的 API 密钥，请参阅：https://developers.google.com/custom-search"
     ai_google_custom_search_cx: "Google 自定义搜索 API 的 CX"
     ai_discord_search_enabled: "启用 Discord 搜索功能"
@@ -133,15 +133,15 @@ zh_CN:
     ai_discord_search_mode: "选择用于 Discord 搜索的搜索模式"
     ai_discord_search_persona: "用于 Discord 搜索的角色。"
     ai_discord_allowed_guilds: "允许机器人搜索的 Discord 公会（服务器）"
-    ai_translation_enabled: "启用AI翻译功能"
+    ai_translation_enabled: "启用 AI 翻译功能"
     ai_translation_backfill_limit_to_public_content: "启用时，仅翻译公共类别中的内容。禁用时，群组 PM 和不公开类别中的内容也将发送以进行翻译。"
     ai_translation_include_bot_content: "启用后，机器人（用户 ID 小于 0）编写的内容也将发送进行翻译。"
-    ai_translation_max_post_length: "帖子翻译的最大字符数。超过此长度的帖子将不会被翻译。"
+    ai_translation_max_post_length: "要翻译的帖子的最大字符数。超过此长度的帖子将不会被翻译。"
     ai_translation_backfill_max_age_days: "待翻译帖子和话题的最长期限。超过此期限的帖子和话题将不进行翻译。0 表示禁用回填，但不会禁用新帖子的翻译。"
-    ai_translation_backfill_hourly_rate: "每小时回填翻译的帖子和话题数量。设置为 0 可禁用现有内容的自动翻译回填。"
-    ai_translation_max_tokens_multiplier: "倍数来决定用于翻译的最大令牌数量。 默认情况下，我们将最大令牌设置为帖子中字符数的大约2至5倍。 这个倍数可以调整，以考虑或推理模型使用更多的令牌。"
-    ai_usage_rollup_after_days: "每次请求的 AI 使用数据在被汇总为每日统计之前要保留的天数。设为 0 表示不进行汇总。"
-    ai_audit_logs_purge_after_days: "删除超过指定天数的 AI API 审计日志。默认值约为 6 个月。设置为 0 则无限期保留。"
+    ai_translation_backfill_hourly_rate: "回填操作期间每小时翻译的帖子和话题数量。设置为 0 可禁用现有内容的自动翻译回填。"
+    ai_translation_max_tokens_multiplier: "倍数来决定用于翻译的最大词元数量。默认情况下，我们将最大词元数设置为帖子中字符数的大约 2-5 倍。这个倍数可以调整，以考虑将使用更多词元允许思考或推理模型。"
+    ai_usage_rollup_after_days: "每次请求的 AI 使用数据在被汇总到每日统计之前要保留的天数。设为 0 表示不进行汇总。"
+    ai_audit_logs_purge_after_days: "删除超过此天数的 AI API 审核日志。默认值约为 6 个月。设置为 0 则无限期保留。"
   reviewables:
     reasons:
       flagged_by_toxicity: AI 插件将其分类为有毒后对其进行了标记。
@@ -261,7 +261,7 @@ zh_CN:
         stock_quote:
           name: "股票报价 (AlphaVantage)"
         image_generation_category:
-          name: "图像生成……"
+          name: "图片生成…"
         image_generation_custom:
           name: "自定义"
         image_generation_openai:
@@ -276,14 +276,16 @@ zh_CN:
           name: "从空白开始…"
       name:
         characters: "只能包含数字、字母和下划线"
+      secret_bindings:
+        secret_not_found: "所选凭证不存在."
     ai_helper:
       errors:
         completion_request_failed: "尝试提供建议时出错。请重试。"
-        no_illustrator_persona: "Post Illustrator 角色未配置。请检查您的网站设置。"
-        no_image_generation_tool: "Post Illustrator 角色必须附带图像生成工具。请在管理面板中为该角色配置图像生成工具。"
-        no_image_generated: "图像生成失败。请重试或检查您的工具配置。"
-        llm_model_not_configured: "图像生成未配置任何语言模型。请在您的网站设置中配置默认语言模型。"
-        unknown_error: "生成缩略图时出现意外错误。请重试。"
+        no_illustrator_persona: "帖子插图创建器角色未配置。请检查您的站点设置。"
+        no_image_generation_tool: "帖子插图创建器角色必须附带图片生成工具。请在管理面板中为此角色配置图片生成工具。"
+        no_image_generated: "无法生成图片。请重试或检查您的工具配置。"
+        llm_model_not_configured: "没有为图片生成配置任何语言模型。请在您的站点设置中配置默认语言模型。"
+        unknown_error: "生成缩略图时发生意外错误。请重试。"
       prompts:
         translate: 翻译为%{language}
         generate_titles: 建议话题标题
@@ -385,7 +387,7 @@ zh_CN:
           description: "支持助手的生成 Markdown 表功能的默认角色"
         post_illustrator:
           name: "帖子插图创建器"
-          description: "使用现有的图像生成工具生成用于文章配图的图像"
+          description: "使用可用图片生成工具生成用于帖子配图的图片"
         proofreader:
           name: "审校"
           description: "支持助手的审校文本功能的默认角色"
@@ -424,7 +426,7 @@ zh_CN:
           description: "报告自动化脚本中使用的默认角色"
         discover:
           name: "发现"
-          description: "发现功能中使用的默认 Persona（免费搜索）"
+          description: "发现功能中使用的默认角色（免费搜索）"
         chat_thread_titler:
           name: "聊天主题标题"
           description: "自动生成聊天主题标题的默认角色"
@@ -482,8 +484,8 @@ zh_CN:
             description: "搜索时要使用的基本查询。示例：'#urgent' 会在搜索查询前面加上 '#urgent'，并且仅包含具有紧急类别或标签的话题。"
         flag_post:
           flag_type:
-            name: "举报类型"
-            description: "控制帖子是否被审核、隐藏、删除或视为垃圾邮件。"
+            name: "标记类型"
+            description: "控制帖子是被审核、隐藏、删除还是视为垃圾信息。"
       tool_summary:
         read_artifact: "阅读 Web 工件"
         update_artifact: "更新 Web 工件"
@@ -521,10 +523,10 @@ zh_CN:
         github_search_code: "在 GitHub 仓库中搜索代码"
         github_search_files: "在 GitHub 仓库中搜索文件"
         github_file_content: "从 GitHub 仓库检索文件的内容"
-        github_diff: "获取 GitHub 拉取请求或提交差异"
+        github_diff: "检索 GitHub 拉取请求或提交差异"
         random_picker: "选择一个随机数或列表的随机元素"
         categories: "列出论坛上所有公开可见的类别"
-        flag_post: "举报当前帖子以供管理人员审核"
+        flag_post: "标记当前帖子供管理人员审核"
         search: "搜索论坛上的所有公开话题"
         tags: "列出论坛上的所有标签"
         time: "查找不同时区的时间"
@@ -551,7 +553,7 @@ zh_CN:
         github_diff: "<a href='%{url}'>%{repo} %{ref}</a>"
         github_file_content: "已从 %{repo_name}@%{branch} 检索到 %{file_paths} 的内容"
         random_picker: "正在从 %{options} 中选择，已选：%{result}"
-        flag_post: "举报帖子 %{post_id} (flag_post: %{flag_post})"
+        flag_post: "标记帖子 %{post_id}（flag_post：%{flag_post}）"
         read: "正在阅读：<a href='%{url}'>%{title}</a>"
         time: "%{timezone} 的时间为 %{time}"
         summarize: "已总结 <a href='%{url}'>%{title}</a>"
@@ -583,13 +585,13 @@ zh_CN:
           raw: "在我搜索“%{query}”时，您向我展示了以下信息：\n\n%{context}\n\n让我们继续对话吧。"
       flag_post:
         errors:
-          no_context: "没有可用于举报的帖子上下文。"
-          no_reason: "举报帖子需要提供一个理由。"
-          invalid_flag_type: "举报类型无效。"
-        skipped: "裁定失败；未创建举报。"
-        already_flagged: "该帖子已被标记待审查。"
-        flagged: "帖子已标记待审查。"
-        reason: "AI机器人标记了此帖子。\n\n原因： %{reason}"
+          no_context: "没有可用于标记的帖子上下文。"
+          no_reason: "标记帖子需要提供原因。"
+          invalid_flag_type: "标记类型无效。"
+        skipped: "裁定失败；未创建标记。"
+        already_flagged: "该帖子已被标记待审核。"
+        flagged: "帖子已被标记待审核。"
+        reason: "AI 机器人标记了此帖子。\n\n原因：%{reason}"
     summarization:
       configuration_hint:
         other: "首先配置这些设置：%{settings}"
@@ -637,9 +639,7 @@ zh_CN:
       configuration:
         disable_embeddings: "您必须先禁用 'ai embeddings enabled'。"
         choose_model: "首先设置 'ai embeddings selected model'。"
-        model_test_failed: "我们无法使用此模型生成测试嵌入向量。请检查设置是否正确。"
-    secrets:
-      delete_failed_in_use: "此凭证目前正被一个或多个LLM或嵌入使用，无法删除。"
+        model_test_failed: "我们无法使用此模型生成测试嵌入向量。请检查配置是否正确。"
     llm_models:
       missing_provider_param: "%{param}不能为空"
       secret_required: "必须选择一种凭证。"
@@ -652,11 +652,11 @@ zh_CN:
       removed: "已移除"
     translation:
       errors:
-        disabled: "人工智能翻译功能未完全配置。"
+        disabled: "AI 翻译功能未完全配置。"
         all_posts_translated: "此话题中的所有帖子均已翻译。"
     llm_credit_allocation:
-      limit_exceeded_user: "该社区今天已达到其AI信用额度。请在 %{reset_time} 之后重试或联系您的站点管理员以获取更多信息。"
-      limit_exceeded_admin: "您的AI信用额度已达上限。请在 %{reset_time}后重试。"
+      limit_exceeded_user: "此社区今天已达到其 AI 点数上限。请在 %{reset_time} 后重试或联系您的站点管理员获取更多信息。"
+      limit_exceeded_admin: "您已达到 AI 点数上限。请在 %{reset_time} 后重试。"
     errors:
       quota_exceeded: "您已超出此模型的配额。请在 %{relative_time}后再试。"
       quota_required: "必须为此模型指定最大词元数或使用次数"
diff --git a/plugins/discourse-apple-auth/config/locales/server.ar.yml b/plugins/discourse-apple-auth/config/locales/server.ar.yml
index 884607bd314ea..5c62f074811c3 100644
--- a/plugins/discourse-apple-auth/config/locales/server.ar.yml
+++ b/plugins/discourse-apple-auth/config/locales/server.ar.yml
@@ -7,6 +7,7 @@
 ar:
   site_settings:
     sign_in_with_apple_enabled: 'هل تريد تفعيل تسجيل الدخول باستخدام Apple؟'
+    apple_client_id: "(تسجيل الدخول باستخدام Apple) يُشير إلى \"معرّف الخدمة\" الخاص بشركة Apple الموجود في لوحة تحكم المطورين. عادةً ما يُستخدم فيه نمط اسم نطاق معكوس (على سبيل المثال: com.example.auth)"
     apple_team_id: '(تسجيل الدخول باستخدام Apple) معرف فريق Apple (10 حروف)'
     apple_key_id: '(تسجيل الدخول باستخدام Apple) معرف مفتاح Apple (10 حروف)'
     apple_pem: '(الدخول عبر حساب Apple) محتوى ملف PEM لشركة Apple، مع ضرورة تضمين أسطر BEGIN و END'
diff --git a/plugins/discourse-apple-auth/config/locales/server.ja.yml b/plugins/discourse-apple-auth/config/locales/server.ja.yml
index c78a5b690b2b2..bf3668c63b33d 100644
--- a/plugins/discourse-apple-auth/config/locales/server.ja.yml
+++ b/plugins/discourse-apple-auth/config/locales/server.ja.yml
@@ -7,6 +7,7 @@
 ja:
   site_settings:
     sign_in_with_apple_enabled: 'Apple でのサインインを有効にしますか？'
+    apple_client_id: "(Apple でサインイン) 開発者コンソールの Apple「サービス識別子」。通常、逆ドメイン名形式の文字列 (com.example.auth など)"
     apple_team_id: '(Apple でサインイン) Apple チーム ID (10 文字)'
     apple_key_id: '(Apple でサインイン) Apple キー ID (10 文字)'
     apple_pem: '(Apple でサインイン) Apple Pem ファイルのコンテンツ。BEGIN 行と END 行を含めます'
diff --git a/plugins/discourse-apple-auth/config/locales/server.zh_CN.yml b/plugins/discourse-apple-auth/config/locales/server.zh_CN.yml
index 2b19c29d9837c..a82f96089f377 100644
--- a/plugins/discourse-apple-auth/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-apple-auth/config/locales/server.zh_CN.yml
@@ -7,7 +7,7 @@
 zh_CN:
   site_settings:
     sign_in_with_apple_enabled: '是否启用使用 Apple 登录？'
-    apple_client_id: "（使用 Apple 登录）开发者控制台中的 Apple“服务标识符”。通常是一个反向域名格式的字符串（例如 com.example.auth）。"
+    apple_client_id: "（使用 Apple 登录）开发者控制台中的 Apple“服务标识符”。通常是一个反向域名样式的字符串（例如 com.example.auth）。"
     apple_team_id: '（使用 Apple 登录）Apple Team ID（10 个字符）'
     apple_key_id: '（使用 Apple 登录）Apple Key ID（10 个字符）'
     apple_pem: '（使用 Apple 登录）Apple Pem 文件内容。包括 BEGIN 和 END 行'
diff --git a/plugins/discourse-assign/config/locales/client.de.yml b/plugins/discourse-assign/config/locales/client.de.yml
index ebbe63a3cfc8f..3ee29fdf2a808 100644
--- a/plugins/discourse-assign/config/locales/client.de.yml
+++ b/plugins/discourse-assign/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_assign: "Discourse – Zuordnen"
+          discourse_assign: "Discourse Zuordnen"
   js:
     filters:
       unassigned:
diff --git a/plugins/discourse-assign/config/locales/client.el.yml b/plugins/discourse-assign/config/locales/client.el.yml
index 9f79461d67034..6d35c2f3e7b09 100644
--- a/plugins/discourse-assign/config/locales/client.el.yml
+++ b/plugins/discourse-assign/config/locales/client.el.yml
@@ -7,6 +7,7 @@
 el:
   js:
     discourse_assign:
+      topic_search_placeholder: "Αναζητήστε θέματα βάσει τίτλου ή λέξεις-κλειδιών…"
       sidebar_name_filter_placeholder: "Όνομα/Όνομα χρήστη"
       group_everyone: "Όλοι"
       assigned_to: "Ανατέθηκε σε"
diff --git a/plugins/discourse-assign/config/locales/server.ar.yml b/plugins/discourse-assign/config/locales/server.ar.yml
index f5000152f3a16..84b687fc9cb68 100644
--- a/plugins/discourse-assign/config/locales/server.ar.yml
+++ b/plugins/discourse-assign/config/locales/server.ar.yml
@@ -14,6 +14,7 @@ ar:
     assign_self_regex: "العبارة النمطية التي يجب تمريرها للتعيين الذاتي. مثال: 'قائمتي'"
     assign_other_regex: "العبارة النمطية التي يجب تمريرها لتعيين الموضوعات إلى الآخرين من خلال الإشارة. مثال: \"قائمتك\""
     unassign_on_group_archive: "إلغاء تعيين الرسالة (وإعادة تعيينها إذا عادت إلى صندوق الوارد) عند أرشفة إحدى المجموعات للرسالة"
+    unassign_on_close: "إلغاء تعيين الموضوع تلقائيًا عند إغلاقه. ملاحظة: لن يتم إنشاء منشور تتبّع."
     reassign_on_open: "إعادة تعيين المستخدمين/المجموعات المعيَّنة مسبقًا عند فتح الموضوع"
     invite_on_assign: "دعوة المستخدم أو المجموعة إلى الرسالة الشخصية عند تعيينها إليهما، إذا لم يكونا مشاركين فيها بالفعل."
     assign_mailer: "متى يتم إرسال إشعار بالمهام المعيَّنة عبر البريد الإلكتروني"
diff --git a/plugins/discourse-assign/config/locales/server.el.yml b/plugins/discourse-assign/config/locales/server.el.yml
index 4f7887f8e2e9c..d9bf8985d2e95 100644
--- a/plugins/discourse-assign/config/locales/server.el.yml
+++ b/plugins/discourse-assign/config/locales/server.el.yml
@@ -8,6 +8,7 @@ el:
   site_settings:
     assigns_by_staff_mention: "Εάν ένα μέλος του προσωπικού επισημάνει ένα άλλο μέλος του προσωπικού, το θέμα ανατίθεται αυτόματα"
   discourse_assign:
+    forbidden_assignee_not_pm_participant: "Δεν είναι δυνατή η ανάθεση στον χρήστη @%{username} επειδή δεν έχει πρόσβαση σε αυτό το ΠΜ. Μπορείτε να χορηγήσετε πρόσβαση στον χρήστη @%{username} προσκαλώντας τον σε αυτό το ΠΜ."
     reminders_frequency:
       never: "ποτέ"
       daily: "καθημερινά"
diff --git a/plugins/discourse-assign/config/locales/server.ja.yml b/plugins/discourse-assign/config/locales/server.ja.yml
index 72ab5872a021b..b176435b2624a 100644
--- a/plugins/discourse-assign/config/locales/server.ja.yml
+++ b/plugins/discourse-assign/config/locales/server.ja.yml
@@ -14,6 +14,7 @@ ja:
     assign_self_regex: "自己割り当てのために渡す必要のある正規表現。例「マイリスト」"
     assign_other_regex: "メンションによってトピックを別のユーザーに割り当てるために渡す必要のある正規表現。例「あなたのリスト」"
     unassign_on_group_archive: "メッセージがグループによってアーカイブされると、メッセージの割り当てを解除する（受信トレイに戻されると再割り当てされる）"
+    unassign_on_close: "トピックが閉じられると自動的に割り当てが解除されます。注意: 投稿の追跡は作成されません。"
     reassign_on_open: "トピックがオープンになると、前に割り当てられたユーザー/グループに再割り当てする"
     invite_on_assign: "個人メッセージがユーザーまたはグループに割り当てられたときに、それらのユーザーまたはグループがすでに PM に参加していない場合は、PM に招待します。"
     assign_mailer: "割り当ての通知メールを送信するタイミング"
diff --git a/plugins/discourse-assign/config/locales/server.zh_CN.yml b/plugins/discourse-assign/config/locales/server.zh_CN.yml
index aad068c8cd0d5..dd48d8484cd57 100644
--- a/plugins/discourse-assign/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-assign/config/locales/server.zh_CN.yml
@@ -14,7 +14,7 @@ zh_CN:
     assign_self_regex: "需要为自指定传递的正则表达式。例如，“我的名单”"
     assign_other_regex: "通过提及将话题指定给其他人需要传递的正则表达式。例如，“您的名单”"
     unassign_on_group_archive: "当消息被群组归档时，取消指定消息（如果移回收件箱则重新指定）"
-    unassign_on_close: "主题关闭时自动取消分配。注意：不会创建任何追踪帖子。"
+    unassign_on_close: "当话题关闭时自动取消指定。注意：不会创建任何跟踪帖子。"
     reassign_on_open: "当话题被打开后，重新指定给之前指定的用户/群组"
     invite_on_assign: "将个人消息指定给用户或群组时，如果他们还不是参与者，请邀请他们加入 PM。"
     assign_mailer: "何时发送任务指定的通知电子邮件"
diff --git a/plugins/discourse-calendar/config/locales/client.ar.yml b/plugins/discourse-calendar/config/locales/client.ar.yml
index 12938d8f2561f..81e8385c57936 100644
--- a/plugins/discourse-calendar/config/locales/client.ar.yml
+++ b/plugins/discourse-calendar/config/locales/client.ar.yml
@@ -7,9 +7,11 @@
 ar:
   admin_js:
     admin:
+      calendar: "التقويم والأحداث"
       site_settings:
         categories:
           discourse_post_event: "حدث Discourse"
+          discourse_calendar: "التقويم والأحداث"
   js:
     notifications:
       titles:
@@ -34,6 +36,7 @@ ar:
         header_title: "العطلات"
         pick_region_description: "اختر منطقة لعرض العطلات لتلك المنطقة."
         disabled_holidays_description: "سيتم استبعاد العطلات المتوقفة من تقويم عطلات فريق العمل."
+        header_description: "اختر منطقة لعرض العطلات الخاصة بها. سيتم استبعاد العطلات المتوقفة من تقويم عطلات فريق العمل."
       date: "التاريخ"
       add_to_calendar: "الإضافة إلى تقويم Google"
       toggle_timezone_offset_title: "تبديل إزاحة المنطقة الزمنية"
@@ -42,6 +45,7 @@ ar:
         title: "المنطقة"
         none: "لا يوجد"
         use_current_region: "استخدام المنطقة الحالية"
+        select_region: "اختر منطقة..."
         names:
           ae: "الإمارات العربية المتحدة"
           ar: "الأرجنتين"
@@ -432,6 +436,7 @@ ar:
         event:
           expired: "انتهى"
           closed: "مغلق"
+          full: "كامل"
           status:
             standalone:
               title: "مستقل"
@@ -489,6 +494,9 @@ ar:
         minimal:
           label: "حدث صغير"
           checkbox_label: "إخفاء زرَّي ذاهب/غير ذاهب وحالة المدعوين"
+        max_attendees:
+          label: "الحد الأقصى للحضور"
+          placeholder: "لا يوجد حد"
         allow_chat:
           label: "تكامل الدردشة"
           checkbox_label: "إنشاء قناة دردشة خاصة بحدث معين وإدارتها"
diff --git a/plugins/discourse-calendar/config/locales/client.de.yml b/plugins/discourse-calendar/config/locales/client.de.yml
index d8d243bea6c16..85bdc715804c0 100644
--- a/plugins/discourse-calendar/config/locales/client.de.yml
+++ b/plugins/discourse-calendar/config/locales/client.de.yml
@@ -10,7 +10,7 @@ de:
       calendar: "Kalender & Ereignisse"
       site_settings:
         categories:
-          discourse_post_event: "Discourse – Ereignis"
+          discourse_post_event: "Discourse Ereignis"
           discourse_calendar: "Kalender und Ereignisse"
   js:
     notifications:
@@ -45,7 +45,7 @@ de:
         title: "Region"
         none: "Keine"
         use_current_region: "Aktuelle Region verwenden"
-        select_region: "Region auswählen ..."
+        select_region: "Region auswählen …"
         names:
           ae: "Vereinigte Arabische Emirate"
           ar: "Argentinien"
diff --git a/plugins/discourse-calendar/config/locales/client.el.yml b/plugins/discourse-calendar/config/locales/client.el.yml
index cc7aaf2e9656b..97e60939c68ef 100644
--- a/plugins/discourse-calendar/config/locales/client.el.yml
+++ b/plugins/discourse-calendar/config/locales/client.el.yml
@@ -340,6 +340,7 @@ el:
           label: "Περιγραφή"
         name:
           label: "Όνομα εκδήλωσης"
+          placeholder: "Προαιρετικό, προεπιλογή στον τίτλο θέματος"
         invitees:
           label: "Προσκεκλημένες ομάδες"
         status:
diff --git a/plugins/discourse-calendar/config/locales/client.ja.yml b/plugins/discourse-calendar/config/locales/client.ja.yml
index 7cf535fc03799..ac00561f27239 100644
--- a/plugins/discourse-calendar/config/locales/client.ja.yml
+++ b/plugins/discourse-calendar/config/locales/client.ja.yml
@@ -7,9 +7,11 @@
 ja:
   admin_js:
     admin:
+      calendar: "カレンダーとイベント"
       site_settings:
         categories:
           discourse_post_event: "Discourse イベント"
+          discourse_calendar: "カレンダーとイベント"
   js:
     notifications:
       titles:
@@ -34,6 +36,7 @@ ja:
         header_title: "祝祭日"
         pick_region_description: "地域を選択すると、その地域の祝祭日が表示されます。"
         disabled_holidays_description: "無効化された祝祭日は、スタッフの祝祭日カレンダーから除外されます。"
+        header_description: "地域を選択すると、その地域の休日が表示されます。無効化された休日は、スタッフの休日カレンダーから除外されます。"
       date: "日付"
       add_to_calendar: "Google カレンダーに追加"
       toggle_timezone_offset_title: "タイムゾーンオフセットの切り替え"
@@ -42,6 +45,7 @@ ja:
         title: "地域"
         none: "なし"
         use_current_region: "現在の地域を使用"
+        select_region: "地域を選択..."
         names:
           ae: "アラブ首長国連邦"
           ar: "アルゼンチン"
@@ -407,6 +411,7 @@ ja:
         event:
           expired: "期限切れ"
           closed: "終了"
+          full: "満席"
           status:
             standalone:
               title: "単発"
@@ -464,6 +469,9 @@ ja:
         minimal:
           label: "ミニマルイベント"
           checkbox_label: "参加/不参加ボタンと招待者のステータスを非表示にする"
+        max_attendees:
+          label: "最大参加者"
+          placeholder: "制限なし"
         allow_chat:
           label: "チャットの統合"
           checkbox_label: "イベント専用のチャットチャンネルを作成して管理する"
diff --git a/plugins/discourse-calendar/config/locales/client.zh_CN.yml b/plugins/discourse-calendar/config/locales/client.zh_CN.yml
index bbfded1a12fc4..9567ce11436c6 100644
--- a/plugins/discourse-calendar/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-calendar/config/locales/client.zh_CN.yml
@@ -36,7 +36,7 @@ zh_CN:
         header_title: "假期"
         pick_region_description: "选择一个区域以查看该区域的假期。"
         disabled_holidays_description: "已禁用的假期将被排除在管理人员假期日历之外。"
-        header_description: "请选择一个地区以查看该地区的假期。被禁用的假期将从员工假期日历中排除。"
+        header_description: "请选择一个区域以查看该区域的假期。被禁用的假期将从员工假期日历中排除。"
       date: "日期"
       add_to_calendar: "添加到 Google 日历"
       toggle_timezone_offset_title: "切换时区偏移"
@@ -45,7 +45,7 @@ zh_CN:
         title: "区域"
         none: "无"
         use_current_region: "使用当前区域"
-        select_region: "选择一个地区……"
+        select_region: "选择一个区域…"
         names:
           ae: "阿拉伯联合酋长国"
           ar: "阿根廷"
diff --git a/plugins/discourse-calendar/config/locales/server.ar.yml b/plugins/discourse-calendar/config/locales/server.ar.yml
index 27cfe496c3b72..294aa557c5f69 100644
--- a/plugins/discourse-calendar/config/locales/server.ar.yml
+++ b/plugins/discourse-calendar/config/locales/server.ar.yml
@@ -49,6 +49,7 @@ ar:
     all_day_event_start_time: "ستبدأ الأحداث التي ليس بها وقت محدَّد للبدء في هذا الوقت. التنسيق هو HH:mm. للساعة 6 صباحًا، أدخل 06:00."
     all_day_event_end_time: "ستنتهي الأحداث التي ليس بها وقت محدَّد للانتهاء في هذا الوقت. التنسيق هو HH:mm. للساعة 6 مساءً، أدخل 18:00."
     all_day_event_time_error: "الوقت غير صالح. يجب كتابة الوقت بالتنسيق HH:mm (مثال: 08:00)."
+    calendar_categories: "اعرض التقويم أعلى الفئة. مُعرّف الفئة إلزامي. مثال: categoryId=6;weekends=false;defaultView=year;\n إعدادات أخرى صالحة: weekends(true/false) لتحديد عرض عطلات نهاية الأسبوع، defaultView(day,week,month,year) لتحديد طريقة عرض التقويم الافتراضية."
     calendar_categories_outlet: "يسمح بتغيير المنفذ المفترض أن يعرض تقويم الفئة."
     working_days: "تحديد أيام العمل. يمكنك عرض مدى توافر مجموعة باستخدام علامة `timezones` في منشور: مثال: `[timezones group=admins][timezones]`"
     working_day_start_hour: "وقت البدء لساعات يوم العمل"
@@ -60,6 +61,7 @@ ar:
     calendar_automatic_holidays_enabled: "يحدِّد حالة العطلة تلقائيًا حسب المنطقة الجغرافية للمستخدمين (ملاحظة: يمكنك إيقاف عطلات تلقائية محدَّدة في إعدادات المكوِّن الإضافي)"
     event_participation_buttons: "قائمة أزرار المشاركة في الأحداث التي يمكن للمستخدمين استخدامها."
     sidebar_show_upcoming_events: "عرض رابط الأحداث القادمة في الشريط الجانبي ضمن \"المزيد\"."
+    calendar_first_day_of_week: "حدد اليوم الأول من الأسبوع لعرض التقويم. الخيارات المتاحة هي السبت، أو الأحد، أو الاثنين."
   discourse_calendar:
     invite_user_notification: "دعاك %{username} إلى: %{description}"
     calendar_must_be_in_first_post: "لا يمكن استخدام علامة التقويم إلا في المنشور الأول في الموضوع."
@@ -85,6 +87,7 @@ ar:
           raw_invitees:
             only_group: "لا يقبل الحدث إلا أسماء المجموعات."
           ends_at_before_starts_at: "لا يمكن أن ينتهي الحدث قبل أن يبدأ."
+          max_attendees_reached: "هذا الحدث مكتمل العدد."
           start_must_be_present_and_a_valid_date: "يتطلَّب الحدث تاريخ بدء صالحًا."
           end_must_be_a_valid_date: "يجب أن يكون تاريخ الانتهاء تاريخًا صالحًا."
           invalid_recurrence: "يجب أن يكون التكرار واحدًا مما يلي: every_month أو every_week أو every_two_weeks أو every_four_week أو every_day، أو every_weekday."
diff --git a/plugins/discourse-calendar/config/locales/server.de.yml b/plugins/discourse-calendar/config/locales/server.de.yml
index 70109a433574a..8c3a86dac93aa 100644
--- a/plugins/discourse-calendar/config/locales/server.de.yml
+++ b/plugins/discourse-calendar/config/locales/server.de.yml
@@ -8,6 +8,7 @@ de:
   reports:
     currently_away:
       title: Derzeit abwesende Benutzer
+      description: "Benutzer, die aktuell im Urlaub oder abwesend sind. Diese können nach Gruppenmitgliedschaft gefiltert werden."
       labels:
         username: Benutzername
   discourse_automation:
@@ -87,7 +88,7 @@ de:
           raw_invitees:
             only_group: "Ein Ereignis akzeptiert nur Gruppennamen."
           ends_at_before_starts_at: "Ein Ereignis kann nicht enden, bevor es beginnt."
-          max_attendees_reached: "Diese Veranstaltung ist ausgebucht."
+          max_attendees_reached: "Dieses Ereignis ist ausgebucht."
           start_must_be_present_and_a_valid_date: "Ein Ereignis erfordert ein gültiges Startdatum."
           end_must_be_a_valid_date: "Das Enddatum muss ein gültiges Datum sein."
           invalid_recurrence: "Die Wiederholung muss einer der folgenden Werte sein: every_month, every_week, every_two_weeks, every_four_weeks, every_day, every_weekday."
diff --git a/plugins/discourse-calendar/config/locales/server.ja.yml b/plugins/discourse-calendar/config/locales/server.ja.yml
index 43f757ac84228..12055e7d9a4f3 100644
--- a/plugins/discourse-calendar/config/locales/server.ja.yml
+++ b/plugins/discourse-calendar/config/locales/server.ja.yml
@@ -49,6 +49,7 @@ ja:
     all_day_event_start_time: "開始時刻が指定されていないイベントはこの時刻に開始します。フォーマットは HH:mm です。午前 6 時の場合は、06:00 と入力します"
     all_day_event_end_time: "終了時刻が指定されていないイベントはこの時刻に終了します。フォーマットは HH:mm です。午後 6 時の場合は、18:00 と入力します"
     all_day_event_time_error: "無効な時刻です。フォーマットは HH:mm である必要があります（例: 08:00）。"
+    calendar_categories: "カテゴリの上部にカレンダーを表示する。categoryId は必須です。例: categoryId=6;weekends=false;defaultView=year;\n その他の有効な設定: weekends(true/false)、defaultView(day,week,month,year)"
     calendar_categories_outlet: "カテゴリカレンダーを表示する場所を変更できるようにします。"
     working_days: "稼働日を設定します。投稿に `timezones` タグを使用して、グループの空き状況を表示できます。例: `[timezones group=admins][timezones]`"
     working_day_start_hour: "稼働時間の開始時刻。"
@@ -60,6 +61,7 @@ ja:
     calendar_automatic_holidays_enabled: "ユーザーの地域に基づいて休暇ステータスを自動的に設定します (注意: 特定の自動休暇はプラグインの設定で無効にできます)"
     event_participation_buttons: "ユーザーが使用できるイベント参加ボタンのリスト。"
     sidebar_show_upcoming_events: "サイドバーの「もっと」の下に今後のイベントのリンクを表示する。"
+    calendar_first_day_of_week: "カレンダーに表示する週の最初の曜日を設定します。オプションは、土曜日、日曜日、または月曜日です。"
   discourse_calendar:
     invite_user_notification: "%{username} があなたを招待しました: %{description}"
     calendar_must_be_in_first_post: "Calendar タグは、トピックの最初の投稿でのみ使用できます。"
@@ -85,6 +87,7 @@ ja:
           raw_invitees:
             only_group: "イベントにはグループ名のみを使用できます。"
           ends_at_before_starts_at: "イベントを開始時刻より前に終了されることはできません。"
+          max_attendees_reached: "このイベントは満席です。"
           start_must_be_present_and_a_valid_date: "イベントには有効な開始日が必要です。"
           end_must_be_a_valid_date: "終了日は有効な日付である必要があります。"
           invalid_recurrence: "繰り返しは、every_month、every_week、every_two_weeks、every_four_weeks、every_day、every_weekday のいずれかである必要があります。"
diff --git a/plugins/discourse-calendar/config/locales/server.pl_PL.yml b/plugins/discourse-calendar/config/locales/server.pl_PL.yml
index 69f3fcd0f6261..3967ef3f894a4 100644
--- a/plugins/discourse-calendar/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-calendar/config/locales/server.pl_PL.yml
@@ -8,6 +8,7 @@ pl_PL:
   reports:
     currently_away:
       title: Użytkownicy aktualnie nieobecni
+      description: "Użytkownicy, którzy aktualnie są na urlopie lub nie mają urlopu, można ich filtrować według grup."
       labels:
         username: Nazwa użytkownika
   discourse_automation:
diff --git a/plugins/discourse-calendar/config/locales/server.zh_CN.yml b/plugins/discourse-calendar/config/locales/server.zh_CN.yml
index f8b3ae0449a87..29ffe50d1e35d 100644
--- a/plugins/discourse-calendar/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-calendar/config/locales/server.zh_CN.yml
@@ -49,7 +49,7 @@ zh_CN:
     all_day_event_start_time: "未指定开始时间的活动将在此时间开始。格式为 HH:mm。如为上午 6:00，输入 06:00"
     all_day_event_end_time: "未指定结束时间的活动将在此时间结束。格式为 HH:mm。如为下午 6:00，输入 18:00"
     all_day_event_time_error: "时间无效。格式必须为 HH:mm（例如：08:00）。"
-    calendar_categories: "在类别顶部显示一个日历。categoryId 为必填参数。\n例如：categoryId=6;weekends=false;defaultView=year；\n 其他有效设置：weekends(true/false) 和 defaultView(day,week,month,year)。"
+    calendar_categories: "在类别顶部显示一个日历。categoryId 为必选参数。\n示例：categoryId=6;weekends=false;defaultView=year;\n其他有效设置：weekends(true/false) 和 defaultView(day,week,month,year)。"
     calendar_categories_outlet: "允许更改应显示类别日历的位置。"
     working_days: "设置工作日。您可以在帖子中使用 `timezones` 标签显示群组可用性，例如：`[timezones group=admins][timezones]`"
     working_day_start_hour: "工作日的开始时间。"
diff --git a/plugins/discourse-chat-integration/config/locales/client.ar.yml b/plugins/discourse-chat-integration/config/locales/client.ar.yml
index 335b0df794871..74fedd4f44df4 100644
--- a/plugins/discourse-chat-integration/config/locales/client.ar.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.ar.yml
@@ -82,6 +82,7 @@ ar:
               help: "على سبيل المثال، #channel، @username."
           errors:
             action_prohibited: "لا يملك برنامج الروبوت إذن النشر في هذه القناة"
+            channel_not_found: "القناة المحددة غير موجودة على Slack."
         telegram:
           title: "Telegram"
           param:
@@ -128,6 +129,7 @@ ar:
               help: "اسم لوصف القناة. لا يتم استخدامه للاتصال بـ Matrix."
             room_id:
               title: "مُعرِّف الغرفة"
+              help: "\"المُعرِّف الخاص\" للغرفة. يجب أن يبدو مثل: !abcdefghijkl"
           errors:
             unknown_token: "رمز الوصول غير صالح"
             unknown_room: "مُعرِّف الغرفة غير صالح"
diff --git a/plugins/discourse-chat-integration/config/locales/client.el.yml b/plugins/discourse-chat-integration/config/locales/client.el.yml
index 175e6c943c53c..e92685de7c5b8 100644
--- a/plugins/discourse-chat-integration/config/locales/client.el.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.el.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 el:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          chat_integration: "Ενσωμάτωση συνομιλίας"
   js:
     chat_integration:
       menu_title: "Ενσωματώσεις Συνομιλίας"
diff --git a/plugins/discourse-chat-integration/config/locales/client.ja.yml b/plugins/discourse-chat-integration/config/locales/client.ja.yml
index c976dc16a3c8c..3b8c6afe7889c 100644
--- a/plugins/discourse-chat-integration/config/locales/client.ja.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.ja.yml
@@ -82,6 +82,7 @@ ja:
               help: "例: #channel、@username。"
           errors:
             action_prohibited: "ボットには、そのチャンネルに投稿する権限がありません"
+            channel_not_found: "指定されたチャンネルは Slack に存在しません"
         telegram:
           title: "Telegram"
           param:
@@ -128,6 +129,7 @@ ja:
               help: "チャンネルを説明する名前。Matrix への接続には使用されません。"
             room_id:
               title: "ルーム ID"
+              help: "ルームの「プライベート識別子」。!abcdefghijkl のような形式です"
           errors:
             unknown_token: "アクセストークンが無効です"
             unknown_room: "ルーム ID が無効です"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ar.yml b/plugins/discourse-data-explorer/config/locales/client.ar.yml
index 52d4b6eff3ca8..e11fc4f9cd966 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ar.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ar.yml
@@ -11,24 +11,21 @@ ar:
         no_semicolons: "أزِل الفواصل المنقوطة من الاستعلام."
         dirty: "يجب عليك حفظ الاستعلام قبل التشغيل."
     explorer:
+      default_query: "افتراضي"
       or: "أو"
       admins_only: "مستكشف البيانات متاح للمسؤولين فقط."
       allow_groups: "السماح للمجموعات بالوصول إلى هذا الاستعلام"
       title: "مستكشف البيانات"
-      create: "إنشاء جديد"
+      create: "إنشاء"
       create_placeholder: "اسم الاستعلام..."
       description_placeholder: "أدخِل وصفًا هنا"
       import:
         label: "استيراد"
-        modal: "استيراد استعلام"
         unparseable_json: "ملف JSON غير قابل للتحليل"
         wrong_json: "ملف JSON خاطئ. يجب أن يحتوي ملف JSON على كائن \"استعلام\"، والذي يجب أن يحتوي على الأقل على خاصية \"sql\"."
       help:
         label: "المساعدة"
         modal_title: "مساعدة مستكشف البيانات"
-        auto_resolution: "<h2>ربط السجلات التلقائي</h2> <p>عندما يؤدي الاستعلام إلى إرجاع مُعرِّف الكيان، فقد يستبدله مستكشف البيانات تلقائيًا باسم الكيان والمعلومات المفيدة الأخرى في نتائج الاستعلام. يتوفَّر الربط التلقائي لـ <i><b>user_id</b></i> و<i><b>group_id</b></i> و<i><b>topic_id</b></i> و<i><b>category_id</b></i> و<i><b>badge_id</b></i>. لتجربة ذلك، شغِّل هذا الاستعلام:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>إنشاء معلمات مخصَّصة</h2> <p>لإنشاء معلمات مخصَّصة لاستعلاماتك، ضع هذا في الجزء العلوي من استعلامك واتبع التنسيق:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>ملاحظة: السطر الأول الذي يحتوي على [params] مطلوب، بالإضافة إلى شرطتين قبله وكل معلمة مخصَّصة تريد الإعلان عنها.</i></p>"
-        default_values: "<h3>القيم الافتراضية</h3> <p>يمكنك إعلان المعلمات بقيم افتراضية أو من دونها. ستظهر القيم الافتراضية في حقلٍ نصي أسفل محرِّر الاستعلام، والذي يمكنك تعديله حسب احتياجاتك. ستظل المعلمات المعلنة دون قيم افتراضية تنشئ حقلًا نصيًا، لكنها ستكون فارغة ومظللة باللون الأحمر.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "مخطط قاعدة البيانات"
         filter: "بحث..."
@@ -40,13 +37,12 @@ ar:
           null_: "فارغ"
       export: "تصدير"
       view_json: "عرض JSON"
+      view: "اعرض"
       save: "حفظ التغييرات"
-      saverun: "حفظ التغييرات والتشغيل"
       run: "تشغيل"
-      undo: "تجاهل التغييرات"
+      undo: "تجاهل التغييرين"
       edit: "تعديل"
       delete: "حذف"
-      recover: "إلغاء حذف الاستعلام"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "جدول"
@@ -76,7 +72,6 @@ ar:
       query_user: "تم إنشاؤه بواسطة"
       column: "العمود %{number}"
       explain_label: "هل تريد تضمين خطة الاستعلام؟"
-      save_params: "الضبط على الإعدادات الافتراضية"
       reset_params: "إعادة التعيين"
       search_placeholder: "بحث..."
       no_search_results: "عذرًا، لم نتمكن من العثور على أي نتائج مطابقة لنصك."
diff --git a/plugins/discourse-data-explorer/config/locales/client.be.yml b/plugins/discourse-data-explorer/config/locales/client.be.yml
index 40f4159d45cf9..748a3cea14ea2 100644
--- a/plugins/discourse-data-explorer/config/locales/client.be.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.be.yml
@@ -7,13 +7,14 @@
 be:
   js:
     explorer:
+      default_query: "Прадвызначаная"
       or: "або"
+      create: "стварыць"
       types:
         bool:
           yes: "Так"
           no: "Не"
       export: "экспарт"
-      save: "Захаваць"
       edit: "Рэдагаваць"
       delete: "Выдаліць"
       query_groups: "групы"
diff --git a/plugins/discourse-data-explorer/config/locales/client.bg.yml b/plugins/discourse-data-explorer/config/locales/client.bg.yml
index 557d4fb7dc158..fde1dc28571b4 100644
--- a/plugins/discourse-data-explorer/config/locales/client.bg.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.bg.yml
@@ -7,7 +7,9 @@
 bg:
   js:
     explorer:
+      default_query: "По подразбиране"
       or: "или"
+      create: "Създай"
       import:
         label: "Импорт"
       help:
@@ -19,7 +21,6 @@ bg:
           yes: "Да"
           no: "Не"
       export: "Експорт "
-      save: "Запази промените"
       edit: "Редактирай"
       delete: "Изтрий"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml b/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml
index db4814804ff36..a4d0f0972493f 100644
--- a/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml
@@ -7,7 +7,9 @@
 bs_BA:
   js:
     explorer:
+      default_query: "Uobičajen"
       or: "ili"
+      create: "napravi"
       help:
         label: "Pomoć"
       schema:
@@ -17,7 +19,6 @@ bs_BA:
           yes: "Da"
           no: "Ne"
       export: "Izvoz"
-      save: "Spremiti promjene"
       edit: "Izmijeni"
       delete: "Delete"
       query_groups: "Grupa"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ca.yml b/plugins/discourse-data-explorer/config/locales/client.ca.yml
index f609ebe82c910..71e8c2464ee66 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ca.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ca.yml
@@ -11,15 +11,15 @@ ca:
         no_semicolons: "Elimina els punts i coma de la consulta."
         dirty: "Cal desar la consulta abans d'executar-la"
     explorer:
+      default_query: "Per defecte"
       or: "o"
       admins_only: "L'explorador de dades sols és disponible per a administradors."
       title: "Explorador de dades"
-      create: "Crea'n un de nou"
+      create: "Crea"
       create_placeholder: "Nom de consulta..."
       description_placeholder: "Introduïu una descripció aquí"
       import:
         label: "Importa"
-        modal: "Importa una consulta"
       help:
         label: "Ajuda"
       schema:
@@ -32,13 +32,9 @@ ca:
           no: "No"
           null_: "Nul"
       export: "Exporta"
-      save: "Desa els canvis"
-      saverun: "Desa els canvis i executa"
       run: "Executa"
-      undo: "Descarta els canvis"
       edit: "Edita"
       delete: "Suprimeix"
-      recover: "Restaura la consulta"
       download_json: "JSON"
       download_csv: "CSV"
       others_dirty: "Una consulta té canvis no desats que es perdran si continueu navegant."
@@ -55,7 +51,6 @@ ca:
       query_user: "Creat per"
       column: "Columna %{number}"
       explain_label: "Hi incloem pla de consulta?"
-      save_params: "Estableix valors per defecte"
       reset_params: "Restableix"
       search_placeholder: "Cerca..."
       no_search_results: "Ho sentim, no hem trobat cap resultat que coincideixi amb el vostre text."
diff --git a/plugins/discourse-data-explorer/config/locales/client.cs.yml b/plugins/discourse-data-explorer/config/locales/client.cs.yml
index d66eb070731b1..090469939facb 100644
--- a/plugins/discourse-data-explorer/config/locales/client.cs.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.cs.yml
@@ -7,8 +7,9 @@
 cs:
   js:
     explorer:
+      default_query: "Výchozí"
       or: "nebo"
-      create: "Vytvořit nový"
+      create: "Vytvořit"
       import:
         label: "Import"
       help:
@@ -21,7 +22,9 @@ cs:
           no: "Ne"
           null_: "Null"
       export: "Export"
+      view: "Zobrazit"
       save: "Uložit změny"
+      undo: "Zahodit změny"
       edit: "Upravit"
       delete: "Smazat"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.da.yml b/plugins/discourse-data-explorer/config/locales/client.da.yml
index 33ea13da4cadd..b7fe9d49b897a 100644
--- a/plugins/discourse-data-explorer/config/locales/client.da.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.da.yml
@@ -11,16 +11,16 @@ da:
         no_semicolons: "Fjern semikoloner fra forespørgslen."
         dirty: "Du skal gemme forespørgslen, før du kører den."
     explorer:
+      default_query: "Standard"
       or: "eller"
       admins_only: "Data explorer er kun tilgængelige for administratorer."
       allow_groups: "Tillad grupper at få adgang til denne forespørgsel"
       title: "Data Udforsker"
-      create: "Opret Ny"
+      create: "Opret"
       create_placeholder: "Navn på forespørgsel..."
       description_placeholder: "Indtast en beskrivelse her"
       import:
         label: "Importer"
-        modal: "Importer en forespørgsel"
       help:
         label: "Hjælp"
         modal_title: "Hjælp til Data Udforsker"
@@ -34,12 +34,9 @@ da:
           null_: "Null"
       export: "Eksporter"
       save: "Gem ændringer"
-      saverun: "Gem ændringer og kør"
       run: "Kør"
-      undo: "Kassér Ændringer"
       edit: "Rediger"
       delete: "Slet"
-      recover: "Fortryd sletning af forespørgsel"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabel"
diff --git a/plugins/discourse-data-explorer/config/locales/client.de.yml b/plugins/discourse-data-explorer/config/locales/client.de.yml
index 4e0d1095a9a67..e05c676ea1385 100644
--- a/plugins/discourse-data-explorer/config/locales/client.de.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.de.yml
@@ -11,16 +11,19 @@ de:
         no_semicolons: "Entferne die Semikolons aus der Anfrage."
         dirty: "Du musst die Anfrage vor der Ausführung speichern."
     explorer:
+      default_query: "Standard"
+      default_query_notice: "Dies ist eine Standardabfrage, deren SQL-Code nicht bearbeitet werden kann. Erstelle eine neue Abfrage, um den SQL-Code zu bearbeiten."
+      queries: "Anfragen"
+      query_created: "Anfrage erstellt!"
       or: "oder"
       admins_only: "Der Daten-Explorer ist nur für Administratoren verfügbar."
       allow_groups: "Gruppen erlauben, auf diese Anfrage zuzugreifen"
       title: "Daten-Explorer"
-      create: "Neu erstellen"
+      create: "Erstellen"
       create_placeholder: "Name der Anfrage …"
       description_placeholder: "Hier bitte eine Beschreibung eingeben"
       import:
         label: "Importieren"
-        modal: "Anfrage importieren"
         unparseable_json: "JSON-Datei kann nicht verarbeitet werden."
         wrong_json: "Falsche JSON-Datei. Eine JSON-Datei sollte ein „query“-Objekt enthalten, das zumindest eine „sql“-Eigenschaft haben sollte."
       help:
@@ -41,6 +44,7 @@ de:
           null_: "Null"
       export: "Exportieren"
       view_json: "JSON anzeigen"
+      view: "Ansehen"
       save: "Änderungen speichern"
       saverun: "Änderungen speichern und ausführen"
       run: "Ausführen"
diff --git a/plugins/discourse-data-explorer/config/locales/client.el.yml b/plugins/discourse-data-explorer/config/locales/client.el.yml
index d5ee9da2536eb..735a435cc59e4 100644
--- a/plugins/discourse-data-explorer/config/locales/client.el.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.el.yml
@@ -7,7 +7,10 @@
 el:
   js:
     explorer:
+      default_query: "Προεπιλογή"
       or: "ή"
+      create: "Δημιουργία"
+      description_placeholder: "Εισάγετε εδώ μια περιγραφή"
       import:
         label: "Εισαγωγή"
       help:
@@ -19,7 +22,9 @@ el:
           yes: "Ναι "
           no: "Όχι"
       export: "Εξαγωγή"
+      view: "Προβολή"
       save: "Αποθήκευση αλλαγών"
+      undo: "Απόρριψη αλλαγών"
       edit: "Επεξεργασία"
       delete: "Σβήσιμο"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.es.yml b/plugins/discourse-data-explorer/config/locales/client.es.yml
index c7d254f5c52f1..29fb641778cee 100644
--- a/plugins/discourse-data-explorer/config/locales/client.es.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.es.yml
@@ -11,24 +11,21 @@ es:
         no_semicolons: "Eliminar los punto y coma de la consulta."
         dirty: "Debes guardar la consulta antes de ejecutarla."
     explorer:
+      default_query: "Por defecto"
       or: "o"
       admins_only: "El explorador de datos solo esta disponible para administradores."
       allow_groups: "Permitir a los grupos acceder a esta consulta"
       title: "Explorador de datos"
-      create: "Crear nueva"
+      create: "Crear"
       create_placeholder: "Nombre de la consulta..."
       description_placeholder: "Escribe una descripción aquí"
       import:
         label: "Importar"
-        modal: "Importar una consulta"
         unparseable_json: "Archivo JSON no analizable."
         wrong_json: "Archivo JSON incorrecto. Debería contener un objeto «query», con al menos una propiedad «sql»."
       help:
         label: "Ayuda"
         modal_title: "Ayuda sobre el explorador de datos"
-        auto_resolution: "<h2>Resolución automática de entidades</h2> <p>Cuando tu consulta devuelva el ID de una entidad, puede que el explorador de datos lo sustituya por el nombre de la entidad y otra información útil en los resultados de la consulta. La resolución automática está disponible para <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> y <i><b>badge_id</b></i>. Para probarla, ejecuta esta consulta:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Crear parámetros personalizados</h2><p>Para crear parámetros personalizados en tus consultas, pon lo siguiente al principio siguiendo el formato:</p><pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Nota: hay que incluir la primera línea con [params], además de los dos guiones que van al principio de la línea, y también debes incluir los guiones en cada parámetro personalizado que quieras declarar.</i></p>"
-        default_values: "<h3>Valores por defecto</h3> <p>Puedes declarar parámetros de manera que tengan o no un valor por defecto. Los valores por defecto aparecerán en un campo de texto debajo del editor de consultas, y puedes editarlos según lo necesites. Los parámetros declarados sin un valor por defecto también crearán un campo de texto, pero estará vacío y marcado en rojo.</p><pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Esquema de base de datos"
         filter: "Buscar..."
@@ -40,13 +37,12 @@ es:
           null_: "Nulo"
       export: "Exportar"
       view_json: "Ver JSON"
+      view: "Ver"
       save: "Guardar cambios"
-      saverun: "Guardar cambios y ejecutar"
       run: "Ejecutar"
       undo: "Descartar cambios"
       edit: "Editar"
       delete: "Eliminar"
-      recover: "Recuperar consulta"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabla"
@@ -68,7 +64,6 @@ es:
       query_user: "Creado por"
       column: "Columna %{number}"
       explain_label: "¿Incluir plan de consulta?"
-      save_params: "Establecer configuración por defecto"
       reset_params: "Restablecer"
       search_placeholder: "Buscar..."
       no_search_results: "Lo sentimos, no hemos podido encontrar ningún resultado que coincida con tu texto."
diff --git a/plugins/discourse-data-explorer/config/locales/client.et.yml b/plugins/discourse-data-explorer/config/locales/client.et.yml
index b1fcbbc9fd433..460f1c63ab305 100644
--- a/plugins/discourse-data-explorer/config/locales/client.et.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.et.yml
@@ -7,13 +7,13 @@
 et:
   js:
     explorer:
+      default_query: "Vaikimisi"
       or: "või"
       title: "Andmete eksportija"
-      create: "Loo uus"
+      create: "Loo"
       create_placeholder: "Päringu nimi..."
       import:
         label: "Impordi"
-        modal: "Impordi päring"
       help:
         label: "Abi"
       schema:
@@ -25,16 +25,12 @@ et:
           no: "Ei"
           null_: "Nulli"
       export: "Ekspordi"
-      save: "Salvesta muudatused"
-      saverun: "Salvesta muudatused ja käivita"
       run: "Käivita"
-      undo: "Loobu muudatustest"
       edit: "Muuda"
       delete: "Kustuta"
       download_json: "JSON"
       download_csv: "CSV"
       query_groups: "Rühmad"
       query_description: "Kirjeldus"
-      save_params: "Määra vaikeväärtused"
       reset_params: "Nulli"
       search_placeholder: "Otsi..."
diff --git a/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml b/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml
index 498264709cae7..bc5f60c751267 100644
--- a/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml
@@ -7,7 +7,9 @@
 fa_IR:
   js:
     explorer:
+      default_query: "پیش‌فرض"
       or: "یا"
+      create: "ایجاد"
       import:
         label: "ورود داده‌ها"
       help:
@@ -19,7 +21,7 @@ fa_IR:
           yes: "بله"
           no: "خیر"
       export: "خروجی گرفتن"
-      save: "ذخیره تغییرات"
+      save: "ذخیر تغییرات"
       run: "اجرا"
       edit: "ویرایش"
       delete: "حذف"
diff --git a/plugins/discourse-data-explorer/config/locales/client.fi.yml b/plugins/discourse-data-explorer/config/locales/client.fi.yml
index a57e73746d0fc..6d004e941739c 100644
--- a/plugins/discourse-data-explorer/config/locales/client.fi.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.fi.yml
@@ -11,24 +11,21 @@ fi:
         no_semicolons: "Poista puolipisteet kyselystä."
         dirty: "Kysely täytyy tallentaa ennen suorittamista."
     explorer:
+      default_query: "Oletus"
       or: "tai"
       admins_only: "Dataselain on vain ylläpitäjille."
       allow_groups: "Salli ryhmien käyttää tätä kyselyä"
       title: "Dataselain"
-      create: "Luo uusi"
+      create: "Luo"
       create_placeholder: "Kyselyn nimi..."
       description_placeholder: "Kirjoita kuvaus tähän"
       import:
         label: "Tuo"
-        modal: "Tuo kysely"
         unparseable_json: "JSON-tiedosto ei ole jäsennettävissä."
         wrong_json: "Väärä JSON-tiedosto. JSON-tiedoston tulisi sisältää query-objekti, jolla tulisi olla ainakin sql-ominaisuus."
       help:
         label: "Apua"
         modal_title: "Dataselaimen ohje"
-        auto_resolution: "<h2>Automaattinen yksikön selvitys</h2> <p>Kun kyselysi palauttaa yksikön, Dataselain voi korvata sen automaattisesti yksikön nimellä ja muilla hyödyllisillä tiedoilla kyselyn tuloksissa. Automaattinen selvitys on käytettävissä <i><b>user_id</b></i>-, <i><b>group_id</b></i>-, <i><b>topic_id</b></i>-, <i><b>category_id</b></i>- ja <i><b>badge_id</b></i>-tietueissa. Voit kokeilla tätä suorittamalla tämän kyselyn:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Mukautettujen parametrien luominen</h2> <p>Voit luoda mukautettuja parametreja kyselyillesi lisäämällä tämän kyselysi yläosaan ja käyttämällä muotoa:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Huomautus: ensimmäinen rivi, jossa on [params], on pakollinen yhdessä sitä edeltävien väliviivojen kanssa, sekä jokainen mukautettu parametri, jonka haluat esitellä.</i></p>"
-        default_values: "<h3>Oletusarvot</h3> <p>Voit esitellä parametreja oletusarvoilla tai ilman. Oletusarvot näkyvät tekstikentässä kyselyeditorin alla, ja voit muokata niitä tarpeidesi mukaan. Ilman oletusarvoja esitellyt parametrit luovat tekstikentän, mutta ne ovat tyhjiä ja korostettu punaisena.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Tietokannan rakenne"
         filter: "Hae..."
@@ -41,12 +38,10 @@ fi:
       export: "Vie"
       view_json: "Näytä JSON"
       save: "Tallenna muutokset"
-      saverun: "Tallenna muutokset ja suorita"
       run: "Suorita"
-      undo: "Kumoa muutokset"
+      undo: "Hylkää muutokset"
       edit: "Muokkaa"
       delete: "Poista"
-      recover: "Palauta poistettu kysely"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Taulukko"
@@ -68,7 +63,6 @@ fi:
       query_user: "Luonut"
       column: "Sarake %{number}"
       explain_label: "Sisällytä kyselysuunnitelma?"
-      save_params: "Aseta oletusarvot"
       reset_params: "Palauta"
       search_placeholder: "Hae..."
       no_search_results: "Pahoittelut, emme löytäneet tekstiäsi vastaavia tuloksia."
diff --git a/plugins/discourse-data-explorer/config/locales/client.fr.yml b/plugins/discourse-data-explorer/config/locales/client.fr.yml
index 61b8ac7efe1b4..959cae93d831f 100644
--- a/plugins/discourse-data-explorer/config/locales/client.fr.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.fr.yml
@@ -11,24 +11,21 @@ fr:
         no_semicolons: "Supprimez les points-virgules de la requête."
         dirty: "Vous devez enregistrer la requête avant de l'exécuter."
     explorer:
+      default_query: "Par défaut"
       or: "ou"
       admins_only: "L'explorateur de données n'est disponible que pour les administrateurs."
       allow_groups: "Autoriser les groupes à accéder à cette requête"
       title: "Explorateur de données"
-      create: "Nouvelle requête"
+      create: "Créer"
       create_placeholder: "Nom de la requête…"
       description_placeholder: "Saisissez une description ici"
       import:
         label: "Importer"
-        modal: "Importer une requête"
         unparseable_json: "Fichier JSON non analysable."
         wrong_json: "Fichier JSON incorrect. Un fichier JSON doit contenir un objet « query », qui doit au moins avoir une propriété « sql »."
       help:
         label: "Aide"
         modal_title: "Aide de l'explorateur de données"
-        auto_resolution: "<h2>Résolution d'entité automatique</h2> <p>Lorsque votre requête renvoie un identifiant d'entité, l'explorateur de données peut le remplacer automatiquement par le nom de l'entité et d'autres informations utiles dans les résultats de la requête. La résolution automatique est disponible pour <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> et <i><b>badge_id</b></i>. Pour essayer cette fonction, exécutez cette requête :</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Création de paramètres personnalisés</h2> <p>Pour créer des paramètres personnalisés pour vos requêtes, placez ceci en haut de votre requête et respectez le format :</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Remarque : la première ligne avec [params] est requise, ainsi que les deux tirets qui la précèdent et chaque paramètre personnalisé que vous souhaitez déclarer.</i></p>"
-        default_values: "<h3>Valeurs par défaut</h3> <p>Vous pouvez déclarer des paramètres avec ou sans valeurs par défaut. Les valeurs par défaut s'afficheront dans un champ de texte sous l'éditeur de requête, que vous pourrez modifier selon vos besoins. Les paramètres déclarés sans valeurs par défaut généreront toujours un champ de texte, mais seront vides et surlignés en rouge.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Schéma de la base de données"
         filter: "Recherche…"
@@ -41,12 +38,10 @@ fr:
       export: "Exporter"
       view_json: "Afficher JSON"
       save: "Enregistrer les modifications"
-      saverun: "Enregistrer les modifications et exécuter"
       run: "Exécuter"
       undo: "Annuler les modifications"
       edit: "Modifier"
       delete: "Supprimer"
-      recover: "Annuler la suppression de la requête"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tableau"
@@ -68,7 +63,6 @@ fr:
       query_user: "Créé par "
       column: "Colonne %{number}"
       explain_label: "Inclure le plan d'exécution ?"
-      save_params: "Définir les valeurs par défaut"
       reset_params: "Réinitialiser"
       search_placeholder: "Recherche…"
       no_search_results: "Désolé, nous n'avons trouvé aucun résultat correspondant à votre texte."
diff --git a/plugins/discourse-data-explorer/config/locales/client.gl.yml b/plugins/discourse-data-explorer/config/locales/client.gl.yml
index 1703ead27b30a..8314c66c1c298 100644
--- a/plugins/discourse-data-explorer/config/locales/client.gl.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.gl.yml
@@ -7,7 +7,9 @@
 gl:
   js:
     explorer:
+      default_query: "Predeterminado"
       or: "ou"
+      create: "Crear"
       import:
         label: "Importar"
       help:
@@ -19,7 +21,6 @@ gl:
           yes: "Si"
           no: "Non"
       export: "Exportar"
-      save: "Gardar os cambios"
       edit: "Editar"
       delete: "Eliminar"
       query_groups: "Grupos"
diff --git a/plugins/discourse-data-explorer/config/locales/client.he.yml b/plugins/discourse-data-explorer/config/locales/client.he.yml
index 986b3cca6eb94..5de8253d91aab 100644
--- a/plugins/discourse-data-explorer/config/locales/client.he.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.he.yml
@@ -11,24 +11,21 @@ he:
         no_semicolons: "הסרת הנקודה פסיק מהשאילתה."
         dirty: "עליך לשמור את השאילתה בטרם ההרצה."
     explorer:
+      default_query: "ברירת מחדל"
       or: "או"
       admins_only: "דפדפן הנתונים זמין למנהלים בלבד."
       allow_groups: "לאפשר לקבוצות לגשת לשאילתה הזאת"
       title: "דפדפן נתונים"
-      create: "יצירת חדשה"
+      create: "יצירה"
       create_placeholder: "שם השאילתה…"
       description_placeholder: "יש להקליד תיאור כאן"
       import:
         label: "ייבוא"
-        modal: "ייבוא שאילתה"
         unparseable_json: "קובץ JSON שאינו ניתן לפענוח."
         wrong_json: "קובץ JSON שגוי. קובץ JSON צריך להכיל רכיב ‚query’, שצריך לכלול לפחות מאפיין ‚sql’."
       help:
         label: "עזרה"
         modal_title: "עזרה עם דפדפן הנתונים"
-        auto_resolution: "<h2>אבחנת יישות אוטומטית</h2> <p>כאשר השאילתה שלך מחזירה מזהה יישות, סייר הנתונים עשוי להחליף אותו בשם היישות ובפרטים מועילים נוספים אוטומטית בתוצאות השאילתה. אבחנה אוטומטית זמינה עבור <i><b>user_id</b></i>,‏ <i><b>group_id</b></i>,‏ <i><b>topic_id</b></i>,‏ <i><b>category_id</b></i> ו־<i><b>badge_id</b></i>. כדי לנסות זאת יש להריץ את השאילתה הבאה:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>יצירת משתנים מותאמים אישית</h2> <p>כדי ליצור משתנים מותאמים אישית לשאילתות שלך, יש להציב זאת בראש השאילתה ולהיצמד לתבנית:</p> ‎<pre><code>‎-- [params]\n‎-- int :num = 1\n\nSELECT :num</code></pre> <p><i>לתשומך לבך: השורה הראשונה עם [params] נחוצה, בצירוף שני מינוסים לפניה וכל משתנה מותאם אישית שעליו ברצונך להכריז.</i></p>"
-        default_values: "<h3>ערכי בררת מחדל</h3> <p>ניתן להכריז על משתנים עם או בלי ערכי בררת מחדל. ערכי בררת מחדל יופיעו בשדה טקסט מעל לעורך השאילתות אותם ניתן לערוך בהתאם לצורך. משתנים שמוכרזים ללא ערכי בררת מחדל עדיין ייצרו שדה טקסט אך הם יהיו ריקים ויודגשו באדום.</p> <pre><code>‎-- [params]\n‎-- text :username = my_username\n‎-- int :age</code></pre>"
       schema:
         title: "סכמת מסד הנתונים"
         filter: "חיפוש…"
@@ -40,13 +37,12 @@ he:
           null_: "ריק"
       export: "ייצוא"
       view_json: "הצגת JSON"
+      view: "תצוגה"
       save: "שמירת השינויים"
-      saverun: "שמירת השינויים והרצה"
       run: "הרצה"
       undo: "התעלמות מהשינויים"
       edit: "עריכה"
       delete: "מחיקה"
-      recover: "ביטול מחיקת השאילתה"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "טבלה"
@@ -72,7 +68,6 @@ he:
       query_user: "נוצר על ידי"
       column: "עמודה %{number}"
       explain_label: "לכלול תכנית שאילתה?"
-      save_params: "הגדרת בררות מחדל"
       reset_params: "איפוס"
       search_placeholder: "חיפוש…"
       no_search_results: "לא הצלחנו למצוא תוצאות שעונות לטקסט שלך, עמך הסליחה."
diff --git a/plugins/discourse-data-explorer/config/locales/client.hr.yml b/plugins/discourse-data-explorer/config/locales/client.hr.yml
index 889fedbf59b8a..24b9f43109416 100644
--- a/plugins/discourse-data-explorer/config/locales/client.hr.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.hr.yml
@@ -7,10 +7,11 @@
 hr:
   js:
     explorer:
+      default_query: "Zadano"
       or: "ili"
+      create: "Stvorite"
       help:
         label: "Pomoć"
-        auto_resolution: "<h2>Automatsko razlučivanje entiteta</h2> <p>Kada vaš upit vrati ID entiteta, Data Explorer ga može automatski zamijeniti nazivom entiteta i drugim korisnim informacijama u rezultatima upita. Automatsko rješavanje dostupno je za <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> i <i><b>badge_id</b></i>. Kako biste ovo isprobali, pokrenite ovaj upit:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
       schema:
         filter: "Pretraži..."
       types:
diff --git a/plugins/discourse-data-explorer/config/locales/client.hu.yml b/plugins/discourse-data-explorer/config/locales/client.hu.yml
index e1206b15ce1c3..f6f263563add4 100644
--- a/plugins/discourse-data-explorer/config/locales/client.hu.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.hu.yml
@@ -11,24 +11,21 @@ hu:
         no_semicolons: "Pontosvesszők eltávolítása a lekérdezésből."
         dirty: "Futtatás előtt el kell mentenie a lekérdezést."
     explorer:
+      default_query: "Alapértelmezett"
       or: "vagy"
       admins_only: "Az adatfelfedező csak az adminok számára érhető el."
       allow_groups: "Engedélyezés csoportok számára, hogy hozzáférjenek ehhez a lekérdezéshez"
       title: "Adatfelfedező"
-      create: "Új létrehozása"
+      create: "Létrehozás"
       create_placeholder: "Lekérdezés neve…"
       description_placeholder: "Adjon meg egy leírást"
       import:
         label: "Importálás"
-        modal: "Lekérdezés importálása"
         unparseable_json: "Nem értelmezhető JSON-fájl."
         wrong_json: "Hibás JSON-fájl. A JSON-fájlnak kellene tartalmaznia egy „query” objektumot, amelynek legalább egy „sql” tulajdonsággal kell rendelkeznie."
       help:
         label: "Súgó"
         modal_title: "Adatfelfedező súgó"
-        auto_resolution: "<h2>Automatikus entitásfeloldás</h2> <p>Ha egy lekérdezés egy entitásazonosítót ad vissza, akkor az Adatfelfedező automatikusan lecserélheti az entitás nevére és más hasznos információkra a találatokban. Az automatikus feloldás ezeknél érhető el: <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> és <i><b>badge_id</b></i>. Próbálja ki ezen lekérdezés futtatásával:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Egyéni paraméterek létrehozása</h2> <p>Hogy egyéni paramétereket hozzon létre a lekérdezéseihez, tegye ezt a lekérdezés fölé, és kövesse a formátumot:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Megjegyzés: a [params] sor kötelező, az azt megelőző két kötőjellel együtt, és deklarálnia kell minden egyes egyéni paramétert.</i></p>"
-        default_values: "<h3>Alapértelmezett értékek</h3> <p>Deklarálhatja a paramétereket alapértelmezett értékkel vagy azok nélkül. Az alapértelmezett értékek meg fognak jelenni a szövegmezőben, a lekérdezésszerkesztő alatt, amellyel a céljainak megfelelően szerkesztheti azokat. Az alapértelmezett érték nélküli paraméterek is szövegmezőt fognak kapni, de üresek lesznek, és pirossal lesznek kiemelve..</p> <pre><code>-- [params]\n-- text :username = saját_felhasználónév\n-- int :age</code></pre>"
       schema:
         title: "Adatbázis-séma"
         filter: "Keresés…"
@@ -39,13 +36,12 @@ hu:
           no: "Nem"
           null_: "Null"
       export: "Exportálás"
+      view: "Megtekintés"
       save: "Módosítások mentése"
-      saverun: "Módosítások mentése és futtatása"
       run: "Futtatás"
-      undo: "Módosítások elvetése"
+      undo: "Változások elvetése"
       edit: "Szerkesztés"
       delete: "Törlés"
-      recover: "Lekérdezés törlésének visszavonása"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tábla"
@@ -64,7 +60,6 @@ hu:
       query_user: "Létrehozta:"
       column: "%{number}. oszlop"
       explain_label: "Beleveszi a lekérdezési tervet?"
-      save_params: "Alapértékek beállítása"
       reset_params: "Alaphelyzetbe állítás"
       search_placeholder: "Keresés…"
       no_search_results: "Sajnos nem találtunk a szövegének megfelelő találatot."
diff --git a/plugins/discourse-data-explorer/config/locales/client.hy.yml b/plugins/discourse-data-explorer/config/locales/client.hy.yml
index 1a3902df8bc1f..72666020daa02 100644
--- a/plugins/discourse-data-explorer/config/locales/client.hy.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.hy.yml
@@ -11,15 +11,15 @@ hy:
         no_semicolons: "Հեռացրեք կետ-ստորակատերերը հարցումից"
         dirty: "Դուք պետք է պահպանեք հարցումը գործարկելուց առաջ"
     explorer:
+      default_query: "Լռելյայն"
       or: "կամ"
       admins_only: "Տվյալների ուսումնասիրումը հասանելի է միասյն ադմիններին:"
       title: "Տվյալների Ուսումնասիրում"
-      create: "Ստեղծել Նոր"
+      create: "Ստեղծել"
       create_placeholder: "Հարցման անուն..."
       description_placeholder: "Մուտքագրեք նկարագրություն այստեղ"
       import:
         label: "Ներմուծել"
-        modal: "Ներմուծել Հարցում"
       help:
         label: "Օգնություն"
       schema:
@@ -32,13 +32,9 @@ hy:
           no: "Ոչ"
           null_: "Զրոյական"
       export: "Արտահանել"
-      save: "Պահպանել Փոփոխությունները"
-      saverun: "Պահպանել փոփոխությունները և Գործարկել"
       run: "Գործարկել"
-      undo: "Չեղարկել Փոփոխությունները"
       edit: "Խմբագրել"
       delete: "Ջնջել"
-      recover: "Վերականգնել Հարցումը"
       download_json: "JSON"
       download_csv: "CSV"
       others_dirty: "Հարցումն ունի չպահպանված փոփոխություններ, որոնք կկորչեն, եթե Դուք տեղափոխվեք:"
@@ -51,7 +47,6 @@ hy:
       query_time: "Վերջին գործարկումը"
       query_user: "Ստեղծել է՝"
       explain_label: "Ներառե՞լ հարցման պլանը:"
-      save_params: "Սահմանել Լռելյայններ"
       reset_params: "Վերահաստատե;"
       search_placeholder: "Որոնում..."
       no_search_results: "Ներողություն, մենք չկարողացանք գտնել Ձեր տեքստի հետ համընկնող որևէ արդյունք:"
diff --git a/plugins/discourse-data-explorer/config/locales/client.id.yml b/plugins/discourse-data-explorer/config/locales/client.id.yml
index f9a91c5f7bafc..d5bf715dde877 100644
--- a/plugins/discourse-data-explorer/config/locales/client.id.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.id.yml
@@ -7,7 +7,9 @@
 id:
   js:
     explorer:
+      default_query: "Asal"
       or: "atau"
+      create: "Buat"
       help:
         label: "Bantuan"
       schema:
@@ -17,7 +19,6 @@ id:
           yes: "Ya"
           no: "Tidak"
       export: "Ekspor"
-      save: "Simpan perubahan"
       edit: "Ubah"
       delete: "Hapus"
       query_groups: "Grup"
diff --git a/plugins/discourse-data-explorer/config/locales/client.it.yml b/plugins/discourse-data-explorer/config/locales/client.it.yml
index a9046576d212b..c8aac30c45d56 100644
--- a/plugins/discourse-data-explorer/config/locales/client.it.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.it.yml
@@ -11,24 +11,21 @@ it:
         no_semicolons: "Rimuovi i punti e virgola dalla query."
         dirty: "È necessario salvare la query prima di eseguirla."
     explorer:
+      default_query: "Predefinito"
       or: "o"
       admins_only: "Data explorer è disponibile solo per gli amministratori."
       allow_groups: "Consenti ai gruppi di accedere a questa query"
       title: "Data Explorer"
-      create: "Crea Nuovo"
+      create: "Crea"
       create_placeholder: "Nome query..."
       description_placeholder: "Inserisci una descrizione qui"
       import:
         label: "Importa"
-        modal: "Importa una query"
         unparseable_json: "File JSON non analizzabile."
         wrong_json: "File JSON errato. Un file JSON dovrebbe contenere un oggetto \"query\" contenente almeno una proprietà \"sql\"."
       help:
         label: "Guida"
         modal_title: "Guida di Data Explorer"
-        auto_resolution: "<h2>Risoluzione automatica dell'entità</h2> <p>Quando la query restituisce l'ID di un'entità, Data Explorer può sostituirla automaticamente con il nome dell'entità e altre informazioni utili nei risultati delle query. La risoluzione automatica è disponibile per i dati <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> e <i><b>badge_id</b></i>. Fai una prova, eseguendo questa query:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Creazione di parametri personalizzati</h2> <p>Per creare parametri personalizzati per le query, inserisci questo codice nella parte superiore della query e segui il formato:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Nota: la prima riga con [params] è obbligatoria, come i due trattini che precedono e tutti i parametri personalizzati che intendi dichiarare.</i></p>"
-        default_values: "<h3>Valori predefiniti</h3> <p>È possibile dichiarare parametri con o senza valori predefiniti. I valori predefiniti verranno visualizzati in un campo di testo sotto l'editor di query, che può essere modificato in base alle esigenze. I parametri dichiarati senza valori predefiniti genereranno comunque un campo di testo, ma saranno vuoti ed evidenziati in rosso.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Schema del Database "
         filter: "Ricerca..."
@@ -40,13 +37,11 @@ it:
           null_: "Null"
       export: "Esporta"
       view_json: "Visualizza JSON"
-      save: "Salva Modifiche"
-      saverun: "Salva modifiche ed esegui"
+      save: "Salva le modifiche"
       run: "Esegui"
-      undo: "Annulla Modifiche"
+      undo: "Annulla modifiche"
       edit: "Modifica"
       delete: "Elimina"
-      recover: "Ripristina Query"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabella"
@@ -68,7 +63,6 @@ it:
       query_user: "Creato da"
       column: "Colonna %{number}"
       explain_label: "Includere il piano query?"
-      save_params: "Imposta Predefiniti"
       reset_params: "Annulla"
       search_placeholder: "Ricerca..."
       no_search_results: "Spiacenti, non abbiamo trovato alcun risultato che corrisponda al tuo testo."
diff --git a/plugins/discourse-data-explorer/config/locales/client.ja.yml b/plugins/discourse-data-explorer/config/locales/client.ja.yml
index 9bc4dab3412bf..f8fcac90e2d90 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ja.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ja.yml
@@ -11,24 +11,21 @@ ja:
         no_semicolons: "クエリからセミコロンを削除します。"
         dirty: "クエリは保存してから実行する必要があります。"
     explorer:
+      default_query: "デフォルト"
       or: "または"
       admins_only: "データエクスプローラーは管理者のみが利用できます。"
       allow_groups: "このクエリへのアクセスをグループに許可する"
       title: "データエクスプローラー"
-      create: "新規作成"
+      create: "作成"
       create_placeholder: "クエリ名..."
       description_placeholder: "説明をここに入力"
       import:
         label: "インポート"
-        modal: "クエリをインポート"
         unparseable_json: "解析不能な JSON ファイルです。"
         wrong_json: "不正な JSON ファイル。JSON ファイルには 'query' オブジェクトと、その中に少なくとも 'sql' プロパティが含まれている必要があります。"
       help:
         label: "ヘルプ"
         modal_title: "データエクスプローラーのヘルプ"
-        auto_resolution: "<h2>エンティティの自動解決</h2> <p>クエリがエンティティ ID を返す場合、データエクスプローラーはクエリ結果において、それを自動的にエンティティ名とその他の有用な情報に置き換えることができます。自動解決は、<i><b>user_id</b></i>、<i><b>group_id</b></i>、<i><b>topic_id</b></i>、<i><b>category_id</b></i>、および <i><b>badge_id</b></i> で利用できます。次のクエリを実行して試してください。</p>\n<pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>カスタムパラメーターの作成</h2> <p>クエリのカスタムパラメーターを作成するには、次のコードをクエリの先頭に配置し、フォーマットに従います。</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>注意: 最初の [params] の行は必須です。また、その前と宣言するカスタムパラメーターの前に 2 つのダッシュが必要です。</i></p>"
-        default_values: "<h3>デフォルト値</h3> <p>パラメーターはデフォルト値の有無に関係なく宣言できます。デフォルト値はクエリエディターの下のテキストフィールドに表示され、必要に応じて編集することができます。パラメーターはデフォルト値なしで宣言された場合でもテキストフィールドを生成しますが、空となり、赤でハイライトされます。</p>\n<pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "データベーススキーマ"
         filter: "検索..."
@@ -40,13 +37,12 @@ ja:
           null_: "Null"
       export: "エクスポート"
       view_json: "JSON を表示"
+      view: "表示"
       save: "変更を保存"
-      saverun: "変更を保存して実行"
       run: "実行"
       undo: "変更を破棄"
       edit: "編集"
       delete: "削除"
-      recover: "クエリの削除を取り消す"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "テーブル"
@@ -66,7 +62,6 @@ ja:
       query_user: "作成者"
       column: "列 %{number}"
       explain_label: "クエリプランを含めますか？"
-      save_params: "デフォルトを設定"
       reset_params: "リセット"
       search_placeholder: "検索..."
       no_search_results: "残念ながら、テキストに一致する結果は見つかりませんでした。"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ko.yml b/plugins/discourse-data-explorer/config/locales/client.ko.yml
index 862fe226aaf89..6b97458302a5d 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ko.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ko.yml
@@ -11,16 +11,16 @@ ko:
         no_semicolons: "쿼리에서 세미콜론을 제거하십시오."
         dirty: "실행하기 전에 쿼리를 저장해야합니다."
     explorer:
+      default_query: "기본"
       or: "또는"
       admins_only: "데이터 탐색기는 관리자 만 사용할 수 있습니다."
       allow_groups: "그룹이이 쿼리에 액세스하도록 허용"
       title: "데이터 탐색기"
-      create: "새로 만들기"
+      create: "만들기"
       create_placeholder: "검색어 이름 ..."
       description_placeholder: "여기에 설명을 입력하세요"
       import:
         label: "가져오기"
-        modal: "검색어 가져 오기"
       help:
         label: "도움말"
       schema:
@@ -33,13 +33,9 @@ ko:
           no: "아니오"
           null_: "없는"
       export: "내보내기"
-      save: "변경사항 저장"
-      saverun: "변경 사항 저장 및 실행"
       run: "운영"
-      undo: "변경 사항을 취소"
       edit: "편집"
       delete: "삭제"
-      recover: "삭제 취소 쿼리"
       download_json: "JSON"
       download_csv: "CSV"
       others_dirty: "검색어에 저장하지 않은 변경 사항이있어 이동하면 사라집니다."
@@ -53,7 +49,6 @@ ko:
       query_time: "마지막 실행"
       query_user: "작성자"
       explain_label: "쿼리 계획을 포함 하시겠습니까?"
-      save_params: "기본값 설정"
       reset_params: "리셋"
       search_placeholder: "검색..."
       no_search_results: "죄송합니다. 귀하의 텍스트와 일치하는 결과를 찾을 수 없습니다."
diff --git a/plugins/discourse-data-explorer/config/locales/client.lt.yml b/plugins/discourse-data-explorer/config/locales/client.lt.yml
index be3140b532edc..1320d49cda62e 100644
--- a/plugins/discourse-data-explorer/config/locales/client.lt.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.lt.yml
@@ -7,7 +7,9 @@
 lt:
   js:
     explorer:
+      default_query: "Numatytasis"
       or: "arba"
+      create: "Sukurti"
       import:
         label: "Importuoti"
       help:
diff --git a/plugins/discourse-data-explorer/config/locales/client.lv.yml b/plugins/discourse-data-explorer/config/locales/client.lv.yml
index 50260326fc911..2867cf2daf9cb 100644
--- a/plugins/discourse-data-explorer/config/locales/client.lv.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.lv.yml
@@ -7,7 +7,9 @@
 lv:
   js:
     explorer:
+      default_query: "Noklusējums"
       or: "vai"
+      create: "Izveidot"
       import:
         label: "Importēt"
       help:
@@ -19,7 +21,6 @@ lv:
           yes: "Jā"
           no: "Nē"
       export: "Eksportēt"
-      save: "Saglabāt izmaiņas"
       edit: "Labot"
       delete: "Dzēst"
       query_groups: "Grupas"
diff --git a/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml b/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml
index 501a625ed4a7b..07e61032f887b 100644
--- a/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml
@@ -11,14 +11,14 @@ nb_NO:
         no_semicolons: "Fjern semikolonene fra spørringen."
         dirty: "Du må lagre spørringen før du kjører den."
     explorer:
+      default_query: "Forvalg"
       or: "eller"
       admins_only: "Datautforskeren er kun tilgjengelig for administratorer."
       title: "Datautforsker"
-      create: "Opprett ny"
+      create: "Opprett"
       create_placeholder: "Spørringsnavn…"
       import:
         label: "Importer"
-        modal: "Importer en spørring"
       help:
         label: "Hjelp"
       schema:
@@ -29,11 +29,8 @@ nb_NO:
           no: "Nei"
           null_: "Null"
       export: "Eksporter"
-      save: "Lagre endringer"
-      undo: "Forkast endringer"
       edit: "Rediger"
       delete: "Slett"
-      recover: "Angre sletting av spørring"
       download_json: "JSON"
       download_csv: "CSV"
       others_dirty: "En spørring har ulagrede endringer, og vil gå tapt hvis du navigerer vekk."
@@ -43,7 +40,6 @@ nb_NO:
       query_groups: "Grupper"
       query_description: "Beskrivelse"
       explain_label: "Inkluder spørringsplan?"
-      save_params: "Sett forvalg"
       reset_params: "Tilbakestill"
       search_placeholder: "Søk…"
     group:
diff --git a/plugins/discourse-data-explorer/config/locales/client.nl.yml b/plugins/discourse-data-explorer/config/locales/client.nl.yml
index 4615fb3f45e89..11f402c5233dd 100644
--- a/plugins/discourse-data-explorer/config/locales/client.nl.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.nl.yml
@@ -11,24 +11,21 @@ nl:
         no_semicolons: "Verwijder de puntkomma's uit de query."
         dirty: "Je moet de query opslaan voordat je deze uitvoert."
     explorer:
+      default_query: "Standaard"
       or: "of"
       admins_only: "De gegevensverkenner is alleen beschikbaar voor beheerders."
       allow_groups: "Groepen hebben toegang tot deze query"
       title: "Gegevensverkenner"
-      create: "Nieuwe maken"
+      create: "Maken"
       create_placeholder: "Querynaam..."
       description_placeholder: "Voer hier een beschrijving in"
       import:
         label: "Importeren"
-        modal: "Een query importeren"
         unparseable_json: "Onparseerbaar JSON-bestand."
         wrong_json: "Onjuist JSON-bestand. Een JSON-bestand moet een 'query'-object bevatten, dat minimaal een 'sql'-eigenschap moet hebben."
       help:
         label: "Help"
         modal_title: "Gegevensverkenner-help"
-        auto_resolution: "<h2>Automatische omzetting van entiteiten</h2> <p>Wanneer je query een entiteit-ID retourneert, kan Gegevensverkenner deze automatisch vervangen door de entiteitnaam en andere nuttige informatie in queryresultaten. Automatische omzetting is beschikbaar voor <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> en <i><b>badge_id</b></i>. Voer deze query uit om dit te proberen:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Aangepaste parameters maken</h2> <p>Om aangepaste parameters te maken voor je query's, plaats je dit bovenaan je query en volg je de notatie:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Opmerking : de eerste regel met [params] is vereist, samen met twee streepjes ervoor en elke aangepaste parameter die je wilt declareren.</i></p>"
-        default_values: "<h3>Standaardwaarden</h3> <p>Je kunt parameters declareren met of zonder standaardwaarde. Standaardwaarden worden weergegeven in een tekstveld onder de query-editor, die je naar wens kunt bewerken. Parameters die zijn gedeclareerd zonder standaardwaarde leveren nog steeds een tekstveld op, maar zijn leeg en rood gemarkeerd.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Databaseschema"
         filter: "Zoeken..."
@@ -41,12 +38,10 @@ nl:
       export: "Exporteren"
       view_json: "JSON weergeven"
       save: "Wijzigingen opslaan"
-      saverun: "Wijzigingen opslaan en uitvoeren"
       run: "Uitvoeren"
       undo: "Wijzigingen negeren"
       edit: "Bewerken"
       delete: "Verwijderen"
-      recover: "Query verwijderen ongedaan maken"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabel"
@@ -68,7 +63,6 @@ nl:
       query_user: "Gemaakt door"
       column: "Kolom %{number}"
       explain_label: "Queryplan bijvoegen?"
-      save_params: "Standaardwaarden instellen"
       reset_params: "Resetten"
       search_placeholder: "Zoeken..."
       no_search_results: "Er zijn geen resultaten gevonden voor je tekst."
diff --git a/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml b/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml
index 34100f54a42ef..3521320a1e3c7 100644
--- a/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml
@@ -11,24 +11,27 @@ pl_PL:
         no_semicolons: "Usuń średniki z zapytania."
         dirty: "Musisz zapisać zapytanie zanim je wykonasz."
     explorer:
+      default_query: "Domyślny"
+      default_query_notice: "To jest zapytanie domyślne, którego nie można edytować. Aby edytować zapytanie SQL, utwórz nowe zapytanie."
+      queries: "Zapytania"
+      query_created: "Zapytanie utworzone!"
       or: "lub"
       admins_only: "Eksplorator danych jest dostępny wyłącznie dla administratorów."
       allow_groups: "Zezwól grupom na dostęp do tego zapytania"
       title: "Eksplorator danych"
-      create: "Stwórz nowy"
+      create: "Utwórz"
       create_placeholder: "Nazwa zapytania…"
       description_placeholder: "Wprowadź opis zapytania"
       import:
         label: "Import"
-        modal: "Importuj zapytanie"
         unparseable_json: "Nieprzetwarzalny plik JSON."
         wrong_json: "Nieprawidłowy plik JSON. Plik JSON powinien zawierać obiekt 'query', który powinien mieć przynajmniej właściwość 'sql'."
       help:
         label: "Pomoc"
         modal_title: "Pomoc eksploratora danych"
-        auto_resolution: "<h2>Automatyczne rozpoznawanie encji</h2> <p>Gdy Twoje zapytanie zwróci identyfikator encji, eksplorator danych może automatycznie zastąpić go nazwą encji i innymi przydatnymi informacjami w wynikach zapytania. Automatyczne rozpoznawanie jest dostępne dla <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> i <i><b>badge_id</b></i>. Aby to wypróbować, wykonaj następujące zapytanie:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Tworzenie niestandardowych parametrów</h2> <p>Aby utworzyć niestandardowe parametry dla zapytań, umieść to na początku zapytania i postępuj zgodnie z formatem:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Uwaga: pierwszy wiersz z [params] jest wymagany, wraz z dwoma myślnikami poprzedzającymi go i każdym niestandardowym parametrem, który chcesz zadeklarować.</i></p>"
-        default_values: "<h3>Wartości domyślne</h3> <p>Możesz zadeklarować parametry z wartościami domyślnymi lub bez nich. Wartości domyślne pojawią się w polu tekstowym poniżej edytora zapytań, które możesz edytować zgodnie z własnymi potrzebami. Parametry zadeklarowane bez wartości domyślnych nadal będą generować pole tekstowe, ale będzie ono puste i podświetlone na czerwono.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
+        auto_resolution: "<h2>Automatyczne rozpoznawanie encji</h2> <p>Gdy zapytanie zwróci identyfikator encji, Data Explorer może automatycznie zastąpić go nazwą encji i innymi przydatnymi informacjami w wynikach zapytania. Automatyczne rozwiązanie jest dostępne dla <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> i <i><b>badge_id</b></i>Aby to wypróbować, uruchom następujące zapytanie:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
+        custom_params: "<h2>Tworzenie parametrów niestandardowych</h2> <p>Aby utworzyć parametry niestandardowe dla zapytań, umieść to na górze zapytania i postępuj zgodnie z formatem:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Uwaga: wymagany jest pierwszy wiersz z [params], wraz z dwoma poprzedzającymi go myślnikami i każdym parametrem niestandardowym, który chcesz zadeklarować.</i></p>"
+        default_values: "<h3>Wartości domyślne</h3> <p>Parametry można deklarować z wartościami domyślnymi lub bez nich. Wartości domyślne pojawią się w polu tekstowym poniżej edytora zapytań, które można edytować według własnych potrzeb. Parametry zadeklarowane bez wartości domyślnych nadal wygenerują pole tekstowe, ale będą puste i podświetlone na czerwono.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
         data_types: "<h3>Typy danych</h3> <p>Oto popularne typy danych, których możesz używać:</p> <ul> <li><b>liczba całkowita</b> - czterobajtowa liczba całkowita ze znakiem</li> <li><b>tekst</b> - ciąg znaków o zmiennej długości</li> <li><b>wartość logiczna</b> – prawda/fałsz</li> <li><b>data</b> - data kalendarzowa (rok, miesiąc, dzień)</li> <li><b>current_user_id</b> - ID użytkownika uruchamiającego zapytanie (wstrzykiwane automatycznie, przydatne w raportach grupowych)</li> </ul> <p>Aby uzyskać więcej informacji na temat typów danych, odwiedź <a href='http://www.postgresql.org/docs/9.3/static/datatype.html#DATATYPE-TABLE' target='_blank'>tę witrynę</a>.</p>"
       schema:
         title: "Schemat bazy danych"
@@ -41,13 +44,14 @@ pl_PL:
           null_: "Null"
       export: "Eksport"
       view_json: "Wyświetl JSON"
+      view: "Widok"
       save: "Zapisz zmiany"
-      saverun: "Zapisz zmiany i wykonaj"
+      saverun: "Zapisz zmiany i uruchom"
       run: "Wykonaj"
       undo: "Odrzuć zmiany"
       edit: "Edytuj"
       delete: "Usuń"
-      recover: "Przywróć zapytanie"
+      recover: "Cofnij usunięcie zapytania"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabela"
@@ -73,7 +77,7 @@ pl_PL:
       query_user: "Stworzone przez"
       column: "Kolumna %{number}"
       explain_label: "Dołączyć plan zapytania?"
-      save_params: "Ustaw domyślne"
+      save_params: "Ustaw wartości domyślne"
       reset_params: "Przywróć"
       search_placeholder: "Wyszukiwanie..."
       no_search_results: "Nie znaleziono żadnych wyników."
diff --git a/plugins/discourse-data-explorer/config/locales/client.pt.yml b/plugins/discourse-data-explorer/config/locales/client.pt.yml
index c87d3906c80fd..2a7e266807a9a 100644
--- a/plugins/discourse-data-explorer/config/locales/client.pt.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.pt.yml
@@ -11,14 +11,14 @@ pt:
         no_semicolons: "Remova os pontos e vírgulas da consulta."
         dirty: "Deve guardar a consulta antes de executar."
     explorer:
+      default_query: "Predefinição"
       or: "ou"
       admins_only: "O explorador de dados está disponível apenas para os administradores."
       title: "Explorador de Dados"
-      create: "Criar Nova"
+      create: "Criar"
       create_placeholder: "Nome da consulta..."
       import:
         label: "Importar"
-        modal: "Importar Uma Consulta"
       help:
         label: "Ajuda"
       schema:
@@ -30,13 +30,9 @@ pt:
           yes: "Sim"
           no: "Não"
       export: "Exportar"
-      save: "Guardar alterações"
-      saverun: "Guardar Alterações e Executar"
       run: "Executar"
-      undo: "Ignorar Alterações"
       edit: "Editar"
       delete: "Eliminar"
-      recover: "Recuperar Consulta"
       download_json: "JSON"
       download_csv: "CSV"
       others_dirty: "Uma consulta tem alterações não guardadas que serão perdidas se navegar para outro lado."
@@ -48,7 +44,6 @@ pt:
       query_description: "Descrição"
       column: "Coluna %{number}"
       explain_label: "Incluir plano de consulta?"
-      save_params: "Definir Predefinições"
       reset_params: "Repor"
       search_placeholder: "Pesquisar..."
     group:
diff --git a/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml b/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml
index 63b426a6cc431..4cbdc741ddcc9 100644
--- a/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml
@@ -11,24 +11,21 @@ pt_BR:
         no_semicolons: "Remover os pontos e vírgulas da consulta."
         dirty: "Você precisa salvar a consulta antes de executar."
     explorer:
+      default_query: "Padrão"
       or: "ou"
       admins_only: "O explorador de dados só está disponível para administradores."
       allow_groups: "Permitir que grupos acessem esta consulta"
       title: "Explorador de Dados"
-      create: "Criar Nova"
+      create: "Criar"
       create_placeholder: "Nome da consulta…"
       description_placeholder: "Insira uma descrição aqui"
       import:
         label: "Importar"
-        modal: "Importar Uma Consulta"
         unparseable_json: "Arquivo JSON não analisável"
         wrong_json: "Arquivo JSON incorreto. Um arquivo JSON deve conter um objeto \"consulta\", que deve ter pelo menos a propriedade \"sql\""
       help:
         label: "Ajuda"
         modal_title: "Ajuda do Explorador de Dados"
-        auto_resolution: "<h2>Resolução de entidade automática</h2> <p>Quando a sua consulta retorna uma id de entidade, o Explorador de Dados pode substituí-la automaticamente pelo nome da entidade e outras informações úteis nos resultados da consulta. A resolução automática está disponível para <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> e <i><b>badge_id</b></i>. Para tentar isso, execute esta consulta:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Criação de parâmetros personalizados/h2> <p>Para criar parâmetros personalizados para suas consultas, insira isto no topo da sua consulta e siga o formato:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Observação: a primeira linha com [params] é necessária, junto com dois traços antes dela e de cada parâmetro personalizado que você deseja criar.</i></p>"
-        default_values: "<h3>Valores padrão</h3> <p>Você pode declarar parâmetros com ou sem valores padrão. Valores padrão serão exibidos em um campo de texto abaixo do editor de consultas, que pode ser editado conforme necessário. Parâmetros declarados sem valores padrão ainda irão gerar um campo de texto, mas estarão vazios e destacados em vermelho.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Esquema de Banco de Dados"
         filter: "Pesquisar..."
@@ -41,12 +38,10 @@ pt_BR:
       export: "Exportar"
       view_json: "Visualizar JSON"
       save: "Salvar alterações"
-      saverun: "Salvar Mudanças e Executar"
       run: "Executar"
-      undo: "Descartar Mudanças"
+      undo: "Descartar alterações"
       edit: "Editar"
       delete: "Excluir"
-      recover: "Desfazer Exclusão da Consulta"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabela"
@@ -68,7 +63,6 @@ pt_BR:
       query_user: "Criado(a) por"
       column: "Coluna %{number}"
       explain_label: "Incluir plano de consulta?"
-      save_params: "Definir Padrões"
       reset_params: "Redefinir"
       search_placeholder: "Pesquisar..."
       no_search_results: "Desculpe, não conseguimos encontrar nenhum resultado contendo o seu texto."
diff --git a/plugins/discourse-data-explorer/config/locales/client.ro.yml b/plugins/discourse-data-explorer/config/locales/client.ro.yml
index cefeabf56e811..cd7e84714bd0a 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ro.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ro.yml
@@ -7,7 +7,9 @@
 ro:
   js:
     explorer:
+      default_query: "Implicit"
       or: "sau"
+      create: "Creează"
       import:
         label: "Importă"
       help:
@@ -20,6 +22,7 @@ ro:
           no: "Nu"
       export: "Exportă"
       save: "Salvează modificări"
+      undo: "Renunță la modificări"
       edit: "Editează"
       delete: "Șterge"
       query_groups: "Grupuri"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ru.yml b/plugins/discourse-data-explorer/config/locales/client.ru.yml
index ffc91e92e9783..e7b36043a99f4 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ru.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ru.yml
@@ -11,6 +11,7 @@ ru:
         no_semicolons: "Удалите точку с запятой из запроса."
         dirty: "Вы должны сохранить запрос перед его выполнением."
     explorer:
+      default_query: "Домашнюю страницу"
       or: "или"
       admins_only: "Исследование данных доступно только для администраторов."
       allow_groups: "Разрешить группам доступ к этому запросу"
@@ -20,15 +21,11 @@ ru:
       description_placeholder: "Введите описание"
       import:
         label: "Импорт"
-        modal: "Импорт запроса"
         unparseable_json: "Невозможно распарсить JSON-файл."
         wrong_json: "Неверный формат JSON-файла. Файл должен содержать объект 'запрос', у которого как минимум должно быть свойство 'sql'."
       help:
         label: "Помощь"
         modal_title: "Проводник данных. Справка."
-        auto_resolution: "<h2>Автоматическое разрешение</h2> <p>Когда запрос возвращает идентификатор объекта, проводник данных может автоматически заменить его именем объекта и другой полезной информацией в результатах запроса. Автоматическое разрешение доступно для <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> и <i><b>badge_id</b></i>. Для пробы запустите этот запрос:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Создание настраиваемых параметров</h2> <p>Чтобы создать настраиваемые параметры для запроса, поместите эти данные в верхней части запроса, придерживаясь следующего формата:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Примечание: первая строка с [params] обязательна, с двумя дефисами перед ней и всеми настраиваемыми параметрами, которые вы хотите объявить.</i></p>"
-        default_values: "<h3>Значения по умолчанию</h3> <p>Вы можете объявлять параметры со значениями по умолчанию или без таковых. Значения по умолчанию будут отображаться в текстовом поле под редактором запросов, эти значения вы можете менять по своему усмотрению. Параметры, объявленные без значений по умолчанию, по-прежнему будут создавать текстовое поле, но такие поля будут пустыми и будут выделены красным цветом.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Схема базы данных"
         filter: "Поиск…"
@@ -40,13 +37,12 @@ ru:
           null_: "Null"
       export: "Экспорт"
       view_json: "Просмотреть JSON"
+      view: "Вид"
       save: "Сохранить изменения"
-      saverun: "Сохранить изменения и выполнить запрос"
       run: "Выполнить запрос"
       undo: "Отменить изменения"
       edit: "Изменить"
       delete: "Удалить"
-      recover: "Восстановить запрос"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Таблица"
@@ -72,7 +68,6 @@ ru:
       query_user: "Создано"
       column: "Колонка %{number}"
       explain_label: "Отобразить план запроса"
-      save_params: "Установка значений по умолчанию"
       reset_params: "Сбросить"
       search_placeholder: "Поиск…"
       no_search_results: "К сожалению, мы не смогли найти результаты, соответствующие вашему запросу."
diff --git a/plugins/discourse-data-explorer/config/locales/client.sk.yml b/plugins/discourse-data-explorer/config/locales/client.sk.yml
index 396d680ad5142..868884cab29f1 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sk.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sk.yml
@@ -11,24 +11,21 @@ sk:
         no_semicolons: "Odstráňte z dotazu bodkočiarky."
         dirty: "Pred spustením musíte dotaz uložiť."
     explorer:
+      default_query: "Predvolené"
       or: "alebo"
       admins_only: "Prieskumník údajov je dostupný iba administrátorom."
       allow_groups: "Povolenie prístupu skupín k tomuto dotazu"
       title: "Prieskumník údajov"
-      create: "Vztvoriť novú"
+      create: "Vytvoriť"
       create_placeholder: "Názov dotazu..."
       description_placeholder: "Sem zadajte popis"
       import:
         label: "Import"
-        modal: "Importovať dopyt"
         unparseable_json: "Súbor JSON, ktorý sa nedá rozdeliť."
         wrong_json: "Nesprávny súbor JSON. Súbor JSON by mal obsahovať objekt \"query\", ktorý by mal mať aspoň vlastnosť \"sql\"."
       help:
         label: "Pomoc"
         modal_title: "Pomocník Prieskumníka údajov"
-        auto_resolution: "<h2>Automatické rozlíšenie subjektu</h2> <p>Keď váš dotaz vráti id entity, Data Explorer ho môže vo výsledkoch dotazu automaticky nahradiť názvom entity a ďalšími užitočnými informáciami. Automatické rozlíšenie je k dispozícii pre <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> a <i><b>badge_id</b></i>. Ak to chcete vyskúšať, spustite tento dotaz:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Vytvorenie vlastných parametrov</h2> <p>Ak chcete vytvoriť vlastné parametre pre svoje dotazy, vložte ich na začiatok dotazu a postupujte podľa tohto formátu:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Poznámka: prvý riadok s [params] je povinný, spolu s dvoma pomlčkami pred ním a každým vlastným parametrom, ktorý chcete deklarovať.</i></p>"
-        default_values: "<h3>Predvolené hodnoty</h3> <p>Parametre môžete deklarovať s predvolenými hodnotami alebo bez nich. Predvolené hodnoty sa zobrazia v textovom poli pod editorom dotazu, ktoré môžete upraviť podľa svojich potrieb. Parametre deklarované bez predvolených hodnôt budú stále generovať textové pole, ale bude prázdne a zvýraznené červenou farbou.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Schéma databázy"
         filter: "Hľadať"
@@ -40,13 +37,11 @@ sk:
           null_: "Null"
       export: "Exportovať"
       view_json: "Zobraziť JSON"
-      save: "Uložiť zmeny"
-      saverun: "Uložiť zmeny a spustiť"
+      save: "Uloženie zmien"
       run: "Spustiť"
-      undo: "Zahodiť zmeny"
+      undo: "Zahodenie zmien"
       edit: "Upraviť"
       delete: "Odstrániť"
-      recover: "Zrušenie vymazania dotazu"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabuľka"
@@ -72,7 +67,6 @@ sk:
       query_user: "Vytvoril"
       column: "Stĺpec %{number}"
       explain_label: "Zahrnúť plán dotazov?"
-      save_params: "Predvolené"
       reset_params: "Resetovať"
       search_placeholder: "Hľadať"
       no_search_results: "Prepáčte, nenašli sme žiadne výsledky zodpovedajúce vášmu textu."
diff --git a/plugins/discourse-data-explorer/config/locales/client.sl.yml b/plugins/discourse-data-explorer/config/locales/client.sl.yml
index cb30d6e7e76ea..a3a6da0c540e3 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sl.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sl.yml
@@ -11,16 +11,16 @@ sl:
         no_semicolons: "Odstranite podpičja iz poizvedbe."
         dirty: "Pred zagonom morate poizvedbo shraniti."
     explorer:
+      default_query: "Privzeto"
       or: "ali"
       admins_only: "Raziskovalec podatkov je na voljo samo skrbnikom."
       allow_groups: "Dovoli skupinam dostop do te poizvedbe"
       title: "Raziskovalec podatkov"
-      create: "Ustvari novo"
+      create: "Ustvari"
       create_placeholder: "Ime poizvedbe..."
       description_placeholder: "Vnesite opis tukaj"
       import:
         label: "Uvozi"
-        modal: "Uvozi poizvedbo"
       help:
         label: "Pomoč"
       schema:
@@ -33,13 +33,9 @@ sl:
           no: "Ne"
           null_: "Null"
       export: "Izvozi"
-      save: "Shrani spremembe"
-      saverun: "Shrani spremembe in zaženi"
       run: "Zaženi"
-      undo: "Zavrzi spremembe"
       edit: "Uredi"
       delete: "Izbriši"
-      recover: "Povrni poizvedbo"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabela"
@@ -60,7 +56,6 @@ sl:
       query_user: "Ustvaril"
       column: "Stolpec %{number}"
       explain_label: "Vključi načrt poizvedbe?"
-      save_params: "Nastavi privzete vrednosti"
       reset_params: "Ponastavi"
       search_placeholder: "Išči..."
       no_search_results: "Oprostite, nismo našli nobenega zadetka, ki bi ustrezal vaši poizvedbi."
diff --git a/plugins/discourse-data-explorer/config/locales/client.sq.yml b/plugins/discourse-data-explorer/config/locales/client.sq.yml
index 18726a728e6e4..4aa50878c490b 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sq.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sq.yml
@@ -7,7 +7,9 @@
 sq:
   js:
     explorer:
+      default_query: "Paracaktuar"
       or: "ose"
+      create: "Krijo"
       import:
         label: "Importo"
       help:
@@ -17,7 +19,6 @@ sq:
           yes: "Po"
           no: "Jo"
       export: "Eksporto"
-      save: "Ruaj ndryshimet"
       edit: "Redaktoni"
       delete: "Fshij"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.sr.yml b/plugins/discourse-data-explorer/config/locales/client.sr.yml
index d7caaa769462e..95dff48160b41 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sr.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sr.yml
@@ -7,13 +7,14 @@
 sr:
   js:
     explorer:
+      default_query: "Подразумевано"
       or: "ili"
+      create: "Kreiraj"
       types:
         bool:
           yes: "Da"
           no: "Ne"
       export: "Izvoz"
-      save: "Sačuvaj izmene"
       edit: "Izmeni"
       delete: "Obriši"
       query_groups: "Grupe"
diff --git a/plugins/discourse-data-explorer/config/locales/client.sv.yml b/plugins/discourse-data-explorer/config/locales/client.sv.yml
index 756b155932d63..ac1d19689d5c3 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sv.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sv.yml
@@ -11,24 +11,21 @@ sv:
         no_semicolons: "Ta bort semikolon från sökningen."
         dirty: "Du måste spara sökningen innan du kör."
     explorer:
+      default_query: "Standard"
       or: "eller"
       admins_only: "Datautforskaren är endast tillgänglig för administratörer."
       allow_groups: "Tillåt att grupper går till denna sökning"
       title: "Datautforskaren"
-      create: "Skapa ny"
+      create: "Skapa"
       create_placeholder: "Sökningsnamn..."
       description_placeholder: "Ange en beskrivning här"
       import:
         label: "Importera"
-        modal: "Importera en sökning"
         unparseable_json: "JSON-fil kan inte tolkas."
         wrong_json: "Fel JSON-fil. En JSON-fil bör innehålla ett 'query'-objekt, som åtminstone bör ha en 'sql'-egenskap."
       help:
         label: "Hjälp"
         modal_title: "Hjälp med Datautforskaren"
-        auto_resolution: "<h2>Automatisk enhetsmatchning</h2> <p>När din fråga returnerar ett enhets-ID kan Datautforskaren automatiskt ersätta det med enhetens namn och annan användbar information i frågeresultaten. Automatisk matchning finns tillgängligt för <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> och <i><b>badge_id</b></i>. För att prova detta kör du den här frågan:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Skapa anpassade parametrar</h2> <p>För att skapa anpassade parametrar för dina sökfrågor skriver du detta högst upp i din sökfråga, enligt formatet:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Obs: Den första raden med [params] krävs, med två bindestreck före den och varje anpassad parameter som du vill ange.</i></p>"
-        default_values: "<h3>Standardvärden</h3> <p>Du kan ange parametrar med eller utan standardvärden. Standardvärden kommer att visas i ett textfält under frågeredigeraren, som du kan redigera enligt dina behov. Parametrar som anges utan standardvärden kommer fortfarande att generera ett textfält, men kommer att vara tomma och rödmarkerade.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Databasschema"
         filter: "Sök..."
@@ -40,12 +37,9 @@ sv:
           null_: "Tomt"
       export: "Exportera"
       save: "Spara ändringar"
-      saverun: "Spara ändringar och kör"
       run: "Kör"
-      undo: "Ignorera ändringar"
       edit: "Redigera"
       delete: "Ta bort"
-      recover: "Återställ sökning"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabell"
@@ -67,7 +61,6 @@ sv:
       query_user: "Skapat av"
       column: "Kolumn %{number}"
       explain_label: "Inkludera sökningsplan?"
-      save_params: "Ange förvalda värden"
       reset_params: "Återställ"
       search_placeholder: "Sök..."
       no_search_results: "Tyvärr kunde vi inte hitta några resultat som stämmer överens med din text."
diff --git a/plugins/discourse-data-explorer/config/locales/client.sw.yml b/plugins/discourse-data-explorer/config/locales/client.sw.yml
index a58de4124e481..8811cee9f2788 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sw.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sw.yml
@@ -11,15 +11,15 @@ sw:
         no_semicolons: "Ondoa alama ya mkato kwenye swali."
         dirty: "Lazima uhifadhi taarifa kabla ya kutekeleza."
     explorer:
+      default_query: "Halisi"
       or: "au"
       admins_only: "Uwezo wa kupitia taarifa zote unapatikana kwa viongozi tu."
       title: "Utafiti wa Taarifa"
-      create: "Tengeneza Mpya"
+      create: "Tengeneza"
       create_placeholder: "Jina la ulizo..."
       description_placeholder: "Andika maelezo hapa"
       import:
         label: "Imeingizwa kutoka sehemu nyingine"
-        modal: "Ingiza Ulizo"
       help:
         label: "Msaada"
       schema:
@@ -32,11 +32,8 @@ sw:
           no: "Hapana"
           null_: "Hamna Kitu"
       export: "Hamisha"
-      save: "Hifadhi Mabadiliko"
-      undo: "Kataa Mabadiliko"
       edit: "Hariri"
       delete: "Futa"
-      recover: "Rejesha Suala"
       download_json: "JSON"
       download_csv: "CSV"
       others_dirty: "Mabaliko uliyofanya kwenye ulizo hayajahifadhiwa, hifadhi kabla ya kwenda kwingine."
@@ -45,6 +42,5 @@ sw:
       query_description: "Maelezo"
       query_user: "Imetengenezwa na"
       explain_label: "pamoja na mpango wa swala?"
-      save_params: "Seti Chaguo-misingi"
       reset_params: "Weka/Anzisha Upya"
       search_placeholder: "Tafuta"
diff --git a/plugins/discourse-data-explorer/config/locales/client.te.yml b/plugins/discourse-data-explorer/config/locales/client.te.yml
index b1ab014270ffa..1da11f4b6eda9 100644
--- a/plugins/discourse-data-explorer/config/locales/client.te.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.te.yml
@@ -7,7 +7,9 @@
 te:
   js:
     explorer:
+      default_query: "అప్రమేయ"
       or: "లేదా"
+      create: "సృష్టించండి"
       help:
         label: "సహాయం"
       types:
@@ -15,7 +17,6 @@ te:
           yes: "అవును"
           no: "లేదు"
       export: "ఎగుమతి"
-      save: "మార్పులను సేవ్ చేయండి"
       edit: "సవరించండి"
       delete: "తొలగించండి"
       query_groups: "సమూహాలు"
diff --git a/plugins/discourse-data-explorer/config/locales/client.th.yml b/plugins/discourse-data-explorer/config/locales/client.th.yml
index 4a8397bb20082..9702791020689 100644
--- a/plugins/discourse-data-explorer/config/locales/client.th.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.th.yml
@@ -7,7 +7,9 @@
 th:
   js:
     explorer:
+      default_query: "ค่าเริ่มต้น"
       or: "หรือ"
+      create: "สร้าง"
       help:
         label: "ช่วยเหลือ"
       schema:
@@ -17,7 +19,6 @@ th:
           yes: "ใช่"
           no: "ไม่ใช่"
       export: "ส่งออก"
-      save: "บันทึกการเปลี่ยนแปลง"
       edit: "แก้ไข"
       delete: "ลบ"
       query_groups: "กลุ่ม"
diff --git a/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml b/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml
index e8276094d3918..34b72a5b9bf27 100644
--- a/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml
@@ -11,24 +11,21 @@ tr_TR:
         no_semicolons: "Noktalı virgülleri sorgudan kaldırın."
         dirty: "Çalıştırmadan önce sorguyu kaydetmeniz gerekir."
     explorer:
+      default_query: "Varsayılan"
       or: "veya"
       admins_only: "Veri gezgini yalnızca yöneticiler tarafından kullanılabilir."
       allow_groups: "Grupların bu sorguya erişmesine izin ver"
       title: "Veri Gezgini"
-      create: "Yeni Oluştur"
+      create: "Oluştur"
       create_placeholder: "Sorgu adı ..."
       description_placeholder: "Buraya bir açıklama girin"
       import:
         label: "İçe Aktar"
-        modal: "Sorguyu İçe Aktar"
         unparseable_json: "Ayrıştırılamayan JSON dosyası."
         wrong_json: "Yanlış JSON dosyası. Bir JSON dosyası, en azından bir \"sql\" özelliğine sahip olması gereken bir \"query\" nesnesi içermelidir."
       help:
         label: "Yardım"
         modal_title: "Veri Gezgini Yardımı"
-        auto_resolution: "<h2>Otomatik Varlık Çözünürlüğü</h2> <p>Sorgunuz bir varlık kimliği döndürdüğünde, Veri Gezgini bunu otomatik olarak varlık adı ve sorgu sonuçlarındaki diğer yararlı bilgilerle değiştirebilir. Otomatik çözümleme <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> ve <i><b>badge_id</b></i> için kullanılabilir. Bunu denemek için şu sorguyu çalıştırın:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Özel Parametreler Oluşturma</h2> <p>Sorgularınıza özel parametreler oluşturmak için şunu sorgunuzun en üstüne koyun ve formatı izleyin:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Not: [params] ile başlayan ilk satır, önündeki iki tire ve bildirmek istediğiniz her özel parametre ile birlikte gereklidir.</i></p>"
-        default_values: "<h3>Varsayılan Değerler</h3> <p>Parametreleri varsayılan değerlerle ya da varsayılan değerler olmadan bildirebilirsiniz. Varsayılan değerler, sorgu düzenleyicisinin altında, ihtiyaçlarınıza göre düzenleyebileceğiniz bir metin alanında görünür. Varsayılan değerler olmadan bildirilen parametreler yine bir metin alanı oluşturur, ancak boş olacak ve kırmızı renkle vurgulanır.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
       schema:
         title: "Veritabanı Şeması"
         filter: "Ara..."
@@ -40,13 +37,11 @@ tr_TR:
           null_: "Boş"
       export: "Dışa Aktar"
       view_json: "JSON'u görüntüle"
-      save: "Değişiklikleri Kaydet"
-      saverun: "Değişiklikleri Kaydet ve Çalıştır"
+      save: "Değişiklikleri kaydet"
       run: "Çalıştır"
-      undo: "Değişiklikleri At"
+      undo: "Değişiklikleri sil"
       edit: "Düzenle"
       delete: "Sil"
-      recover: "Sorguyu Silme İşlemini Geri Al"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tablo"
@@ -68,7 +63,6 @@ tr_TR:
       query_user: "Oluşturan:"
       column: "%{number}. sütun"
       explain_label: "Sorgu planı dahil edilsin mi?"
-      save_params: "Varsayılanları Ayarla"
       reset_params: "Sıfırla"
       search_placeholder: "Ara..."
       no_search_results: "Üzgünüz, metninizle eşleşen bir sonuç bulamadık."
diff --git a/plugins/discourse-data-explorer/config/locales/client.ug.yml b/plugins/discourse-data-explorer/config/locales/client.ug.yml
index ec2be848e1d45..8319c4c547572 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ug.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ug.yml
@@ -7,7 +7,9 @@
 ug:
   js:
     explorer:
+      default_query: "كۆڭۈلدىكى"
       or: "ياكى"
+      create: "قۇر"
       help:
         label: "ياردەم"
       types:
@@ -15,7 +17,9 @@ ug:
           yes: "ھەئە"
           no: "ياق"
       export: "چىقار"
+      view: "كۆرۈنۈش"
       save: "ئۆزگەرتىشنى ساقلا"
+      undo: "ئۆزگەرتىشنى تاشلىۋەت"
       edit: "تەھرىر"
       delete: "ئۆچۈر"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.uk.yml b/plugins/discourse-data-explorer/config/locales/client.uk.yml
index 7c6e2b67dc7b5..527ac39dccc83 100644
--- a/plugins/discourse-data-explorer/config/locales/client.uk.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.uk.yml
@@ -11,25 +11,21 @@ uk:
         no_semicolons: "Вилучіть крапки з комою з запиту."
         dirty: "Ви повинні зберегти запит перед запуском."
     explorer:
+      default_query: "Стандартна"
       or: "або"
       admins_only: "Data explorer доступний лише адміністраторам."
       allow_groups: "Дозволити групам доступ до цього запиту"
       title: "Data Explorer"
-      create: "Створити новий"
+      create: "Створити"
       create_placeholder: "Назва запиту..."
       description_placeholder: "Введіть тут опис"
       import:
         label: "Імпорт"
-        modal: "Імпорт запиту"
         unparseable_json: "Непридатний для обробки JSON файл."
         wrong_json: "Неправильний JSON-файл. JSON-файл повинен містити об'єкт 'query', який повинен мати як мінімум властивість 'sql'."
       help:
         label: "Довідка"
         modal_title: "Довідка з огляду даних"
-        auto_resolution: "<h2>Автоматичне розпізнавання сутностей</h2> <p>Коли ваш запит повертає ідентифікатор сутності, Data Explorer може автоматично замінити його назвою сутності та іншою корисною інформацією в результатах запиту. Автоматичне вирішення доступне для <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> та <i><b>badge_id</b></i>. Щоб спробувати це, виконайте цей запит:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Створення користувацьких параметрів</h2> <p>Щоб створити користувацькі параметри для ваших запитів, помістіть це на початок запиту та дотримуйтесь формату:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Примітка: перший рядок з [params] є обов'язковим, разом з двома тире перед ним та кожним користувацьким параметром, який потрібно оголосити.</i></p>"
-        default_values: "<h3>Значення за замовчуванням</h3> <p>Ви можете оголошувати параметри зі значеннями за замовчуванням або без них. Значення за замовчуванням відображатимуться в текстовому полі під редактором запитів, яке ви можете редагувати відповідно до своїх потреб. Параметри, оголошені без значень за замовчуванням, все одно генеруватимуть текстове поле, але будуть порожніми та виділеними червоним кольором.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
-        data_types: "<h3>Типи даних</h3> <p>Ось поширені типи даних, які ви можете використовувати:</p> <ul> <li><b>ціле число</b> - чотирибайтове ціле число зі знаком</li> <li><b>текст</b> - рядок символів змінної довжини</li> <li><b>логічне число</b> – true/false</li> <li><b>date</b> - календарна дата (рік, місяць, день)</li> <li><b>current_user_id</b> - ідентифікатор користувача, який виконує запит (автоматично вводиться, корисно для групових звітів)</li> </ul> <p>Для отримання додаткової інформації про типи даних відвідайте <a href='http://www.postgresql.org/docs/9.3/static/datatype.html#DATATYPE-TABLE' target='_blank'>цей вебсайт</a>.</p>"
       schema:
         title: "Схема бази даних"
         filter: "Пошук…"
@@ -41,13 +37,12 @@ uk:
           null_: "Null"
       export: "Експорт"
       view_json: "Переглянути JSON"
+      view: "Вигляд"
       save: "Зберегти зміни"
-      saverun: "Збережіть зміни та запустіть"
       run: "Запуск"
       undo: "Скасувати зміни"
       edit: "Редагувати"
       delete: "Видалити"
-      recover: "Видалити запит"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Таблиця"
@@ -73,7 +68,6 @@ uk:
       query_user: "Створено"
       column: "Колонка %{number}"
       explain_label: "Включити план запитів?"
-      save_params: "Встановити значення за замовчуванням"
       reset_params: "Скинути"
       search_placeholder: "Пошук…"
       no_search_results: "На жаль, не вдалося знайти жодного результату, відповідного вашому тексту."
diff --git a/plugins/discourse-data-explorer/config/locales/client.ur.yml b/plugins/discourse-data-explorer/config/locales/client.ur.yml
index 4cc9a1f5e8b0e..fff79ed00c340 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ur.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ur.yml
@@ -11,15 +11,15 @@ ur:
         no_semicolons: "کمانڈ سے semicolons ہٹا دیں۔"
         dirty: "چلانے سے پہلے آپ کا کمانڈ کو محفوظ کرنا لازمی ہے۔"
     explorer:
+      default_query: "ڈِیفالٹ"
       or: "یا"
       admins_only: "ڈیٹا ایکسپلورر صرف منتظمین کو دستیاب ہے۔"
       title: "ڈیٹا ایکسپلورر"
-      create: "نیا بنائیں"
+      create: "بنائیں"
       create_placeholder: "ڈیٹا کمانڈ کا نام..."
       description_placeholder: "یہاں تفصیل درج کریں"
       import:
         label: "درآمد"
-        modal: "ڈیٹا کمانڈ درآمد کریں"
       help:
         label: "مدد"
       schema:
@@ -32,13 +32,11 @@ ur:
           no: "نہیں"
           null_: "خالی"
       export: "برآمد"
+      view: "مشاهده"
       save: "تبدیلیاں محفوظ کریں"
-      saverun: "تبدیلیاں محفوظ کریں اور چلائیں"
       run: "چلائیں"
-      undo: "تبدیلیاں منسوخ کریں"
       edit: "ترمیم کریں"
       delete: "مٹائیں"
-      recover: "ڈیٹا کمانڈ کا حذف کرنا منسوخ کریں"
       download_json: "JSON"
       download_csv: "CSV"
       others_dirty: "ایک ڈیٹا کمانڈ کی غیرمحفوظ کردہ تبدیلیاں موجود ہیں جو آپ کے یہاں سے جانے کے بعد کھو جائیں گی۔"
@@ -52,7 +50,6 @@ ur:
       query_time: "چلا آخری دفعہ"
       query_user: "نے بنایا"
       explain_label: "ڈیٹا کمانڈ پلَین شامل کریں؟"
-      save_params: "ڈیفالٹس سَیٹ کریں"
       reset_params: "رِی سَیٹ"
       search_placeholder: "تلاش کریں..."
       no_search_results: "معذرت، ہمیں آپ کے متن سے ملتے ہوے کوئی نتائج نہ مل سکے۔"
diff --git a/plugins/discourse-data-explorer/config/locales/client.vi.yml b/plugins/discourse-data-explorer/config/locales/client.vi.yml
index 5b3e64b9fab73..0bf2b9b607cf0 100644
--- a/plugins/discourse-data-explorer/config/locales/client.vi.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.vi.yml
@@ -7,7 +7,9 @@
 vi:
   js:
     explorer:
+      default_query: "Mặc định"
       or: "hoặc"
+      create: "Tạo"
       import:
         label: "Nhập"
       help:
@@ -19,7 +21,9 @@ vi:
           yes: "Đồng ý"
           no: "Không"
       export: "Xuất"
+      view: "Xem"
       save: "Lưu thay đổi"
+      undo: "Hủy bỏ các thay đổi"
       edit: "Sửa"
       delete: "Xóa"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml b/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml
index 9df504d4a2435..1e8d346a5c63d 100644
--- a/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml
@@ -11,25 +11,21 @@ zh_CN:
         no_semicolons: "从查询中移除分号。"
         dirty: "您必须先保存查询，然后才能运行。"
     explorer:
+      default_query: "默认"
       or: "或者"
       admins_only: "数据资源管理器仅供管理员使用。"
       allow_groups: "允许群组访问此查询"
       title: "数据资源管理器"
-      create: "创建新查询"
+      create: "创建"
       create_placeholder: "查询名称…"
       description_placeholder: "在此处输入描述"
       import:
         label: "导入"
-        modal: "导入查询"
         unparseable_json: "无法解析的 JSON 文件。"
         wrong_json: "错误的 JSON 文件。JSON 文件应包含一个 'query' 对象，该对象至少应具有一个 'sql' 属性。"
       help:
         label: "帮助"
         modal_title: "数据资源管理器帮助"
-        auto_resolution: "<h2>自动实体解析</h2> <p>当您的查询返回实体 ID 时，数据资源管理器可能会自动将其替换为查询结果中的实体名称和其他有用信息。自动解析适用于 <i><b>USER_ID</b></i>、<i><b>GROUP_ID</b></i>、<i><b>topic_id</b></i>、<i><b>CATEGORY_ID</b></i> 和 <i><b>badge_id</b></i>。要尝试此操作，请运行以下查询：</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>创建自定义参数</h2> <p>要为您的查询创建自定义参数，请将其放在查询的顶部并遵循以下格式：</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>注意：包含 [params] 以及它前面的两个破折号和您要声明的每个自定义参数的第一行是必需的。</i></p>"
-        default_values: "<h3>默认值</h3> <p>您可以声明带或不带默认值的参数。默认值将显示在查询编辑器下方的文本字段中，您可以根据需要对其进行编辑。没有默认值声明的参数仍将生成一个文本字段，但将为空并以红色高亮显示。</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
-        data_types: "<h3>数据类型</h3> <p>以下是您可以使用的常见数据类型：</p> <ul> <li><b>整数</b> - 有符号四字节整数</li> <li><b>文本</b> - 可变长度字符字符串</li> <li><b>布尔值</b> – true/false</li> <li><b>日期</b> - 日历日期（年、月、日）</li> </ul> <p>有关数据类型的更多信息，请访问<a href='http://www.postgresql.org/docs/9.3/static/datatype.html#DATATYPE-TABLE' target='_blank'>此网站</a>。</p>"
       schema:
         title: "数据库架构"
         filter: "搜索…"
@@ -41,13 +37,12 @@ zh_CN:
           null_: "空"
       export: "导出"
       view_json: "查看 JSON"
-      save: "保存变更"
-      saverun: "保存变更并运行"
+      view: "查看"
+      save: "保存更改"
       run: "运行"
-      undo: "舍弃变更"
+      undo: "舍弃更改"
       edit: "编辑"
       delete: "删除"
-      recover: "取消删除查询"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "表"
@@ -67,7 +62,6 @@ zh_CN:
       query_user: "创建者"
       column: "第 %{number} 列"
       explain_label: "包括查询计划？"
-      save_params: "设置默认值"
       reset_params: "重置"
       search_placeholder: "搜索…"
       no_search_results: "抱歉，我们找不到任何与您的文本匹配的结果。"
diff --git a/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml b/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml
index 59ba77c878e41..28e76f6716919 100644
--- a/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml
@@ -7,7 +7,9 @@
 zh_TW:
   js:
     explorer:
+      default_query: "預設"
       or: "或"
+      create: "創建"
       import:
         label: "匯入"
       help:
@@ -19,7 +21,6 @@ zh_TW:
           yes: "是"
           no: "否"
       export: "匯出"
-      save: "儲存變更"
       edit: "編輯"
       delete: "刪除"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/server.de.yml b/plugins/discourse-data-explorer/config/locales/server.de.yml
index 914ef59f1b86c..4f1f161cca502 100644
--- a/plugins/discourse-data-explorer/config/locales/server.de.yml
+++ b/plugins/discourse-data-explorer/config/locales/server.de.yml
@@ -5,6 +5,8 @@
 # https://translate.discourse.org/
 
 de:
+  site_settings:
+    data_explorer_enabled: "Daten-Explorer aktivieren"
   discourse_automation:
     scriptables:
       recurring_data_explorer_result_pm:
@@ -18,4 +20,26 @@ de:
     report_generator:
       private_message:
         title: "Geplanter Bericht für %{query_name}"
+        body: |
+          Hallo %{recipient_name}, dein Daten-Explorer-Bericht ist fertig.
+
+          Anfragename:
+          %{query_name}
+
+          Hier sind die Ergebnisse:
+          %{table}
+
+          <a href='%{base_url}/admin/plugins/discourse-data-explorer/queries/%{query_id}'>Abfrage im Daten-Explorer anzeigen</a>
+
+          Bericht erstellt um %{created_at} (%{timezone})
+      post:
+        body: |
+          ### Geplanter Bericht für %{query_name}
+
+          Hier sind die Ergebnisse:
+          %{table}
+
+          <a href='%{base_url}/admin/plugins/discourse-data-explorer/queries/%{query_id}'>Abfrage im Daten-Explorer anzeigen</a>
+
+          Bericht erstellt um %{created_at} (%{timezone})
       upload_appendix: "Anhang: [%{filename}|attachment](%{short_url})"
diff --git a/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml b/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml
index 784ed6c156f03..892a6868915b5 100644
--- a/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml
@@ -6,7 +6,7 @@
 
 pl_PL:
   site_settings:
-    data_explorer_enabled: "Włącz eksplorator danych w /admin/plugins/discourse-data-explorer"
+    data_explorer_enabled: "Włącz eksplorator danych"
   discourse_automation:
     scriptables:
       recurring_data_explorer_result_pm:
diff --git a/plugins/discourse-data-explorer/config/locales/server.uk.yml b/plugins/discourse-data-explorer/config/locales/server.uk.yml
index c85028fe5a6a9..5fab456c620a2 100644
--- a/plugins/discourse-data-explorer/config/locales/server.uk.yml
+++ b/plugins/discourse-data-explorer/config/locales/server.uk.yml
@@ -5,8 +5,6 @@
 # https://translate.discourse.org/
 
 uk:
-  site_settings:
-    data_explorer_enabled: "Увімкніть Провідник даних у /admin/plugins/discourse-data-explorer"
   discourse_automation:
     scriptables:
       recurring_data_explorer_result_pm:
diff --git a/plugins/discourse-details/config/locales/client.de.yml b/plugins/discourse-details/config/locales/client.de.yml
index 5f60e2751a784..c3839eb4e2a36 100644
--- a/plugins/discourse-details/config/locales/client.de.yml
+++ b/plugins/discourse-details/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_details: "Discourse – Details"
+          discourse_details: "Discourse Details"
   js:
     details:
       title: Details ausblenden
diff --git a/plugins/discourse-gamification/config/locales/client.be.yml b/plugins/discourse-gamification/config/locales/client.be.yml
index fd0588aac469f..41a8272a9e56c 100644
--- a/plugins/discourse-gamification/config/locales/client.be.yml
+++ b/plugins/discourse-gamification/config/locales/client.be.yml
@@ -26,7 +26,7 @@ be:
       edit: "Рэдагаваць"
       back: "Назад"
       save: "Захаваць"
-      apply: "прымяніць"
+      apply: "Прымяніць"
       update_range:
         all_time: "За ўвесь час"
       custom_range_from: "ад"
diff --git a/plugins/discourse-gamification/config/locales/client.de.yml b/plugins/discourse-gamification/config/locales/client.de.yml
index 3a52fd16f429f..9222b4e149524 100644
--- a/plugins/discourse-gamification/config/locales/client.de.yml
+++ b/plugins/discourse-gamification/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_gamification: "Discourse – Gamifizierung"
+          discourse_gamification: "Discourse Gamifizierung"
   js:
     gamification_score: "Beifall"
     gamification:
diff --git a/plugins/discourse-gamification/config/locales/client.el.yml b/plugins/discourse-gamification/config/locales/client.el.yml
index 35fcbd899a793..fc811ad99dbd2 100644
--- a/plugins/discourse-gamification/config/locales/client.el.yml
+++ b/plugins/discourse-gamification/config/locales/client.el.yml
@@ -6,6 +6,7 @@
 
 el:
   js:
+    gamification_score: "Εις υγείαν"
     gamification:
       you: "Εσείς"
       leaderboard:
diff --git a/plugins/discourse-github/config/locales/client.ar.yml b/plugins/discourse-github/config/locales/client.ar.yml
index 5aa883dc5cb75..9cc8300c56dee 100644
--- a/plugins/discourse-github/config/locales/client.ar.yml
+++ b/plugins/discourse-github/config/locales/client.ar.yml
@@ -11,6 +11,7 @@ ar:
         draft: "مسودة"
         open: "فتح"
         approved: "تمت الموافقة"
+        merged: "تم دمجه"
         closed: "مغلق"
   admin_js:
     admin:
diff --git a/plugins/discourse-github/config/locales/client.de.yml b/plugins/discourse-github/config/locales/client.de.yml
index af3b16d24d442..bc44221dcb49a 100644
--- a/plugins/discourse-github/config/locales/client.de.yml
+++ b/plugins/discourse-github/config/locales/client.de.yml
@@ -11,12 +11,12 @@ de:
         draft: "Entwurf"
         open: "Offen"
         approved: "Genehmigt"
-        merged: "Merged"
+        merged: "Zusammengeführt"
         closed: "Geschlossen"
   admin_js:
     admin:
       site_settings:
         categories:
-          discourse_github: "Discourse – GitHub"
+          discourse_github: "Discourse GitHub"
   replace_github_link:
     edit_reason: "Github-Link wurde durch einen permanenten Link ersetzt"
diff --git a/plugins/discourse-github/config/locales/client.el.yml b/plugins/discourse-github/config/locales/client.el.yml
index bb576acf40863..efc543c1cbfd6 100644
--- a/plugins/discourse-github/config/locales/client.el.yml
+++ b/plugins/discourse-github/config/locales/client.el.yml
@@ -12,3 +12,8 @@ el:
         open: "Ξεκίνημα"
         approved: "Εγκρίθηκε "
         closed: "Κλειστή"
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_github: "Discourse GitHub"
diff --git a/plugins/discourse-github/config/locales/client.ja.yml b/plugins/discourse-github/config/locales/client.ja.yml
index d2134058b3f2a..e50d256b604db 100644
--- a/plugins/discourse-github/config/locales/client.ja.yml
+++ b/plugins/discourse-github/config/locales/client.ja.yml
@@ -11,6 +11,7 @@ ja:
         draft: "下書き"
         open: "オープン"
         approved: "承認済み"
+        merged: "マージ済み"
         closed: "終了"
   admin_js:
     admin:
diff --git a/plugins/discourse-github/config/locales/client.zh_CN.yml b/plugins/discourse-github/config/locales/client.zh_CN.yml
index 7c03c170a95a7..1c87c9a6eee1c 100644
--- a/plugins/discourse-github/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-github/config/locales/client.zh_CN.yml
@@ -9,7 +9,7 @@ zh_CN:
     github:
       pr_status:
         draft: "草稿"
-        open: "已打开"
+        open: "开放"
         approved: "已批准"
         merged: "已合并"
         closed: "已关闭"
diff --git a/plugins/discourse-github/config/locales/server.ar.yml b/plugins/discourse-github/config/locales/server.ar.yml
index eb08fbf428640..368b4d1ead4b2 100644
--- a/plugins/discourse-github/config/locales/server.ar.yml
+++ b/plugins/discourse-github/config/locales/server.ar.yml
@@ -12,6 +12,8 @@ ar:
     github_linkback_access_token: 'رمز وصول صالح للمستخدم الذي سينشر الرابط ولإحصاء الإرسالات/المساهمات لمنح الشارات. راجع <a href="https://meta.discourse.org/t/99895">هنا</a> للحصول على الإرشادات بشأن كيفية الحصول على رمز مميَّز.'
     github_linkback_maximum_links: "الحد الأقصى لعدد الروابط التي يمكن إنشاؤها من منشور واحد. عندما تحتوي إحدى المشاركات على روابط أكثر من الحد، لا يتم إنشاء أيٍّ منها."
     github_permalinks_enabled: "تفعيل استبدال الرابط الثابت من GitHub"
+    github_pr_status_enabled: "عرض حالة طلب السحب على GitHub في لوحات المعاينة (مسودة، أو مفتوح، أو مُعتمد، أو مدمج، أو مغلق)"
+    github_webhook_secret: "الرمز السري المستخدم للتحقق من توقيع Webhook في GitHub. يجب ضبط هذه القيمة ضمن إعدادات Webhook على GitHub."
     github_permalinks_exclude: "اسم الملف أو الدليل الذي يجب استبعاده من استبدال الرابط الثابت. أدخل اسم الملف أو المسار الكامل فقط: user/repository/optional-directory/filename"
     github_badges_enabled: "تفعيل شارات GitHub"
     github_badges_repos: "عناوين URL الخاصة بمستودعات GitHub للبحث عن المساهمات والإرسالات"
diff --git a/plugins/discourse-github/config/locales/server.de.yml b/plugins/discourse-github/config/locales/server.de.yml
index 116876eed295a..0ba79a37e577a 100644
--- a/plugins/discourse-github/config/locales/server.de.yml
+++ b/plugins/discourse-github/config/locales/server.de.yml
@@ -12,7 +12,7 @@ de:
     github_linkback_access_token: 'Ein gültiges Zugriffstoken für den Benutzer, der den Linkback veröffentlicht, und für das Zählen von Commits/Beiträgen, um Abzeichen zu vergeben. Siehe <a href="https://meta.discourse.org/t/99895">hier</a> für Anweisungen, wie du ein Token bekommst.'
     github_linkback_maximum_links: "Maximale Anzahl von Linkbacks, die aus einem einzigen Beitrag erstellt werden können. Wenn ein Beitrag mehr Links enthält, werden keine erstellt."
     github_permalinks_enabled: "Überschreiben von GitHub-Permalinks aktivieren"
-    github_pr_status_enabled: "Zeige den GitHub-Pull-Request-Status in der Onebox an (Entwurf, offen, genehmigt, merged, geschlossen)"
+    github_pr_status_enabled: "Zeige den GitHub-Pull-Request-Status in der Onebox an (Entwurf, offen, genehmigt, zusammengeführt, geschlossen)"
     github_webhook_secret: "Geheimes Token zur Überprüfung der GitHub-Webhook-Signatur. Konfiguriere diesen Wert in deinen GitHub-Webhook-Einstellungen."
     github_permalinks_exclude: "Dateiname oder Verzeichnis, der/das vom Überschreiben von Permalinks ausgeschlossen werden soll. Gib nur den Dateinamen oder den vollständigen Pfad an: user/repository/optional-directory/filename"
     github_badges_enabled: "GitHub-Abzeichen aktivieren"
diff --git a/plugins/discourse-github/config/locales/server.el.yml b/plugins/discourse-github/config/locales/server.el.yml
index b4353e951475a..82d2029e2c320 100644
--- a/plugins/discourse-github/config/locales/server.el.yml
+++ b/plugins/discourse-github/config/locales/server.el.yml
@@ -6,4 +6,6 @@
 
 el:
   site_settings:
+    github_linkback_access_token: 'Ένα έγκυρο διακριτικό πρόσβασης για τον χρήστη που θα δημοσιεύσει το σύνδεσμο επιστροφής και για την καταμέτρηση των υποβολών/συνεισφορών για την απονομή παρασήμων. Δείτε <a href="https://meta.discourse.org/t/99895">εδώ</a> για οδηγίες σχετικά με τον τρόπο απόκτησης ενός διακριτικού.'
+    github_permalinks_exclude: "Όνομα αρχείου ή κατάλογος που θα πρέπει να εξαιρεθεί από τις αντικαταστάσεις μόνιμων συνδέσμων. Παρέχετε μόνο όνομα αρχείου ή πλήρη διαδρομή: user/repository/optional-directory/filename"
     github_badges_enabled: "Ενεργοποίηση παρασήμων GitHub"
diff --git a/plugins/discourse-github/config/locales/server.ja.yml b/plugins/discourse-github/config/locales/server.ja.yml
index 70cc52ce9d78d..ef9f865ce0c4d 100644
--- a/plugins/discourse-github/config/locales/server.ja.yml
+++ b/plugins/discourse-github/config/locales/server.ja.yml
@@ -12,6 +12,8 @@ ja:
     github_linkback_access_token: 'バックリンクを投稿するユーザー用とバッジを付与するためのコミット数/貢献数をカウントするための有効なアクセストークン。トークンの取得方法については、<a href="https://meta.discourse.org/t/99895">こちら</a>をご覧ください。'
     github_linkback_maximum_links: "1 つの投稿から作成できるリンクバックの最大数。投稿に複数のリンクが含まれる場合は、何も作成されません。"
     github_permalinks_enabled: "GitHub パーマリンクの上書きを有効にする"
+    github_pr_status_enabled: "Onebox に GitHub プルリクエストのステータスを表示する (下書き、オープン、承認済み、マージ済み、クローズ)"
+    github_webhook_secret: "GitHub webhook の署名検証用のシークレットトークン。GitHub の webhook 設定でこの値を構成します。"
     github_permalinks_exclude: "パーマリンクの上書きから除外する必要のあるファイル名またはディレクトリ。ファイル名のみ、またはフルパス（user/repository/optional-directory/filename）を指定します"
     github_badges_enabled: "GitHub バッジを有効にする"
     github_badges_repos: "貢献とコミットをスキャンする GitHub リポジトリの URL"
diff --git a/plugins/discourse-github/config/locales/server.zh_CN.yml b/plugins/discourse-github/config/locales/server.zh_CN.yml
index 85359fc614bad..7dc2a91206985 100644
--- a/plugins/discourse-github/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-github/config/locales/server.zh_CN.yml
@@ -12,8 +12,8 @@ zh_CN:
     github_linkback_access_token: '一个有效访问令牌，用于将发布反向链接的用户以及计算提交/贡献以授予徽章。有关如何获取令牌的说明，请参阅<a href="https://meta.discourse.org/t/99895">此处</a>。'
     github_linkback_maximum_links: "从单个帖子创建的最大反向链接数。当帖子包含更多链接时，将不会创建任何链接。"
     github_permalinks_enabled: "启用 GitHub 永久链接覆盖"
-    github_pr_status_enabled: "在onebox中显示 Github pull request状态（draft, open, approved, merged, closed）"
-    github_webhook_secret: "用于 Github webhook 签名验证的 Secret token，在您的Github webhook 设置中配置。"
+    github_pr_status_enabled: "在 onebox 中显示 Github 拉取请求状态（草稿、开放、已批准、已合并、已关闭）"
+    github_webhook_secret: "用于 Github 网络钩子签名验证的密钥令牌。在您的 Github 网络钩子设置中配置。"
     github_permalinks_exclude: "应从永久链接覆盖中排除的文件名或目录。仅提供文件名或完整路径：user/repository/optional-directory/filename"
     github_badges_enabled: "启用 GitHub 徽章"
     github_badges_repos: "用于扫描贡献和提交的 GitHub 仓库的 URL"
diff --git a/plugins/discourse-hcaptcha/config/locales/client.de.yml b/plugins/discourse-hcaptcha/config/locales/client.de.yml
index ee10c49c89565..e2a8987164fd7 100644
--- a/plugins/discourse-hcaptcha/config/locales/client.de.yml
+++ b/plugins/discourse-hcaptcha/config/locales/client.de.yml
@@ -14,4 +14,4 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_hcaptcha: "Discourse – hCaptcha"
+          discourse_hcaptcha: "Discourse hCaptcha"
diff --git a/plugins/discourse-hcaptcha/config/locales/client.el.yml b/plugins/discourse-hcaptcha/config/locales/client.el.yml
index d872d0ecc405b..a48a372a71c1f 100644
--- a/plugins/discourse-hcaptcha/config/locales/client.el.yml
+++ b/plugins/discourse-hcaptcha/config/locales/client.el.yml
@@ -5,3 +5,8 @@
 # https://translate.discourse.org/
 
 el:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_hcaptcha: "Discourse hCaptcha"
diff --git a/plugins/discourse-local-dates/config/locales/client.de.yml b/plugins/discourse-local-dates/config/locales/client.de.yml
index 39b2a2e055024..ee8a1d57004e6 100644
--- a/plugins/discourse-local-dates/config/locales/client.de.yml
+++ b/plugins/discourse-local-dates/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_local_dates: "Discourse – Lokale Daten"
+          discourse_local_dates: "Discourse Lokale Daten"
   js:
     discourse_local_dates:
       relative_dates:
diff --git a/plugins/discourse-local-dates/config/locales/server.ar.yml b/plugins/discourse-local-dates/config/locales/server.ar.yml
index b51483ca19c81..7ca0a58381733 100644
--- a/plugins/discourse-local-dates/config/locales/server.ar.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ar.yml
@@ -6,7 +6,7 @@
 
 ar:
   site_settings:
-    discourse_local_dates_enabled: "فعِّل ميزة discourse-local-dates. ستُضيف هذه الميزة دعم التواريخ التي تستوعب المناطق الزمنية المحلية في المنشورات باستخدام عنصر [date]"
     discourse_local_dates_default_formats: "لمعرفة تنسيقات التاريخ والوقت الأكثر استخدامًا، راجع: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>تنسيق سلاسل momentjs النصية</a>"
     discourse_local_dates_default_timezones: "القائمة الافتراضية للمناطق الزمنية، يجب أن تكون <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>منطقة زمنية</a> صالحة"
+    discourse_local_dates_email_format: "التنسيق المستخدم لعرض التاريخ في رسائل البريد الإلكتروني، الأمثلة: 'LLLL' أو 'llll' أو 'YYYY-MM-DDTHH:mm:ss[Z]'. انظر: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>تنسيق سلسلة momentjs</a>"
     discourse_local_dates_email_timezone: "المنطقة الزمنية المستخدمة لعرض التواريخ في الرسائل الإلكترونية، يجب أن تكون صالحة وفقًا لـ <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>قائمة المناطق الزمنية TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.bs_BA.yml b/plugins/discourse-local-dates/config/locales/server.bs_BA.yml
index 103df91ca99c8..33eed641b51f1 100644
--- a/plugins/discourse-local-dates/config/locales/server.bs_BA.yml
+++ b/plugins/discourse-local-dates/config/locales/server.bs_BA.yml
@@ -6,6 +6,5 @@
 
 bs_BA:
   site_settings:
-    discourse_local_dates_enabled: "Dozvoliti discourse-local-dates mogućnost. To će dodati podršku za lokalne vremenske zone da prepoznaju datume u objavama koristeći [date] element"
     discourse_local_dates_default_formats: "Često korišteni formati za datum i vrijeme, pogledati: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Uobičajena lista vremenskih zona, mora biti validna <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.cs.yml b/plugins/discourse-local-dates/config/locales/server.cs.yml
index f18c505909760..047bd643f5f4b 100644
--- a/plugins/discourse-local-dates/config/locales/server.cs.yml
+++ b/plugins/discourse-local-dates/config/locales/server.cs.yml
@@ -6,7 +6,6 @@
 
 cs:
   site_settings:
-    discourse_local_dates_enabled: "Povolit funkci discourse-local-dates. Tím se přidá podpora pro data v místním časovém pásmu v příspěvcích pomocí prvku [date] ."
     discourse_local_dates_default_formats: "Často používané formáty data a času, viz: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Výchozí seznam časových pásem, musí být platný <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
     discourse_local_dates_email_format: "Formát používaný k zobrazení data v e-mailech, příklady: 'LLLL', 'llll' nebo 'RRRR-MM-DDTHH:mm:ss[Z]'. Viz <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formát řetězce momentjs</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.da.yml b/plugins/discourse-local-dates/config/locales/server.da.yml
index adbac915444b7..5ab4404e9d9f0 100644
--- a/plugins/discourse-local-dates/config/locales/server.da.yml
+++ b/plugins/discourse-local-dates/config/locales/server.da.yml
@@ -6,7 +6,6 @@
 
 da:
   site_settings:
-    discourse_local_dates_enabled: "Aktivér funktionen discourse-local-dates. Dette tilføjer understøttelse til lokale tidszone-bevidste datoer i indlæg ved hjælp af [date] -elementet"
     discourse_local_dates_default_formats: "Ofte anvendte datotidsformater , se: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Standardliste med tidszoner skal være en gyldig <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
     discourse_local_dates_email_timezone: "Tidszone brugt til at vise datoer i e-mails, skal være en gyldig <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.de.yml b/plugins/discourse-local-dates/config/locales/server.de.yml
index 476827ab92918..77241a3d7f861 100644
--- a/plugins/discourse-local-dates/config/locales/server.de.yml
+++ b/plugins/discourse-local-dates/config/locales/server.de.yml
@@ -6,7 +6,7 @@
 
 de:
   site_settings:
-    discourse_local_dates_enabled: "Aktiviere die Funktion für lokale Datumswerte. Dadurch können in Beiträgen zeitzonenbezogene Datumswerte mit dem Element [date] eingegeben werden"
+    discourse_local_dates_enabled: "Das \"Discourse Lokale Daten\" Plug-in aktivieren. Dadurch können Benutzer „[date]“ in Beiträgen verwenden, um Lesern das Datum in ihrer lokalen Zeitzone anzuzeigen."
     discourse_local_dates_default_formats: "Häufig verwendete Datums- und Zeitformate, siehe: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Standard-Liste der Zeitzonen. Es müssen gültige <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>Zeitzonen</a> sein."
     discourse_local_dates_email_format: "Format, das verwendet wird, um ein Datum in E-Mails anzuzeigen. Beispiele: 'LLLL', 'llll' oder 'YYYY-MM-DDTHH:mm:ss[Z]'. Siehe: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.es.yml b/plugins/discourse-local-dates/config/locales/server.es.yml
index 128144aa8ba71..22d11a5b063e1 100644
--- a/plugins/discourse-local-dates/config/locales/server.es.yml
+++ b/plugins/discourse-local-dates/config/locales/server.es.yml
@@ -6,7 +6,6 @@
 
 es:
   site_settings:
-    discourse_local_dates_enabled: "Activa la característica discourse-local-dates. Esto agregará soporte a las fechas de la zona horaria local en las publicaciones que usan el elemento [fecha]."
     discourse_local_dates_default_formats: "Formatos de fecha usados frecuentemente, ver: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formato momentjs string</a>"
     discourse_local_dates_default_timezones: "Lista por defecto de zonas horarias, debe ser un <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> válido"
     discourse_local_dates_email_timezone: "La zona horaria usada para mostrar fechas en correos electrónicos debe ser una <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>zona horaria</a> válida"
diff --git a/plugins/discourse-local-dates/config/locales/server.fa_IR.yml b/plugins/discourse-local-dates/config/locales/server.fa_IR.yml
index e906d49b00dec..535a393b019be 100644
--- a/plugins/discourse-local-dates/config/locales/server.fa_IR.yml
+++ b/plugins/discourse-local-dates/config/locales/server.fa_IR.yml
@@ -6,6 +6,5 @@
 
 fa_IR:
   site_settings:
-    discourse_local_dates_enabled: "به کار گیری ویژگی discource-local-dates. این کار پشتیباتی از تاریخهای متغیر با منطقه زمانی را با استفاده از عنصر [date] به پستها می افزاید"
     discourse_local_dates_default_formats: "فرمت‌های متداول زمان تاریخ، نگاه کنید به: قالب رشته <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'></a>"
     discourse_local_dates_default_timezones: "فهرست پیش‌فرض مناطق زمانی، باید <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.fi.yml b/plugins/discourse-local-dates/config/locales/server.fi.yml
index f380581c30109..3ff89eb3ae54c 100644
--- a/plugins/discourse-local-dates/config/locales/server.fi.yml
+++ b/plugins/discourse-local-dates/config/locales/server.fi.yml
@@ -6,7 +6,6 @@
 
 fi:
   site_settings:
-    discourse_local_dates_enabled: "Ota käyttöön discourse-local-dates-ominaisuus. Tällöin viesteissä voi olla [date]-elementtejä, jotka tuottavat aikavyöhykkeet huomioivia päiväyksiä"
     discourse_local_dates_default_formats: "Tyypillisiä päivämäärän ja kellonajan mutooja, ks: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Luettelo oletusaikavyöhykkeistä, täytyy olla kelvollinen <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>aikavyöhyke</a>"
     discourse_local_dates_email_timezone: "Aikavyöhyke, jota käytetään päivämäärien näyttämiseen sähköposteissa, on oltava kelvollinen <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.fr.yml b/plugins/discourse-local-dates/config/locales/server.fr.yml
index 5112295988df6..deddc80041c5a 100644
--- a/plugins/discourse-local-dates/config/locales/server.fr.yml
+++ b/plugins/discourse-local-dates/config/locales/server.fr.yml
@@ -6,7 +6,6 @@
 
 fr:
   site_settings:
-    discourse_local_dates_enabled: "Activez la fonctionnalité « discourse-local-dates ». Cela permettra d'ajouter la prise en charge des dates tenant compte du fuseau horaire local dans les publications à l'aide de l'élément [date]"
     discourse_local_dates_default_formats: "Formats de date fréquemment utilisés, voir : <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Liste de fuseaux horaires <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> (page en anglais) par défaut"
     discourse_local_dates_email_timezone: "Fuseau horaire utilisé pour afficher les dates dans les e-mails, doit être un <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> (fuseau horaire) valide"
diff --git a/plugins/discourse-local-dates/config/locales/server.he.yml b/plugins/discourse-local-dates/config/locales/server.he.yml
index 0162971045ac1..4e52d70f8be7f 100644
--- a/plugins/discourse-local-dates/config/locales/server.he.yml
+++ b/plugins/discourse-local-dates/config/locales/server.he.yml
@@ -6,7 +6,6 @@
 
 he:
   site_settings:
-    discourse_local_dates_enabled: "הפעלת תכונת התאריכים המקומיים ב־Discourse. הגדרה זו תוסיף תמיכה בתארוך שמודע לאזור הזמן המקומי בעת שימוש ברכיב [date]"
     discourse_local_dates_default_formats: "תבניות זמן נפוצות, מידע נוסף: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>תבנית מחרוזת momentjs</a>"
     discourse_local_dates_default_timezones: "רשימת בררת מחדל של אזורי זמן, חיי להיות <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>אזור זמן</a> תקני"
     discourse_local_dates_email_format: "תבנית שמשמשת להצגת תאריך בהודעות דוא״ל, דוגמאות: ‚LLLL’,‏ ‚llll’ או ‚YYYY-MM-DDTHH:mm:ss[Z]’. לפרטים: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>תבנית מחרוזת momentjs</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.hr.yml b/plugins/discourse-local-dates/config/locales/server.hr.yml
index 284473d85ee4a..7f628fdf39761 100644
--- a/plugins/discourse-local-dates/config/locales/server.hr.yml
+++ b/plugins/discourse-local-dates/config/locales/server.hr.yml
@@ -6,7 +6,6 @@
 
 hr:
   site_settings:
-    discourse_local_dates_enabled: "Uključire discourse-local-dates mogućnost. Ovo će biti dodatna podrška datumima iz objava koji ovise o lokalnim vremenskim zonama i koriste element [date]"
     discourse_local_dates_default_formats: "Često upotrebljavani formati datuma i vremena, vidi: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Zadana lista vremenskih zona, mora biti važeća <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
     discourse_local_dates_email_timezone: "Vremenska zona koja se koristi za prikaz datuma u e-mail porukama mora biti valjana <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.hu.yml b/plugins/discourse-local-dates/config/locales/server.hu.yml
index 19769392fded2..306f8f55d3490 100644
--- a/plugins/discourse-local-dates/config/locales/server.hu.yml
+++ b/plugins/discourse-local-dates/config/locales/server.hu.yml
@@ -6,7 +6,6 @@
 
 hu:
   site_settings:
-    discourse_local_dates_enabled: "A discourse-local-dates funkció engedélyezése. Ez támogatást nyújt a bejegyzésekben lévő dátumok helyi időzónában történő megjelenítéséhez, a [date] elem használatával"
     discourse_local_dates_default_formats: "Gyakran használt dátum- és időformátumok, lásd: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs karakterlánc formátum</a>"
     discourse_local_dates_default_timezones: "Az időzónák alapértelmezett listája, érvényes <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> időzónának kell lennie"
     discourse_local_dates_email_timezone: "Az e-mailekben a dátumok megjelenítéséhez használt időzóna érvényes <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>időzónának kell lennie."
diff --git a/plugins/discourse-local-dates/config/locales/server.it.yml b/plugins/discourse-local-dates/config/locales/server.it.yml
index ca9c6477376b4..7b2a68e66c7f1 100644
--- a/plugins/discourse-local-dates/config/locales/server.it.yml
+++ b/plugins/discourse-local-dates/config/locales/server.it.yml
@@ -6,7 +6,6 @@
 
 it:
   site_settings:
-    discourse_local_dates_enabled: "Attiva la funzionalità discourse-local-dates, che aggiunge il supporto nei messaggi ai fusi orari locali delle date, attraverso l'elemento [date]"
     discourse_local_dates_default_formats: "Formati di data e ora più comuni, consulta il: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formato stringhe momentjs</a>"
     discourse_local_dates_default_timezones: "Lista dei fusi orari predefiniti, deve essere un <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> valido"
     discourse_local_dates_email_timezone: "Fuso orario utilizzato per visualizzare le date nelle e-mail, deve essere un fuso orario valido <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.ja.yml b/plugins/discourse-local-dates/config/locales/server.ja.yml
index 68d7e27bc0c52..7539f7a193459 100644
--- a/plugins/discourse-local-dates/config/locales/server.ja.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ja.yml
@@ -6,7 +6,7 @@
 
 ja:
   site_settings:
-    discourse_local_dates_enabled: "discourse-local-dates 機能を有効にします。これにより、[date] 要素を使用した投稿で現地タイムゾーンに対応した日付がサポートされます"
     discourse_local_dates_default_formats: "よく使用される日付時刻フォーマット。「<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 文字列フォーマット</a>」をご覧ください。"
     discourse_local_dates_default_timezones: "デフォルトのタイムゾーンのリスト。有効な <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> である必要があります"
+    discourse_local_dates_email_format: "メールで日付を表示するために使用される形式。例: 'LLLL', 'llll' or 'YYYY-MM-DDTHH:mm:ss[Z]'。参照: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 文字列形式</a>"
     discourse_local_dates_email_timezone: "メールで日付を表示するために使用されるタイムゾーン。有効な <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> である必要があります"
diff --git a/plugins/discourse-local-dates/config/locales/server.ko.yml b/plugins/discourse-local-dates/config/locales/server.ko.yml
index 4758fe9377531..bc885d5e58ccb 100644
--- a/plugins/discourse-local-dates/config/locales/server.ko.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ko.yml
@@ -6,6 +6,5 @@
 
 ko:
   site_settings:
-    discourse_local_dates_enabled: "discourse-local-dates 기능을 사용합니다. 이렇게하면 [date] 요소를 사용하여 게시물에서 지역 시간대 인식 날짜에 대한 지원이 추가됩니다"
     discourse_local_dates_default_formats: "자주 사용되는 날짜 시간 형식은 다음을 참조하십시오: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 문자열 형식</a>"
     discourse_local_dates_default_timezones: "기본 시간대 목록은 유효한 <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> 여야합니다."
diff --git a/plugins/discourse-local-dates/config/locales/server.nb_NO.yml b/plugins/discourse-local-dates/config/locales/server.nb_NO.yml
index 2f62fcc329ea0..dfeed862c2000 100644
--- a/plugins/discourse-local-dates/config/locales/server.nb_NO.yml
+++ b/plugins/discourse-local-dates/config/locales/server.nb_NO.yml
@@ -6,6 +6,5 @@
 
 nb_NO:
   site_settings:
-    discourse_local_dates_enabled: "Aktiver discourse-local-dates funksjonen. Dette gjør det mulig å støtte datoer som tilpasser seg lokale tidssoner i innlegg ved bruk av [date] elementet"
     discourse_local_dates_default_formats: "Ofte brukte tidsformater, les: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Standard liste over tidssoner, må være en gyldig <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.nl.yml b/plugins/discourse-local-dates/config/locales/server.nl.yml
index ad4b782cd9ad9..dd4786b3f2986 100644
--- a/plugins/discourse-local-dates/config/locales/server.nl.yml
+++ b/plugins/discourse-local-dates/config/locales/server.nl.yml
@@ -6,7 +6,6 @@
 
 nl:
   site_settings:
-    discourse_local_dates_enabled: "Schakel de functie discourse-local-dates in. Dit voegt ondersteuning toe voor lokale tijdzonebewuste datums in berichten via het element [date]"
     discourse_local_dates_default_formats: "Vaak gebruikte datum- en tijdnotaties, zie: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Standaardlijst van tijdzones, moet een geldige <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> zijn."
     discourse_local_dates_email_timezone: "Tijdzone gebruikt voor het weergeven van datums in e-mails, moet een geldige <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> zijn"
diff --git a/plugins/discourse-local-dates/config/locales/server.pl_PL.yml b/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
index 25a256a406c84..718e279c9da42 100644
--- a/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
@@ -6,7 +6,7 @@
 
 pl_PL:
   site_settings:
-    discourse_local_dates_enabled: "Aktywuj funkcję discourse‐local‐dates. Sprawi to, że dodane zostanie wsparcie dla lokalnych stref czasowych w elemencie [date] wpisów"
+    discourse_local_dates_enabled: "Włącz wtyczkę „discourse-local-dates”. Dzięki temu użytkownicy będą mogli używać „[data]” we wpisach, aby wyświetlać czytelnikom daty w ich lokalnej strefie czasowej."
     discourse_local_dates_default_formats: "Najczęściej używane formaty dat, zobacz: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>format linii w momentjs</a>"
     discourse_local_dates_default_timezones: "Domyślna lista stref czasowych, musi być prawidłową <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>strefą</a>"
     discourse_local_dates_email_format: "Format używany do wyświetlania daty w wiadomościach e-mail, przykłady: „LLLL”, „llll” lub „RRRR-MM-DDTHH:mm:ss[Z]”. Zobacz: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>format ciągu momentjs</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.pt_BR.yml b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
index 16c57bab26271..3b85655baa2e3 100644
--- a/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-local-dates/config/locales/server.pt_BR.yml
@@ -6,7 +6,6 @@
 
 pt_BR:
   site_settings:
-    discourse_local_dates_enabled: "Ative o recurso discourse-local-dates. Isso adicionará suporte para datas com reconhecimento de fuso horário local nas postagens com o elemento [date]."
     discourse_local_dates_default_formats: "Formatos de data e hora usados ​​com frequência, acsse: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formato de linha moment.js</a>"
     discourse_local_dates_default_timezones: "Lista padrão de fusos horários, precisa ser um <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>fuso horário</a> válido"
     discourse_local_dates_email_timezone: "O fuso horário usado para mostrar as datas nos e-mails, deve ser um <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>fuso horário</a> válido"
diff --git a/plugins/discourse-local-dates/config/locales/server.ro.yml b/plugins/discourse-local-dates/config/locales/server.ro.yml
index ac97e05ce10a2..3b3989074ee87 100644
--- a/plugins/discourse-local-dates/config/locales/server.ro.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ro.yml
@@ -6,6 +6,5 @@
 
 ro:
   site_settings:
-    discourse_local_dates_enabled: "Activează funcționalitatea discourse-local-dates. Aceasta va adăuga suport pentru fusurile orare locale în articole folosind elementul [date]."
     discourse_local_dates_default_formats: "Formatele de dată și oră utilizate frecvent, vezi: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formatul de șir momentjs</a>"
     discourse_local_dates_default_timezones: "Lista implicită a fusurilor orare, trebuie să fie un <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>fuz orar</a>valid"
diff --git a/plugins/discourse-local-dates/config/locales/server.ru.yml b/plugins/discourse-local-dates/config/locales/server.ru.yml
index 691fd3ce6c25b..4a0d2a938d6e2 100644
--- a/plugins/discourse-local-dates/config/locales/server.ru.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ru.yml
@@ -6,7 +6,6 @@
 
 ru:
   site_settings:
-    discourse_local_dates_enabled: "Включить поддержку локальных дат (discourse-local-dates). Эта функция добавит поддержку дат в публикациях, использующих элемент [date], с учетом локального часового пояса"
     discourse_local_dates_default_formats: "Часто используемые форматы даты и времени, см.: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>форматирование строк с помощью moment.js</a>"
     discourse_local_dates_default_timezones: "Список часовых поясов должен содержать допустимые <a target='_blank' rel='noopener' href='https://ru.wikipedia.org/wiki/Часовой_пояс'>часовые пояса</a>"
     discourse_local_dates_email_timezone: "Часовой пояс, используемый для отображения дат в электронных письмах, должен быть допустимым <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.sk.yml b/plugins/discourse-local-dates/config/locales/server.sk.yml
index 01f6e0abb4833..e1e7c3f369e31 100644
--- a/plugins/discourse-local-dates/config/locales/server.sk.yml
+++ b/plugins/discourse-local-dates/config/locales/server.sk.yml
@@ -6,7 +6,6 @@
 
 sk:
   site_settings:
-    discourse_local_dates_enabled: "Povolenie funkcie discourse-local-dates. Pridá to podporu pre dátumy v miestnom časovom pásme v príspevkoch pomocou prvku [date]."
     discourse_local_dates_default_formats: "Často používané časové zóny, viď. <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>formáty momentjs</a>"
     discourse_local_dates_default_timezones: "Predvolený zoznam časových zón, musí byť platná <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>ČZ</a>"
     discourse_local_dates_email_timezone: "Časová zóna používaná na zobrazenie dátumov v e-mailoch, musí to byť platná <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.tr_TR.yml b/plugins/discourse-local-dates/config/locales/server.tr_TR.yml
index 4c0f5c2aeed67..9300c1a367f32 100644
--- a/plugins/discourse-local-dates/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-local-dates/config/locales/server.tr_TR.yml
@@ -6,7 +6,6 @@
 
 tr_TR:
   site_settings:
-    discourse_local_dates_enabled: "Discourse-yerel-tarihler özelliğini etkinleştirin. Bu, [date] ögesini kullanan gönderilerdeki yerel saat dilimine duyarlı tarihlere destek ekler"
     discourse_local_dates_default_formats: "Sık kullanılan tarih saat formatları, bkz: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs dize biçimi</a>"
     discourse_local_dates_default_timezones: "Varsayılan saat dilimleri listesi, geçerli bir <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>saat dilimi</a>olmalıdır"
     discourse_local_dates_email_timezone: "E-postalarda tarihleri göstermek için kullanılan saat dilimi, geçerli bir <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> olmalıdır"
diff --git a/plugins/discourse-local-dates/config/locales/server.ug.yml b/plugins/discourse-local-dates/config/locales/server.ug.yml
index ecc86c8451610..0da48c605ad82 100644
--- a/plugins/discourse-local-dates/config/locales/server.ug.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ug.yml
@@ -6,7 +6,6 @@
 
 ug:
   site_settings:
-    discourse_local_dates_enabled: "بۇ discourse-local-dates ئىقتىدارى قوزغىتىلىدۇ. يازمىدا [date] ئېلېمېنتى ئىشلىتىپ يەرلىك ۋاقىت رايونى ۋاقتىنى تونۇشنى قوللايدۇ"
     discourse_local_dates_default_formats: "دائىم ئىشلىتىلىدىغان چېسلا ۋاقىت پىچىمى، <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs ھەرپ تىزىق پىچىمى</a>دىن كۆرۈڭ"
     discourse_local_dates_default_timezones: "كۆڭۈلدىكى ۋاقىت رايونى تىزىمى، چوقۇم ئىناۋەتلىك <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> بولۇشى كېرەك"
     discourse_local_dates_email_timezone: "ۋاقىت رايونى ئېلخەتتىكى چېسلانى كۆرسىتىشكە ئىشلىتىلىدۇ، چوقۇم ئىناۋەتلىك <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> بولۇشى كېرەك"
diff --git a/plugins/discourse-local-dates/config/locales/server.uk.yml b/plugins/discourse-local-dates/config/locales/server.uk.yml
index 822109d260e2b..41dd271430ca6 100644
--- a/plugins/discourse-local-dates/config/locales/server.uk.yml
+++ b/plugins/discourse-local-dates/config/locales/server.uk.yml
@@ -6,7 +6,6 @@
 
 uk:
   site_settings:
-    discourse_local_dates_enabled: "Увімкнути функцію локальних дат. Це додасть підтримку дат з урахуванням місцевого часового поясу у дописах з елементом [date]."
     discourse_local_dates_default_formats: "Найчастіші формати дати, див .: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>формат рядка momentjs</a>"
     discourse_local_dates_default_timezones: "Список часових поясів за замовчуванням повинен бути дійсним <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>"
     discourse_local_dates_email_format: "Формат, який використовується для відображення дати в листах, приклади: 'LLLL', 'llll' або 'YYYY-MM-DDTHH:mm:ss[Z]'. див.: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>формат рядка momentjs</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.ur.yml b/plugins/discourse-local-dates/config/locales/server.ur.yml
index 72d3e43dbcf62..cd7e5dcc75d0b 100644
--- a/plugins/discourse-local-dates/config/locales/server.ur.yml
+++ b/plugins/discourse-local-dates/config/locales/server.ur.yml
@@ -6,7 +6,6 @@
 
 ur:
   site_settings:
-    discourse_local_dates_enabled: "ڈسکورس-لوکل-تاریخ کی خصوصیت کو فعال کریں۔ یہ [تاریخ] عنصر کا استعمال کرتے ہوئے پوسٹس میں مقامی خطہ کے وقت سے آگاہی کی تاریخوں میں تعاون کا اضافہ کرے گا۔"
     discourse_local_dates_default_formats: "اکثر استعمال ہونے والے تاریخ ٹائم فارمیٹس، دیکھیے: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs سٹرِنگ فارمَیٹ</a>"
     discourse_local_dates_default_timezones: "خطہ کے اوقات کی ڈِیفالٹ فہرست، ایک درست <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> ہونا لازمی ہے"
     discourse_local_dates_email_timezone: "ای میلز میں تاریخیں دکھانے کے لیے استعمال ہونے والا خطہ کے وقت، ایک درست <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a>ہونا چاہیے"
diff --git a/plugins/discourse-local-dates/config/locales/server.vi.yml b/plugins/discourse-local-dates/config/locales/server.vi.yml
index e0de575f96a00..6a8171e2373a7 100644
--- a/plugins/discourse-local-dates/config/locales/server.vi.yml
+++ b/plugins/discourse-local-dates/config/locales/server.vi.yml
@@ -6,7 +6,6 @@
 
 vi:
   site_settings:
-    discourse_local_dates_enabled: "Bật tính năng discourse-local-dates. Điều này sẽ hỗ trợ nhận biết múi giờ địa phương trong các tút sử dụng phần tử [date]."
     discourse_local_dates_default_formats: "Các định dạng ngày giờ thường được sử dụng, hãy xem: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>định dạng chuỗi momentjs</a>"
     discourse_local_dates_default_timezones: "Danh sách múi giờ mặc định, phải là <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>TZ</a> hợp lệ"
     discourse_local_dates_email_format: "Định dạng dùng để hiển thị ngày tháng trong email, ví dụ: 'LLLL', 'llll' hoặc 'YYYY-MM-DDTHH:mm:ss[Z]'. Xem: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>định dạng chuỗi momentjs</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.zh_CN.yml b/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
index 815cf7ca47967..b2c3248941660 100644
--- a/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-local-dates/config/locales/server.zh_CN.yml
@@ -6,8 +6,7 @@
 
 zh_CN:
   site_settings:
-    discourse_local_dates_enabled: "启用 discourse-local-dates 功能。这将使用 [date] 元素在帖子中添加对本地时区感知日期的支持。"
     discourse_local_dates_default_formats: "常用的日期时间格式，请参阅：<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 字符串格式</a>"
     discourse_local_dates_default_timezones: "时区的默认列表，必须是有效的<a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>时区</a>"
-    discourse_local_dates_email_format: "用于在电子邮件中显示日期的格式，例如：“LLLL”、“llll”或“YYYY-MM-DDTHH:mm:ss[Z]”。请参阅：<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 字符串格式</a>"
+    discourse_local_dates_email_format: "用于在电子邮件中显示日期的格式，示例：'LLLL'、'llll' 或 'YYYY-MM-DDTHH:mm:ss[Z]'。请参阅：<a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs 字符串格式</a>"
     discourse_local_dates_email_timezone: "用于在电子邮件中显示日期的时区，必须是有效的<a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>时区</a>"
diff --git a/plugins/discourse-login-with-amazon/config/locales/server.ar.yml b/plugins/discourse-login-with-amazon/config/locales/server.ar.yml
index 79428fa286954..ccc7766cd59b6 100644
--- a/plugins/discourse-login-with-amazon/config/locales/server.ar.yml
+++ b/plugins/discourse-login-with-amazon/config/locales/server.ar.yml
@@ -11,6 +11,8 @@ ar:
     login_with_amazon_client_secret: "تسجيل الدخول باستخدام سر عميل Amazon"
     login_with_amazon_scope: "تسجيل الدخول باستخدام نطاقات Amazon OAuth2 (مفصولة بمسافة)"
     login_with_amazon_overrides_email: "يستبدل عنوان البريد الإلكتروني في حساب مستخدم Discourse."
+    login_with_amazon_user_can_connect: "السماح للمستخدمين الحاليين بربط حساباتهم على Amazon ضمن إعدادات التفضيلات."
+    login_with_amazon_user_can_revoke: "السماح للمستخدمين بإلغاء ربط حساباتهم على Amazon ضمن إعدادات التفضيلات."
     errors:
       login_with_amazon_client_id_is_blank: "يجب عليك ضبط 'login with amazon client id' قبل تفعيل هذا الإعداد."
       login_with_amazon_client_secret_is_blank: "يجب عليك ضبط 'login with amazon client secret' قبل تفعيل هذا الإعداد."
diff --git a/plugins/discourse-login-with-amazon/config/locales/server.ja.yml b/plugins/discourse-login-with-amazon/config/locales/server.ja.yml
index 842e98bb46ab5..b466f73bb3ded 100644
--- a/plugins/discourse-login-with-amazon/config/locales/server.ja.yml
+++ b/plugins/discourse-login-with-amazon/config/locales/server.ja.yml
@@ -11,6 +11,8 @@ ja:
     login_with_amazon_client_secret: "「Amazon でログイン」クライアントシークレット"
     login_with_amazon_scope: "「Amazon でログイン」OAuth2 スコープ（スペース区切り）"
     login_with_amazon_overrides_email: "Discourse ユーザーアカウントのメールアドレスを上書きします。"
+    login_with_amazon_user_can_connect: "既存のユーザーが設定で Amazon アカウントに接続することを許可します。"
+    login_with_amazon_user_can_revoke: "ユーザーが設定で関連付けられている Amazon アカウントを取り消すことを許可します。"
     errors:
       login_with_amazon_client_id_is_blank: "この設定を有効にする前に、'login with amazon client id' を設定する必要があります。"
       login_with_amazon_client_secret_is_blank: "この設定を有効にする前に、'login with amazon client secret' を設定する必要があります。"
diff --git a/plugins/discourse-login-with-amazon/config/locales/server.zh_CN.yml b/plugins/discourse-login-with-amazon/config/locales/server.zh_CN.yml
index 51f084428a4d2..7ee1f1ebbe972 100644
--- a/plugins/discourse-login-with-amazon/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-login-with-amazon/config/locales/server.zh_CN.yml
@@ -11,8 +11,8 @@ zh_CN:
     login_with_amazon_client_secret: "使用 Amazon 客户端密钥登录"
     login_with_amazon_scope: "使用 Amazon OAuth2 范围登录（空格分隔）"
     login_with_amazon_overrides_email: "覆盖 Discourse 用户帐户上的电子邮件地址。"
-    login_with_amazon_user_can_connect: "允许现有用户在偏好设置中连接他们的亚马逊账户。"
-    login_with_amazon_user_can_revoke: "允许用户在偏好设置中撤销其关联的亚马逊账户。"
+    login_with_amazon_user_can_connect: "允许现有用户在偏好设置中关联他们的 Amazon 账户。"
+    login_with_amazon_user_can_revoke: "允许用户在偏好设置中撤销其关联的 Amazon 账户。"
     errors:
       login_with_amazon_client_id_is_blank: "在启用此设置之前，您必须设置“使用 Amazon 客户端 ID 登录”。"
       login_with_amazon_client_secret_is_blank: "在启用此设置之前，您必须设置“使用 Amazon 客户端密钥登录”。"
diff --git a/plugins/discourse-narrative-bot/config/locales/client.de.yml b/plugins/discourse-narrative-bot/config/locales/client.de.yml
index 1ee62e884b956..de4f67efd9263 100644
--- a/plugins/discourse-narrative-bot/config/locales/client.de.yml
+++ b/plugins/discourse-narrative-bot/config/locales/client.de.yml
@@ -14,4 +14,4 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_narrative_bot: "Discourse – Narrative Bot"
+          discourse_narrative_bot: "Discourse Narrative Bot"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 231d6dbf76c4a..210ea93740997 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -152,13 +152,13 @@ el:
       hello:
         title: "Χαιρετίσματα!"
         message: |-
-          Ευχαριστώ που συμμετείχατε στο %{title} και καλώς ήρθατε!
+          Ευχαριστώ που συμμετέχετε στο %{title} και καλώς ήρθατε!
 
           - Είμαι μόνο ένα bot αλλά [το φιλικό μας προσωπικό] (%{base_uri}/about) είναι επίσης εδώ για να σας βοηθήσει εάν χρειαστεί να επικοινωνήσετε με κάποιο άτομο.
 
-          - Για λόγους ασφαλείας, περιορίζουμε προσωρινά τι μπορούν να κάνουν οι νέοι χρήστες. Θα αποκτήσετε [νέες ικανότητες] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (και [badges](%{base_uri}/badges)) καθώς θα σας γνωρίσουμε.
+          - Για λόγους ασφαλείας, περιορίζουμε προσωρινά τι μπορούν να κάνουν οι νέοι χρήστες. Θα αποκτήσετε [νέες ικανότητες] (https://blog.discourse.org/2018/06/understanding-discourse-trust-levels/) (και [παράσημα](%{base_uri}/badges)) καθώς θα σας γνωρίσουμε.
 
-          - Πιστεύουμε στη [συμπεριφορά της πολιτισμένης κοινότητας] (%{base_uri}/guidelines) ανά πάσα στιγμή.
+          - Πιστεύουμε στην [πολιτισμένη συμπεριφορά της κοινότητας] (%{base_uri}/guidelines) ανά πάσα στιγμή.
       onebox:
         reply: |-
           Τέλεια! Αυτό θα λειτουργήσει με τους περισσοτερους <img src="%{base_uri}/plugins/discourse-narrative-bot/images/font-awesome-link.png" width="16" height="16"> συνδέσμους. Να θυμάσαι, ο σύνδεσμος πρέπει να είναι σε μια γραμμή _μόνος του_, χωρίς κάτι άλλο από εμπρός ή στο τέλος.
@@ -332,6 +332,10 @@ el:
 
           Λάβετε υπόψη ότι έχετε μόνο %{deletion_after} ώρες για να αναιρέσετε τη διαγραφή μιας ανάρτησης.
       category_hashtag:
+        instructions: |-
+          Ξέρατε ότι μπορείτε να αναφερθείτε σε κατηγορίες και ετικέτες στις αναρτήσεις σας; Για παράδειγμα, έχετε δει την κατηγορία %{category};
+
+          Γράψτε `#` οπουδήποτε σε μια πρόταση και διαλέξτε οποιαδήποτε κατηγορία ή ετικέτα.
         reply: |-
           Άψογα! Να θυμάστε ότι αυτό λειτουργεί για κατηγορίες _και_ ετικέτες, αν οι ετικέτες είναι ενεργές.
       change_topic_notification_level:
diff --git a/plugins/discourse-oauth2-basic/config/locales/client.ar.yml b/plugins/discourse-oauth2-basic/config/locales/client.ar.yml
index e912c8acccf90..b8b7e1d770b86 100644
--- a/plugins/discourse-oauth2-basic/config/locales/client.ar.yml
+++ b/plugins/discourse-oauth2-basic/config/locales/client.ar.yml
@@ -13,3 +13,7 @@ ar:
       site_settings:
         categories:
           discourse_oauth2_basic: "تسجيل الدخول عبر OAuth2"
+      config:
+        login:
+          sub_pages:
+            oauth2: "OAuth2"
diff --git a/plugins/discourse-oauth2-basic/config/locales/client.ja.yml b/plugins/discourse-oauth2-basic/config/locales/client.ja.yml
index a778060ae348f..89c3b3b38abaa 100644
--- a/plugins/discourse-oauth2-basic/config/locales/client.ja.yml
+++ b/plugins/discourse-oauth2-basic/config/locales/client.ja.yml
@@ -13,3 +13,7 @@ ja:
       site_settings:
         categories:
           discourse_oauth2_basic: "OAuth2 ログイン"
+      config:
+        login:
+          sub_pages:
+            oauth2: "OAuth2"
diff --git a/plugins/discourse-oauth2-basic/config/locales/server.el.yml b/plugins/discourse-oauth2-basic/config/locales/server.el.yml
index 1de3fcb1c5ee0..9eebff0bec85f 100644
--- a/plugins/discourse-oauth2-basic/config/locales/server.el.yml
+++ b/plugins/discourse-oauth2-basic/config/locales/server.el.yml
@@ -6,4 +6,5 @@
 
 el:
   site_settings:
+    oauth2_debug_auth: "Να συμπεριλαμβάνονται πλούσιες πληροφορίες αποσφαλμάτωσης στα αρχεία καταγραφής σας"
     oauth2_disable_csrf: "Απενεργοποίηση ελέγχου CSRF"
diff --git a/plugins/discourse-openid-connect/config/locales/client.ar.yml b/plugins/discourse-openid-connect/config/locales/client.ar.yml
index aa8510c465838..2f6d844998cd8 100644
--- a/plugins/discourse-openid-connect/config/locales/client.ar.yml
+++ b/plugins/discourse-openid-connect/config/locales/client.ar.yml
@@ -10,6 +10,10 @@ ar:
       site_settings:
         categories:
           discourse_openid_connect: "Discourse OpenID Connect"
+      config:
+        login:
+          sub_pages:
+            oidc: "OIDC"
   js:
     login:
       oidc:
diff --git a/plugins/discourse-openid-connect/config/locales/client.de.yml b/plugins/discourse-openid-connect/config/locales/client.de.yml
index a52efc4b7a7de..d63e2e682224a 100644
--- a/plugins/discourse-openid-connect/config/locales/client.de.yml
+++ b/plugins/discourse-openid-connect/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_openid_connect: "Discourse – OpenID Connect"
+          discourse_openid_connect: "Discourse OpenID Connect"
       config:
         login:
           sub_pages:
diff --git a/plugins/discourse-openid-connect/config/locales/client.ja.yml b/plugins/discourse-openid-connect/config/locales/client.ja.yml
index bb9037fdcffec..e64d97fb62424 100644
--- a/plugins/discourse-openid-connect/config/locales/client.ja.yml
+++ b/plugins/discourse-openid-connect/config/locales/client.ja.yml
@@ -10,6 +10,10 @@ ja:
       site_settings:
         categories:
           discourse_openid_connect: "Discourse OpenID Connect"
+      config:
+        login:
+          sub_pages:
+            oidc: "OIDC"
   js:
     login:
       oidc:
diff --git a/plugins/discourse-openid-connect/config/locales/server.de.yml b/plugins/discourse-openid-connect/config/locales/server.de.yml
index 9b576ea87d225..13b77f34ae26f 100644
--- a/plugins/discourse-openid-connect/config/locales/server.de.yml
+++ b/plugins/discourse-openid-connect/config/locales/server.de.yml
@@ -13,6 +13,7 @@ de:
     openid_connect_authorize_scope: "Die Bereiche, die an den Autorisierungsendpunkt gesendet werden. Muss „openid“ enthalten."
     openid_connect_rp_initiated_logout: "Leitet den Benutzer nach der Abmeldung zum end_session_endpoint um. Muss von deinem Identitätsanbieter unterstützt werden und im Discovery-Dokument enthalten sein."
     openid_connect_rp_initiated_logout_redirect: "(Optional) Die post_logout_redirect_uri, die an den Abmeldungsendpunkt übergeben wird. Wenn sie angegeben wird, muss sie beim Identitätsanbieter registriert sein."
+    openid_connect_rp_initiated_logout_include_client_id: "(optional) Füge die client_id (Einstellung openid_connect_client_id) als Abfrageparameter an den Logout-Endpunkt an"
     openid_connect_token_scope: "Die Bereiche, die bei der Anforderung des Token-Endpunkts gesendet werden. Die offizielle Spezifikation erfordert dies nicht."
     openid_connect_error_redirects: "Wenn der Callback error_reason den ersten Parameter enthält, wird der Benutzer zu der URL im zweiten Parameter umgeleitet"
     openid_connect_allow_association_change: "Erlaube es Benutzern, ihre Discourse-Konten vom OpenID-Connect-Anbieter zu trennen und wieder mit diesem zu verbinden"
diff --git a/plugins/discourse-openid-connect/config/locales/server.el.yml b/plugins/discourse-openid-connect/config/locales/server.el.yml
index 30860b95850a6..58cc4c74abfbb 100644
--- a/plugins/discourse-openid-connect/config/locales/server.el.yml
+++ b/plugins/discourse-openid-connect/config/locales/server.el.yml
@@ -6,4 +6,5 @@
 
 el:
   site_settings:
+    openid_connect_rp_initiated_logout: "Ανακατεύθυνση του χρήστη στο end_session_endpoint μετά την αποσύνδεση. Πρέπει να υποστηρίζεται από τον πάροχο ταυτότητάς σας και να περιλαμβάνεται στο έγγραφο εντοπισμού."
     openid_connect_rp_initiated_logout_redirect: "(προαιρετικό) Το post_logout_redirect_uri που θα διαβιβαστεί στο τελικό σημείο αποσύνδεσης. Εάν παρέχεται, πρέπει να είναι καταχωρημένο με τον πάροχο ταυτότητας."
diff --git a/plugins/discourse-patreon/config/locales/client.de.yml b/plugins/discourse-patreon/config/locales/client.de.yml
index cd58d961dcd59..a2ba235c68214 100644
--- a/plugins/discourse-patreon/config/locales/client.de.yml
+++ b/plugins/discourse-patreon/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_patreon: "Discourse – Patreon"
+          discourse_patreon: "Discourse Patreon"
   js:
     login:
       patreon:
diff --git a/plugins/discourse-patreon/config/locales/client.el.yml b/plugins/discourse-patreon/config/locales/client.el.yml
index ed4ea5ef45fe3..ce68f263b7c98 100644
--- a/plugins/discourse-patreon/config/locales/client.el.yml
+++ b/plugins/discourse-patreon/config/locales/client.el.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 el:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_patreon: "Discourse Patreon"
   js:
     login:
       patreon:
diff --git a/plugins/discourse-policy/config/locales/server.ar.yml b/plugins/discourse-policy/config/locales/server.ar.yml
index 4ff7e06f08dc3..adf3847b950ff 100644
--- a/plugins/discourse-policy/config/locales/server.ar.yml
+++ b/plugins/discourse-policy/config/locales/server.ar.yml
@@ -8,6 +8,7 @@ ar:
   site_settings:
     policy_enabled: "هل تريد السماح بالسياسات؟"
     policy_restrict_to_staff_posts: "قد لا تظهر السياسات إلا على منشورات فريق العمل"
+    create_policy_allowed_groups: "يلزم الانضمام إلى المجموعة لإضافة السياسات إلى المنشورات"
     policy_easy_revoke: "عرض زرَّي القبول والإلغاء في الوقت نفسه"
   discourse_policy:
     errors:
diff --git a/plugins/discourse-policy/config/locales/server.ja.yml b/plugins/discourse-policy/config/locales/server.ja.yml
index 7c295185c2643..f08935f8ff60f 100644
--- a/plugins/discourse-policy/config/locales/server.ja.yml
+++ b/plugins/discourse-policy/config/locales/server.ja.yml
@@ -8,6 +8,7 @@ ja:
   site_settings:
     policy_enabled: "ポリシーを許可？"
     policy_restrict_to_staff_posts: "ポリシーはスタッフの投稿のみに表示される場合があります"
+    create_policy_allowed_groups: "投稿にポリシーを追加するにはグループメンバーシップを必要とする"
     policy_easy_revoke: "同意ボタンと同意の取り消しボタンを同時に表示する"
   discourse_policy:
     errors:
diff --git a/plugins/discourse-post-voting/config/locales/client.ar.yml b/plugins/discourse-post-voting/config/locales/client.ar.yml
index 9a59b10b761aa..12dba3e4ad065 100644
--- a/plugins/discourse-post-voting/config/locales/client.ar.yml
+++ b/plugins/discourse-post-voting/config/locales/client.ar.yml
@@ -30,8 +30,10 @@ ar:
         label: "إنشاء موضوع للتصويت على المنشورات"
       composer_actions:
         create_as_post_voting:
+          label: "تبديل التصويت على المنشورات"
           desc: "سيتم إنشاء الموضوع مع منشورات قابلة للتصويت"
         remove_as_post_voting:
+          label: "إزالة التصويت على المنشورات"
           desc: "سيتم إنشاء الموضوع بتنسيق عادي"
     vote:
       already_voted: "يمكنك التصويت مرة واحدة فقط لكل سؤال."
diff --git a/plugins/discourse-post-voting/config/locales/client.el.yml b/plugins/discourse-post-voting/config/locales/client.el.yml
index 56ca750a5757b..84bcca4a9d32e 100644
--- a/plugins/discourse-post-voting/config/locales/client.el.yml
+++ b/plugins/discourse-post-voting/config/locales/client.el.yml
@@ -112,3 +112,6 @@ el:
         voters_count_diff:
           one: "και %{count} ακόμα χρήστης..."
           other: "και %{count} ακόμα χρήστες..."
+    review:
+      transcript:
+        view: "Προβολή μεταγραφής προηγούμενων μηνυμάτων"
diff --git a/plugins/discourse-post-voting/config/locales/client.ja.yml b/plugins/discourse-post-voting/config/locales/client.ja.yml
index 287e0b3476e5a..d7e4f448a4d72 100644
--- a/plugins/discourse-post-voting/config/locales/client.ja.yml
+++ b/plugins/discourse-post-voting/config/locales/client.ja.yml
@@ -30,8 +30,10 @@ ja:
         label: "投稿の投票トピックを作成する"
       composer_actions:
         create_as_post_voting:
+          label: "投稿の投票を切り替える"
           desc: "トピックは投票可能な投稿で作成されます"
         remove_as_post_voting:
+          label: "投稿の投票を削除する"
           desc: "トピックは通常の形式で作成されます"
     vote:
       already_voted: "質問ごとに 1 回だけ投票できます。"
diff --git a/plugins/discourse-post-voting/config/locales/server.ar.yml b/plugins/discourse-post-voting/config/locales/server.ar.yml
index 6deffd63782ae..cfe46a2dbdbd6 100644
--- a/plugins/discourse-post-voting/config/locales/server.ar.yml
+++ b/plugins/discourse-post-voting/config/locales/server.ar.yml
@@ -39,8 +39,11 @@ ar:
   discourse_post_voting:
     reviewables:
       actions:
+        comment_actions:
+          bundle_title: "ماذا تريد أن تفعل بهذا التعليق؟"
         no_action_comment:
           title: "التي لم يتم اتخاذ إجراء بشأنها"
+          description: "اترك التعليق كما هو."
         agree_and_keep_comment:
           title: "إبقاء التعليق"
           description: "الموافقة على البلاغ والاحتفاظ بالتعليق دون تغيير"
diff --git a/plugins/discourse-post-voting/config/locales/server.ja.yml b/plugins/discourse-post-voting/config/locales/server.ja.yml
index af2a8e11914e4..0c74b0bcd6b87 100644
--- a/plugins/discourse-post-voting/config/locales/server.ja.yml
+++ b/plugins/discourse-post-voting/config/locales/server.ja.yml
@@ -34,8 +34,11 @@ ja:
   discourse_post_voting:
     reviewables:
       actions:
+        comment_actions:
+          bundle_title: "コメントをどうしますか？"
         no_action_comment:
           title: "未対応"
+          description: "コメントをそのままにします。"
         agree_and_keep_comment:
           title: "コメントを保持"
           description: "通報に同意し、コメントを変更しないままにします。"
diff --git a/plugins/discourse-post-voting/config/locales/server.zh_CN.yml b/plugins/discourse-post-voting/config/locales/server.zh_CN.yml
index 2863b9d7e12eb..37b3ebee2868c 100644
--- a/plugins/discourse-post-voting/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-post-voting/config/locales/server.zh_CN.yml
@@ -35,10 +35,10 @@ zh_CN:
     reviewables:
       actions:
         comment_actions:
-          bundle_title: "你想如何处理这条评论？"
+          bundle_title: "您想如何处理该评论？"
         no_action_comment:
-          title: "无行动"
-          description: "请保留原评论。"
+          title: "无措施"
+          description: "保持评论原样。"
         agree_and_keep_comment:
           title: "保留评论"
           description: "同意举报并保持评论不变。"
diff --git a/plugins/discourse-presence/config/locales/client.ar.yml b/plugins/discourse-presence/config/locales/client.ar.yml
index 6b873d964ed13..9dad1690de41f 100644
--- a/plugins/discourse-presence/config/locales/client.ar.yml
+++ b/plugins/discourse-presence/config/locales/client.ar.yml
@@ -21,6 +21,13 @@ ar:
         few: "يعدّلون المشاركة"
         many: "يعدّلون المشاركة"
         other: "يعدّلون المشاركة"
+      translating:
+        zero: "جارٍ الترجمة"
+        one: "جارٍ الترجمة"
+        two: "جارٍ الترجمة"
+        few: "جارٍ الترجمة"
+        many: "جارٍ الترجمة"
+        other: "جارٍ الترجمة"
       replying_to_topic:
         zero: "يكتب ردًا"
         one: "يكتب ردًا"
diff --git a/plugins/discourse-presence/config/locales/client.ja.yml b/plugins/discourse-presence/config/locales/client.ja.yml
index c929e1acfe95d..2f1111b36d2ad 100644
--- a/plugins/discourse-presence/config/locales/client.ja.yml
+++ b/plugins/discourse-presence/config/locales/client.ja.yml
@@ -11,5 +11,7 @@ ja:
         other: "返信中"
       editing:
         other: "編集中"
+      translating:
+        other: "翻訳中"
       replying_to_topic:
         other: "返信中"
diff --git a/plugins/discourse-presence/config/locales/client.zh_CN.yml b/plugins/discourse-presence/config/locales/client.zh_CN.yml
index 10d24a7f5d3aa..49b52560ffca0 100644
--- a/plugins/discourse-presence/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-presence/config/locales/client.zh_CN.yml
@@ -12,6 +12,6 @@ zh_CN:
       editing:
         other: "正在编辑"
       translating:
-        other: "翻译"
+        other: "正在翻译"
       replying_to_topic:
         other: "正在回复"
diff --git a/plugins/discourse-reactions/config/locales/client.de.yml b/plugins/discourse-reactions/config/locales/client.de.yml
index a2151bf8e3c96..ed5f587869c46 100644
--- a/plugins/discourse-reactions/config/locales/client.de.yml
+++ b/plugins/discourse-reactions/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_reactions: "Discourse – Reaktionen"
+          discourse_reactions: "Discourse Reaktionen"
   js:
     discourse_reactions:
       reactions_title: "Reaktionen"
diff --git a/plugins/discourse-reactions/config/locales/server.ar.yml b/plugins/discourse-reactions/config/locales/server.ar.yml
index c938fe7e506bb..3be2893367f33 100644
--- a/plugins/discourse-reactions/config/locales/server.ar.yml
+++ b/plugins/discourse-reactions/config/locales/server.ar.yml
@@ -13,6 +13,7 @@ ar:
     discourse_reactions_desaturated_reaction_panel: "يقلل التشويش البصري للتفاعلات عن طريق عرضها بألوان غير مشبَّعة حتى التمرير فوقها."
     discourse_reactions_excluded_from_like: "التفاعلات التي لا تُحتسَب كتسجيل إعجاب. سيتم احتساب أي تفاعلات غير موجودة في هذه القائمة كتسجيل إعجاب للشارات والبلاغات وأغراضٍ أخرى."
     discourse_reactions_like_sync_enabled: "إذا تم تفعيل هذا الإعداد، فسيتم إنشاء سجلات الإعجاب المطابقة للتفاعلات التاريخية، باستثناء تلك التفاعلات المحدَّدة في `discourse_reactions_excluded_from_like`. ستحدث هذه المزامنة بشكلٍ منتظم في الخلفية، وأيضًا عند تغيير `discourse_reactions_excluded_from_like`."
+    discourse_reactions_allow_any_emoji: "عند تفعيل هذا الخيار، سيُضاف زر يتيح للمستخدمين اختيار أي رمز تعبيري من قائمة الردود. سيتم السماح للأعضاء باختيار أي رمز تعبيري، بما في ذلك الرموز المخصصة. لتقييد الرموز المتاحة، استخدم إعداد الموقع emoji_deny_list."
     errors:
       invalid_excluded_emoji: "لا يمكنك استبعاد الرموز التعبيرية التي ليست ضمن 'discourse reactions enabled reactions' ولا يمكنك استبعاد الرموز التعبيرية المستخدمة في 'discourse reactions reaction for like'."
   badges:
diff --git a/plugins/discourse-reactions/config/locales/server.ja.yml b/plugins/discourse-reactions/config/locales/server.ja.yml
index 668239499a58a..264ac01b60959 100644
--- a/plugins/discourse-reactions/config/locales/server.ja.yml
+++ b/plugins/discourse-reactions/config/locales/server.ja.yml
@@ -13,6 +13,7 @@ ja:
     discourse_reactions_desaturated_reaction_panel: "ホバーされるまで彩度を下げて表示することで、リアクションの視覚的な煩わしさを低減します。"
     discourse_reactions_excluded_from_like: "「いいね！」としてカウントされないリアクション。このリストに含まれないリアクションは、バッジ、レポート作成、およびその他の目的で「いいね！」としてカウントされます。"
     discourse_reactions_like_sync_enabled: "これが有効である場合、`discourse_reactions_excluded_from_like` で定義されたリアクションを除き、過去のリアクションにはそれに一致する「いいね！」レコードが作成されます。この同期はバックグラウンドで定期的に処理されます。また、`discourse_reactions_excluded_from_like` を変更した場合にも処理されます。"
+    discourse_reactions_allow_any_emoji: "これを有効にすると、リアクションピッカーで任意の絵文字を選択できるボタンが追加されます。メンバーはカスタム絵文字を含む任意の絵文字をリアクションに選択できます。利用可能なリアクションを宣言するには、`emoji_deny_list` サイト設定を使用してください。"
     errors:
       invalid_excluded_emoji: "「Discourse リアクション対応リアクション」含まれない絵文字を除外できません。また、「「いいね！」に対する Discourse リアクション」に使用される絵文字は除外できません。"
   badges:
diff --git a/plugins/discourse-reactions/config/locales/server.zh_CN.yml b/plugins/discourse-reactions/config/locales/server.zh_CN.yml
index 92fbd70bfadbe..a844449172ec4 100644
--- a/plugins/discourse-reactions/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-reactions/config/locales/server.zh_CN.yml
@@ -13,7 +13,7 @@ zh_CN:
     discourse_reactions_desaturated_reaction_panel: "通过在悬停前显示不饱和的回应，减少回应的视觉噪音。"
     discourse_reactions_excluded_from_like: "不计为“赞”的回应。任何不在此列表中的回应都将计为“赞”，用于徽章、报告和其他目的。"
     discourse_reactions_like_sync_enabled: "如果启用此功能，历史回应将创建其匹配的“赞”记录，`discourse_reactions_excluded_from_like` 中定义的回应除外。此同步将在后台定期发生，当您更改 `discourse_reactions_excluded_from_like` 时也会进行同步。"
-    discourse_reactions_allow_any_emoji: "如果启用此设置，将添加一个按钮，允许用户在回应中选择任意自定义表情符号。要限制用户可用表情符号的范围，请使用 `emoji_deny_list` 站点设置。"
+    discourse_reactions_allow_any_emoji: "如果启用此设置，将添加一个按钮，允许用户在回应选择器中选择任意表情符号。成员将被允许选择任何表情符号，包括自定义表情符号，用于回应。要限制可用回应，请使用 `emoji_deny_list` 站点设置。"
     errors:
       invalid_excluded_emoji: "您不能排除不在 'discourse reactions enabled reactions' 中的表情符号，也不能排除用于 'discourse reactions reaction for like' 的表情符号。"
   badges:
diff --git a/plugins/discourse-rewind/config/locales/client.ar.yml b/plugins/discourse-rewind/config/locales/client.ar.yml
index c5a79611ff1d2..b0eb7a3ad33d0 100644
--- a/plugins/discourse-rewind/config/locales/client.ar.yml
+++ b/plugins/discourse-rewind/config/locales/client.ar.yml
@@ -5,29 +5,317 @@
 # https://translate.discourse.org/
 
 ar:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_rewind: "Discourse Rewind"
   js:
     discourse_rewind:
+      placeholder: Discourse Rewind
+      title: Rewind
+      loading: "جارٍ تجهيز الشبكات.."
+      viewing_other_user: "أنت تشاهد تقرير <strong>%{username}</strong> في ميزة Discourse Rewind."
+      cannot_view_rewind_gibberish: >
+        [تم رفض الوصول:: فشل روتين إعادة تشغيل النظام الرئيسي]<br><br> جارٍ تهيئة سجل الشذوذ...<br><br> &nbsp;&nbsp;>> نقص في سعة المخزن المؤقت الكمي ⧛<br> &nbsp;&nbsp;>> انحراف التكافؤ بين العقد (Δ=004.33)<br> &nbsp;&nbsp;>> جزء من الحزمة ϟ عند الإزاحة ∇47<br> &nbsp;&nbsp;>> انتهت مهلة مصافحة قناة التدفق<br><br>
+      cannot_view_rewind: >
+        لا يتوفر عرض تقرير Discourse Rewind هذا. قد يكون المالك لم يشارك التقرير للجمهور؟<br><br>$> _<br><br>
+      preferences:
+        enable_rewind: "فعّل ميزة Discourse Rewind. سيعرض هذا ملخص نشاطك السنوي في ملفك الشخصي وعلى صورتك الرمزية."
+        share_publicly: "شارك ملخص نشاطك السنوي في Discourse Rewind مع أعضاء المنتدى الآخرين. سيتمكّن أي عضو من الاطلاع على ملخصك."
+        cannot_share_when_profile_hidden: "لكي تتمكن من مشاركة Rewind، يجب السماح للآخرين بعرض ملفك الشخصي العام."
+      profile_link: "عرض ملخص نشاطك في Discourse Rewind لعام %{rewindYear}"
       share:
         toggle_label:
           private: "خاص"
           public: "عام"
+        confirm: "تأكد من مراجعة ملخص Rewind لديك قبل مشاركته، فقد يتضمن بيانات من الرسائل الشخصية. يمكنك إعادة جعله خاصًا في أي وقت."
+        confirm_button:
+          enable: "اجعله عامًا"
+          disable: "اجعله خاصًا"
+        enabled_success: "يمكنك الآن مشاركة ملخص Rewind مع أعضاء المنتدى الآخرين."
+        disabled_success: "أصبح ملخص Rewind الآن خاصًا."
       reports:
+        activity_calendar:
+          title: جدول النشاط
+          cell_title:
+            visited_no_posts: "لقد زرت المنتدى وتصفحت المحتوى في %{date}، لكنك لم تنشر أي منشورات."
+            visited_no_posts_others: "زار %{username} المنتدى وتصفّح المحتوى في %{date}، لكنه لم ينشر أي منشورات."
+            visited_with_posts:
+              zero: "لم تنشئ أي منشورات في %{date}."
+              one: "أنشأت منشورًا واحدًا في %{date}."
+              two: "أنشأت منشورين في %{date}."
+              few: "أنشأت %{count} منشورات في %{date}."
+              many: "أنشأت %{count} منشورًا في %{date}."
+              other: "أنشأت %{count} منشور في %{date}."
+            visited_with_posts_others:
+              zero: "أنشأ %{username} %{count} منشور في %{date}."
+              one: "أنشأ %{username} منشورًا واحدًا في %{date}."
+              two: "أنشأ %{username} منشورين في %{date}."
+              few: "أنشأ %{username} %{count} منشورات في %{date}."
+              many: "أنشأ %{username} %{count} منشورًا في %{date}."
+              other: "أنشأ %{username} %{count} منشور في %{date}."
+            no_activity: "لم تكن متواجدًا في المنتدى في %{date}."
+            no_activity_others: "لم يكن %{username} متواجدًا في المنتدى في %{date}."
+        top_words:
+          title: استخدام الكلمات
         reading_time:
           title: وقت القراءة
+          book_comparison: "لقد قضيت <code>%{readingTime}</code> في القراءة على موقعنا! هذا الوقت يعادل الوقت اللازم لقراءة <i>%{bookTitle}</i>"
+          book_comparison_others: "قضى %{username} <code>%{readingTime}</code> في القراءة على موقعنا! هذا الوقت يعادل الوقت اللازم لقراءة <i>%{bookTitle}</i>"
+        post_used_reactions:
+          title: أكثر التفاعلات استخدامًا في الموضوعات
+          total_number: "إجمالي عدد التفاعلات: %{count}"
+        post_received_reactions:
+          title: أكثر التفاعلات الواردة في المواضيع
+        fbff:
+          title: صديقك المفضل إلى الأبد في المنتدى
+          title_others: "صديق %{username} المفضل إلى الأبد في المنتدى"
+        most_viewed_categories:
+          title:
+            zero: ليست لديك فئات حققت مشاهدة أكثر من غيرها
+            one: الفئة الأكثر مشاهدة لديك
+            two: الفئتان الأكثر مشاهدة لديك
+            few: أكثر %{count} فئات مشاهدة لديك
+            many: أكثر %{count} فئة مشاهدة لديك
+            other: أكثر %{count} فئة مشاهدة لديك
+          title_others:
+            zero: "ليست لدى %{username} فئات حققت مشاهدة أكثر من غيرها"
+            one: "الفئة الأكثر مشاهدة لدى %{username}"
+            two: "الفئتان الأكثر مشاهدة لدى %{username}"
+            few: "أكثر %{count} فئات مشاهدة لدى %{username}"
+            many: "أكثر %{count} فئة مشاهدة لدى %{username}"
+            other: "أكثر %{count} فئة مشاهدة لدى %{username}"
+        most_viewed_tags:
+          title:
+            zero: ليست لديك وسوم حققت مشاهدة أكثر من غيرها
+            one: الوسم الأكثر مشاهدة لديك
+            two: الوسمان الأكثر مشاهدة لديك
+            few: أكثر %{count} وسوم مشاهدة لديك
+            many: أكثر %{count} وسمًا مشاهدة لديك
+            other: أكثر %{count} وسم مشاهدة لديك
+          title_others:
+            zero: "ليست لدى %{username} وسوم حققت مشاهدة أكثر من غيرها"
+            one: "الوسم الأكثر مشاهدة لدى %{username}"
+            two: "الوسمان الأكثر مشاهدة لدى %{username}"
+            few: "أكثر %{count} وسوم مشاهدة لدى %{username}"
+            many: "أكثر %{count} وسمًا مشاهدة لدى %{username}"
+            other: "أكثر %{count} وسم مشاهدة لدى %{username}"
+        best_topics:
+          view_topic: عرض الموضوع
+          title:
+            zero: ليست لديك أي موضوعات مثالية
+            one: أفضل موضوع لديك
+            two: أفضل موضوعين لديك
+            few: أفضل %{count} موضوعات لديك
+            many: أفضل %{count} موضوعًا لديك
+            other: أفضل %{count} موضوع لديك
+          title_others:
+            zero: "ليست لدى %{username} أي موضوعات مثالية"
+            one: "أفضل موضوع لدى %{username}"
+            two: "أفضل موضوعين لدى %{username}"
+            few: "أفضل %{count} موضوعات لدى %{username}"
+            many: "أفضل %{count} موضوعًا لدى %{username}"
+            other: "أفضل %{count} موضوع لدى %{username}"
+        best_posts:
+          view_post: عرض المنشور
+          title:
+            zero: ليس لديك منشور مثالي
+            one: أفضل منشور لديك
+            two: أفضل منشورين لديك
+            few: أفضل %{count} منشورات لديك
+            many: أفضل %{count} منشورًا لديك
+            other: أفضل %{count} منشور لديك
+          title_others:
+            zero: "ليس لدى %{username} منشور مثالي"
+            one: "أفضل منشور لدى %{username}"
+            two: "أفضل منشوران لدى %{username}"
+            few: "أفضل %{count} منشورات لدى %{username}"
+            many: "أفضل %{count} منشورًا لدى %{username}"
+            other: "أفضل %{count} منشور لدى %{username}"
+        ai_usage:
+          title: استخدام الذكاء الاصطناعي
+          total_requests: إجمالي الطلبات
+          total_tokens: إجمالي الرموز
+          success_rate: معدل النجاح
+          favorite_features: الميزات الأكثر استخدامًا
+          favorite_models: نماذج الذكاء الاصطناعي الأكثر استخدامًا
+          wake_up: "انهض يا %{username}..."
+          system_title: "تم رصد استخدام تقنيات الذكاء الاصطناعي"
+          section_features: "أهم الميزات"
+          section_models: "أفضل النماذج"
         assignments:
+          title: المهام
+          total_assigned: المهام المعينة لي
           total_assigned_others: "معيَّن إلى %{username}"
+          completed: قائمة المهام المكتملة
+          pending: المهام المعلقة
+          assigned_by_user: المهام المعطاة
+          completion_rate: معدل الإكمال
         chat_usage:
+          title: نشاط الدردشة
+          total_messages: إجمالي الرسائل
+          reactions_received: التفاعلات المستلمة
+          avg_message_length: متوسط طول الرسالة
+          favorite_channels: القنوات المفضلة
           messages: الرسائل
+          bot_name: XxRewindBotxX
           author: أنت
           author_others: "%{username}"
+          channel_title: "#نشاط_الدردشة"
           status_online: "● متصل"
+          message_1:
+            zero: "لقد أرسلت <strong>%{count}</strong> من الرسائل هذا العام!"
+            one: "لقد أرسلت رسالة واحدة (<strong>%{count}</strong>) هذا العام!"
+            two: "لقد أرسلت رسالتين (<strong>%{count}</strong>) هذا العام!"
+            few: "لقد أرسلت <strong>%{count}</strong> رسائل هذا العام!"
+            many: "لقد أرسلت <strong>%{count}</strong> رسالة هذا العام!"
+            other: "لقد أرسلت <strong>%{count}</strong> رسالة هذا العام!"
+          reply_1: "هذا رائع B-)"
+          message_2_MF: |
+            { dm_count, plural,
+                zero {ليس لديك أي محادثات خاصة}one {لديك محادثة خاصة واحدة (<strong>#</strong>)}
+                two {لديك محادثتان خاصتان (<strong>#</strong>)}
+                few {لديك <strong>#</strong> محادثات خاصة}
+                many {لديك <strong>#</strong> محادثة خاصة}
+              other {لديك <strong>#</strong> محادثة خاصة}
+            } مع{ channel_count, plural,
+                zero {أي شخص أو مجموعة}one {شخص واحد أو مجموعة واحدة (<strong>#</strong>)}
+                two {شخصين مختلفين أو مجموعتين مختلفتين (<strong>#</strong>)}
+                few {<strong>#</strong> أشخاص مختلفين أو مجموعات مختلفة}
+                many {<strong>#</strong> شخصًا مختلفًا أو مجموعة مختلفة}
+              other {<strong>#</strong> شخص مختلف أو مجموعة مختلفة}
+            }.
+          reply_2: "ممتاااااز :D"
+          message_3:
+            zero: "أحب الناس رسائلك! حصلت على <strong>%{count}</strong> من التفاعلات ❤️"
+            one: "أحب الناس رسائلك! حصلت على تفاعل واحد (<strong>%{count}</strong>) ❤️"
+            two: "أحب الناس رسائلك! حصلت على تفاعلين (<strong>%{count}</strong>) ❤️"
+            few: "أحب الناس رسائلك! حصلت على <strong>%{count}</strong> تفاعلات ❤️"
+            many: "أحب الناس رسائلك! حصلت على <strong>%{count}</strong> تفاعلًا ❤️"
+            other: "أحب الناس رسائلك! حصلت على <strong>%{count}</strong> تفاعل ❤️"
+          reply_3: "r0fl rAwr 8-)"
+          message_4: "بلغ متوسط طول رسالتك <strong>%{length}</strong> من الأحرف"
+          message_5: "قنواتك المفضلة:"
+          dancing_baby_alt: "طفل راقص"
+        favorite_gifs:
+          title:
+            zero: صورة GIF المفضلة لديك
+            one: صورة GIF المفضلة لديك
+            two: صورتا GIF المفضلتان لديك
+            few: صور GIF الـ%{count} المفضلة لديك
+            many: صور GIF الـ%{count} المفضلة لديك
+            other: صور GIF الـ%{count} المفضلة لديك
+          title_others:
+            zero: "صورة GIF المفضلة لدى %{username}"
+            one: "صورة GIF المفضلة لدى %{username}"
+            two: "صورتا GIF المفضلتان لدى %{username}"
+            few: "صور GIF الـ%{count} المفضلة لدى %{username}"
+            many: "صور GIF الـ%{count} المفضلة لدى %{username}"
+            other: "صور GIF الـ%{count} المفضلة لدى %{username}"
+          total_usage:
+            zero: ليس هناك أي استخدامات
+            one: الاستخدام مرة واحدة
+            two: إجمالي الاستخدام مرتين
+            few: إجمالي الاستخدام %{count} مرات
+            many: إجمالي الاستخدام %{count} مرة
+            other: إجمالي الاستخدام %{count} مرة
         invites:
           title: الدعوات
+          total_invites: إجمالي الدعوات المرسلة
+          redeemed: الدعوات المقبولة
+          redemption_rate: معدل القبول
+          avg_trust_level: متوسط مستوى الثقة
+          invitee_impact: تأثير المدعوين
+          invitee_impact_others: "تأثير المدعوين من %{username}"
           invitee_posts: منشور تم إنشاؤه
+          invitee_topics: المواضيع المطروحة
           invitee_likes: تسجيلات الإعجاب الممنوحة
+          most_active_invitee: المدعو الأكثر نشاطًا
+          guest_book_title: سجل الزوار
+          guest_book_subtitle: دعوات مجتمعك
+          guest_book_subtitle_others: "دعوات مجتمع %{username}"
           label_invitations_sent: "تم إرسال الدعوات:"
+          label_guests_joined: "الدعوات المقبولة:"
+          label_acceptance_rate: "معدل القبول:"
+          section_contributions: مساهمات المدعوين
+          label_posts_written: "المنشورات المكتوبة:"
+          label_topics_started: "الموضوعات المطروحة:"
+          label_likes_given: "تسجيلات الإعجاب الممنوحة:"
+          section_most_active: الضيف الأكثر نشاطًا
         new_user_interactions:
+          title: توجيه المستخدمين الجدد
+          subtitle:
+            zero: لم تساعد أي مستخدمين جددًا هذا العام
+            one: ساعدت مستخدمًا واحدًا جديدًا هذا العام
+            two: ساعدت مستخدمين جديدين هذا العام
+            few: ساعدت %{count} مستخدمين جددًا هذا العام
+            many: ساعدت %{count} مستخدمًا جديدًا هذا العام
+            other: ساعدت %{count} مستخدم جديد هذا العام
+          subtitle_others:
+            zero: "لم يساعد %{username} أي مستخدمين جددًا هذا العام"
+            one: "ساعد %{username} مستخدمًا واحدًا جديدًا هذا العام"
+            two: "ساعد %{username} مستخدمين جديدين هذا العام"
+            few: "ساعد %{username} %{count} مستخدمين جددًا هذا العام"
+            many: "ساعد %{username} %{count} مستخدمًا جديدًا هذا العام"
+            other: "ساعد %{username} %{count} مستخدم جديد هذا العام"
+          new_member:
+            zero: "ليس هناك أي أعضاء جدد"
+            one: "عضو واحد جديد"
+            two: "عضوان جديدان"
+            few: "%{count} أعضاء جددًا"
+            many: "%{count} عضوًا جديدًا"
+            other: "%{count} عضو جديد"
+          total_interactions: إجمالي التفاعلات
+          unique_new_users: المستخدمون الجدد الفريدون
           likes_given: تسجيلات الإعجاب الممنوحة
+          replies: الردود على المنشورات
           mentions: الإشارات
+          topics_with_new_users: الموضوعات التي شارك فيها المستخدمون الجدد
+          contributions_helped: كانت مساهماتك مفيدة
+          contributions_helped_others: "كانت مساهمات %{username} مفيدة"
+        time_of_day_activity:
+          title: روتين النشاط اليومي
+          play_button: استمع إلى نشاطك على شكل صوت
+          play_button_others: "استمع إلى نشاط %{username} على شكل صوت"
+          stop_button: إيقاف تشغيل الصوت
         writing_analysis:
+          title: تحليل الكتابة
+          menu_file: ملف
           menu_other: أخرى
+          menu_additional: إضافي
+          menu_opening: مفتوح
+          help_text: اضغط على F1 للحصول على المساعدة
+          app_name: محترف في DiscoStar
+          release_info: إصدار %{rewindYear} من CDCK
+          total_words: إجمالي الكلمات
+          total_posts: إجمالي المنشورات
+          avg_post_length: متوسط طول المنشور
+          readability_score_label: درجة سهولة القراءة
+          readability_level: مستوى سهولة القراءة
+          readability_score:
+            over_80:
+              1: "إرنست همنغواي"
+              2: "ريموند كارفر"
+              3: "مايكل كرايتون"
+              4: "روالد دال"
+            over_60:
+              1: "سي إس لويس"
+              2: "ستيفن كينغ"
+              3: "أغاثا كريستي"
+              4: "جورج آر آر مارتن"
+            over_40:
+              1: "جورج أورويل"
+              2: "إف. سكوت فيتزجيرالد"
+              3: "ألدوس هكسلي"
+              4: "جوان ديديون"
+            over_20:
+              1: "كورماك مكارثي"
+              2: "ويليام فولكنر"
+              3: "فيرجينيا وولف"
+              4: "غابرييل غارسيا ماركيز"
+            over_0:
+              1: "جيمس جويس"
+              2: "توماس بينشون"
+              3: "ديفيد فوستر والاس"
+              4: "فيودور دوستويفسكي"
diff --git a/plugins/discourse-rewind/config/locales/client.de.yml b/plugins/discourse-rewind/config/locales/client.de.yml
index f8782dc3ae190..423d2be5c9eaa 100644
--- a/plugins/discourse-rewind/config/locales/client.de.yml
+++ b/plugins/discourse-rewind/config/locales/client.de.yml
@@ -12,7 +12,7 @@ de:
           discourse_rewind: "Discourse Rückblick"
   js:
     discourse_rewind:
-      placeholder: Discourse Rückblick
+      placeholder: Discourse-Rückblick
       title: Rückblick
       loading: "Splines werden retikuliert …"
       viewing_other_user: "Du siehst dir gerade den Discourse-Rückblick-Bericht von <strong>%{username}</strong> an."
@@ -21,7 +21,7 @@ de:
       cannot_view_rewind: >
         Du kannst diesen Discourse-Rückblick-Bericht nicht anzeigen.  Vielleicht hat der Eigentümer ihn nicht öffentlich freigegeben?<br><br> $> _<br><br>
       preferences:
-        enable_rewind: "Discourse Rückblick aktivieren. Dadurch wird die Jahresübersicht deiner Aktivitäten in deinem Profil und auf deinem Avatar angezeigt."
+        enable_rewind: "Discourse-Rückblick aktivieren. Dadurch wird die Jahresübersicht deiner Aktivitäten in deinem Profil und auf deinem Avatar angezeigt."
         share_publicly: "Discourse-Rückblick mit anderen Forenmitgliedern teilen. Jedes Forenmitglied kann deinen Discourse-Rückblick ansehen."
         cannot_share_when_profile_hidden: "Um den Rückblick zu teilen, musst du anderen erlauben, dein öffentliches Profil anzusehen."
       profile_link: "Schau deinen Rückblick für %{rewindYear} an"
@@ -100,14 +100,14 @@ de:
           success_rate: Erfolgsquote
           favorite_features: Meistgenutzte Funktionen
           favorite_models: Meistgenutzte KI-Modelle
-          wake_up: "Wach auf, %{username}…"
+          wake_up: "Aufwachen, %{username} …"
           system_title: "KI-NUTZUNG ERKANNT"
           section_features: "TOP FUNKTIONEN"
           section_models: "TOP-KI-MODELLE"
         assignments:
           title: Zuordnungen
           total_assigned: Mir zugeordnet
-          total_assigned_others: "%{username} Zugeordnet"
+          total_assigned_others: "%{username} zugeordnet"
           completed: Abgeschlossene Zuordnungen
           pending: Ausstehende Zuordnungen
           assigned_by_user: Erhaltene Zuordnungen
diff --git a/plugins/discourse-rewind/config/locales/client.el.yml b/plugins/discourse-rewind/config/locales/client.el.yml
index cd37aec6ff04d..8642b767f3d14 100644
--- a/plugins/discourse-rewind/config/locales/client.el.yml
+++ b/plugins/discourse-rewind/config/locales/client.el.yml
@@ -7,6 +7,7 @@
 el:
   js:
     discourse_rewind:
+      placeholder: Discourse Rewind
       share:
         toggle_label:
           private: "Ιδιωτική"
@@ -15,17 +16,47 @@ el:
         reading_time:
           title: Χρόνος ανάγνωσης
         chat_usage:
+          title: Δραστηριότητα Συνομιλίας
+          total_messages: Συνολικά Μηνύματα
+          dm_messages: Άμεσα Μηνύματα
+          unique_dm_channels: Συνομιλίες Άμεσων Μηνυμάτων
+          reactions_received: Ληφθείσες Αντιδράσεις
+          avg_message_length: Μέσο Μήκος Μηνύματος
+          favorite_channels: Αγαπημένα Κανάλια
           messages: μηνύματα
+          bot_name: XxRewindBotxX
           author: Εσείς
           author_others: "%{username}"
+          channel_title: "#chat-activity"
           status_online: "● σε σύνδεση"
+          message_1:
+            one: "Στείλατε <strong>%{count}</strong> μήνυμα φέτος!"
+            other: "Στείλατε <strong>%{count}</strong> μηνύματα φέτος!"
+          reply_1: "lol awesome B-)"
+          message_2_MF: |
+            Είχατε { dm_count, plural,
+                one {<strong>#</strong> συζήτηση ΑΜ}
+              other {<strong>#</strong> συζητήσεις ΑΜ}
+            } με { channel_count, plural,
+                one {<strong>#</strong> άτομο ή ομάδα}
+              other {<strong>#</strong> διαφορετικά άτομα ή ομάδες}
+            }.
+          reply_2: "cOo0oL :D"
+          message_3:
+            one: "Ο κόσμος λάτρεψε τα μηνύματά σας! Πήρατε <strong>%{count}</strong> αντίδραση ❤️"
+            other: "Ο κόσμος λάτρεψε τα μηνύματά σας! Πήρατε <strong>%{count}</strong> αντιδράσεις ❤️"
+          reply_3: "r0fl rAwr 8-)"
+          message_4: "Το μέσο μήκος των μηνυμάτων σας ήταν <strong>%{length}</strong> χαρακτήρες"
+          message_5: "Τα αγαπημένα σας κανάλια:"
+          dancing_baby_alt: "Μωρό που χορεύει"
         invites:
           title: Προσκλήσεις
           invitee_posts: Δημιουργημένες Αναρτήσεις
-          invitee_likes: Μου αρέσει που αποδόθηκαν
+          invitee_likes: Μου αρέσει που δόθηκαν
           label_invitations_sent: "Οι προσκλήσεις στάλθηκαν:"
+          label_likes_given: "\"Μου αρέσει\" που δόθηκαν:"
         new_user_interactions:
-          likes_given: Μου αρέσει που αποδόθηκαν
+          likes_given: Μου αρέσει που δόθηκαν
           mentions: Επισημάνσεις
         writing_analysis:
           menu_other: Άλλα
diff --git a/plugins/discourse-rewind/config/locales/client.fr.yml b/plugins/discourse-rewind/config/locales/client.fr.yml
index 72a766b67bcf1..1dae7b8f0ac43 100644
--- a/plugins/discourse-rewind/config/locales/client.fr.yml
+++ b/plugins/discourse-rewind/config/locales/client.fr.yml
@@ -15,7 +15,7 @@ fr:
         reading_time:
           title: Temps de lecture
         assignments:
-          title: Affectations
+          title: Attributions
           total_assigned_others: "Attribué à %{username}"
         chat_usage:
           messages: messages directs
diff --git a/plugins/discourse-rewind/config/locales/client.ja.yml b/plugins/discourse-rewind/config/locales/client.ja.yml
index e0d44e4699c21..365e2e6663c6c 100644
--- a/plugins/discourse-rewind/config/locales/client.ja.yml
+++ b/plugins/discourse-rewind/config/locales/client.ja.yml
@@ -5,29 +5,219 @@
 # https://translate.discourse.org/
 
 ja:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_rewind: "Discourse Rewind"
   js:
     discourse_rewind:
+      placeholder: Discourse Rewind
+      title: Rewind
+      loading: "網目状のスプライン..."
+      viewing_other_user: "<strong>%{username}</strong> の Discourse Rewind レポートを表示中です。"
+      cannot_view_rewind_gibberish: >
+        [ACCESS DENIED::REWIND MAINFRAME SUBROUTINE FAILURE]<br><br> Bootstrapping anomaly log...<br><br> &nbsp;&nbsp;>> quantum buffer underrun ⧛<br> &nbsp;&nbsp;>> cross-node parity drift (Δ=004.33)<br> &nbsp;&nbsp;>> packet ϟ fragment at offset ∇47<br> &nbsp;&nbsp;>> flux conduit handshake TIMED OUT<br><br>
+      cannot_view_rewind: >
+        この Discourse Rewind レポートを表示できません。オーナーが公開していない可能性があります。<br><br> $> _<br><br>
+      preferences:
+        enable_rewind: "Discourse Rewind を有効にする。これにより、プロフィールとアバターに年末のアクティビティの要約が表示されます。"
+        share_publicly: "Discourse Rewind サマリーを他のフォーラムメンバーを共有する。すべてのフォーラムメンバーがあなたの Discourse Rewind サマリーを閲覧できるようになります。"
+        cannot_share_when_profile_hidden: "Rewind を共有するには、他のユーザーがあなたの公開プロフィールを閲覧できるようにする必要があります。"
+      profile_link: "%{rewindYear} Discourse Rewind を見る"
       share:
         toggle_label:
           private: "非公開"
           public: "公開"
+        confirm: "共有する前に Rewind を必ず確認してください。個人メッセージのデータが含まれる可能性があります。いつでも非公開に設定できます。"
+        confirm_button:
+          enable: "公開する"
+          disable: "非公開にする"
+        enabled_success: "あなたの Rewind を他のフォーラムメンバーと共有できるようになりました。"
+        disabled_success: "あなたの Rewind は非公開になりました。"
       reports:
+        activity_calendar:
+          title: アクティビティカレンダー
+          cell_title:
+            visited_no_posts: "%{date} に訪問して閲覧しましたが、投稿しませんでした。"
+            visited_no_posts_others: "%{username} が %{date} に訪問して閲覧しましたが、投稿しませんでした。"
+            visited_with_posts:
+              other: "%{date} に %{count} 件投稿しました。"
+            visited_with_posts_others:
+              other: "%{username} が %{date} に %{count} 件投稿しました。"
+            no_activity: "%{date} にはアクセスしていませんでした。"
+            no_activity_others: "%{username} は %{date} にはアクセスしていませんでした。"
+        top_words:
+          title: 語の使用状況
         reading_time:
           title: 閲覧時間
+          book_comparison: "<code>%{readingTime}</code>、このサイトを読んでいました！<i>%{bookTitle}</i> を読み終えるのにかかる時間です"
+          book_comparison_others: "%{username} は <code>%{readingTime}</code>、このサイトを読んでいました！<i>%{bookTitle}</i> を読み終えるのにかかる時間です"
+        post_used_reactions:
+          title: トピックで最も使用されたリアクション
+          total_number: "合計リアクション数: %{count}"
+        post_received_reactions:
+          title: トピックで最も受けたリアクション
+        fbff:
+          title: あなたの FBFF (フォーラムのベストフレンドフォーエバー)
+          title_others: "%{username} の FBFF (フォーラムのベストフレンドフォーエバー)"
+        most_viewed_categories:
+          title:
+            other: あなたが最も閲覧したカテゴリ上位 %{count}
+          title_others:
+            other: "%{username} が最も閲覧したカテゴリ上位 %{count}"
+        most_viewed_tags:
+          title:
+            other: あなたが最も閲覧したタグ上位 %{count}
+          title_others:
+            other: "%{username} が最も閲覧したタグ上位 %{count}"
+        best_topics:
+          view_topic: トピックを見る
+          title:
+            other: あなたのトピック上位 %{count}
+          title_others:
+            other: "%{username} のトピック上位 %{count}"
+        best_posts:
+          view_post: 投稿を見る
+          title:
+            other: あなたの投稿上位 %{count}
+          title_others:
+            other: "%{username} の投稿上位 %{count}"
+        ai_usage:
+          title: AI の使用状況
+          total_requests: 合計リクエスト
+          total_tokens: 合計トークン
+          success_rate: 成功率
+          favorite_features: 最も使用された機能
+          favorite_models: 最も使用された AI モデル
+          wake_up: "目を覚まして、%{username}..."
+          system_title: "AI の使用が検出されました"
+          section_features: "上位機能"
+          section_models: "上位モデル"
         assignments:
+          title: タスク
+          total_assigned: 自分に割り当てられたタスク
           total_assigned_others: "が %{username} に割り当てました"
+          completed: 完了したタスク
+          pending: 保留中のタスク
+          assigned_by_user: 与えられたタスク
+          completion_rate: 完了率
         chat_usage:
+          title: チャットアクティビティ
+          total_messages: 合計メッセージ数
+          reactions_received: 受け取ったリアクション
+          avg_message_length: 平均メッセージ長
+          favorite_channels: お気に入りのチャンネル
           messages: メッセージ
+          bot_name: XxRewindBotxX
           author: あなた
           author_others: "%{username}"
+          channel_title: "#チャットアクティビティ"
           status_online: "● オンライン"
+          message_1:
+            other: "今年、<strong>%{count}</strong> 件のメッセージを送信しました！"
+          reply_1: "笑 すごいね B-)"
+          message_2_MF: |
+            { dm_count, plural,
+                other {<strong>#</strong> 件の DM 会話}
+            }を{ channel_count, plural,
+                other {<strong>#</strong> 人のユーザーまたはグループ}
+            }と行いました。
+          reply_2: "いいねぇ :D"
+          message_3:
+            other: "あなたのメッセージは大好評でした！<strong>%{count}</strong> 件のリアクションがありました ❤️"
+          reply_3: "やったー 8-)"
+          message_4: "平均メッセージ長は <strong>%{length}</strong> 文字でした"
+          message_5: "お気に入りのチャンネル:"
+          dancing_baby_alt: "ダンシングベイビー"
+        favorite_gifs:
+          title:
+            other: あなたのお気に入りの GIF 上位 %{count}
+          title_others:
+            other: "%{username} のお気に入りの GIF 上位 %{count}"
+          total_usage:
+            other: 合計 %{count} 回使用
         invites:
           title: 招待
+          total_invites: 送信した合計招待数
+          redeemed: 承諾された招待数
+          redemption_rate: 承諾率
+          avg_trust_level: 平均信頼レベル
+          invitee_impact: あなたの招待者のインパクト
+          invitee_impact_others: "%{username} の招待者のインパクト"
           invitee_posts: 作成した投稿数
+          invitee_topics: 開始したトピック数
           invitee_likes: '「いいね！」した数'
+          most_active_invitee: 最もアクティブな招待者
+          guest_book_title: ゲストブック
+          guest_book_subtitle: あなたのコミュニティーへの招待
+          guest_book_subtitle_others: "%{username} のコミュニティーへの招待"
           label_invitations_sent: "招待状を送信しました:"
+          label_guests_joined: "承諾された招待数:"
+          label_acceptance_rate: "承諾率:"
+          section_contributions: 招待者の貢献
+          label_posts_written: "作成した投稿数:"
+          label_topics_started: "開始したトピック数:"
+          label_likes_given: "与えられた「いいね！」数:"
+          section_most_active: 最もアクティブなゲスト
         new_user_interactions:
+          title: 新しいユーザーのメンタリング
+          subtitle:
+            other: 今年、%{count} 人の新規ユーザーを支援しました
+          subtitle_others:
+            other: "%{username} は今年、%{count} 人の新規ユーザーを支援しました"
+          new_member:
+            other: "%{count} 人の新規メンバー"
+          total_interactions: 合計インタラクション
+          unique_new_users: ユニーク新規ユーザー
           likes_given: '「いいね！」した数'
+          replies: 投稿への返信
           mentions: メンション
+          topics_with_new_users: 新規ユーザーのトピック
+          contributions_helped: あなたの貢献が役立ちました
+          contributions_helped_others: "%{username} の貢献が役立ちました"
+        time_of_day_activity:
+          title: 1 日のアクティビティリズム
+          play_button: アクティビティを音で再生
+          play_button_others: "%{username} のアクティビティを音で再生"
+          stop_button: 音声の再生を停止
         writing_analysis:
+          title: 作文の分析
+          menu_file: ファイル
           menu_other: その他
+          menu_additional: 追加
+          menu_opening: 開く
+          help_text: F1 でヘルプを表示
+          app_name: DiscoStar Professional
+          release_info: CDCK から %{rewindYear} 年リリース
+          total_words: 合計語数
+          total_posts: 合計投稿数
+          avg_post_length: 平均投稿長
+          readability_score_label: 可読性スコア
+          readability_level: 可読性レベル
+          readability_score:
+            over_80:
+              1: "アーネスト・ヘミングウェイ"
+              2: "レイモンド・カーヴァー"
+              3: "マイケル・クライトン"
+              4: "ロナルド・ダール"
+            over_60:
+              1: "C.S. ルイス"
+              2: "スティーブン・キング"
+              3: "アガサ・クリスティー"
+              4: "ジョージ R.R. マーティン"
+            over_40:
+              1: "ジョージ・オーウェル"
+              2: "F. スコット・フィッツジェラルド"
+              3: "オルダス・ハクスリー"
+              4: "ジョーン・ディディオン"
+            over_20:
+              1: "コーマック・マッカーシー"
+              2: "ウィリアム・フォークナー"
+              3: "ヴァージニア・ウルフ"
+              4: "ガブリエル・ガルシア・マルケス"
+            over_0:
+              1: "ジェームス・ジョイス"
+              2: "トーマス・ピンチョン"
+              3: "デイヴィッド・フォスター・ウォレス"
+              4: "フョードル・ドストエフスキー"
diff --git a/plugins/discourse-rewind/config/locales/client.zh_CN.yml b/plugins/discourse-rewind/config/locales/client.zh_CN.yml
index ed41f4557805d..df911cf69a485 100644
--- a/plugins/discourse-rewind/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-rewind/config/locales/client.zh_CN.yml
@@ -9,102 +9,102 @@ zh_CN:
     admin:
       site_settings:
         categories:
-          discourse_rewind: "Discourse Rewind"
+          discourse_rewind: "Discourse 回顾"
   js:
     discourse_rewind:
-      placeholder: Discourse Rewind
+      placeholder: Discourse 回顾
       title: 回顾
-      loading: "正在重构样条曲线中…"
-      viewing_other_user: "您正在查看<strong>%{username}</strong>的Discourse Rewind。"
+      loading: "正在重构样条曲线…"
+      viewing_other_user: "您正在查看 <strong>%{username}</strong> 的 Discourse 回顾。"
       cannot_view_rewind_gibberish: >
-        [访问被拒绝::主机子程序回滚失败]<br><br> 引导异常日志...<br><br> &nbsp;&nbsp;>> 量子缓冲区欠载 ⧛<br> &nbsp;&nbsp;>> 跨节点奇偶校验漂移 (Δ=004.33)<br> &nbsp;&nbsp;>> 数据包 ϟ 分片偏移量 ∇47<br> &nbsp;&nbsp;>> 通量导管握手超时<br><br>
+        [ACCESS DENIED::REWIND MAINFRAME SUBROUTINE FAILURE]<br><br> Bootstrapping anomaly log...<br><br> &nbsp;&nbsp;>> quantum buffer underrun ⧛<br> &nbsp;&nbsp;>> cross-node parity drift (Δ=004.33)<br> &nbsp;&nbsp;>> packet ϟ fragment at offset ∇47<br> &nbsp;&nbsp;>> flux conduit handshake TIMED OUT<br><br>
       cannot_view_rewind: >
-        您无权访问该用户的 Discourse Rewind，可能该用户选择不公开他的回顾内容。<br><br> $> _<br><br>
+        您无法查看此 Discourse 回顾报告。也许所有者尚未公开分享？<br><br> $> _<br><br>
       preferences:
-        enable_rewind: "开启 Discourse Rewind。这将在您的个人资料和您的头像框中展示当年度的活动总结。"
-        share_publicly: "与其他论坛成员分享 Discourse Rewind 总结。任何论坛成员都可以查看您的 Discourse Rewind 总结。"
-        cannot_share_when_profile_hidden: "要分享 Rewind，您必须允许其他人查看您的公开个人资料。"
-      profile_link: "查看您 %{rewindYear} 年度的 Discourse Rewind"
+        enable_rewind: "启用 Discourse 回顾。这将在您的个人资料中和您的头像上显示年终活动总结。"
+        share_publicly: "与其他论坛成员分享 Discourse 回顾总结。任何论坛成员都可以查看您的 Discourse 回顾总结。"
+        cannot_share_when_profile_hidden: "要分享回顾，您必须允许其他人查看您的公开个人资料。"
+      profile_link: "查看您的 %{rewindYear} 年 Discourse 回顾"
       share:
         toggle_label:
           private: "不公开"
           public: "公开"
-        confirm: "在分享您的回顾记录前请仔细检查，这可能包含您的隐私信息。您可以随时将其设为私有。"
+        confirm: "在分享您的回顾前请仔细检查，其中可能包含来自个人消息的数据。您可以随时重新将其设为不公开。"
         confirm_button:
           enable: "设为公开"
-          disable: "设为私有"
-        enabled_success: "你的回顾内容现在可与其他论坛成员分享了。"
-        disabled_success: "已设为私有。"
+          disable: "设为不公开"
+        enabled_success: "您的回顾现在可与其他论坛成员分享了。"
+        disabled_success: "您的回复现在已设为非公开。"
       reports:
         activity_calendar:
           title: 活动日历
           cell_title:
-            visited_no_posts: "你在 %{date} 来潜水了，但没有发帖。"
-            visited_no_posts_others: "%{username} 在 %{date} 访问并潜水，但没有发过帖子。"
+            visited_no_posts: "您在 %{date} 访问并潜水，但没有发帖。"
+            visited_no_posts_others: "%{username} 在 %{date} 访问并潜水，但没有发帖。"
             visited_with_posts:
-              other: "你在 %{date} 发了 %{count} 篇帖子。"
+              other: "您在 %{date} 发表了 %{count} 个帖子。"
             visited_with_posts_others:
-              other: "%{username} 在 %{date} 发布了 %{count} 条帖子。"
-            no_activity: "你在 %{date} 没来过。"
-            no_activity_others: "%{username} 在 %{date} 没有活动"
+              other: "%{username} 在 %{date} 发表了 %{count} 个帖子。"
+            no_activity: "您在 %{date} 没来过。"
+            no_activity_others: "%{username} 在 %{date} 没来过。"
         top_words:
           title: 词语使用
         reading_time:
           title: 阅读时间
-          book_comparison: "您在本站上阅读了 <code>%{readingTime}</code> ！这相当于您阅读完 <i>%{bookTitle}</i> 所需要的时间。"
-          book_comparison_others: "%{username} 在我们网站上花了 <code>%{readingTime}</code> 阅读时间！这相当于阅读完 <i>%{bookTitle}</i> 这本书所需的时间。"
+          book_comparison: "您在我们的站点上阅读了 <code>%{readingTime}</code>！这相当于您读完 <i>%{bookTitle}</i> 所需的时间。"
+          book_comparison_others: "%{username} 在我们的站点上阅读了 <code>%{readingTime}</code>！这相当于读完 <i>%{bookTitle}</i> 所需的时间。"
         post_used_reactions:
           title: 话题中最常用的回应
-          total_number: "回应总数： %{count}"
+          total_number: "回应总数：%{count}"
         post_received_reactions:
-          title: 收到最多回应的主题
+          title: 收到最多回应的话题
         fbff:
-          title: 你的论坛挚友 (Forum Best FriendForever)
+          title: 您的论坛挚友
           title_others: "%{username} 的论坛挚友"
         most_viewed_categories:
           title:
-            other: 你最常浏览的 %{count} 个分类
+            other: 您最常浏览的 %{count} 个类别
           title_others:
-            other: "%{username} 的 %{count} 个最常浏览的分类"
+            other: "%{username} 最常浏览的 %{count} 个类别"
         most_viewed_tags:
           title:
-            other: 你最常浏览的 %{count} 个标签
+            other: 您最常浏览的 %{count} 个标签
           title_others:
-            other: "%{username} 的 %{count} 个最常浏览的标签"
+            other: "%{username} 最常浏览的 %{count} 个标签"
         best_topics:
           view_topic: 查看话题
           title:
-            other: 你最优秀的 %{count} 个话题
+            other: 您最好的 %{count} 个话题
           title_others:
-            other: "%{username} 的 %{count} 个最佳话题"
+            other: "%{username} 最好的 %{count} 个话题"
         best_posts:
           view_post: 查看帖子
           title:
-            other: 你最优秀的 %{count} 个帖子
+            other: 您最好的 %{count} 个帖子
           title_others:
-            other: "%{username} 的 %{count} 个最佳帖子"
+            other: "%{username} 最好的 %{count} 个帖子"
         ai_usage:
           title: AI 使用
-          total_requests: 总请求数
-          total_tokens: 总词元数
+          total_requests: 请求总数
+          total_tokens: 词元总数
           success_rate: 成功率
           favorite_features: 使用最多的功能
           favorite_models: 最常用的 AI 模型
-          wake_up: "醒醒吧， %{username}..."
+          wake_up: "醒醒吧，%{username}…"
           system_title: "检测到 AI 使用"
-          section_features: "顶级功能"
-          section_models: "顶级模型"
+          section_features: "位居前列的功能"
+          section_models: "位居前列的模型"
         assignments:
           title: 指定
           total_assigned: 指定给我
-          total_assigned_others: "已被分配至%{username}"
-          completed: 指定已完成
+          total_assigned_others: "指定给 %{username}"
+          completed: 任务已完成
           pending: 待指定的任务
           assigned_by_user: 已指定的任务
           completion_rate: 完成率
         chat_usage:
           title: 聊天活动
-          total_messages: 总消息数
+          total_messages: 消息总数
           dm_messages: 直接消息
           unique_dm_channels: 直接消息对话
           reactions_received: 收到的回应
@@ -117,24 +117,24 @@ zh_CN:
           channel_title: "#聊天活动"
           status_online: "● 在线"
           message_1:
-            other: "今年你发送了 <strong>%{count}</strong> 条消息！"
-          reply_1: "lol 超棒的 B-)"
+            other: "今年您发送了 <strong>%{count}</strong> 条消息！"
+          reply_1: "哈哈，太棒了 B-)"
           message_2_MF: |
-            你有 { dm_count, plural,
+            您有包含 { channel_count, plural,
+                other {<strong>#</strong> 个人或群组}
+            }的{ dm_count, plural,
                 other {<strong>#</strong> DM 对话}
-            } 和 { channel_count, plural,
-                other {~ ~<strong>#</strong> 不同的人或群体}
             }。
           reply_2: "酷毙了 :D"
           message_3:
-            other: "大家都很喜欢你的留言！你收到了 <strong>%{count}</strong> 个回应 ❤️"
+            other: "大家都很喜欢您的消息！您收到了 <strong>%{count}</strong> 个回应 ❤️"
           reply_3: "r0fl rAwr 8-)"
-          message_4: "你的平均消息长度为 <strong>%{length}</strong> 个字符"
-          message_5: "你最喜欢的频道："
-          dancing_baby_alt: "跳舞宝宝（Dancing Baby）"
+          message_4: "您的平均消息长度为 <strong>%{length}</strong> 个字符"
+          message_5: "您最喜欢的频道："
+          dancing_baby_alt: "跳舞的宝宝"
         favorite_gifs:
           title:
-            other: 你最喜欢的 %{count} GIF
+            other: 您最喜欢的 %{count} 个 GIF
           title_others:
             other: "%{username} 最喜欢的 %{count} 个 GIF"
           total_usage:
@@ -145,42 +145,42 @@ zh_CN:
           redeemed: 已接受的邀请
           redemption_rate: 接受率
           avg_trust_level: 平均信任级别
-          invitee_impact: 你的受邀者带来的影响
-          invitee_impact_others: "%{username} 邀请用户的影响"
+          invitee_impact: 您的受邀者的影响
+          invitee_impact_others: "%{username} 的受邀者的影响"
           invitee_posts: 创建的帖子
-          invitee_topics: 发起的话题数
+          invitee_topics: 发起的话题
           invitee_likes: 点赞
           most_active_invitee: 最活跃的受邀者
           guest_book_title: 留言簿
-          guest_book_subtitle: 你的社区邀请
+          guest_book_subtitle: 您的社区邀请
           guest_book_subtitle_others: "%{username} 的社区邀请"
-          label_invitations_sent: "已发送邀请:"
-          label_guests_joined: "已接受邀请："
-          label_acceptance_rate: "接受率:"
-          section_contributions: 受邀者的贡献
+          label_invitations_sent: "已发送的邀请:"
+          label_guests_joined: "已接受的邀请："
+          label_acceptance_rate: "接受率："
+          section_contributions: 受邀者贡献
           label_posts_written: "撰写的帖子："
-          label_topics_started: "发起的话题:"
-          label_likes_given: "点赞数："
+          label_topics_started: "发起的话题："
+          label_likes_given: "点赞："
           section_most_active: 最活跃访客
         new_user_interactions:
           title: 指导新用户
           subtitle:
-            other: 今年你帮助了 %{count} 位新用户
+            other: 今年您帮助了 %{count} 个新用户
           subtitle_others:
             other: "%{username} 今年帮助了 %{count} 个新用户"
           new_member:
             other: "%{count} 个新成员"
-          total_interactions: 总互动次数
-          unique_new_users: 唯一新用户
+          total_interactions: 互动总数
+          unique_new_users: 唯一身份新用户
           likes_given: 点赞
           replies: 回复帖子
           mentions: 提及
           topics_with_new_users: 有新用户的话题
-          contributions_helped: 你的贡献很有帮助
-          contributions_helped_others: "%{username} 的贡献帮助了他人"
+          contributions_helped: 您的贡献很有帮助
+          contributions_helped_others: "%{username} 的贡献很有帮助"
         time_of_day_activity:
           title: 每日活动节奏
-          play_button: 以声音播放你的活动
+          play_button: 以声音播放您的活动
           play_button_others: "播放 %{username} 的活动声音"
           stop_button: 停止音频播放
         writing_analysis:
@@ -191,35 +191,35 @@ zh_CN:
           menu_opening: 正在打开
           help_text: 按 F1 获取帮助
           app_name: DiscoStar Professional
-          release_info: CDCK 于 %{rewindYear} 发布
+          release_info: 通过 CDCK 发布 %{rewindYear} 报告
           total_words: 总字数
-          total_posts: 总帖子数
+          total_posts: 帖子总数
           avg_post_length: 平均帖子长度
           readability_score_label: 可读性评分
           readability_level: 可读性级别
           readability_score:
             over_80:
-              1: "Ernest Hemingway（海明威）"
-              2: "Raymond Carver（雷蒙德·卡佛）"
-              3: "Michael Crichton（迈克尔·克莱顿）"
-              4: "Roald Dahl（罗尔德·达尔）"
+              1: "厄尼斯特·海明威（Ernest Hemingway）"
+              2: "雷蒙德·卡佛（Raymond Carver）"
+              3: "迈克尔·克莱顿（Michael Crichton）"
+              4: "罗尔德·达尔（Roald Dahl）"
             over_60:
-              1: "C.S. Lewis（C.S.刘易斯）"
-              2: "Stephen King（史蒂芬·金）"
-              3: "Agatha Christie（阿加莎·克里斯蒂）"
-              4: "George R.R. Martin（乔治·R·R·马丁）"
+              1: "C.S. 刘易斯（C.S. Lewis）"
+              2: "史蒂芬·金（Stephen King）"
+              3: "阿加莎·克里斯蒂（Agatha Christie）"
+              4: "乔治·R.R.·马丁（George R.R. Martin）"
             over_40:
-              1: "George Orwell（乔治·奥威尔）"
-              2: "F. Scott Fitzgerald（菲茨杰拉德）"
-              3: "Aldous Huxley（阿道司·赫胥黎）"
-              4: "Joan Didion（琼·狄迪恩）"
+              1: "乔治·奥威尔（George Orwell）"
+              2: "弗朗西斯·斯科特·菲茨杰拉德（F. Scott Fitzgerald）"
+              3: "奥尔德斯·赫胥黎（Aldous Huxley）"
+              4: "琼·狄迪恩（Joan Didion）"
             over_20:
-              1: "Cormac McCarthy（科马克·麦卡锡）"
-              2: "William Faulkner（威廉·福克纳）"
-              3: "Virgina Woolf（弗吉尼亚·伍尔夫）"
-              4: "Gabriel Garcia Marquez（加夫列尔·加西亚·马尔克斯）"
+              1: "科马克·麦卡锡（Cormac McCarthy）"
+              2: "威廉·福克纳（William Faulkner）"
+              3: "弗吉尼亚·伍尔夫（Virgina Woolf）"
+              4: "加夫列尔·加西亚·马尔克斯（Gabriel Garcia Marquez）"
             over_0:
-              1: "James Joyce（詹姆斯·乔伊斯）"
-              2: "Thomas Pynchon（托马斯·品钦）"
-              3: "David Foster Wallace（大卫·福斯特·华莱士）"
-              4: "Fyodor Dostoevsky（陀思妥耶夫斯基）"
+              1: "詹姆斯·乔伊斯（James Joyce）"
+              2: "托马斯·品钦（Thomas Pynchon）"
+              3: "大卫·福斯特·华莱士（David Foster Wallace）"
+              4: "费奥多尔·陀思妥耶夫斯基（Fyodor Dostoevsky）"
diff --git a/plugins/discourse-rewind/config/locales/server.ar.yml b/plugins/discourse-rewind/config/locales/server.ar.yml
index f2a8a4998e38f..b1ceb3474e78c 100644
--- a/plugins/discourse-rewind/config/locales/server.ar.yml
+++ b/plugins/discourse-rewind/config/locales/server.ar.yml
@@ -5,3 +5,12 @@
 # https://translate.discourse.org/
 
 ar:
+  site_settings:
+    discourse_rewind_enabled: "تفعيل Discourse Rewind للحصول على ملخص ممتع لنشاط الأعضاء في المجتمع في نهاية العام."
+  discourse_rewind:
+    report_failed: "فشل إنشاء تقرير Discourse Rewind."
+    invalid_year: "يمكن إنشاء Rewind فقط في شهري يناير أو ديسمبر."
+    user_not_found: "تعذّر العثور على المستخدم أو لا يمكن عرض ملفه الشخصي."
+    reports_not_cached: "لم يتم إنشاء التقارير بعد. يرجى تحديث الصفحة."
+    report_not_found: "تعذّر العثور على التقرير."
+    cannot_share_when_profile_hidden: "لكي تتمكن من مشاركة Rewind، يجب السماح للآخرين بعرض ملفك الشخصي العام."
diff --git a/plugins/discourse-rewind/config/locales/server.ja.yml b/plugins/discourse-rewind/config/locales/server.ja.yml
index 38bed0508c2ba..d5516cd41872f 100644
--- a/plugins/discourse-rewind/config/locales/server.ja.yml
+++ b/plugins/discourse-rewind/config/locales/server.ja.yml
@@ -5,3 +5,12 @@
 # https://translate.discourse.org/
 
 ja:
+  site_settings:
+    discourse_rewind_enabled: "Discourse Rewind を有効にして、コミュニティーメンバーのアクティビティに関する楽しい年末サマリーを作成する"
+  discourse_rewind:
+    report_failed: "Discourse Rewind レポートの生成に失敗しました。"
+    invalid_year: "Rewind は 1 月または 12 月にのみ生成できます。"
+    user_not_found: "ユーザーが見つからないか、表示できません。"
+    reports_not_cached: "レポートはまだ生成されていません。ページを更新してください。"
+    report_not_found: "レポートが見つかりません。"
+    cannot_share_when_profile_hidden: "Rewind を共有するには、他のユーザーがあなたの公開プロフィールを閲覧できるようにする必要があります。"
diff --git a/plugins/discourse-rewind/config/locales/server.zh_CN.yml b/plugins/discourse-rewind/config/locales/server.zh_CN.yml
index ae5db6195658a..94abceb565a6b 100644
--- a/plugins/discourse-rewind/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-rewind/config/locales/server.zh_CN.yml
@@ -6,11 +6,11 @@
 
 zh_CN:
   site_settings:
-    discourse_rewind_enabled: "启用 Discourse Rewind，回顾成员们在社区的活动，提供有趣的年终总结。"
+    discourse_rewind_enabled: "启用 Discourse 回顾，回顾成员在社区的活动，提供有趣的年终总结。"
   discourse_rewind:
-    report_failed: "未能生成 Discourse Rewind 报告。"
-    invalid_year: "回顾功能只能在1月或12月生成。"
-    user_not_found: "未找到用户或无法查看该用户。"
-    reports_not_cached: "报告尚未生成，请刷新页面。"
-    report_not_found: "未找到报告。"
-    cannot_share_when_profile_hidden: "要分享 Rewind，您必须允许其他人查看您的公开个人资料。"
+    report_failed: "无法生成 Discourse 回顾报告。"
+    invalid_year: "回顾只能在 1 月或 12 月生成。"
+    user_not_found: "找不到用户或无法查看该用户。"
+    reports_not_cached: "报告尚未生成。请刷新页面。"
+    report_not_found: "找不到报告。"
+    cannot_share_when_profile_hidden: "要分享回顾，您必须允许其他人查看您的公开个人资料。"
diff --git a/plugins/discourse-rss-polling/config/locales/client.de.yml b/plugins/discourse-rss-polling/config/locales/client.de.yml
index 2f26e73958435..1f387e3f6d09b 100644
--- a/plugins/discourse-rss-polling/config/locales/client.de.yml
+++ b/plugins/discourse-rss-polling/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_rss_polling: "Discourse – RSS-Abfrage"
+          discourse_rss_polling: "Discourse RSS-Abfrage"
   js:
     rss_polling:
       title: RSS-Abfrage
diff --git a/plugins/discourse-solved/config/locales/client.ar.yml b/plugins/discourse-solved/config/locales/client.ar.yml
index 79b4c4901ea00..9bfbaf2a4b5b0 100644
--- a/plugins/discourse-solved/config/locales/client.ar.yml
+++ b/plugins/discourse-solved/config/locales/client.ar.yml
@@ -33,6 +33,7 @@ ar:
         few: "حلول"
         many: "حلًا"
         other: "حل"
+      accepted_answer_solver_info: "تم الحل بواسطة %{user} في %{post}"
       accepted_answer_post_number: "المنشور %{post_number}"
       accepted_notification: "<p><span>%{username}</span> %{description}</p>"
       topic_status_filter:
@@ -42,6 +43,7 @@ ar:
       no_solved_topics_title: "لم تحل أي موضوعات بعد"
       no_solved_topics_title_others: "لم يحل %{username} أي موضوعات حتى الآن"
       no_solved_topics_body: "عندما تقدِّم ردًا مفيدًا على أحد الموضوعات، فقد يحدِّد مالك الموضوع أو فريق العمل ردك على أنه الحل."
+      marked_solved_by: "تم وضع علامة \"تم الحل\" بواسطة %{user}"
       move_post_cancel: "ألغِ"
       confirm_solved_removal_confirm: "تأكيد"
       confirm_solved_removal_cancel: "ألغِ"
diff --git a/plugins/discourse-solved/config/locales/client.de.yml b/plugins/discourse-solved/config/locales/client.de.yml
index a761bdab1a8a2..50d5a1087f778 100644
--- a/plugins/discourse-solved/config/locales/client.de.yml
+++ b/plugins/discourse-solved/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_solved: "Discourse – Gelöst"
+          discourse_solved: "Discourse Gelöst"
   js:
     notifications:
       alt:
diff --git a/plugins/discourse-solved/config/locales/client.ja.yml b/plugins/discourse-solved/config/locales/client.ja.yml
index 0c9bb54c51815..59d065dc74faa 100644
--- a/plugins/discourse-solved/config/locales/client.ja.yml
+++ b/plugins/discourse-solved/config/locales/client.ja.yml
@@ -28,6 +28,7 @@ ja:
       solution: "解決策"
       solution_summary:
         other: "解決策"
+      accepted_answer_solver_info: "%{user} が %{post} で解決済み"
       accepted_answer_post_number: "投稿 %{post_number}"
       accepted_notification: "<p><span>%{username}</span> %{description}</p>"
       topic_status_filter:
@@ -37,6 +38,7 @@ ja:
       no_solved_topics_title: "まだトピックを解決していません。"
       no_solved_topics_title_others: "%{username} はまだトピックを解決していません"
       no_solved_topics_body: "トピックに有益な返信を提供すると、その返信がトピックオーナーまたはスタッフによって解決策として選択される場合があります。"
+      marked_solved_by: "%{user} が解決済みに指定"
       move_post_cancel: "キャンセル"
       confirm_solved_removal_confirm: "確認"
       confirm_solved_removal_cancel: "キャンセル"
diff --git a/plugins/discourse-solved/config/locales/server.de.yml b/plugins/discourse-solved/config/locales/server.de.yml
index 2cc33089bee13..ead89bc0715f7 100644
--- a/plugins/discourse-solved/config/locales/server.de.yml
+++ b/plugins/discourse-solved/config/locales/server.de.yml
@@ -31,6 +31,7 @@ de:
   reports:
     accepted_solutions:
       title: "Akzeptierte Lösungen"
+      description: "Anzahl der pro Tag als gelöst markierten Themen innerhalb eines ausgewählten Datumsbereichs, optional nach Kategorie gefiltert, einschließlich eines 30-Tage-Vergleichswerts."
       xaxis: "Tag"
       yaxis: "Gesamt"
   solved:
diff --git a/plugins/discourse-solved/config/locales/server.el.yml b/plugins/discourse-solved/config/locales/server.el.yml
index 6d1ad1b106c66..3332cff9d9776 100644
--- a/plugins/discourse-solved/config/locales/server.el.yml
+++ b/plugins/discourse-solved/config/locales/server.el.yml
@@ -43,3 +43,4 @@ el:
     triggerables:
       first_accepted_solution:
         title: Πρώτη αποδεκτή λύση
+        doc: Πυροδοτείται όταν ένας χρήστης λαμβάνει αποδοχή μιας λύσης για πρώτη φορά.
diff --git a/plugins/discourse-solved/config/locales/server.pl_PL.yml b/plugins/discourse-solved/config/locales/server.pl_PL.yml
index a70ce75c6053e..3bc572cf4a38a 100644
--- a/plugins/discourse-solved/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-solved/config/locales/server.pl_PL.yml
@@ -31,6 +31,7 @@ pl_PL:
   reports:
     accepted_solutions:
       title: "Zaakceptowane rozwiązania"
+      description: "Ile tematów miało zaakceptowane rozwiązanie dziennie w określonym przedziale dat, z opcjonalnym filtrem kategorii i 30-dniowym porównaniem całkowitych wyników."
       xaxis: "Dzień"
       yaxis: "Wszystkie"
   solved:
diff --git a/plugins/discourse-subscriptions/config/locales/client.de.yml b/plugins/discourse-subscriptions/config/locales/client.de.yml
index 38ca59add12d0..55587e298bf59 100644
--- a/plugins/discourse-subscriptions/config/locales/client.de.yml
+++ b/plugins/discourse-subscriptions/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_subscriptions: "Discourse – Abonnements"
+          discourse_subscriptions: "Discourse Abonnements"
   site_settings:
     discourse_subscriptions_enabled: Aktiviere das Discourse-Subscriptions-Plug-in.
     discourse_subscriptions_extra_nav_subscribe: Zeige die Schaltfläche „Abonnieren“ in der Hauptnavigation
diff --git a/plugins/discourse-subscriptions/config/locales/client.el.yml b/plugins/discourse-subscriptions/config/locales/client.el.yml
index 7bad13948f59d..92103d19a8eef 100644
--- a/plugins/discourse-subscriptions/config/locales/client.el.yml
+++ b/plugins/discourse-subscriptions/config/locales/client.el.yml
@@ -5,6 +5,8 @@
 # https://translate.discourse.org/
 
 el:
+  site_settings:
+    discourse_subscriptions_enable_verbose_logging: Ενεργοποιεί πιο λεπτομερή καταγραφή για να βοηθήσει στην αποσφαλμάτωση. Παρακαλούμε μην την αφήνετε μόνιμα ενεργοποιημένη στην παραγωγή.
   js:
     discourse_subscriptions:
       title: Συνδρομές Discourse
diff --git a/plugins/discourse-subscriptions/config/locales/server.ar.yml b/plugins/discourse-subscriptions/config/locales/server.ar.yml
index 16e8616e195dd..3cde339031833 100644
--- a/plugins/discourse-subscriptions/config/locales/server.ar.yml
+++ b/plugins/discourse-subscriptions/config/locales/server.ar.yml
@@ -7,6 +7,7 @@
 ar:
   discourse_subscriptions:
     customer_not_found: لم يتم العثور على العميل
+    subscription_not_found: لم يتم العثور على الاشتراك
     card:
       declined: تم رفض البطاقة
       invalid: البطاقة غير صالحة
diff --git a/plugins/discourse-subscriptions/config/locales/server.ja.yml b/plugins/discourse-subscriptions/config/locales/server.ja.yml
index 1a5fe777b0648..fabba83ca923a 100644
--- a/plugins/discourse-subscriptions/config/locales/server.ja.yml
+++ b/plugins/discourse-subscriptions/config/locales/server.ja.yml
@@ -7,6 +7,7 @@
 ja:
   discourse_subscriptions:
     customer_not_found: お客様が見つかりません
+    subscription_not_found: サブスクリプションが見つかりません
     card:
       declined: カードが拒否されました
       invalid: カードが無効です
diff --git a/plugins/discourse-subscriptions/config/locales/server.zh_CN.yml b/plugins/discourse-subscriptions/config/locales/server.zh_CN.yml
index 630823e7b9167..291ec0fccb360 100644
--- a/plugins/discourse-subscriptions/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-subscriptions/config/locales/server.zh_CN.yml
@@ -7,7 +7,7 @@
 zh_CN:
   discourse_subscriptions:
     customer_not_found: 找不到客户
-    subscription_not_found: 未找到订阅
+    subscription_not_found: 找不到订阅
     card:
       declined: 银行卡被拒绝
       invalid: 卡片无效
diff --git a/plugins/discourse-templates/config/locales/client.ar.yml b/plugins/discourse-templates/config/locales/client.ar.yml
index d2a342abf24aa..f704470550bc2 100644
--- a/plugins/discourse-templates/config/locales/client.ar.yml
+++ b/plugins/discourse-templates/config/locales/client.ar.yml
@@ -18,6 +18,7 @@ ar:
         title: "القوالب (داخل منطقة نصية)"
         insert_template: "%{shortcut} إدراج قالب"
     templates:
+      filter_hint: "التصفية حسب الكلمة الرئيسية..."
       insert_template: "إدراج قالب"
       close_templates: "إغلاق محدِّد القوالب"
       copy: "نسخ القالب"
diff --git a/plugins/discourse-templates/config/locales/client.de.yml b/plugins/discourse-templates/config/locales/client.de.yml
index 651616ea011d7..b2fa2d3b288c2 100644
--- a/plugins/discourse-templates/config/locales/client.de.yml
+++ b/plugins/discourse-templates/config/locales/client.de.yml
@@ -11,14 +11,14 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_templates: "Discourse – Vorlagen"
+          discourse_templates: "Discourse Vorlagen"
   js:
     keyboard_shortcuts_help:
       templates:
         title: "Vorlagen (innerhalb eines Textbereichs)"
         insert_template: "%{shortcut} Vorlage einfügen"
     templates:
-      filter_hint: "Nach Stichwort filtern..."
+      filter_hint: "Nach Stichwort filtern …"
       insert_template: "Vorlage einfügen"
       close_templates: "Vorlagenauswahl schließen"
       copy: "Vorlage kopieren"
diff --git a/plugins/discourse-templates/config/locales/client.ja.yml b/plugins/discourse-templates/config/locales/client.ja.yml
index 2cf3768e09d4c..655b9b9d2906b 100644
--- a/plugins/discourse-templates/config/locales/client.ja.yml
+++ b/plugins/discourse-templates/config/locales/client.ja.yml
@@ -18,6 +18,7 @@ ja:
         title: "テンプレート (テキストエリア内)"
         insert_template: "%{shortcut} テンプレートの挿入"
     templates:
+      filter_hint: "キーワードでフィルタ..."
       insert_template: "テンプレートの挿入"
       close_templates: "テンプレートセレクタを閉じる"
       copy: "テンプレートのコピー"
diff --git a/plugins/discourse-templates/config/locales/client.zh_CN.yml b/plugins/discourse-templates/config/locales/client.zh_CN.yml
index 717f3b7d0b909..308eede7a8928 100644
--- a/plugins/discourse-templates/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-templates/config/locales/client.zh_CN.yml
@@ -18,7 +18,7 @@ zh_CN:
         title: "模板（文本区域内）"
         insert_template: "%{shortcut} 插入模板"
     templates:
-      filter_hint: "使用关键词过滤..."
+      filter_hint: "使用关键词筛选…"
       insert_template: "插入模板"
       close_templates: "关闭模板选择器"
       copy: "复制模板"
diff --git a/plugins/discourse-topic-voting/config/locales/client.ar.yml b/plugins/discourse-topic-voting/config/locales/client.ar.yml
index 8b7129176bd1e..c50d608ac9013 100644
--- a/plugins/discourse-topic-voting/config/locales/client.ar.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.ar.yml
@@ -10,6 +10,7 @@ ar:
       sort_options:
         votes: "الأصوات"
     topic_voting:
+      title: "التصويت على الموضوع"
       reached_limit: "لم يعُد بإمكانك التصويت الآن، يُرجى إزالة صوت حالي!"
       list_votes: "قائمة بأصواتك"
       votes_nav_help: "الموضوعات الأكثر تصويتًا"
@@ -20,6 +21,9 @@ ar:
       voted_title: "تم التصويت"
       voting_closed_title: "مغلق"
       voting_limit: "الحد"
+      see_votes: "لديك %{count}/%{max} من الأصوات المتبقية"
+      locked: "مغلق"
+      locked_description: "زد مستوى الثقة لديك لتتمكن من التصويت"
       votes:
         zero: "%{count} من الأصوات"
         one: "صوت واحد %{count}"
diff --git a/plugins/discourse-topic-voting/config/locales/client.es.yml b/plugins/discourse-topic-voting/config/locales/client.es.yml
index d1d39f7eae1a7..a015e3a711175 100644
--- a/plugins/discourse-topic-voting/config/locales/client.es.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.es.yml
@@ -20,6 +20,8 @@ es:
       voted_title: "Votado"
       voting_closed_title: "Cerrado"
       voting_limit: "Límite"
+      see_votes: "Te quedan %{count}/%{max} votos"
+      locked_description: "Sube de nivel de confianza para votar"
       votes:
         one: "%{count} voto"
         other: "%{count} votos"
diff --git a/plugins/discourse-topic-voting/config/locales/client.ja.yml b/plugins/discourse-topic-voting/config/locales/client.ja.yml
index 59f40dd74f5ff..9be6b70984140 100644
--- a/plugins/discourse-topic-voting/config/locales/client.ja.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.ja.yml
@@ -10,6 +10,7 @@ ja:
       sort_options:
         votes: "投票"
     topic_voting:
+      title: "トピック投票"
       reached_limit: "票数が不足しています。既存の投票を削除してください！"
       list_votes: "投票をリスト"
       votes_nav_help: "票数が最も多いトピック"
@@ -20,6 +21,9 @@ ja:
       voted_title: "投票済み"
       voting_closed_title: "終了"
       voting_limit: "制限"
+      see_votes: "残り %{count} 票 (全 %{max} 票) です"
+      locked: "ロック済み"
+      locked_description: "信頼レベルを上げて投票します"
       votes:
         other: "%{count} 票"
       anonymous_button:
diff --git a/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml b/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml
index 8c0b1eba03cd4..86a018320ee4e 100644
--- a/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml
@@ -24,7 +24,7 @@ zh_CN:
       voting_closed_title: "已关闭"
       voting_limit: "限制"
       see_votes: "您还剩余 %{count}/%{max} 票"
-      locked: "投票已锁定"
+      locked: "已锁定"
       locked_description: "提升信任级别以投票"
       votes:
         other: "%{count} 票"
diff --git a/plugins/discourse-topic-voting/config/locales/server.ar.yml b/plugins/discourse-topic-voting/config/locales/server.ar.yml
index 5c4ed9c532de0..a3249e6a37bd9 100644
--- a/plugins/discourse-topic-voting/config/locales/server.ar.yml
+++ b/plugins/discourse-topic-voting/config/locales/server.ar.yml
@@ -30,3 +30,9 @@ ar:
       few: "تعذَّر نقل %{count} أصوات لأن المستخدم قد صوَّت بالفعل في موضوع آخر."
       many: "تعذَّر نقل %{count} صوتًا لأن المستخدم قد صوَّت بالفعل في موضوع آخر."
       other: "تعذَّر نقل %{count} صوت لأن المستخدم قد صوَّت بالفعل في موضوع آخر."
+    filter:
+      description:
+        topic_votes_min: "الحد الأدنى لعدد الأصوات على الموضوع"
+        topic_votes_max: "الحد الأقصى لعدد الأصوات على الموضوع"
+        order_topic_votes: "ترتيب الموضوعات حسب الأكثر تصويتًا"
+        order_topic_votes_asc: "ترتيب الموضوعات حسب الأقل تصويتًا"
diff --git a/plugins/discourse-topic-voting/config/locales/server.ja.yml b/plugins/discourse-topic-voting/config/locales/server.ja.yml
index 960e9a4f9de8d..89c238e5855dc 100644
--- a/plugins/discourse-topic-voting/config/locales/server.ja.yml
+++ b/plugins/discourse-topic-voting/config/locales/server.ja.yml
@@ -20,3 +20,9 @@ ja:
       other: "%{count} 票が移動されました。"
     duplicated_votes:
       other: "ユーザーが別のトピックに投票済みであるため、%{count} 票を移動できませんでした。"
+    filter:
+      description:
+        topic_votes_min: "トピックの最低投票数"
+        topic_votes_max: "トピックの最大投票数"
+        order_topic_votes: "投票数の多い順にトピックを並べ替えます"
+        order_topic_votes_asc: "投票数の少ない順にトピックを並べ替えます"
diff --git a/plugins/discourse-topic-voting/config/locales/server.zh_CN.yml b/plugins/discourse-topic-voting/config/locales/server.zh_CN.yml
index d892ee6690cb3..dd265632a9d90 100644
--- a/plugins/discourse-topic-voting/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-topic-voting/config/locales/server.zh_CN.yml
@@ -24,5 +24,5 @@ zh_CN:
       description:
         topic_votes_min: "最低话题投票数"
         topic_votes_max: "最高话题投票数"
-        order_topic_votes: "按得票最多的话题排序"
-        order_topic_votes_asc: "按票数少的话题排序"
+        order_topic_votes: "按得票最多对话题排序"
+        order_topic_votes_asc: "按得票最少对话题排序"
diff --git a/plugins/discourse-user-notes/config/locales/client.ar.yml b/plugins/discourse-user-notes/config/locales/client.ar.yml
index b91af8f9f1ce6..e1db69ec4f276 100644
--- a/plugins/discourse-user-notes/config/locales/client.ar.yml
+++ b/plugins/discourse-user-notes/config/locales/client.ar.yml
@@ -8,5 +8,10 @@ ar:
   js:
     user_notes:
       title: "ملاحظات المستخدمين"
+      attach: "إضافة ملاحظة للمستخدم"
       attach_note_description: "أضف ملاحظة حول هذا المستخدم. ستكون هذه الملاحظة مرئية لفريق العمل فقط."
+      remove: "إزالة ملاحظة المستخدم"
+      show: "ملاحظات المستخدمين (%{count})"
       delete_confirm: "هل تريد بالتأكيد حذف ملاحظة المستخدم هذه؟"
+      show_post: "عرض المنشور"
+      show_flag: "عرض البلاغ"
diff --git a/plugins/discourse-user-notes/config/locales/client.ja.yml b/plugins/discourse-user-notes/config/locales/client.ja.yml
index 8ffef1a38b0ae..9f9726c265c97 100644
--- a/plugins/discourse-user-notes/config/locales/client.ja.yml
+++ b/plugins/discourse-user-notes/config/locales/client.ja.yml
@@ -8,5 +8,10 @@ ja:
   js:
     user_notes:
       title: "ユーザーメモ"
+      attach: "ユーザーメモを追加"
       attach_note_description: "このユーザーに関するメモを追加します。このメモはスタッフのみに表示されます。"
+      remove: "ユーザーメモを削除"
+      show: "ユーザーメモ (%{count})"
       delete_confirm: "このユーザーメモを削除してもよろしいですか？"
+      show_post: "投稿を表示"
+      show_flag: "通報を表示"
diff --git a/plugins/discourse-user-notes/config/locales/server.el.yml b/plugins/discourse-user-notes/config/locales/server.el.yml
index 3f0eadec673ff..6a3c41416974f 100644
--- a/plugins/discourse-user-notes/config/locales/server.el.yml
+++ b/plugins/discourse-user-notes/config/locales/server.el.yml
@@ -9,7 +9,7 @@ el:
     user_notes_enabled: "Επιτρέψτε στους συντονιστές να προθέτουν σημειώσεις στους χρήστες"
     user_notes_moderators_delete: "Να επιτρέπεται στους συντονιστές να διαγράφουν σημειώσεις χρήστη"
   user_notes:
-    official_warning: "Έλαβες μια επίσημη προειδοποίηση από το @%{username} - %{warning_link}"
+    official_warning: "Έλαβες μια επίσημη προειδοποίηση από @%{username} - %{warning_link}"
     user_suspended: "Ο χρήστης @%{username} ανέστειλε αυτόν τον λογαριασμό έως τις %{suspended_till}. Λόγος: %{reason}"
     user_silenced: "Ο χρήστης @%{username} ανέστειλε αυτόν τον λογαριασμό έως τις %{silenced_till}. Λόγος: %{reason}"
   reports:
diff --git a/plugins/discourse-zendesk-plugin/config/locales/client.de.yml b/plugins/discourse-zendesk-plugin/config/locales/client.de.yml
index 4762212914666..69152292ec5d4 100644
--- a/plugins/discourse-zendesk-plugin/config/locales/client.de.yml
+++ b/plugins/discourse-zendesk-plugin/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          discourse_zendesk: "Discourse – Zendesk"
+          discourse_zendesk: "Discourse Zendesk"
   js:
     topic:
       create_zendesk_issue: "Zendesk-Ticket erstellen"
diff --git a/plugins/discourse-zendesk-plugin/config/locales/client.el.yml b/plugins/discourse-zendesk-plugin/config/locales/client.el.yml
index fbe6c3f7c320d..7e9f1a9036a24 100644
--- a/plugins/discourse-zendesk-plugin/config/locales/client.el.yml
+++ b/plugins/discourse-zendesk-plugin/config/locales/client.el.yml
@@ -5,6 +5,11 @@
 # https://translate.discourse.org/
 
 el:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          discourse_zendesk: "Discourse Zendesk"
   js:
     zendesk:
       general_error: Κάτι δεν πήγε καλά.
diff --git a/plugins/footnote/config/locales/client.ar.yml b/plugins/footnote/config/locales/client.ar.yml
index 2a750a58c04af..5050cd013b6ee 100644
--- a/plugins/footnote/config/locales/client.ar.yml
+++ b/plugins/footnote/config/locales/client.ar.yml
@@ -5,6 +5,12 @@
 # https://translate.discourse.org/
 
 ar:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          footnote: "حواشي Discourse"
   js:
     footnote:
+      title: "الحواشي السفلية"
       add: "إضافة حاشية سفلية"
diff --git a/plugins/footnote/config/locales/client.ja.yml b/plugins/footnote/config/locales/client.ja.yml
index 0191bafe3a2a8..ec608930642e0 100644
--- a/plugins/footnote/config/locales/client.ja.yml
+++ b/plugins/footnote/config/locales/client.ja.yml
@@ -5,6 +5,12 @@
 # https://translate.discourse.org/
 
 ja:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          footnote: "Discourse 脚注"
   js:
     footnote:
+      title: "脚注"
       add: "脚注を追加"
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index a766d6362e263..0441937f3957b 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -12,6 +12,8 @@ ar:
           poll: "استطلاع رأي Discourse"
   js:
     poll:
+      dynamic:
+        enabled_hint: "يمكن إضافة الخيارات أو إزالتها."
       voters:
         zero: "ناخب"
         one: "ناخب واحد"
@@ -180,6 +182,8 @@ ar:
           step: المسافة
         poll_public:
           label: عرض أسماء المصوِّتين
+        poll_dynamic:
+          label: السماح بإضافة الخيارات أو إزالتها بعد النشر.
         poll_title:
           label: العنوان (اختياري)
         poll_options:
diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml
index 45992b507820b..b4ad1c96e0549 100644
--- a/plugins/poll/config/locales/client.de.yml
+++ b/plugins/poll/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          poll: "Discourse – Umfrage"
+          poll: "Discourse Umfrage"
   js:
     poll:
       dynamic:
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index 41cfb45c7508c..1a76107036420 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -12,6 +12,8 @@ ja:
           poll: "Discourse 投票"
   js:
     poll:
+      dynamic:
+        enabled_hint: "オプションは追加または削除できます。"
       voters:
         other: "投票者数"
       total_votes:
@@ -140,6 +142,8 @@ ja:
           step: 間隔
         poll_public:
           label: 投票者を表示する
+        poll_dynamic:
+          label: 投稿後にオプションを追加または削除することを許可する
         poll_title:
           label: タイトル (オプション)
         poll_options:
diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml
index a3d9d1445dc98..81c7bc797996f 100644
--- a/plugins/poll/config/locales/client.zh_CN.yml
+++ b/plugins/poll/config/locales/client.zh_CN.yml
@@ -13,7 +13,7 @@ zh_CN:
   js:
     poll:
       dynamic:
-        enabled_hint: "可添加或删除选项。"
+        enabled_hint: "可以添加或移除选项。"
       voters:
         other: "投票人"
       total_votes:
diff --git a/plugins/poll/config/locales/server.ar.yml b/plugins/poll/config/locales/server.ar.yml
index 5c578f25bccde..461ebfc35f38e 100644
--- a/plugins/poll/config/locales/server.ar.yml
+++ b/plugins/poll/config/locales/server.ar.yml
@@ -49,6 +49,8 @@ ar:
     edit_window_expired:
       cannot_edit_default_poll_with_votes: "لا يمكنك تغيير استطلاع بعد أول %{minutes} دقيقة."
       cannot_edit_named_poll_with_votes: "لا يمكنك تغيير اسم الاستطلاع <strong>${name}</strong> بعد أول %{minutes} دقيقة."
+    dynamic_poll:
+      enabled_hint: "يمكن إضافة الخيارات أو إزالتها."
     no_poll_with_this_name: "لا يوجد استطلاع باسم <strong>%{name}</strong> مرتبط بهذا المنشور."
     post_is_deleted: "لا يمكن اتخاذ إجراء على منشور محذوف."
     user_cant_post_in_topic: "لا يمكنك التصويت لأنه لا يمكنك النشر في هذا الموضوع."
diff --git a/plugins/poll/config/locales/server.ja.yml b/plugins/poll/config/locales/server.ja.yml
index 33d6c5ac37f52..a10ce245e12eb 100644
--- a/plugins/poll/config/locales/server.ja.yml
+++ b/plugins/poll/config/locales/server.ja.yml
@@ -39,6 +39,8 @@ ja:
     edit_window_expired:
       cannot_edit_default_poll_with_votes: "%{minutes} 分を過ぎると、投票を変更できません。"
       cannot_edit_named_poll_with_votes: "%{minutes} 分を過ぎると、<strong>${name}</strong> という名前の投票を変更することはできません。"
+    dynamic_poll:
+      enabled_hint: "オプションは追加または削除できます。"
     no_poll_with_this_name: "この投稿に関連付けられた <strong>%{name}</strong> という名前の投票はありません。"
     post_is_deleted: "削除された投稿を操作することはできません。"
     user_cant_post_in_topic: "このトピックに投稿できないため投票できません。"
diff --git a/plugins/poll/config/locales/server.zh_CN.yml b/plugins/poll/config/locales/server.zh_CN.yml
index 48fc64cf8493c..7177e2da8b1b7 100644
--- a/plugins/poll/config/locales/server.zh_CN.yml
+++ b/plugins/poll/config/locales/server.zh_CN.yml
@@ -40,7 +40,7 @@ zh_CN:
       cannot_edit_default_poll_with_votes: "在创建 %{minutes} 分钟后，您将无法更改投票。"
       cannot_edit_named_poll_with_votes: "在创建 %{minutes} 分钟后，您将无法更改投票名称“<strong>${name}</strong>”。"
     dynamic_poll:
-      enabled_hint: "可添加或删除选项。"
+      enabled_hint: "可以添加或移除选项。"
     no_poll_with_this_name: "没有与此帖子相关的名为“<strong>%{name}</strong>”的投票。"
     post_is_deleted: "无法对已被删除的帖子执行操作。"
     user_cant_post_in_topic: "您无法投票，因为您无法在此话题中发帖。"
diff --git a/plugins/spoiler-alert/config/locales/client.de.yml b/plugins/spoiler-alert/config/locales/client.de.yml
index f47abfe961b98..2c1352ff5b929 100644
--- a/plugins/spoiler-alert/config/locales/client.de.yml
+++ b/plugins/spoiler-alert/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          spoiler_alert: "Discourse – Spoiler-Alarm"
+          spoiler_alert: "Discourse Spoiler-Alarm"
   js:
     spoiler:
       title: Spoiler unkenntlich machen
diff --git a/plugins/styleguide/config/locales/client.ar.yml b/plugins/styleguide/config/locales/client.ar.yml
index 9ab4d4c726313..0634feb6d8c3d 100644
--- a/plugins/styleguide/config/locales/client.ar.yml
+++ b/plugins/styleguide/config/locales/client.ar.yml
@@ -38,6 +38,8 @@ ar:
           title: "نظام الخطوط"
         colors:
           title: "الألوان"
+        dialog:
+          title: "حوار"
         icons:
           title: "الأيقونات"
           full_list: "طالِع قائمة أيقونات Font Awesome كاملةً"
@@ -59,6 +61,8 @@ ar:
           title: "التنقّل الرأسي"
         categories_list:
           title: "قائمة الفئات"
+        topic_link:
+          title: "رابط الموضوع والحالة"
         topic_list_item:
           title: "العنصر في قائمة الموضوعات"
         topic_statuses:
@@ -99,6 +103,8 @@ ar:
           title: "أيقونات الترويسة"
         spinners:
           title: "المُنزلقات"
+        otp:
+          title: "رمز التحقق لمرة واحدة"
         empty_state:
           title: "حالة فارغة"
         tooltips:
diff --git a/plugins/styleguide/config/locales/client.de.yml b/plugins/styleguide/config/locales/client.de.yml
index 9fa43954db945..2099ffde17786 100644
--- a/plugins/styleguide/config/locales/client.de.yml
+++ b/plugins/styleguide/config/locales/client.de.yml
@@ -9,7 +9,7 @@ de:
     admin:
       site_settings:
         categories:
-          styleguide: "Discourse – Styleguide"
+          styleguide: "Discourse Styleguide"
   js:
     styleguide:
       title: "Styleguide"
diff --git a/plugins/styleguide/config/locales/client.ja.yml b/plugins/styleguide/config/locales/client.ja.yml
index 930512a739f5d..3442dd5b5ee85 100644
--- a/plugins/styleguide/config/locales/client.ja.yml
+++ b/plugins/styleguide/config/locales/client.ja.yml
@@ -38,6 +38,8 @@ ja:
           title: "フォントシステム"
         colors:
           title: "色"
+        dialog:
+          title: "ダイアログ"
         icons:
           title: "アイコン"
           full_list: "Font Awesome Icons の全リストを表示"
@@ -59,6 +61,8 @@ ja:
           title: "スタックナビゲーション"
         categories_list:
           title: "カテゴリリスト"
+        topic_link:
+          title: "トピックのリンクとステータス"
         topic_list_item:
           title: "トピックリスト項目"
         topic_statuses:
@@ -99,6 +103,8 @@ ja:
           title: "ヘッダーアイコン"
         spinners:
           title: "スピナー"
+        otp:
+          title: "OTP"
         empty_state:
           title: "エンプティステート"
         tooltips:
diff --git a/plugins/styleguide/config/locales/client.zh_CN.yml b/plugins/styleguide/config/locales/client.zh_CN.yml
index 5ef201fded681..2b18992d6d76e 100644
--- a/plugins/styleguide/config/locales/client.zh_CN.yml
+++ b/plugins/styleguide/config/locales/client.zh_CN.yml
@@ -62,7 +62,7 @@ zh_CN:
         categories_list:
           title: "类别列表"
         topic_link:
-          title: "主题链接和状态"
+          title: "话题链接和状态"
         topic_list_item:
           title: "话题列表项"
         topic_statuses:

From cba702c88f03b3facd815a2ee47e4015654bd3de Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com>
Date: Wed, 25 Feb 2026 13:55:18 -0300
Subject: [PATCH 079/168] FEATURE: Add "Use Predefined Topics" modal to admin
 onboarding banner (#37826)

Continuing the work from
https://github.com/discourse/discourse/pull/37583 we are adding a few
options to our users to start creating content and topics in their new
community

This makes the predefined topics usage clearer and not random, and this
also adds a way for plugins to hook into the admin onboarding
experience, using the "admin-onboarding-start-posting-options` behavior
object and `StartPostingOption` class

When we have a plugin hooked up to this, it shows the option picker; if
not, it goes directly to predefined options:

Default behavior:



https://github.com/user-attachments/assets/d8e3eaf7-dc36-4f1e-b9e2-5bb12f353e88


with 1+ options:


https://github.com/user-attachments/assets/c05be6b0-4ff8-477b-9a9d-f755846730b5

---------

Co-authored-by: Penar Musaraj <pmusaraj@gmail.com>
---
 .../components/admin-onboarding-banner.scss   |  34 ++++
 config/locales/client.en.yml                  |   8 +-
 .../components/admin-onboarding/banner.gjs    |  63 +++++--
 .../modal/predefined-topics-options.gjs       |  97 ++++++++++
 .../modal/start-posting-options.gjs           |  28 +++
 .../predefined-topics-option.gjs              |  18 ++
 .../admin-onboarding/start-posting-option.gjs |  42 +++++
 .../discourse/app/lib/transformer/registry.js |   1 +
 ...st.js => admin-onboarding-banner-test.gjs} |  52 +++++-
 spec/system/admin_onboarding_banner_spec.rb   | 166 ++++++++++++++++++
 .../components/admin_onboarding_banner.rb     |  39 ++++
 .../admin_onboarding_predefined_topics.rb     |  33 ++++
 12 files changed, 562 insertions(+), 19 deletions(-)
 create mode 100644 frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs
 create mode 100644 frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs
 create mode 100644 frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs
 create mode 100644 frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
 rename frontend/discourse/tests/acceptance/{admin-onboarding-banner-test.js => admin-onboarding-banner-test.gjs} (68%)
 create mode 100644 spec/system/admin_onboarding_banner_spec.rb
 create mode 100644 spec/system/page_objects/components/admin_onboarding_banner.rb
 create mode 100644 spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb

diff --git a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss b/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
index 4622de376fef8..a66a8d04bd9a7 100644
--- a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
+++ b/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
@@ -103,3 +103,37 @@
     }
   }
 }
+
+.start-posting-options-modal {
+  .option {
+    padding-bottom: var(--space-4);
+  }
+}
+
+.predefined-topic-options-modal {
+  .d-modal__subtitle-text {
+    padding: var(--space-2) 0;
+  }
+
+  &__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  &__card {
+    margin-bottom: var(--space-4);
+  }
+
+  &__content {
+    border-bottom: 1px solid var(--content-border-color);
+  }
+
+  &__card:last-child > &__content {
+    border-bottom: none;
+  }
+
+  &__body {
+    max-width: var(--modal-max-width);
+  }
+}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 65f23daaed19b..c9cb91857b4d9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -467,6 +467,13 @@ en:
         title: "Start Posting"
         description: "Give people something to talk about together"
         action: "Icebreaker ideas"
+        choose_option: "How would you like to start?"
+        predefined_topics: "Pre-defined Topics"
+        predefined_topics_subtitle: "Break the ice with one of the following conversation starters. <br/> Pick one and customize it to your liking:"
+        predefined_topics_description: "Pick from a collection of conversation starters to get discussions going"
+        use_predefined: "Use pre-defined Topics"
+        start_with_this: "Start with this"
+        back: "Back"
         icebreakers:
           fun_facts:
             title: "What are some fun facts about you?"
@@ -481,7 +488,6 @@ en:
             title: "What is your favorite food?"
             body: "Share your favorite food with the community! I'll start: I love pizza, especially with extra cheese and pepperoni."
 
-
       spread_the_word:
         title: "Spread the Word!"
         description: "Share a link with everyone in your network"
diff --git a/frontend/discourse/app/components/admin-onboarding/banner.gjs b/frontend/discourse/app/components/admin-onboarding/banner.gjs
index 860d8695b7ab4..aa32203eca996 100644
--- a/frontend/discourse/app/components/admin-onboarding/banner.gjs
+++ b/frontend/discourse/app/components/admin-onboarding/banner.gjs
@@ -5,10 +5,14 @@ import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { TrackedArray } from "@ember-compat/tracked-built-ins";
 import SiteSetting from "discourse/admin/models/site-setting";
+import PredefinedTopicsOptionsModal from "discourse/components/admin-onboarding/modal/predefined-topics-options";
+import StartPostingOptions from "discourse/components/admin-onboarding/modal/start-posting-options";
+import PredefinedTopicOption from "discourse/components/admin-onboarding/predefined-topics-option";
 import OnboardingStep from "discourse/components/admin-onboarding/step";
 import DButton from "discourse/components/d-button";
 import CreateInvite from "discourse/components/modal/create-invite";
 import { getAbsoluteURL } from "discourse/lib/get-url";
+import { applyValueTransformer } from "discourse/lib/transformer";
 import { clipboardCopy, defaultHomepage } from "discourse/lib/utilities";
 import { i18n } from "discourse-i18n";
 
@@ -43,45 +47,70 @@ const STEPS = [
 
     @service composer;
     @service appEvents;
+    @service modal;
+    @service siteSettings;
 
     icon = "comments";
-    icebreaker_topics = [
-      "fun_facts",
-      "coolest_thing_you_have_seen_today",
-      "introduce_yourself",
-      "what_is_your_favorite_food",
-    ];
 
     constructor() {
       super(...arguments);
-      this.appEvents.on("topic:created", this, this.checkIfPosted);
+
+      this.appEvents.on("topic:created", this, this.completeStep);
+      this.appEvents.on(
+        "admin-onboarding:posting-complete",
+        this,
+        this.completeStep
+      );
     }
 
     willDestroy() {
       super.willDestroy(...arguments);
-      this.appEvents.off("topic:created", this, this.checkIfPosted);
+
+      this.appEvents.off("topic:created", this, this.completeStep);
+      this.appEvents.off(
+        "admin-onboarding:posting-complete",
+        this,
+        this.completeStep
+      );
     }
 
-    checkIfPosted() {
+    completeStep() {
       this.markAsCompleted();
     }
 
-    @action
-    async performAction() {
-      const randomTopic =
-        this.icebreaker_topics[
-          Math.floor(Math.random() * this.icebreaker_topics.length)
-        ];
+    showStartPostingOptions() {
+      const options = applyValueTransformer(
+        "admin-onboarding-start-posting-options",
+        [PredefinedTopicOption]
+      );
+
+      if (options.length === 1) {
+        // show predefined topics directly if it's the only option available
+        return this.modal.show(PredefinedTopicsOptionsModal);
+      }
+
+      this.modal.show(StartPostingOptions, {
+        model: {
+          options,
+        },
+      });
+    }
 
+    openTopic(topicKey) {
       this.composer.openNewTopic({
         title: i18n(
-          `admin_onboarding_banner.start_posting.icebreakers.${randomTopic}.title`
+          `admin_onboarding_banner.start_posting.icebreakers.${topicKey}.title`
         ),
         body: i18n(
-          `admin_onboarding_banner.start_posting.icebreakers.${randomTopic}.body`
+          `admin_onboarding_banner.start_posting.icebreakers.${topicKey}.body`
         ),
       });
     }
+
+    @action
+    async performAction() {
+      this.showStartPostingOptions();
+    }
   },
   class SpreadTheWord extends OnboardingStep {
     static name = "spread_the_word";
diff --git a/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs b/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs
new file mode 100644
index 0000000000000..b0c840f4e3c9d
--- /dev/null
+++ b/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs
@@ -0,0 +1,97 @@
+import Component from "@glimmer/component";
+import { concat, fn } from "@ember/helper";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import DButton from "discourse/components/d-button";
+import DModal from "discourse/components/d-modal";
+import { i18n } from "discourse-i18n";
+
+export default class PredefinedTopicOptions extends Component {
+  @service composer;
+
+  icebreakerTopics = [
+    "fun_facts",
+    "coolest_thing_you_have_seen_today",
+    "introduce_yourself",
+    "what_is_your_favorite_food",
+  ];
+
+  openTopic(topicKey) {
+    this.composer.openNewTopic({
+      title: i18n(
+        `admin_onboarding_banner.start_posting.icebreakers.${topicKey}.title`
+      ),
+      body: i18n(
+        `admin_onboarding_banner.start_posting.icebreakers.${topicKey}.body`
+      ),
+    });
+  }
+
+  @action
+  cancel() {
+    this.args.closeModal();
+  }
+
+  @action
+  handleSelectTopic(topic) {
+    this.args.closeModal();
+    this.openTopic(topic);
+  }
+
+  <template>
+    <DModal
+      class="predefined-topic-options-modal"
+      @title={{i18n "admin_onboarding_banner.start_posting.predefined_topics"}}
+      @subtitle={{htmlSafe
+        (i18n
+          "admin_onboarding_banner.start_posting.predefined_topics_subtitle"
+        )
+      }}
+      @closeModal={{this.cancel}}
+    >
+      <:body>
+        <div class="predefined-topic-options-modal__list">
+          {{#each this.icebreakerTopics as |topic|}}
+            <div class="predefined-topic-options-modal__card">
+              <div class="predefined-topic-options-modal__content">
+                <div class="predefined-topic-options-modal__header">
+                  <h4 class="predefined-topic-options-modal__title">
+                    {{i18n
+                      (concat
+                        "admin_onboarding_banner.start_posting.icebreakers."
+                        topic
+                        ".title"
+                      )
+                    }}
+                  </h4>
+                  <DButton
+                    @icon="far-pen-to-square"
+                    @action={{fn this.handleSelectTopic topic}}
+                    class="predefined-topic-options-modal__select-btn btn-primary"
+                  />
+                </div>
+                <p class="predefined-topic-options-modal__body">
+                  {{i18n
+                    (concat
+                      "admin_onboarding_banner.start_posting.icebreakers."
+                      topic
+                      ".body"
+                    )
+                  }}
+                </p>
+              </div>
+            </div>
+          {{/each}}
+        </div>
+      </:body>
+      <:footer>
+        <DButton
+          @label="cancel"
+          @action={{this.cancel}}
+          class="predefined-topic-options-modal__cancel-button btn-transparent"
+        />
+      </:footer>
+    </DModal>
+  </template>
+}
diff --git a/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs b/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs
new file mode 100644
index 0000000000000..ccdc7e21c7ad4
--- /dev/null
+++ b/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs
@@ -0,0 +1,28 @@
+import DButton from "discourse/components/d-button";
+import DModal from "discourse/components/d-modal";
+import { i18n } from "discourse-i18n";
+
+const StartPostingOptions = <template>
+  <DModal
+    class="start-posting-options-modal"
+    @title={{i18n "admin_onboarding_banner.start_posting.choose_option"}}
+    @closeModal={{@closeModal}}
+  >
+    <:body>
+      <div class="modal-options">
+        {{#each @model.options as |Option|}}
+          <Option @closeModal={{@closeModal}} />
+        {{/each}}
+      </div>
+    </:body>
+    <:footer>
+      <DButton
+        @label="cancel"
+        @action={{@closeModal}}
+        class="btn-transparent cancel-button"
+      />
+    </:footer>
+  </DModal>
+</template>;
+
+export default StartPostingOptions;
diff --git a/frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs b/frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs
new file mode 100644
index 0000000000000..60ee91705552a
--- /dev/null
+++ b/frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs
@@ -0,0 +1,18 @@
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import PredefinedTopicsOptionsModal from "discourse/components/admin-onboarding/modal/predefined-topics-options";
+import StartPostingOption from "discourse/components/admin-onboarding/start-posting-option";
+
+export default class PredefinedTopicsOption extends StartPostingOption {
+  @service modal;
+
+  name = "predefined-option";
+  title = "admin_onboarding_banner.start_posting.predefined_topics";
+  body = "admin_onboarding_banner.start_posting.predefined_topics_description";
+  actionLabel = "admin_onboarding_banner.start_posting.use_predefined";
+
+  @action
+  onSelect() {
+    this.modal.show(PredefinedTopicsOptionsModal);
+  }
+}
diff --git a/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
new file mode 100644
index 0000000000000..3de3172f24480
--- /dev/null
+++ b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
@@ -0,0 +1,42 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import DButton from "discourse/components/d-button";
+import concatClass from "discourse/helpers/concat-class";
+import { i18n } from "discourse-i18n";
+
+export default class StartPostingOption extends Component {
+  get name() {
+    throw new Error("Name is required for StartPostingOption");
+  }
+
+  get title() {
+    throw new Error("Title is required for StartPostingOption");
+  }
+
+  get body() {
+    throw new Error("Body is required for StartPostingOption");
+  }
+
+  get actionLabel() {
+    throw new Error("ButtonLabel is required for StartPostingOption");
+  }
+
+  @action
+  onSelect() {
+    throw new Error("onSelect is required for StartPostingOption");
+  }
+
+  <template>
+    <div class={{concatClass "option" this.name}}>
+      <h3>{{i18n this.title}}</h3>
+      <p>
+        {{i18n this.body}}
+      </p>
+      <DButton
+        @label={{this.actionLabel}}
+        @action={{this.onSelect}}
+        class="btn-primary"
+      />
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/app/lib/transformer/registry.js b/frontend/discourse/app/lib/transformer/registry.js
index c47ae2f880e7f..48e9a7c2ebc40 100644
--- a/frontend/discourse/app/lib/transformer/registry.js
+++ b/frontend/discourse/app/lib/transformer/registry.js
@@ -14,6 +14,7 @@ export const VALUE_TRANSFORMERS = Object.freeze([
   // use only lowercase names
   "admin-plugin-icon",
   "admin-reports-show-query-params",
+  "admin-onboarding-start-posting-options",
   "bulk-select-in-nav-controls",
   "category-available-views",
   "category-default-colors",
diff --git a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.js b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
similarity index 68%
rename from frontend/discourse/tests/acceptance/admin-onboarding-banner-test.js
rename to frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
index cbd5406f6adf7..b396a952096c9 100644
--- a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.js
+++ b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
@@ -1,7 +1,11 @@
+import { action } from "@ember/object";
+import { service } from "@ember/service";
 import { click, settled, visit } from "@ember/test-helpers";
 import { test } from "qunit";
 import sinon from "sinon";
+import StartPostingOption from "discourse/components/admin-onboarding/start-posting-option";
 import { AUTO_GROUPS } from "discourse/lib/constants";
+import { withPluginApi } from "discourse/lib/plugin-api";
 import { acceptance } from "discourse/tests/helpers/qunit-helpers";
 
 acceptance("Admin - Onboarding Banner", function (needs) {
@@ -74,19 +78,65 @@ acceptance("Admin - Onboarding Banner", function (needs) {
     assert.dom(".admin-onboarding-banner").doesNotExist();
   });
 
-  test("it can complete `start_posting` step", async function (assert) {
+  test("it can complete `start_posting` step with predefined data", async function (assert) {
     const step = withStep("start_posting", assert);
     await visit("/");
 
     step.isNotChecked();
 
     await step.clickAction();
+
+    assert.dom(".predefined-topic-options-modal__card").exists({ count: 4 });
+    await click(
+      ".predefined-topic-options-modal__card:last-child .predefined-topic-options-modal__select-btn"
+    );
+
     await click(".create");
     await visit("/");
 
     step.isChecked();
   });
 
+  test("it can complete `start_posting` step with registered posting-options", async function (assert) {
+    withPluginApi((api) => {
+      api.registerValueTransformer(
+        "admin-onboarding-start-posting-options",
+        ({ value }) => {
+          value.push(
+            class ExtraOption extends StartPostingOption {
+              @service appEvents;
+
+              name = "extra-option";
+              title = "admin_onboarding_banner.start_posting.extra_option";
+              body =
+                "admin_onboarding_banner.start_posting.extra_option_description";
+              actionLabel = "admin_onboarding_banner.start_posting.use_extra";
+
+              @action
+              onSelect() {
+                this.appEvents.trigger("admin-onboarding:posting-complete");
+                this.args.closeModal();
+              }
+            }
+          );
+          return value;
+        }
+      );
+    });
+
+    const step = withStep("start_posting", assert);
+    await visit("/");
+
+    step.isNotChecked();
+
+    await step.clickAction();
+
+    assert.dom(".option").exists({ count: 2 });
+    await click(".extra-option .btn");
+
+    step.isChecked();
+  });
+
   test("it can complete `invite_collaborators` step", async function (assert) {
     const step = withStep("invite_collaborators", assert);
     await visit("/");
diff --git a/spec/system/admin_onboarding_banner_spec.rb b/spec/system/admin_onboarding_banner_spec.rb
new file mode 100644
index 0000000000000..2754d0d7f1e6d
--- /dev/null
+++ b/spec/system/admin_onboarding_banner_spec.rb
@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+describe "Admin Onboarding Banner", type: :system do
+  fab!(:admin)
+
+  let(:banner) { PageObjects::Components::AdminOnboardingBanner.new }
+  let(:predefined_topics_modal) { PageObjects::Modals::AdminOnboardingPredefinedTopics.new }
+  let(:create_invite_modal) { PageObjects::Modals::CreateInvite.new }
+  let(:composer) { PageObjects::Components::Composer.new }
+  let(:toasts) { PageObjects::Components::Toasts.new }
+
+  before do
+    SiteSetting.enable_site_owner_onboarding = true
+
+    sign_in(admin)
+  end
+
+  describe "banner visibility" do
+    it "shows the onboarding banner for admin users" do
+      visit("/")
+      expect(banner).to be_visible
+    end
+
+    it "shows all three onboarding steps" do
+      visit("/")
+      expect(banner.step("start_posting")).to be_present
+      expect(banner.step("invite_collaborators")).to be_present
+      expect(banner.step("spread_the_word")).to be_present
+    end
+
+    it "can close the banner prematurely" do
+      visit("/")
+      expect(banner).to be_visible
+
+      banner.close
+
+      expect(toasts).to have_success(I18n.t("js.admin_onboarding_banner.skipped"))
+
+      expect(SiteSetting.enable_site_owner_onboarding).to eq(false)
+    end
+  end
+
+  describe "start posting step" do
+    it "opens composer with selected topic and marks step as complete when topic is created" do
+      visit("/")
+      expect(banner.step_not_completed?("start_posting")).to eq(true)
+
+      banner.click_step_action("start_posting")
+      expect(predefined_topics_modal).to be_open
+      expect(predefined_topics_modal.topic_card_count).to eq(4)
+
+      predefined_topics_modal.select_topic(0)
+
+      expect(composer).to be_opened
+      expect(composer.composer_input.value).not_to be_empty
+
+      composer.composer_input.set("Testing topic selection")
+      composer.create
+      expect(page).to have_content("Testing topic selection")
+
+      visit("/")
+      expect(banner.step_completed?("start_posting")).to eq(true)
+    end
+
+    it "can cancel topic selection without completing step" do
+      visit("/")
+      banner.click_step_action("start_posting")
+      expect(predefined_topics_modal).to be_open
+
+      predefined_topics_modal.cancel
+
+      expect(predefined_topics_modal).to be_closed
+      expect(banner.step_not_completed?("start_posting")).to eq(true)
+    end
+  end
+
+  describe "invite collaborators step" do
+    it "marks step as complete after creating invite" do
+      visit("/")
+      expect(banner.step_not_completed?("invite_collaborators")).to eq(true)
+
+      banner.click_step_action("invite_collaborators")
+
+      expect(create_invite_modal).to be_open
+      create_invite_modal.save_button.click
+      expect(create_invite_modal).to have_copy_button
+
+      create_invite_modal.close
+
+      expect(banner.step_completed?("invite_collaborators")).to eq(true)
+    end
+
+    it "does not mark step complete if modal is cancelled" do
+      visit("/")
+      expect(banner.step_not_completed?("invite_collaborators")).to eq(true)
+      banner.click_step_action("invite_collaborators")
+
+      expect(create_invite_modal).to be_open
+      create_invite_modal.close
+
+      expect(banner.step_not_completed?("invite_collaborators")).to eq(true)
+    end
+  end
+
+  describe "spread the word step" do
+    it "copies site URL to clipboard and marks step complete" do
+      visit("/")
+      expect(banner.step_not_completed?("spread_the_word")).to eq(true)
+
+      banner.click_step_action("spread_the_word")
+
+      expect(banner.step_completed?("spread_the_word")).to eq(true)
+      expect(toasts).to have_success(
+        I18n.t("js.admin_onboarding_banner.spread_the_word.copied_to_clipboard"),
+      )
+    end
+  end
+
+  describe "completing all steps" do
+    it "disables onboarding when all steps are complete" do
+      visit("/")
+
+      banner.click_step_action("start_posting")
+      predefined_topics_modal.select_topic(0)
+      composer.create
+      visit("/")
+
+      expect(banner.step_completed?("start_posting")).to eq(true)
+
+      banner.click_step_action("invite_collaborators")
+      create_invite_modal.save_button.click
+      expect(create_invite_modal).to have_copy_button
+      create_invite_modal.close
+
+      expect(banner.step_completed?("invite_collaborators")).to eq(true)
+
+      banner.click_step_action("spread_the_word")
+
+      # banner is hidden after all steps are complete; No need to check for `spread_the_word` step completion
+
+      expect(banner).to be_not_visible
+      expect(SiteSetting.enable_site_owner_onboarding).to eq(false)
+    end
+  end
+
+  describe "when user is not an admin" do
+    fab!(:regular_user, :user)
+
+    it "does not show the banner" do
+      sign_in(regular_user)
+      visit("/")
+
+      expect(banner).to be_not_visible
+    end
+  end
+
+  describe "when setting is disabled" do
+    before { SiteSetting.enable_site_owner_onboarding = false }
+
+    it "does not show the banner" do
+      visit("/")
+
+      expect(banner).to be_not_visible
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/admin_onboarding_banner.rb b/spec/system/page_objects/components/admin_onboarding_banner.rb
new file mode 100644
index 0000000000000..918c370caf368
--- /dev/null
+++ b/spec/system/page_objects/components/admin_onboarding_banner.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class AdminOnboardingBanner < PageObjects::Components::Base
+      def visible?
+        has_css?(".admin-onboarding-banner")
+      end
+
+      def not_visible?
+        has_no_css?(".admin-onboarding-banner")
+      end
+
+      def close
+        find(".admin-onboarding-banner .btn-close").click
+      end
+
+      def step(step_id)
+        find("div##{step_id}")
+      end
+
+      def step_checkbox(step_id)
+        find("div##{step_id} .onboarding-step__checkbox > svg")
+      end
+
+      def step_completed?(step_id)
+        step_checkbox(step_id)[:class].include?("checked")
+      end
+
+      def step_not_completed?(step_id)
+        !step_completed?(step_id)
+      end
+
+      def click_step_action(step_id)
+        find("div##{step_id} .onboarding-step__action .btn").click
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb b/spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb
new file mode 100644
index 0000000000000..c8f7fdc73e6f0
--- /dev/null
+++ b/spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Modals
+    class AdminOnboardingPredefinedTopics < PageObjects::Modals::Base
+      MODAL_SELECTOR = ".predefined-topic-options-modal"
+
+      def open?
+        has_css?("#{MODAL_SELECTOR}")
+      end
+
+      def closed?
+        has_no_css?("#{MODAL_SELECTOR}")
+      end
+
+      def topic_cards
+        all(".predefined-topic-options-modal__card")
+      end
+
+      def topic_card_count
+        topic_cards.count
+      end
+
+      def select_topic(index)
+        topic_cards[index].find(".predefined-topic-options-modal__select-btn").click
+      end
+
+      def cancel
+        find(".predefined-topic-options-modal__cancel-button").click
+      end
+    end
+  end
+end

From 53668b23a16e9e1a6e7a913751a83e4284015230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 25 Feb 2026 20:25:03 +0100
Subject: [PATCH 080/168] DEV: Add comparison budget to ONPDiff (#38063)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The ONP diff algorithm could run for an extremely long time on
pathological inputs (e.g. fully replaced or random content), causing
request timeouts and high CPU usage. The previous safeguard (`p >=
1000`) did not reliably bound work.

Replace it with an explicit comparison budget that caps the number of
element comparisons in the inner `snake` loop. The budget scales
linearly with input size (default factor: 200× combined length, ceiling:
2 000 000 comparisons). When exceeded, a new `DiffLimitExceeded`
exception is raised.

Handle the new exception gracefully at every call site:
- PostsController#revisions / #latest_revision → 422 with message
- StaffActionLogsController#diff → inline fallback message
- PostRevisor#compute_diff_size → treat as Infinity (forces new version)
- discourse-ai UpdateArtifact → fallback diff block

Also adds a pathology benchmark script and comprehensive test coverage
for all affected paths.

Co-authored-by: Sam Saffron <sam.saffron@gmail.com>
---
 .../admin/staff_action_logs_controller.rb     |  8 ++-
 app/controllers/posts_controller.rb           | 22 ++++---
 config/locales/server.en.yml                  |  1 +
 lib/onpdiff.rb                                | 60 ++++++++++++++++---
 lib/post_revisor.rb                           |  2 +
 .../lib/personas/tools/update_artifact.rb     |  6 ++
 .../personas/tools/update_artifact_spec.rb    | 40 +++++++++++++
 spec/lib/onpdiff_spec.rb                      | 10 ++--
 spec/lib/post_revisor_spec.rb                 | 26 ++++++++
 .../staff_action_logs_controller_spec.rb      | 25 ++++++++
 spec/requests/posts_controller_spec.rb        | 30 ++++++++++
 11 files changed, 209 insertions(+), 21 deletions(-)

diff --git a/app/controllers/admin/staff_action_logs_controller.rb b/app/controllers/admin/staff_action_logs_controller.rb
index d5c74530ae2b2..9a999e2a1a0c1 100644
--- a/app/controllers/admin/staff_action_logs_controller.rb
+++ b/app/controllers/admin/staff_action_logs_controller.rb
@@ -54,8 +54,12 @@ def diff
 
     diff_fields.each do |k, v|
       output << "<h3>#{k}</h3><p></p>"
-      diff = DiscourseDiff.new(v[:prev] || "", v[:cur] || "")
-      output << diff.side_by_side_markdown
+      begin
+        diff = DiscourseDiff.new(v[:prev] || "", v[:cur] || "")
+        output << diff.side_by_side_markdown
+      rescue ONPDiff::DiffLimitExceeded
+        output << "<p>#{CGI.escapeHTML(I18n.t("errors.diff_too_complex"))}</p>"
+      end
     end
 
     render json: { side_by_side: output }
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 66adcd5e52074..2e1ec19345d94 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -489,20 +489,26 @@ def revisions
     post = find_post_from_params
     raise Discourse::NotFound if post.hidden && !guardian.can_view_hidden_post_revisions?
 
-    post_revision = find_post_revision_from_params
-    post_revision_serializer =
-      PostRevisionSerializer.new(post_revision, scope: guardian, root: false)
-    render_json_dump(post_revision_serializer)
+    render_json_dump(
+      PostRevisionSerializer.new(find_post_revision_from_params, scope: guardian, root: false),
+    )
+  rescue ONPDiff::DiffLimitExceeded
+    render_json_error(I18n.t("errors.diff_too_complex"), status: 422)
   end
 
   def latest_revision
     post = find_post_from_params
     raise Discourse::NotFound if post.hidden && !guardian.can_view_hidden_post_revisions?
 
-    post_revision = find_latest_post_revision_from_params
-    post_revision_serializer =
-      PostRevisionSerializer.new(post_revision, scope: guardian, root: false)
-    render_json_dump(post_revision_serializer)
+    render_json_dump(
+      PostRevisionSerializer.new(
+        find_latest_post_revision_from_params,
+        scope: guardian,
+        root: false,
+      ),
+    )
+  rescue ONPDiff::DiffLimitExceeded
+    render_json_error(I18n.t("errors.diff_too_complex"), status: 422)
   end
 
   def hide_revision
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d7af6233664be..a220b28524580 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -286,6 +286,7 @@ en:
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>: %{message}"
+    diff_too_complex: "The diff is too complex to compute safely. Please try smaller edits."
     messages:
       invalid_locale: "%{invalid_locale} is not a valid locale"
       too_long_validation:
diff --git a/lib/onpdiff.rb b/lib/onpdiff.rb
index 470b4174c859c..d9bb29a04cf63 100644
--- a/lib/onpdiff.rb
+++ b/lib/onpdiff.rb
@@ -4,7 +4,31 @@
 # in https://publications.mpi-cbg.de/Wu_1990_6334.pdf
 
 class ONPDiff
-  def initialize(a, b)
+  class DiffLimitExceeded < StandardError
+    attr_reader :comparisons_used, :comparison_budget, :left_size, :right_size
+
+    def initialize(comparisons_used:, comparison_budget:, left_size:, right_size:)
+      @comparisons_used = comparisons_used
+      @comparison_budget = comparison_budget
+      @left_size = left_size
+      @right_size = right_size
+      super(
+        "Diff comparison budget exceeded (used=#{comparisons_used}, budget=#{comparison_budget}, left_size=#{left_size}, right_size=#{right_size})",
+      )
+    end
+  end
+
+  DEFAULT_COMPARISON_BUDGET_FACTOR = 200
+  MAX_COMPARISON_BUDGET = 2_000_000
+
+  attr_reader :comparison_budget, :comparisons_used
+
+  def initialize(
+    a,
+    b,
+    comparison_budget_factor: DEFAULT_COMPARISON_BUDGET_FACTOR,
+    max_comparison_budget: MAX_COMPARISON_BUDGET
+  )
     @a, @b = a, b
     @m, @n = a.size, b.size
     @backtrack = []
@@ -14,6 +38,8 @@ def initialize(a, b)
     end
     @offset = @m + 1
     @delta = @n - @m
+    @comparison_budget = [comparison_budget_factor * (@m + @n), max_comparison_budget].min
+    @comparisons_used = 0
   end
 
   def diff
@@ -41,8 +67,6 @@ def compose
     begin
       p += 1
 
-      return(@shortest_path = []) if p >= 1000
-
       k = -p
       while k <= @delta - 1
         fp[k + @offset] = snake(k, fp[k - 1 + @offset] + 1, fp[k + 1 + @offset])
@@ -71,16 +95,29 @@ def compose
   end
 
   def snake(k, p, pp)
-    r = p > pp ? @path[k - 1 + @offset] : @path[k + 1 + @offset]
-    y = [p, pp].max
+    k_offset = k + @offset
+
+    if p > pp
+      r = @path[k_offset - 1]
+      y = p
+    else
+      r = @path[k_offset + 1]
+      y = pp
+    end
+
     x = y - k
 
-    while x < @m && y < @n && @a[x] == @b[y]
+    while x < @m && y < @n
+      @comparisons_used += 1
+      raise_diff_limit_exceeded! if @comparisons_used > @comparison_budget
+
+      break if @a[x] != @b[y]
+
       x += 1
       y += 1
     end
 
-    @path[k + @offset] = @backtrack.size
+    @path[k_offset] = @backtrack.size
     @backtrack << [x, y, r]
 
     y
@@ -220,4 +257,13 @@ def pair_paragraphs(ses, i, j)
 
     pairs
   end
+
+  def raise_diff_limit_exceeded!
+    raise DiffLimitExceeded.new(
+            comparisons_used: @comparisons_used,
+            comparison_budget: @comparison_budget,
+            left_size: @m,
+            right_size: @n,
+          )
+  end
 end
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index c94d162014a7c..e1f02bba03e52 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -444,6 +444,8 @@ def diff_size(before, after)
     @diff_size ||=
       begin
         ONPDiff.new(before, after).short_diff.sum { |str, type| type == :common ? 0 : str.size }
+      rescue ONPDiff::DiffLimitExceeded
+        Float::INFINITY
       end
   end
 
diff --git a/plugins/discourse-ai/lib/personas/tools/update_artifact.rb b/plugins/discourse-ai/lib/personas/tools/update_artifact.rb
index a00b785984642..7c0d4e0d80756 100644
--- a/plugins/discourse-ai/lib/personas/tools/update_artifact.rb
+++ b/plugins/discourse-ai/lib/personas/tools/update_artifact.rb
@@ -204,6 +204,12 @@ def line_based_markdown_diff(before, after)
 
           result << "```"
           result.join("\n")
+        rescue ONPDiff::DiffLimitExceeded
+          <<~DIFF.strip
+            ```diff
+            # #{I18n.t("errors.diff_too_complex")}
+            ```
+          DIFF
         end
 
         def update_custom_html(artifact:, artifact_version:, new_version:)
diff --git a/plugins/discourse-ai/spec/lib/personas/tools/update_artifact_spec.rb b/plugins/discourse-ai/spec/lib/personas/tools/update_artifact_spec.rb
index efd7fa809281f..0c3f01a749898 100644
--- a/plugins/discourse-ai/spec/lib/personas/tools/update_artifact_spec.rb
+++ b/plugins/discourse-ai/spec/lib/personas/tools/update_artifact_spec.rb
@@ -172,6 +172,46 @@
       expect(tool.custom_raw).not_to include("### JavaScript Changes")
     end
 
+    it "falls back when diff rendering exceeds the comparison budget" do
+      responses = [<<~TXT.strip]
+        [HTML]
+        <div>Updated</div>
+        [/HTML]
+      TXT
+
+      ONPDiff
+        .any_instance
+        .stubs(:diff)
+        .raises(
+          ONPDiff::DiffLimitExceeded.new(
+            comparisons_used: 1,
+            comparison_budget: 0,
+            left_size: 1,
+            right_size: 1,
+          ),
+        )
+
+      tool = nil
+
+      DiscourseAi::Completions::Llm.with_prepared_responses(responses) do
+        tool =
+          described_class.new(
+            { artifact_id: artifact.id, instructions: "Just update the HTML" },
+            bot_user: bot_user,
+            llm: llm_model.to_llm,
+            persona_options: {
+              "update_algorithm" => "full",
+            },
+            context: DiscourseAi::Personas::BotContext.new(messages: [], post: post),
+          )
+
+        result = tool.invoke {}
+        expect(result[:status]).to eq("success")
+      end
+
+      expect(tool.custom_raw).to include(I18n.t("errors.diff_too_complex"))
+    end
+
     it "handles updates to specific versions" do
       # Create first version
       responses = [<<~TXT.strip]
diff --git a/spec/lib/onpdiff_spec.rb b/spec/lib/onpdiff_spec.rb
index 0a7e46a131c7a..41b8ab6a05dad 100644
--- a/spec/lib/onpdiff_spec.rb
+++ b/spec/lib/onpdiff_spec.rb
@@ -12,10 +12,12 @@
       )
     end
 
-    it "bails out on large diffs" do
-      a = SecureRandom.alphanumeric(5_000)
-      b = SecureRandom.alphanumeric(5_000)
-      expect(ONPDiff.new(a, b).diff).to eq([])
+    it "raises when comparison budget is exceeded" do
+      diff = ONPDiff.new("abcd", "wxyz", comparison_budget_factor: 1, max_comparison_budget: 2)
+
+      expect { diff.diff }.to raise_error(ONPDiff::DiffLimitExceeded)
+      expect(diff.comparison_budget).to eq(2)
+      expect(diff.comparisons_used).to eq(3)
     end
   end
 
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index b619ad5b17975..d6e70e28f093e 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -533,6 +533,32 @@
         expect(post.revisions.count).to eq(1)
       end
 
+      it "creates a new version when diff computation exceeds the comparison budget" do
+        SiteSetting.editing_grace_period = 1.minute
+        SiteSetting.editing_grace_period_max_diff = 1_000
+
+        post = Fabricate(:post, raw: "hello world")
+        revisor = PostRevisor.new(post)
+
+        ONPDiff
+          .any_instance
+          .stubs(:short_diff)
+          .raises(
+            ONPDiff::DiffLimitExceeded.new(
+              comparisons_used: 2_000_001,
+              comparison_budget: 2_000_000,
+              left_size: 11,
+              right_size: 12,
+            ),
+          )
+
+        revisor.revise!(post.user, { raw: "hello world!" }, revised_at: post.updated_at + 1.second)
+
+        post.reload
+        expect(post.version).to eq(2)
+        expect(post.revisions.count).to eq(1)
+      end
+
       it "creates a new version when the post is flagged" do
         SiteSetting.editing_grace_period = 1.minute
 
diff --git a/spec/requests/admin/staff_action_logs_controller_spec.rb b/spec/requests/admin/staff_action_logs_controller_spec.rb
index f55c7f7014ce1..d72060926697c 100644
--- a/spec/requests/admin/staff_action_logs_controller_spec.rb
+++ b/spec/requests/admin/staff_action_logs_controller_spec.rb
@@ -388,6 +388,31 @@
         get "/admin/logs/staff_action_logs/#{UserHistory.last.id}/diff.json"
         expect(response.status).to eq(200)
       end
+
+      it "falls back when diff generation exceeds the comparison budget" do
+        theme = Fabricate(:theme)
+        theme.set_field(target: :mobile, name: :scss, value: "body {.up}")
+        original_json =
+          ThemeSerializer.new(theme, root: false, include_theme_field_values: true).to_json
+        theme.set_field(target: :mobile, name: :scss, value: "body {.down}")
+        record = StaffActionLogger.new(Discourse.system_user).log_theme_change(original_json, theme)
+
+        ONPDiff
+          .any_instance
+          .stubs(:compose)
+          .raises(
+            ONPDiff::DiffLimitExceeded.new(
+              comparisons_used: 1,
+              comparison_budget: 0,
+              left_size: 1,
+              right_size: 1,
+            ),
+          )
+
+        get "/admin/logs/staff_action_logs/#{record.id}/diff.json"
+        expect(response.status).to eq(200)
+        expect(response.parsed_body["side_by_side"]).to include(I18n.t("errors.diff_too_complex"))
+      end
     end
 
     context "when logged in as a moderator" do
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 4158bb2230b2c..173cf31b9e0af 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -2385,6 +2385,36 @@
       expect(response.status).to eq(400)
     end
 
+    context "when diff generation exceeds the comparison budget" do
+      let(:diff_error) do
+        ONPDiff::DiffLimitExceeded.new(
+          comparisons_used: 1,
+          comparison_budget: 0,
+          left_size: 1,
+          right_size: 1,
+        )
+      end
+
+      before { ONPDiff.any_instance.stubs(:compose).raises(diff_error) }
+
+      it "returns a 422 error for a specific revision endpoint" do
+        sign_in(admin)
+        get "/posts/#{post.id}/revisions/#{post_revision.number}.json"
+
+        expect(response.status).to eq(422)
+        expect(response.parsed_body["errors"]).to include(I18n.t("errors.diff_too_complex"))
+      end
+
+      it "returns a 422 error for the latest revision endpoint" do
+        sign_in(admin)
+        post_revision
+        get "/posts/#{post.id}/revisions/latest.json"
+
+        expect(response.status).to eq(422)
+        expect(response.parsed_body["errors"]).to include(I18n.t("errors.diff_too_complex"))
+      end
+    end
+
     context "when edit history is not visible to the public" do
       before { SiteSetting.edit_history_visible_to_public = false }
 

From 9dcc851c9bf1a19d860c5f617c4a020f2186ce38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Saquetim?=
 <1108771+megothss@users.noreply.github.com>
Date: Wed, 25 Feb 2026 17:36:43 -0300
Subject: [PATCH 081/168] DEV: Add Block API for declarative, validated UI
 extension points (#36810)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit introduces the Blocks API, a declarative system for composing
validated, conditionally rendered UI layouts.

Blocks are Glimmer components with typed argument schemas, conditional
rendering rules, and outlet restrictions — all validated at registration
time. The system provides centralized registries for blocks, outlets,
and condition types, with a two-phase lifecycle that freezes registries
after initialization. Container blocks enable hierarchical layouts, and
a built-in condition system supports route matching, user state, site
settings, viewport breakpoints, and outlet arg inspection — all
composable with AND/OR/NOT combinators.

## Plugin API

Four methods are added to the plugin API.

`api.registerBlock(BlockClass)` registers a block component for use in
layouts, supporting both direct class registration and lazy loading via
factory functions (`api.registerBlock("name", () => import(...))`).

`api.renderBlocks(outletName, layout)` defines the block layout for an
outlet, where each entry is a `LayoutEntry` describing the block, its
args, class names, children, conditions, and container args.

`api.registerBlockOutlet(name, options)` allows plugins and themes to
define their own named outlets.
`api.registerBlockConditionType(ConditionClass)` registers a custom
condition type.

Registration methods must be called in pre-initializers (before the
registry freeze), while `renderBlocks` must be called in
api-initializers (after the freeze).

## The `@block` Decorator

The `@block(name, options)` decorator transforms a Glimmer component
into a block. It supports typed argument schemas with validation
constraints (`min`, `max`, `minLength`, `maxLength`, `pattern`, `enum`,
`itemEnum`, `integer`) for types `string`, `number`, `boolean`, `array`,
`object`, and `any`. Cross-argument constraints like `atLeastOne`,
`exactlyOne`, `allOrNone`, `atMostOne`, and `requires` enforce
relationships between arguments. A `validate(args)` function enables
custom validation logic.

Blocks can restrict which outlets they render in using `allowedOutlets`
and `deniedOutlets` with glob patterns.

Container blocks (`container: true`) can nest children and define a
`childArgs` schema for args passed from children to the parent.

Namespacing is enforced: core blocks use `block-name`, plugins use
`plugin-name:block-name`, and themes use `theme:theme-name:block-name`.
Blocks can only render inside `<BlockOutlet>` components or as
authorized children of container blocks — direct template usage throws
an error.

## `<BlockOutlet>` Component

`<BlockOutlet>` is the root rendering component and is itself a
container block. It accepts `@name` (the outlet identifier),
`@outletArgs` (arguments passed to all blocks in the outlet), and
`@deprecatedArgs` (args that trigger deprecation warnings on access). It
provides `<:before>`, `<:after>`, and `<:error>` named block slots.

Four core outlets are defined: `hero-blocks`, `homepage-blocks`,
`main-outlet-blocks`, and `sidebar-blocks`. The application template
places `<BlockOutlet>` components for `hero-blocks` and
`main-outlet-blocks`, both hidden on admin routes.

## Conditions

Five built-in condition types handle the most common rendering
scenarios.

The `route` condition matches URL patterns using glob syntax, semantic
page types (`CATEGORY_PAGES`, `TAG_PAGES`, `DISCOVERY_PAGES`,
`HOMEPAGE`, `TOPIC_PAGES`, `USER_PAGES`, `ADMIN_PAGES`, `GROUP_PAGES`,
`TOP_MENU`), route params, and query params.

The `user` condition checks login status, trust level,
admin/moderator/staff status, and group membership.

The `setting` condition evaluates site settings with operators like
`enabled`, `equals`, `includes`, `contains`, and `containsAny`.

The `viewport` condition matches breakpoints (`sm`, `md`, `lg`, `xl`,
`2xl`) and touch capability.

The `outlet-arg` condition matches outlet argument values using
dot-notation paths with value matchers supporting primitives, arrays,
regex, `not`, and `any`.

Conditions are composable through combinators: arrays represent AND
logic, `{ any: [...] }` represents OR logic, and `{ not: {...} }`
represents NOT logic. Parameters within conditions (`params`,
`queryParams`) support the same combinator syntax.

## The `@blockCondition` Decorator

Custom conditions extend `BlockCondition` and use the
`@blockCondition(config)` decorator. The config accepts a `type` name, a
`sourceType` for resolving external data (`"none"`, `"outletArgs"`, or
`"object"` for sources like theme settings), an argument schema with the
same validation as block args, cross-arg constraints, and a custom
validation function.

## Built-in Container Blocks

Two container blocks are provided. `group` renders all its children in
sequence, acting as a simple grouping mechanism. `head` renders only the
first child whose conditions pass, implementing an if/else-if/else
fallback pattern.

## Two-Phase Initialization

Registration happens in pre-initializers. The `freeze-block-registry`
initializer then registers built-in blocks and core condition types, and
freezes all three registries (blocks, outlets, conditions) to prevent
further modifications. Layout rendering via `api.renderBlocks()` happens
in api-initializers after the freeze, ensuring all blocks and conditions
are available when layouts are validated.

## Developer Tooling

The dev tools integration provides a visual overlay that renders block
boundaries with hover tooltips showing the block name, conditions, and
arguments. Ghost blocks appear as dashed placeholders for hidden blocks,
showing why they're hidden (failed conditions, no visible children, or
hidden by `head`). Console logging outputs hierarchical condition
evaluation with pass/fail icons, color coding, resolved values, and type
mismatch hints. Outlet info badges display the outlet name, block count,
and arguments.

## Testing Utilities

`withTestBlockRegistration(callback)` and
`withTestConditionRegistration(callback)` temporarily unfreeze their
respective registries for test registration. Block query helpers
(`hasBlock`, `getBlockEntry`, `resolveBlock`, `tryResolveBlock`,
`isBlockResolved`) enable assertions on registry state.
`validateConditions(spec)` validates condition specs in tests.
`setupGhostCapture()` captures ghost block data for assertions on which
blocks were skipped and why.

## Test Coverage

Unit tests cover all five condition types, argument validation,
constraint validation, layout validation, the block/outlet/condition
registries, string similarity, outlet args, value matching, URL
matching, page definitions, debug logging, and console formatting.
Integration tests cover `<BlockOutlet>` rendering, container behavior
(`group`, `head`), condition evaluation, and layout wrappers. System
tests validate conditional rendering across SPA navigation and the dev
tools overlay.

---------

Co-authored-by: David Taylor <david@taylorhq.com>
---
 CODEOWNERS                                    |    9 +
 config/locales/client.en.yml                  |   35 +
 .../discourse/app/blocks/block-outlet.gjs     |  638 ++++
 .../app/blocks/builtin/block-group.gjs        |   27 +
 .../app/blocks/builtin/block-head.gjs         |  118 +
 .../discourse/app/blocks/builtin/index.js     |   32 +
 .../app/blocks/conditions/condition.js        |  241 ++
 .../app/blocks/conditions/decorator.js        |  219 ++
 .../discourse/app/blocks/conditions/index.js  |   12 +
 .../app/blocks/conditions/outlet-arg.js       |  148 +
 .../discourse/app/blocks/conditions/route.js  |  511 +++
 .../app/blocks/conditions/setting.js          |  220 ++
 .../discourse/app/blocks/conditions/user.js   |  281 ++
 .../app/blocks/conditions/viewport.js         |  119 +
 frontend/discourse/app/blocks/index.js        |   14 +
 .../app/components/async-content.gjs          |    2 +-
 .../discourse/app/components/d-styles.gjs     |   20 +
 .../app/components/plugin-connector.js        |    2 +-
 .../app/components/plugin-outlet.gjs          |    2 +-
 .../app/components/sidebar/user/sections.gjs  |    2 +
 .../discourse/app/controllers/application.js  |    7 +-
 .../discourse/app/helpers/css-identifier.js   |   12 +
 .../app/initializers/freeze-block-registry.js |   58 +
 frontend/discourse/app/lib/ajax-error.js      |   20 +-
 .../components/block-layout-wrapper.gjs       |  107 +
 .../components/block-outlet-inline-error.gjs  |   24 +
 .../block-outlet-root-container.gjs           |  276 ++
 .../app/lib/blocks/-internals/css.js          |   54 +
 .../app/lib/blocks/-internals/debug-hooks.js  |  371 +++
 .../app/lib/blocks/-internals/decorator.js    |  376 +++
 .../lib/blocks/-internals/entry-processing.js |  254 ++
 .../app/lib/blocks/-internals/error.js        |  845 +++++
 .../matching/condition-evaluator.js           |  314 ++
 .../-internals/matching/outlet-matcher.js     |  340 ++
 .../-internals/matching/page-definitions.js   |  441 +++
 .../blocks/-internals/matching/url-matcher.js |  103 +
 .../-internals/matching/value-matcher.js      |  323 ++
 .../app/lib/blocks/-internals/patterns.js     |  206 ++
 .../lib/blocks/-internals/registry/block.js   |  527 +++
 .../blocks/-internals/registry/condition.js   |  201 ++
 .../lib/blocks/-internals/registry/helpers.js |  311 ++
 .../lib/blocks/-internals/registry/outlet.js  |  166 +
 .../app/lib/blocks/-internals/utils.js        |  170 +
 .../lib/blocks/-internals/validation/args.js  | 1030 ++++++
 .../-internals/validation/block-args.js       |  195 ++
 .../-internals/validation/block-decorator.js  |  119 +
 .../-internals/validation/condition-args.js   |  134 +
 .../-internals/validation/conditions.js       |  299 ++
 .../-internals/validation/constraints.js      |  488 +++
 .../blocks/-internals/validation/layout.js    |  948 ++++++
 frontend/discourse/app/lib/blocks/index.js    |  142 +
 frontend/discourse/app/lib/glob-utils.js      |   29 +
 frontend/discourse/app/lib/outlet-args.js     |  155 +
 frontend/discourse/app/lib/plugin-api.gjs     |  203 ++
 .../discourse/app/lib/plugin-connectors.js    |   78 +-
 .../app/lib/registry/block-outlets.js         |   56 +
 .../registry.js => registry/transformers.js}  |   28 +-
 .../discourse/app/lib/string-similarity.js    |  166 +
 frontend/discourse/app/lib/transformer.js     |    6 +-
 frontend/discourse/app/loader-shims.js        |    3 +
 frontend/discourse/app/services/blocks.js     |  353 +++
 frontend/discourse/app/services/discovery.js  |    6 +
 .../dev-tools/block-debug/block-info.gjs      |  177 ++
 .../static/dev-tools/block-debug/button.gjs   |  140 +
 .../dev-tools/block-debug/conditions-tree.gjs |  186 ++
 .../dev-tools/block-debug/debug-logger.js     |  541 ++++
 .../dev-tools/block-debug/ghost-block.gjs     |  225 ++
 .../dev-tools/block-debug/outlet-info.gjs     |  153 +
 .../app/static/dev-tools/block-debug/patch.js |  362 +++
 .../app/static/dev-tools/entrypoint.js        |    2 +
 .../static/dev-tools/lib/console-logger.js    |   85 +
 .../static/dev-tools/lib/value-formatter.js   |  129 +
 .../static/dev-tools/mobile-view/button.gjs   |    3 +-
 .../plugin-outlet-debug/args-table.gjs        |   75 -
 .../dev-tools/plugin-outlet-debug/button.gjs  |    7 +-
 .../plugin-outlet-debug/outlet-info.gjs       |   63 +-
 .../dev-tools/plugin-outlet-debug/patch.js    |    9 +-
 .../app/static/dev-tools/safe-mode/button.gjs |    5 +-
 .../static/dev-tools/shared/args-table.gjs    |  179 ++
 .../discourse/app/static/dev-tools/state.js   |  144 +-
 .../discourse/app/static/dev-tools/styles.css |  626 +++-
 .../app/static/dev-tools/toolbar.gjs          |   41 +-
 .../dev-tools/verbose-localization/button.gjs |    4 +-
 .../discourse/app/templates/application.gjs   |    8 +
 .../app/templates/discovery/custom.gjs        |   21 +-
 frontend/discourse/package.json               |    1 +
 .../discourse/tests/helpers/block-testing.gjs |  379 +++
 .../discourse/tests/helpers/qunit-helpers.js  |    8 +
 .../components/block-group-test.gjs           |  478 +++
 .../components/block-head-test.gjs            |  451 +++
 .../components/block-layout-wrapper-test.gjs  |  386 +++
 .../block-outlet-conditions-test.gjs          |  623 ++++
 .../components/block-outlet-test.gjs          | 1759 ++++++++++
 .../tests/unit/blocks/arg-validation-test.js  |  203 ++
 .../unit/blocks/conditions/condition-test.js  |  293 ++
 .../unit/blocks/conditions/decorator-test.js  |  627 ++++
 .../unit/blocks/conditions/outlet-arg-test.js |  301 ++
 .../unit/blocks/conditions/route-test.js      | 1312 ++++++++
 .../unit/blocks/conditions/setting-test.js    |  660 ++++
 .../tests/unit/blocks/conditions/user-test.js |  725 +++++
 .../unit/blocks/conditions/viewport-test.js   |  207 ++
 .../tests/unit/blocks/entry-formatter-test.js |  249 ++
 .../discourse/tests/unit/blocks/error-test.js |  270 ++
 .../tests/unit/lib/block-outlet-test.js       |  898 ++++++
 .../tests/unit/lib/blocks/core/error-test.js  |  154 +
 .../unit/lib/blocks/core/patterns-test.js     |  210 ++
 .../unit/lib/blocks/core/registration-test.js | 1135 +++++++
 .../tests/unit/lib/blocks/core/utils-test.js  |  134 +
 .../lib/blocks/debug/debug-logger-test.js     |  888 ++++++
 .../blocks/matching/outlet-matcher-test.js    |  494 +++
 .../blocks/matching/page-definitions-test.js  |  565 ++++
 .../lib/blocks/matching/url-matcher-test.js   |  246 ++
 .../lib/blocks/matching/value-matcher-test.js |  601 ++++
 .../unit/lib/blocks/validation/args-test.js   | 2822 +++++++++++++++++
 .../unit/lib/blocks/validation/config-test.js |   73 +
 .../unit/lib/blocks/validation/layout-test.js |  512 +++
 .../unit/lib/dev-tools/console-logger-test.js |  151 +
 .../lib/dev-tools/value-formatter-test.js     |  199 ++
 .../tests/unit/lib/outlet-args-test.js        |  147 +
 .../tests/unit/lib/plugin-api-test.js         |  128 +
 .../tests/unit/lib/string-similarity-test.js  |  156 +
 .../tests/unit/services/blocks-test.js        |  612 ++++
 lib/svg_sprite.rb                             |    2 +
 package.json                                  |    2 +-
 pnpm-lock.yaml                                |   13 +-
 .../themes/dev-tools-test-theme/about.json    |    4 +
 .../api-initializers/test-blocks.gjs          |  161 +
 .../pre-initializers/register-test-blocks.gjs |  253 ++
 spec/system/blocks_spec.rb                    |  283 ++
 spec/system/dev_tools_spec.rb                 |  224 +-
 spec/system/page_objects/components/blocks.rb |   32 +
 .../components/dev_tools/block_debug.rb       |  143 +
 .../dev_tools/plugin_outlet_debug.rb          |   46 +
 .../components/dev_tools/toolbar.rb           |   64 +
 tsconfig-base.json                            |    2 +-
 135 files changed, 35748 insertions(+), 319 deletions(-)
 create mode 100644 frontend/discourse/app/blocks/block-outlet.gjs
 create mode 100644 frontend/discourse/app/blocks/builtin/block-group.gjs
 create mode 100644 frontend/discourse/app/blocks/builtin/block-head.gjs
 create mode 100644 frontend/discourse/app/blocks/builtin/index.js
 create mode 100644 frontend/discourse/app/blocks/conditions/condition.js
 create mode 100644 frontend/discourse/app/blocks/conditions/decorator.js
 create mode 100644 frontend/discourse/app/blocks/conditions/index.js
 create mode 100644 frontend/discourse/app/blocks/conditions/outlet-arg.js
 create mode 100644 frontend/discourse/app/blocks/conditions/route.js
 create mode 100644 frontend/discourse/app/blocks/conditions/setting.js
 create mode 100644 frontend/discourse/app/blocks/conditions/user.js
 create mode 100644 frontend/discourse/app/blocks/conditions/viewport.js
 create mode 100644 frontend/discourse/app/blocks/index.js
 create mode 100644 frontend/discourse/app/helpers/css-identifier.js
 create mode 100644 frontend/discourse/app/initializers/freeze-block-registry.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjs
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjs
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/components/block-outlet-root-container.gjs
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/css.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/debug-hooks.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/decorator.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/entry-processing.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/error.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/matching/condition-evaluator.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/matching/outlet-matcher.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/matching/page-definitions.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/matching/url-matcher.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/matching/value-matcher.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/patterns.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/registry/block.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/registry/condition.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/registry/helpers.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/registry/outlet.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/utils.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/validation/args.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/validation/block-args.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/validation/block-decorator.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/validation/condition-args.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/validation/conditions.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/validation/constraints.js
 create mode 100644 frontend/discourse/app/lib/blocks/-internals/validation/layout.js
 create mode 100644 frontend/discourse/app/lib/blocks/index.js
 create mode 100644 frontend/discourse/app/lib/glob-utils.js
 create mode 100644 frontend/discourse/app/lib/outlet-args.js
 create mode 100644 frontend/discourse/app/lib/registry/block-outlets.js
 rename frontend/discourse/app/lib/{transformer/registry.js => registry/transformers.js} (75%)
 create mode 100644 frontend/discourse/app/lib/string-similarity.js
 create mode 100644 frontend/discourse/app/services/blocks.js
 create mode 100644 frontend/discourse/app/static/dev-tools/block-debug/block-info.gjs
 create mode 100644 frontend/discourse/app/static/dev-tools/block-debug/button.gjs
 create mode 100644 frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjs
 create mode 100644 frontend/discourse/app/static/dev-tools/block-debug/debug-logger.js
 create mode 100644 frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjs
 create mode 100644 frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjs
 create mode 100644 frontend/discourse/app/static/dev-tools/block-debug/patch.js
 create mode 100644 frontend/discourse/app/static/dev-tools/lib/console-logger.js
 create mode 100644 frontend/discourse/app/static/dev-tools/lib/value-formatter.js
 delete mode 100644 frontend/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs
 create mode 100644 frontend/discourse/app/static/dev-tools/shared/args-table.gjs
 create mode 100644 frontend/discourse/tests/helpers/block-testing.gjs
 create mode 100644 frontend/discourse/tests/integration/components/block-group-test.gjs
 create mode 100644 frontend/discourse/tests/integration/components/block-head-test.gjs
 create mode 100644 frontend/discourse/tests/integration/components/block-layout-wrapper-test.gjs
 create mode 100644 frontend/discourse/tests/integration/components/block-outlet-conditions-test.gjs
 create mode 100644 frontend/discourse/tests/integration/components/block-outlet-test.gjs
 create mode 100644 frontend/discourse/tests/unit/blocks/arg-validation-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/conditions/condition-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/conditions/decorator-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/conditions/outlet-arg-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/conditions/route-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/conditions/setting-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/conditions/user-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/conditions/viewport-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/entry-formatter-test.js
 create mode 100644 frontend/discourse/tests/unit/blocks/error-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/block-outlet-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/core/error-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/core/patterns-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/core/registration-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/core/utils-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/debug/debug-logger-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/matching/outlet-matcher-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/matching/page-definitions-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/matching/url-matcher-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/matching/value-matcher-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/validation/args-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/validation/config-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/blocks/validation/layout-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/dev-tools/console-logger-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/dev-tools/value-formatter-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/outlet-args-test.js
 create mode 100644 frontend/discourse/tests/unit/lib/string-similarity-test.js
 create mode 100644 frontend/discourse/tests/unit/services/blocks-test.js
 create mode 100644 spec/fixtures/themes/dev-tools-test-theme/about.json
 create mode 100644 spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/api-initializers/test-blocks.gjs
 create mode 100644 spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/pre-initializers/register-test-blocks.gjs
 create mode 100644 spec/system/blocks_spec.rb
 create mode 100644 spec/system/page_objects/components/blocks.rb
 create mode 100644 spec/system/page_objects/components/dev_tools/block_debug.rb
 create mode 100644 spec/system/page_objects/components/dev_tools/plugin_outlet_debug.rb
 create mode 100644 spec/system/page_objects/components/dev_tools/toolbar.rb

diff --git a/CODEOWNERS b/CODEOWNERS
index a2e9f9dc92a2b..4bced546aa22f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,3 +1,12 @@
+# Dev Experience (Block API, Dev Tools, Registry, Plugin API)
+/frontend/discourse/app/blocks/ @discourse/dev-xp
+/frontend/discourse/app/lib/blocks/ @discourse/dev-xp
+/frontend/discourse/app/services/blocks.js @discourse/dev-xp
+/frontend/discourse/app/static/dev-tools/ @discourse/dev-xp
+/frontend/discourse/app/lib/registry/ @discourse/dev-xp
+/frontend/discourse/app/lib/plugin-api.gjs @discourse/dev-xp
+
+# Migrations tooling
 /migrations/ @discourse/migrations-tooling
 /script/bulk_import/ @discourse/migrations-tooling
 /script/import_scripts/ @discourse/migrations-tooling
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c9cb91857b4d9..2ecabbac60adf 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1,5 +1,24 @@
 en:
   js:
+    blocks:
+      ghost:
+        # Section titles
+        status: "Status"
+        conditions: "Conditions"
+        arguments: "Arguments"
+        container_args: "Container Args"
+        in_location: "in"
+        # Status text (used in badge, header, and status section)
+        hidden: "hidden"
+        not_registered: "not registered"
+        no_visible_children: "no visible children"
+        failed: "failed"
+      ghost_reasons:
+        # Longer hint messages shown at bottom of ghost tooltip
+        optional_missing_hint: "This optional block is not rendered because it's not registered."
+        no_visible_children_hint: "This container block is not rendered because none of its children are visible."
+        condition_failed_hint: "This block is not rendered because its conditions failed."
+        head_hidden_tail_hint: "This block is not rendered because another block was rendered first in the `head` container."
     carousel:
       go_to_slide: "Go to slide %{index}"
       previous: "Previous slide"
@@ -355,6 +374,8 @@ en:
 
     broken_plugin_alert: "Caused by plugin '%{name}'"
     broken_transformer_alert: "There was an error. Your site may not work properly."
+    broken_block_alert: "A block configuration error was detected. Check browser console for details."
+    broken_block_factory_alert: "A block failed to load. Some UI elements may not display correctly."
 
     critical_deprecation:
       notice: "<b>[Admin Notice]</b> %{source} contains code which needs updating. (id:%{id})"
@@ -363,6 +384,20 @@ en:
       plugin_source: "Plugin '%{name}'"
       unknown_source: "One of your themes or plugins"
 
+    dev_tools:
+      drag_to_move: "Drag to move"
+      toggle_plugin_outlet_debug: "Toggle plugin outlet debug"
+      toggle_block_debug: "Toggle block debug"
+      block_debug:
+        outlet_boundaries: "Outlet boundaries"
+        visual_overlay: "Visual overlay"
+        ghost_blocks: "Ghost blocks"
+        condition_debugging: "Condition debugging"
+      toggle_safe_mode: "Toggle safe mode"
+      toggle_verbose_localization: "Toggle verbose localization"
+      toggle_mobile_view: "Toggle mobile view"
+      disable_dev_tools: "Disable dev tools"
+
     s3:
       regions:
         ap_northeast_1: "Asia Pacific (Tokyo)"
diff --git a/frontend/discourse/app/blocks/block-outlet.gjs b/frontend/discourse/app/blocks/block-outlet.gjs
new file mode 100644
index 0000000000000..29f5dfe18eee3
--- /dev/null
+++ b/frontend/discourse/app/blocks/block-outlet.gjs
@@ -0,0 +1,638 @@
+// @ts-check
+/**
+ * BlockOutlet System
+ *
+ * This module provides the BlockOutlet component and outlet layout management.
+ * BlockOutlet is the root entry point for rendering blocks in designated areas.
+ *
+ * This file handles:
+ * - BlockOutlet component
+ * - Outlet layout registration and management
+ * - Child block creation and rendering
+ */
+import Component from "@glimmer/component";
+import { DEBUG } from "@glimmer/env";
+import { cached } from "@glimmer/tracking";
+import curryComponent from "ember-curry-component";
+/** @type {import("discourse/components/async-content.gjs")} */
+import AsyncContent from "discourse/components/async-content";
+/** @type {import("discourse/lib/blocks/-internals/components/block-layout-wrapper.gjs")} */
+import { wrapBlockLayout } from "discourse/lib/blocks/-internals/components/block-layout-wrapper";
+/** @type {import("discourse/lib/blocks/-internals/components/block-outlet-inline-error.gjs")} */
+import BlockOutletInlineError from "discourse/lib/blocks/-internals/components/block-outlet-inline-error";
+/** @type {import("discourse/lib/blocks/-internals/components/block-outlet-root-container.gjs")} */
+import BlockOutletRootContainer from "discourse/lib/blocks/-internals/components/block-outlet-root-container";
+import {
+  createDebugGhost,
+  DEBUG_CALLBACK,
+  debugHooks,
+} from "discourse/lib/blocks/-internals/debug-hooks";
+import {
+  block,
+  createBlockArgsWithReactiveGetters,
+  getBlockMetadata,
+  registerRootBlock,
+} from "discourse/lib/blocks/-internals/decorator";
+import {
+  captureCallSite,
+  raiseBlockError,
+} from "discourse/lib/blocks/-internals/error";
+import { isBlockRegistryFrozen } from "discourse/lib/blocks/-internals/registry/block";
+import { applyArgDefaults } from "discourse/lib/blocks/-internals/utils";
+import { validateLayout } from "discourse/lib/blocks/-internals/validation/layout";
+import { isRailsTesting, isTesting } from "discourse/lib/environment";
+import { buildArgsWithDeprecations } from "discourse/lib/outlet-args";
+import { BLOCK_OUTLETS } from "discourse/lib/registry/block-outlets";
+
+/**
+ * A block entry in a layout configuration.
+ *
+ * @typedef {Object} LayoutEntry
+ * @property {typeof Component | string} block - The block component class (must use @block decorator) or a registered block name string.
+ * @property {Object} [args] - Args to pass to the block component.
+ * @property {string|string[]} [classNames] - Additional CSS classes for the block wrapper.
+ * @property {Array<LayoutEntry>} [children] - Nested block entries (only for container blocks).
+ * @property {Array<Object>|Object} [conditions] - Conditions that must pass for block to render.
+ * @property {Object} [containerArgs] - Args passed from parent container's childArgs.
+ */
+
+/**
+ * Maps outlet names to their registered outlet layouts.
+ * Each outlet can have exactly one layout registered.
+ *
+ * DO NOT EXPORT THIS MAP to prevent layouts bypassing the validation steps
+ *
+ * @type {Map<string, {validatedLayout: Promise<Array<Object>>}>}
+ */
+const outletLayouts = new Map();
+
+/**
+ * Counter for generating stable entry keys.
+ * Incremented for each block entry when a layout is registered via `_renderBlocks()`.
+ *
+ * @type {number}
+ */
+let nextEntryKey = 0;
+
+/**
+ * Recursively assigns stable keys to all block entries in a layout.
+ *
+ * Each entry receives a `__stableKey` property that remains constant across
+ * renders. This is critical for Ember's `{{#each key=}}` to maintain DOM
+ * identity when blocks are hidden/shown by conditions.
+ *
+ * Keys are assigned at registration time (in `_renderBlocks()`) rather than
+ * render time, ensuring they survive the shallow cloning in `BlockOutletRootContainer#preprocessEntries`.
+ *
+ * @param {Array<Object>} entries - The block entries to process.
+ */
+function assignStableKeys(entries) {
+  for (const entry of entries) {
+    entry.__stableKey = nextEntryKey++;
+
+    // Recursively assign keys to children
+    if (entry.children?.length) {
+      assignStableKeys(entry.children);
+    }
+  }
+}
+
+/**
+ * Clears all registered outlet layouts.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ */
+export function _resetOutletLayoutsForTesting() {
+  if (DEBUG) {
+    outletLayouts.clear();
+    nextEntryKey = 0;
+  }
+}
+
+/**
+ * Returns the internal outlet layouts map for testing.
+ * Allows tests to access validation promises to verify error handling.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @returns {Map<string, {validatedLayout: Promise<Array<Object>>}>} The outlet layouts map.
+ */
+export function _getOutletLayouts() {
+  if (DEBUG) {
+    return outletLayouts;
+  }
+  return new Map();
+}
+
+/**
+ * Resolves the decoratorClassNames value from block metadata.
+ * Handles string, array, and function forms.
+ *
+ * @param {Object} metadata - The block metadata object.
+ * @param {Object} args - The block's args (passed to function form).
+ * @returns {string|null} The resolved class names string, or null if none.
+ */
+function resolveDecoratorClassNames(metadata, args) {
+  const value = metadata.decoratorClassNames;
+  if (value == null) {
+    return null;
+  }
+  if (typeof value === "function") {
+    return value(args);
+  }
+  if (Array.isArray(value)) {
+    return value.join(" ");
+  }
+  return value;
+}
+
+/**
+ * Creates a renderable child block from a block entry.
+ * Curries the component with all necessary args and wraps all blocks
+ * in a layout wrapper for consistent styling.
+ *
+ * @param {Object} entry - The block entry
+ * @param {import("discourse/lib/blocks/-internals/registry/block").BlockClass} entry.block - The block component class
+ * @param {Object} [entry.args] - Args to pass to the block
+ * @param {Object} [entry.containerArgs] - Container args for parent's childArgs schema
+ * @param {string} [entry.classNames] - Additional CSS classes
+ * @param {string} [entry.id] - Unique identifier for BEM styling and targeting
+ * @param {import("@ember/owner").default} owner - The application owner
+ * @param {Object} [debugContext] - Debug context for visual overlay
+ * @param {string} [debugContext.displayHierarchy] - Where the block is rendered (for tooltip display)
+ * @param {string} [debugContext.containerPath] - Container's full path (for children's __hierarchy)
+ * @param {Object} [debugContext.conditions] - The block's conditions
+ * @param {Object} [debugContext.outletArgs] - Outlet args for debug display
+ * @param {string} [debugContext.key] - Stable unique key for this block
+ * @param {string} [debugContext.outletName] - The outlet name for wrapper class generation
+ * @param {Array<import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult>} [debugContext.processedChildren] - Pre-processed children
+ * @returns {import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult}
+ *   An object containing the curried block component, any containerArgs
+ *   provided in the block entry, and a stable unique key for list rendering.
+ *   The containerArgs are values required by the parent container's childArgs
+ *   schema, accessible to the parent but not to the child block itself.
+ */
+function createChildBlock(entry, owner, debugContext = {}) {
+  const {
+    block: ComponentClass,
+    args = {},
+    containerArgs,
+    classNames,
+    id,
+  } = entry;
+  const blockMeta = getBlockMetadata(ComponentClass);
+  const isContainer = blockMeta?.isContainer ?? false;
+
+  // Apply default values from metadata before building args
+  const argsWithDefaults = applyArgDefaults(ComponentClass, args);
+
+  // Create block args with authorization token embedded.
+  // classNames are handled by wrappers, containerPath provides full path for debug logging.
+  const blockArgs = createBlockArgsWithReactiveGetters(argsWithDefaults, {
+    children: debugContext.processedChildren,
+    outletArgs: debugContext.outletArgs,
+    outletName: debugContext.outletName,
+    __hierarchy: isContainer
+      ? debugContext.containerPath
+      : debugContext.displayHierarchy,
+  });
+
+  // Curry the component with pre-bound args so it can be rendered
+  // without knowing its configuration details
+  const curried = curryComponent(ComponentClass, blockArgs, owner);
+
+  // All blocks are wrapped for consistent styling
+  let wrappedComponent = wrapBlockLayout(
+    {
+      name: blockMeta?.blockName,
+      namespace: blockMeta?.namespace,
+      outletName: debugContext.outletName,
+      isContainer,
+      id,
+      decoratorClassNames: resolveDecoratorClassNames(
+        blockMeta,
+        argsWithDefaults
+      ),
+      classNames,
+      Component: curried,
+    },
+    owner
+  );
+
+  // Apply debug callback if present (for visual overlay)
+  const debugCallback = debugHooks.getCallback(DEBUG_CALLBACK.BLOCK_DEBUG);
+  if (debugCallback) {
+    const debugResult = debugCallback(
+      {
+        name: blockMeta?.blockName,
+        id,
+        Component: wrappedComponent,
+        args: argsWithDefaults,
+        containerArgs,
+        conditions: debugContext.conditions,
+        conditionsPassed: true,
+      },
+      {
+        outletName: debugContext.displayHierarchy,
+        outletArgs: debugContext.outletArgs,
+      }
+    );
+    if (debugResult?.Component) {
+      wrappedComponent = debugResult.Component;
+    }
+  }
+
+  /** @type {import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult} */
+  const result = {
+    Component: wrappedComponent,
+    containerArgs,
+    key: debugContext.key,
+    /**
+     * Returns a ghost version of this child with a custom failure reason.
+     *
+     * Used by container blocks (like head) that choose not to render some children
+     * but want to show them as ghosts in debug mode with an explanation.
+     *
+     * @param {string} reason - The failure reason to display in the ghost overlay.
+     * @returns {import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult|null}
+     *   A ghost child block result, or null if debug mode is disabled.
+     */
+    asGhost(reason) {
+      const ghostResult = createDebugGhost(
+        {
+          name: blockMeta?.blockName,
+          id,
+          args: argsWithDefaults,
+          containerArgs,
+          conditions: debugContext.conditions,
+          failureReason: reason,
+        },
+        {
+          outletName: debugContext.displayHierarchy,
+          outletArgs: debugContext.outletArgs,
+        }
+      );
+
+      if (ghostResult) {
+        /** @type {import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult} */
+        const ghostChild = {
+          Component: ghostResult.Component,
+          containerArgs,
+          key: `${debugContext.key}:ghost`,
+          isGhost: true,
+          asGhost: () => ghostChild,
+        };
+        return ghostChild;
+      }
+
+      return null;
+    },
+  };
+
+  return result;
+}
+
+/**
+ * Registers an outlet layout (array of block entries) for a named outlet.
+ *
+ * This is the main entry point for plugins to render blocks in designated areas.
+ * Each outlet can only have one layout registered. Attempting to register a
+ * second layout throws an error.
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @param {string} outletName - The outlet identifier (must be in BLOCK_OUTLETS).
+ * @param {Array<LayoutEntry>} layout - Array of block entries.
+ * @param {Object} [owner] - The application owner for service lookup (passed from plugin API).
+ * @param {Error|null} [callSiteError] - Pre-captured error for source-mapped stack traces.
+ *   When called via api.renderBlocks(), this is captured there to exclude the PluginApi wrapper.
+ * @returns {Promise<Array<Object>>} Promise resolving to the validated layout array.
+ * @throws {Error} If validation fails or outlet already has a layout.
+ *
+ * @example
+ * ```js
+ *
+ * api.renderBlocks("homepage-blocks", [
+ *   { block: HeroBanner, args: { title: "Welcome" } },
+ *   {
+ *     block: BlockGroup,
+ *     children: [
+ *       { block: FeatureCard, args: { icon: "star" } },
+ *       { block: FeatureCard, args: { icon: "heart" } },
+ *     ]
+ *   },
+ *   {
+ *     block: AdminBanner,
+ *     args: { title: "Admin Only" },
+ *     conditions: [
+ *       { type: "user", admin: true }
+ *     ]
+ *   }
+ * ]);
+ * ```
+ */
+export function _renderBlocks(outletName, layout, owner, callSiteError = null) {
+  if (!callSiteError) {
+    callSiteError = captureCallSite(_renderBlocks);
+  }
+
+  // Check for duplicate registration
+  if (outletLayouts.has(outletName)) {
+    raiseBlockError(
+      `Block outlet "${outletName}" already has a layout registered.`
+    );
+  }
+
+  // Validate outlet name is known
+  if (!BLOCK_OUTLETS.includes(outletName)) {
+    raiseBlockError(`Unknown block outlet: ${outletName}`);
+  }
+
+  // Verify registries are frozen
+  if (!isBlockRegistryFrozen()) {
+    raiseBlockError(
+      `api.renderBlocks() was called before the block registry was frozen. ` +
+        `Move your code to an initializer that runs after "freeze-block-registry". ` +
+        `Outlet: "${outletName}"`
+    );
+  }
+
+  const blocksService = owner?.lookup("service:blocks");
+
+  // Assign stable keys to all entries
+  assignStableKeys(layout);
+
+  // Validate layout asynchronously
+  const validatedLayout = validateLayout(
+    layout,
+    outletName,
+    blocksService,
+    "", // parentPath - empty so paths start with array index like [0]
+    callSiteError // Error object for source-mapped call site
+  ).then(() => layout);
+
+  // Store layout with validation promise for potential future use
+  outletLayouts.set(outletName, { validatedLayout });
+
+  return validatedLayout;
+}
+
+/**
+ * Checks if a layout has been registered for a given outlet.
+ * Used in templates to conditionally render content based on block presence.
+ *
+ * @param {string} outletName - The outlet identifier to check.
+ * @returns {boolean} True if a layout is registered for this outlet.
+ */
+function hasLayout(outletName) {
+  return outletLayouts.has(outletName);
+}
+
+/**
+ * Component signature for BlockOutlet.
+ *
+ * @typedef {Object} BlockOutletSignature
+ * @property {Object} Args
+ * @property {string} Args.name - The outlet name (must be in BLOCK_OUTLETS registry).
+ * @property {Object} [Args.outletArgs] - Arguments to pass to blocks rendered in this outlet.
+ * @property {Object} [Args.deprecatedArgs] - Deprecated args with deprecation warnings.
+ * @property {Object} Blocks
+ * @property {[hasLayout: boolean]} Blocks.before - Yields hasLayout flag before content.
+ * @property {[hasLayout: boolean]} Blocks.after - Yields hasLayout flag after content.
+ * @property {[error: Error]} Blocks.error - Yields error when validation fails.
+ */
+
+/**
+ * Root component for rendering registered blocks in a designated outlet.
+ *
+ * BlockOutlet serves as the entry point for the block rendering system. It:
+ * - Looks up registered layouts by outlet name
+ * - Renders blocks in a consistent wrapper structure
+ * - Provides named blocks (`<:before>`, `<:after>`) for conditional content
+ *
+ * Named blocks:
+ * - `<:before>` - Yields `hasLayout` boolean before block content.
+ * - `<:after>` - Yields `hasLayout` boolean after block content.
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @extends {Component<BlockOutletSignature>}
+ *
+ * @example
+ * ```hbs
+ * <BlockOutlet @name="homepage-blocks">
+ *   <:after as |hasBlocks|>
+ *     {{#unless hasBlocks}}
+ *       <p>No blocks configured</p>
+ *     {{/unless}}
+ *   </:after>
+ * </BlockOutlet>
+ * ```
+ */
+@block("block-outlet", { container: true })
+export default class BlockOutlet extends Component {
+  /**
+   * The outlet name, locked at construction time.
+   * This prevents dynamic name changes which could cause inconsistent rendering.
+   *
+   * @type {string}
+   */
+  #name;
+
+  constructor(owner, args) {
+    super(owner, args);
+
+    // Lock the name at construction to prevent dynamic changes
+    this.#name = this.args.name;
+
+    if (!BLOCK_OUTLETS.includes(this.#name)) {
+      raiseBlockError(
+        `Block outlet ${this.#name} is not registered in the blocks registry`
+      );
+    }
+  }
+
+  get validatedLayout() {
+    return outletLayouts.get(this.#name)?.validatedLayout;
+  }
+
+  /**
+   * Processes block entries and returns renderable components.
+   *
+   * @returns {Promise<{rawChildren: Array<Object>, showGhosts: boolean, showVisualOverlay: boolean, isLoggingEnabled: boolean}>|undefined}
+   */
+  @cached
+  get children() {
+    // We need to track the state outside the promise contexts to force the children to be rendered when
+    // the user enables the debugging
+    const showGhosts = debugHooks.isGhostBlocksEnabled;
+    const showVisualOverlay = debugHooks.isVisualOverlayEnabled;
+    const isLoggingEnabled = debugHooks.isBlockLoggingEnabled;
+
+    if (!this.validatedLayout) {
+      return;
+    }
+
+    /* Block entries are validated asynchronously. TrackedAsyncData lets us wait
+       for validation to complete before rendering blocks, while also exposing
+       any validation errors to the debug overlay.
+
+       Note: We intentionally do NOT evaluate conditions here. Condition evaluation
+       happens in BlockOutletRootContainer.processedChildren so that service reads
+       (router.currentURL, discovery.category, etc.) are tracked by Ember's
+       autotracking system. If we evaluated conditions inside this promise, route
+       changes would not trigger re-evaluation. */
+    const promiseWithLogging = this.validatedLayout
+      .then((rawChildren) => {
+        if (!rawChildren.length) {
+          return;
+        }
+
+        return { rawChildren, showGhosts, showVisualOverlay, isLoggingEnabled };
+      })
+      .catch((error) => {
+        if (isTesting() || isRailsTesting()) {
+          setTimeout(() => {
+            throw error;
+          }, 0);
+        }
+
+        // Notify admins via the client error handler
+        // This also logs the error in the console automatically
+        document.dispatchEvent(
+          new CustomEvent("discourse-error", {
+            detail: { messageKey: "broken_block_alert", error },
+          })
+        );
+
+        throw error;
+      });
+
+    return promiseWithLogging;
+  }
+
+  /**
+   * The locked outlet name, used for CSS class generation and config lookup.
+   *
+   * @returns {string}
+   */
+  get outletName() {
+    return this.#name;
+  }
+
+  /**
+   * The component to render for outlet boundary debug info.
+   * Returns the OutletInfo component when debug mode is enabled, null otherwise.
+   *
+   * @returns {typeof Component|null}
+   */
+  get OutletInfoComponent() {
+    return debugHooks.outletInfoComponent;
+  }
+
+  /**
+   * Combines `@outletArgs` with `@deprecatedArgs` for lazy evaluation.
+   *
+   * Outlet args are values passed from the parent template to blocks rendered
+   * in this outlet. They are separate from layout entry args and accessed via
+   * `@outletArgs` in block components.
+   *
+   * Deprecated args trigger a deprecation warning when accessed, helping
+   * migrate consumers away from renamed or removed outlet args.
+   *
+   * @returns {Object} Combined args object with lazy property getters
+   */
+  @cached
+  get outletArgsWithDeprecations() {
+    if (!this.args.deprecatedArgs) {
+      return this.args.outletArgs || {};
+    }
+    return buildArgsWithDeprecations(
+      this.args.outletArgs || {},
+      this.args.deprecatedArgs,
+      { outletName: this.#name }
+    );
+  }
+
+  <template>
+    {{! yield to :before block with hasLayout boolean for conditional rendering
+        This allows block outlets to wrap other elements and conditionally render them based on
+        the presence of a registered layout if necessary }}
+    {{yield (hasLayout this.outletName) to="before"}}
+
+    {{#let
+      (if
+        this.OutletInfoComponent
+        (component
+          this.OutletInfoComponent
+          outletName=this.outletName
+          outletArgs=this.outletArgsWithDeprecations
+          blockCount=0
+          error=null
+        )
+      )
+      as |OutletInfo|
+    }}
+      <AsyncContent @asyncData={{this.children}}>
+        <:loading>
+          {{! Resolving async blocks should not display a loading UI }}
+        </:loading>
+
+        <:content as |layout|>
+          {{#let
+            (component
+              BlockOutletRootContainer
+              outletName=this.outletName
+              outletArgs=this.outletArgsWithDeprecations
+              rawChildren=layout.rawChildren
+              showGhosts=layout.showGhosts
+              showVisualOverlay=layout.showVisualOverlay
+              isLoggingEnabled=layout.isLoggingEnabled
+              createChildBlockFn=createChildBlock
+            )
+            as |ChildrenContainer|
+          }}
+            {{#if OutletInfo}}
+              <OutletInfo @blockCount={{layout.rawChildren.length}}>
+                <ChildrenContainer />
+              </OutletInfo>
+            {{else}}
+              <ChildrenContainer />
+            {{/if}}
+          {{/let}}
+        </:content>
+
+        <:error as |error|>
+          {{#if OutletInfo}}
+            <OutletInfo @error={{error}}>
+              {{#if (has-block "error")}}
+                {{yield error to="error"}}
+              {{else}}
+                <BlockOutletInlineError @error={{error}} />
+              {{/if}}
+            </OutletInfo>
+          {{else if (has-block "error")}}
+            {{yield error to="error"}}
+          {{else}}
+            <BlockOutletInlineError @error={{error}} />
+          {{/if}}
+        </:error>
+
+        <:empty>
+          {{#if OutletInfo}}
+            <OutletInfo />
+          {{/if}}
+        </:empty>
+      </AsyncContent>
+    {{/let}}
+
+    {{! yield to :after block with hasLayout boolean for conditional rendering
+        This allows block outlets to wrap other elements and conditionally render them based on
+        the presence of a registered layout if necessary }}
+    {{yield (hasLayout this.outletName) to="after"}}
+  </template>
+}
+
+registerRootBlock(BlockOutlet);
diff --git a/frontend/discourse/app/blocks/builtin/block-group.gjs b/frontend/discourse/app/blocks/builtin/block-group.gjs
new file mode 100644
index 0000000000000..86724fef78f77
--- /dev/null
+++ b/frontend/discourse/app/blocks/builtin/block-group.gjs
@@ -0,0 +1,27 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { block } from "discourse/blocks";
+
+/**
+ * A container block that groups multiple children blocks together.
+ * Rendered children are pre-processed by the block outlet system and passed via the @children arg.
+ *
+ * The system wrapper provides standard BEM classes:
+ * - `{outletName}__block-container` - Standard container class
+ * - `{outletName}__block-container--{id}` - BEM modifier when entry has an `id`
+ *
+ * System args (curried at creation time, not passed from parent):
+ * - `@outletName` - The outlet identifier this group belongs to
+ * - `@outletArgs` - Outlet args available for condition evaluation and access
+ */
+@block("group", {
+  container: true,
+  description: "Groups multiple children blocks together",
+})
+export default class GroupedBlocks extends Component {
+  <template>
+    {{#each @children key="key" as |child|}}
+      <child.Component />
+    {{/each}}
+  </template>
+}
diff --git a/frontend/discourse/app/blocks/builtin/block-head.gjs b/frontend/discourse/app/blocks/builtin/block-head.gjs
new file mode 100644
index 0000000000000..e9611ca0aad58
--- /dev/null
+++ b/frontend/discourse/app/blocks/builtin/block-head.gjs
@@ -0,0 +1,118 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import { block } from "discourse/blocks";
+import { eq } from "discourse/truth-helpers";
+import { i18n } from "discourse-i18n";
+
+/**
+ * A container block that renders only its first visible child.
+ *
+ * Use this for prioritized conditional rendering where you want fallback logic:
+ * show the first child whose conditions pass, ignore the rest. This is useful
+ * for "if X, else if Y, else Z" patterns.
+ *
+ * ## Debug Visual Overlay Handling
+ *
+ * Unlike most containers that render all their children, the head block
+ * intentionally only renders one child (the first visible one). This means
+ * the block must handle the debug visual overlay ghosts itself.
+ *
+ * The preprocessing phase passes ALL children that passed their conditions,
+ * plus ghost blocks for children that failed conditions. Since we choose to
+ * not display children 2+, we are responsible for:
+ *
+ * 1. Rendering ghosts for children that failed their own conditions
+ *    (already ghost blocks in @children)
+ * 2. Converting children that passed conditions but aren't rendered
+ *    (because another sibling was first) into ghosts with an explanation
+ *
+ * This ensures the debug overlay accurately shows why each child is or
+ * isn't visible.
+ *
+ * The system wrapper provides standard BEM classes:
+ * - `{outletName}__head` - Standard block class
+ *
+ * System args (curried at creation time, not passed from parent):
+ * - `@outletName` - The outlet identifier this block belongs to
+ * - `@outletArgs` - Outlet args available for condition evaluation and access
+ *
+ * @example
+ * ```javascript
+ * api.renderBlocks("category-sidebar-blocks", [
+ *   {
+ *     block: "head",
+ *     children: [
+ *       // Show support panel for support category
+ *       { block: InfoPanel, args: {...}, conditions: [{ type: "route", params: { categorySlug: "support" } }] },
+ *       // Show dev panel for dev categories
+ *       { block: InfoPanel, args: {...}, conditions: [{ type: "route", params: { categorySlug: "dev" } }] },
+ *       // Default fallback (no conditions = always matches)
+ *       { block: InfoPanel, args: {...} },
+ *     ],
+ *   },
+ * ]);
+ * ```
+ */
+@block("head", {
+  container: true,
+  description: "Renders only the first child whose conditions pass",
+})
+export default class HeadBlock extends Component {
+  @service blocks;
+
+  /**
+   * Children that passed their conditions and could be rendered.
+   *
+   * @returns {Array<import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult>}
+   */
+  get renderableChildren() {
+    return this.args.children?.filter((c) => !c.isGhost) ?? [];
+  }
+
+  /**
+   * The one child we actually render (first that passed conditions).
+   *
+   * @returns {import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult|undefined}
+   */
+  get firstChild() {
+    return this.renderableChildren[0];
+  }
+
+  <template>
+    {{#if this.blocks.showGhosts}}
+      {{!
+        When debug mode is enabled, render children in their original order:
+        - Ghosts for children that failed conditions
+        - The first visible child (actually rendered)
+        - Ghosts for children hidden by priority
+      }}
+      {{#each @children as |child|}}
+        {{#if child.isGhost}}
+          {{! Child failed its own conditions - already a ghost }}
+          <child.Component />
+        {{else if (eq child this.firstChild)}}
+          {{! First child that passed conditions - render it }}
+          <child.Component />
+        {{else}}
+          {{! Passed conditions but hidden by priority - convert to ghost }}
+          {{#let
+            (child.asGhost
+              (i18n "js.blocks.ghost_reasons.head_hidden_tail_hint")
+            )
+            as |ghostChild|
+          }}
+            {{#if ghostChild}}
+              <ghostChild.Component />
+            {{/if}}
+          {{/let}}
+        {{/if}}
+      {{/each}}
+    {{else}}
+      {{! Normal mode: just render the first visible child }}
+      {{#if this.firstChild}}
+        <this.firstChild.Component />
+      {{/if}}
+    {{/if}}
+  </template>
+}
diff --git a/frontend/discourse/app/blocks/builtin/index.js b/frontend/discourse/app/blocks/builtin/index.js
new file mode 100644
index 0000000000000..884a6bdc2b44b
--- /dev/null
+++ b/frontend/discourse/app/blocks/builtin/index.js
@@ -0,0 +1,32 @@
+/**
+ * Built-in blocks registry.
+ *
+ * This module lists all built-in block components provided by Discourse.
+ * These blocks are registered at runtime by the `freeze-block-registry`
+ * initializer, which imports from this file and calls `api.registerBlock()`
+ * for each exported block.
+ *
+ * ## Adding a New Built-in Block
+ *
+ * 1. Create the block component in `app/blocks/builtin/` with the `@block` decorator:
+ *    ```javascript
+ *    import Component from "@glimmer/component";
+ *    import { block } from "discourse/blocks";
+ *
+ *    @block("my-block")
+ *    export default class MyBlock extends Component {
+ *      // ...
+ *    }
+ *    ```
+ *
+ * 2. Add an export to this file:
+ *    ```javascript
+ *    export { default as MyBlock } from "discourse/blocks/builtin/my-block";
+ *    ```
+ *
+ * The initializer automatically picks up any new exports and registers them.
+ *
+ * @module discourse/blocks/builtin
+ */
+export { default as BlockHead } from "./block-head";
+export { default as BlockGroup } from "./block-group";
diff --git a/frontend/discourse/app/blocks/conditions/condition.js b/frontend/discourse/app/blocks/conditions/condition.js
new file mode 100644
index 0000000000000..c2ad3fb017264
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/condition.js
@@ -0,0 +1,241 @@
+// @ts-check
+import { getByPath } from "discourse/lib/blocks";
+
+/**
+ * Base class for all block conditions.
+ *
+ * Subclasses must:
+ * - Use the `@blockCondition` decorator with `type` and `args` schema config
+ * - Implement the `evaluate(args, context)` method
+ * - Optionally provide a `validate` function in the decorator config for custom validation
+ * - Optionally pass `sourceType` to the decorator to enable `source` parameter support
+ *
+ * Condition classes can inject services using `@service` decorator.
+ * The Blocks service sets the owner on condition instances, enabling dependency injection.
+ *
+ * ## Validation Flow
+ *
+ * Validation happens at block registration time in this order:
+ * 1. Unknown args are detected (typo detection with suggestions)
+ * 2. Arg values are validated against the `args` schema (type, min, max, pattern, etc.)
+ * 3. Constraints are validated (atLeastOne, exactlyOne, allOrNone, atMostOne)
+ * 4. Source parameter is validated (based on sourceType)
+ * 5. Custom `validate` function from decorator config is called (if provided)
+ *
+ * ## Source Parameter Support
+ *
+ * Conditions can declare support for the `source` parameter via `static sourceType`:
+ *
+ * - `"none"` (default): `source` parameter is disallowed
+ * - `"outletArgs"`: `source` must be `@outletArgs.propertyPath`; base class resolves it
+ * - `"object"`: `source` is passed directly as an object (e.g., for settings)
+ *
+ * When `sourceType` is `"outletArgs"`, use `resolveSource(args, context)` to get the
+ * resolved value from outlet args.
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @class BlockCondition
+ *
+ * @example
+ * ```javascript
+ * import { blockCondition, BlockCondition } from "discourse/blocks/conditions";
+ *
+ * @blockCondition({
+ *   type: "my-condition",
+ *   sourceType: "outletArgs",
+ *   args: {
+ *     requiredArg: { type: "string", required: true },
+ *     optionalCount: { type: "number", min: 0, max: 10 },
+ *   },
+ *   validate(args) {
+ *     // Custom validation that can't be expressed in schema
+ *     if (args.requiredArg === "forbidden") {
+ *       return "requiredArg cannot be 'forbidden'";
+ *     }
+ *     return null;
+ *   }
+ * })
+ * export default class BlockMyCondition extends BlockCondition {
+ *   @service myService;
+ *
+ *   evaluate(args, context) {
+ *     // Get value from source (outlet args) or fall back to service
+ *     const value = this.resolveSource(args, context) ?? this.myService.defaultValue;
+ *     return this.myService.someCheck(value, args.requiredArg);
+ *   }
+ * }
+ * ```
+ */
+export class BlockCondition {
+  /**
+   * Unique identifier for this condition type.
+   * Used in condition specs: `{ type: "route", ... }`
+   *
+   * This property is defined by the `@blockCondition` decorator and should not
+   * be set directly. Pass the `type` option to the decorator instead.
+   *
+   * @type {string}
+   */
+  static type;
+
+  /**
+   * Declares how this condition handles the `source` parameter.
+   *
+   * - `"none"` (default): `source` parameter is disallowed
+   * - `"outletArgs"`: `source` must be `@outletArgs.propertyPath`; base class resolves it
+   * - `"object"`: `source` is passed directly as an object (e.g., settings object)
+   *
+   * This property is defined by the `@blockCondition` decorator and should not
+   * be set directly. Pass the `sourceType` option to the decorator instead.
+   *
+   * @type {"none" | "outletArgs" | "object"}
+   */
+  static sourceType = "none";
+
+  /**
+   * Arg schema definitions for this condition.
+   *
+   * This property is defined by the `@blockCondition` decorator and should not
+   * be overridden directly. The decorator creates a non-configurable getter
+   * that returns a frozen object.
+   *
+   * @type {Object}
+   */
+  static argsSchema;
+
+  /**
+   * Cross-arg constraint definitions for this condition.
+   *
+   * This property is defined by the `@blockCondition` decorator and should not
+   * be overridden directly. The decorator creates a non-configurable getter
+   * that returns a frozen object or undefined.
+   *
+   * @type {Object|undefined}
+   */
+  static constraints;
+
+  /**
+   * Custom validation function for this condition.
+   *
+   * This property is defined by the `@blockCondition` decorator and should not
+   * be overridden directly. The decorator creates a non-configurable getter
+   * that returns the validate function or undefined.
+   *
+   * @type {Function|undefined}
+   */
+  static validateFn;
+
+  /**
+   * Valid argument keys for this condition.
+   *
+   * This property is derived from the `args` schema by the `@blockCondition`
+   * decorator and should not be overridden directly.
+   *
+   * The `source` key is automatically added by the decorator when
+   * `sourceType !== "none"`.
+   *
+   * @type {readonly string[]}
+   */
+  static validArgKeys;
+
+  /**
+   * Resolves the `source` parameter value based on the condition's `sourceType`.
+   *
+   * - `sourceType: "outletArgs"`: Extracts the property path from `@outletArgs.path.to.value`
+   *   and retrieves the corresponding value from `context.outletArgs`.
+   * - `sourceType: "object"`: Returns the `source` value directly.
+   *
+   * @param {Object} args - The condition arguments containing `source`.
+   * @param {Object} context - Evaluation context containing `outletArgs`.
+   * @param {Object} [context.outletArgs] - The outlet args passed to the block.
+   * @returns {*} The resolved value from outlet args, or undefined if not found.
+   */
+  resolveSource(args, context) {
+    const { source } = args;
+
+    if (!source) {
+      return undefined;
+    }
+
+    // @ts-ignore - Static property defined on subclasses
+    const sourceType = this.constructor.sourceType;
+
+    if (sourceType === "object") {
+      return source;
+    }
+
+    if (sourceType === "outletArgs") {
+      // Extract path after "@outletArgs."
+      const path = source.replace(/^@outletArgs\./, "");
+      return getByPath(context?.outletArgs, path);
+    }
+
+    return undefined;
+  }
+
+  /**
+   * Default source value when `source` parameter is not provided.
+   * Override in subclasses to provide a fallback (e.g., currentUser, siteSettings).
+   *
+   * @type {*}
+   */
+  get defaultSource() {
+    return undefined;
+  }
+
+  /**
+   * Resolves the source value, falling back to defaultSource when not provided.
+   *
+   * @param {Object} args - The condition arguments.
+   * @param {Object} [context] - Evaluation context.
+   * @returns {*} The resolved source or defaultSource.
+   */
+  getSourceValue(args, context) {
+    return args.source !== undefined
+      ? this.resolveSource(args, context)
+      : this.defaultSource;
+  }
+
+  /**
+   * Evaluates whether the condition passes.
+   * Called at render time to determine if a block should be shown.
+   *
+   * **Note: This method MUST be pure and idempotent.** It may be called
+   * multiple times during a single render cycle (e.g., when debug logging
+   * is enabled), and should not have side effects.
+   *
+   * @param {Object} args - The condition arguments from the layout entry.
+   * @param {Object} [context] - Evaluation context from the blocks service.
+   * @param {boolean} [context.debug] - Whether debug logging is enabled.
+   * @param {Object} [context.outletArgs] - Outlet args for source resolution.
+   * @param {number} [context._depth] - Current nesting depth for logging.
+   * @returns {boolean} True if condition passes, false otherwise.
+   */
+  // eslint-disable-next-line no-unused-vars
+  evaluate(args, context) {
+    throw new Error(`${this.constructor.name} must implement evaluate()`);
+  }
+
+  /**
+   * Returns the resolved value for debug logging purposes.
+   *
+   * Override this method in subclasses to provide custom resolved values
+   * for conditions that don't use the standard `source` parameter.
+   * For example, the `outletArg` condition uses a `path` parameter
+   * to resolve values from outlet args.
+   *
+   * @param {Object} args - The condition arguments from the layout entry.
+   * @param {Object} [context] - Evaluation context containing outletArgs.
+   * @returns {{ value: *, hasValue: true }|undefined} Object with resolved value,
+   *   or undefined if this condition doesn't resolve values.
+   */
+  getResolvedValueForLogging(args, context) {
+    // Default implementation returns resolved source if present
+    if (args.source !== undefined) {
+      return { value: this.resolveSource(args, context), hasValue: true };
+    }
+    return undefined;
+  }
+}
diff --git a/frontend/discourse/app/blocks/conditions/decorator.js b/frontend/discourse/app/blocks/conditions/decorator.js
new file mode 100644
index 0000000000000..822efe8a6bfb9
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/decorator.js
@@ -0,0 +1,219 @@
+// @ts-check
+import {
+  MAX_BLOCK_NAME_LENGTH,
+  parseBlockName,
+  VALID_NAMESPACED_BLOCK_PATTERN,
+} from "discourse/lib/blocks/-internals/patterns";
+import { validateConditionArgsSchema } from "discourse/lib/blocks/-internals/validation/condition-args";
+import { validateConstraintsSchema } from "discourse/lib/blocks/-internals/validation/constraints";
+import { formatWithSuggestion } from "discourse/lib/string-similarity";
+import { BlockCondition } from "./condition";
+
+/**
+ * Valid sourceType values for the decorator config.
+ * @constant {ReadonlyArray<string>}
+ */
+const VALID_SOURCE_TYPES = Object.freeze(["none", "outletArgs", "object"]);
+
+/**
+ * Valid config keys for the decorator.
+ * @constant {ReadonlyArray<string>}
+ */
+const VALID_CONFIG_KEYS = Object.freeze([
+  "type",
+  "sourceType",
+  "args",
+  "constraints",
+  "validate",
+]);
+
+/**
+ * WeakSet tracking decorated classes.
+ * Private - only accessible via isDecoratedCondition().
+ */
+const decoratedConditions = new WeakSet();
+
+/**
+ * Checks if a class was decorated with @blockCondition.
+ * Used by the block registration system to reject non-decorated classes.
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @param {Function} ConditionClass - The class to check.
+ * @returns {boolean} True if the class was decorated.
+ */
+export function isDecoratedCondition(ConditionClass) {
+  return decoratedConditions.has(ConditionClass);
+}
+
+/**
+ * Decorator to define a block condition with declarative arg validation.
+ *
+ * The class must extend BlockCondition. The decorator adds static getters
+ * for type, sourceType, argsSchema, constraints, validateFn, and validArgKeys
+ * based on the provided config. Unknown config keys are rejected with helpful suggestions.
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @param {Object} config - Condition configuration.
+ * @param {string} config.type - Unique condition type identifier.
+ * @param {"none"|"outletArgs"|"object"} [config.sourceType="none"] - How source parameter is handled.
+ * @param {Object} [config.args={}] - Arg schema definitions (type, required, min, max, pattern, etc.).
+ *   Use `{ type: "any" }` to allow any type.
+ * @param {Object} [config.constraints] - Cross-arg constraints (atLeastOne, exactlyOne, allOrNone, atMostOne).
+ * @param {Function} [config.validate] - Custom validation function called at registration time.
+ *   Receives args object, returns error string/array or null.
+ * @throws {Error} If config is invalid or class doesn't extend BlockCondition.
+ *
+ * @example
+ * import { blockCondition, BlockCondition } from "discourse/blocks/conditions";
+ *
+ * @blockCondition({
+ *   type: "user",
+ *   sourceType: "outletArgs",
+ *   args: {
+ *     loggedIn: { type: "boolean" },
+ *     admin: { type: "boolean" },
+ *     minTrustLevel: { type: "number", min: 0, max: 4, integer: true },
+ *     groups: { type: "array", itemType: "string" },
+ *   },
+ *   validate(args) {
+ *     if (args.loggedIn === false && args.admin) {
+ *       return "Cannot use loggedIn: false with admin condition.";
+ *     }
+ *     return null;
+ *   }
+ * })
+ * export default class BlockUserCondition extends BlockCondition {
+ *   @service currentUser;
+ *   evaluate(args, context) { ... }
+ * }
+ *
+ * @example
+ * // With constraints
+ * @blockCondition({
+ *   type: "setting",
+ *   sourceType: "object",
+ *   args: {
+ *     name: { type: "string", required: true },
+ *     enabled: { type: "boolean" },
+ *     equals: { type: "any" },
+ *     includes: { type: "array" },
+ *   },
+ *   constraints: {
+ *     atMostOne: ["enabled", "equals", "includes"],
+ *   },
+ * })
+ */
+export function blockCondition(config) {
+  const {
+    type,
+    sourceType = "none",
+    args: argsSchema = {},
+    constraints,
+    validate: validateFn,
+  } = config;
+
+  // Validate config at decoration time
+  if (!type || typeof type !== "string") {
+    throw new Error("blockCondition: `type` is required and must be a string.");
+  }
+
+  // Validate type length
+  if (type.length > MAX_BLOCK_NAME_LENGTH) {
+    throw new Error(
+      `blockCondition: type "${type}" exceeds maximum length of ${MAX_BLOCK_NAME_LENGTH} characters.`
+    );
+  }
+
+  // Validate type follows the namespaced pattern
+  if (!VALID_NAMESPACED_BLOCK_PATTERN.test(type)) {
+    throw new Error(
+      `blockCondition: type "${type}" is invalid. ` +
+        `Valid formats: "condition-name" (core), "plugin:condition-name" (plugin), ` +
+        `"theme:namespace:condition-name" (theme).`
+    );
+  }
+
+  // Parse the type to extract namespace components
+  const parsed = parseBlockName(type);
+
+  // Validate sourceType is one of the allowed values
+  if (!VALID_SOURCE_TYPES.includes(sourceType)) {
+    const suggestion = formatWithSuggestion(sourceType, VALID_SOURCE_TYPES);
+    throw new Error(
+      `blockCondition: Invalid \`sourceType\` ${suggestion}. ` +
+        `Valid values are: ${VALID_SOURCE_TYPES.join(", ")}.`
+    );
+  }
+
+  // Validate no unknown config keys (catches typos)
+  const unknownKeys = Object.keys(config).filter(
+    (key) => !VALID_CONFIG_KEYS.includes(key)
+  );
+  if (unknownKeys.length > 0) {
+    const suggestions = unknownKeys
+      .map((key) => formatWithSuggestion(key, VALID_CONFIG_KEYS))
+      .join(", ");
+    throw new Error(
+      `blockCondition: unknown config key(s): ${suggestions}. ` +
+        `Valid keys are: ${VALID_CONFIG_KEYS.join(", ")}.`
+    );
+  }
+
+  // Validate args schema at decoration time (catches schema definition errors)
+  if (argsSchema && typeof argsSchema === "object") {
+    validateConditionArgsSchema(argsSchema, type);
+  }
+
+  // Validate constraints schema at decoration time
+  if (constraints) {
+    // Constraints reference args schema - validate they're compatible
+    validateConstraintsSchema(constraints, argsSchema, `Condition "${type}"`);
+  }
+
+  // Validate that validate is a function if provided
+  if (validateFn !== undefined && typeof validateFn !== "function") {
+    throw new Error(
+      `blockCondition: "validate" must be a function, got ${typeof validateFn}.`
+    );
+  }
+
+  // Freeze schema and compute derived validArgKeys
+  const frozenSchema = Object.freeze({ ...argsSchema });
+  const frozenConstraints = constraints
+    ? Object.freeze({ ...constraints })
+    : undefined;
+  const argKeys = Object.freeze(Object.keys(argsSchema));
+  const allKeys =
+    sourceType !== "none" ? Object.freeze([...argKeys, "source"]) : argKeys;
+
+  return function decorator(TargetClass) {
+    // Validate that the class extends BlockCondition
+    if (!(TargetClass.prototype instanceof BlockCondition)) {
+      throw new Error(
+        `blockCondition: ${TargetClass.name} must extend BlockCondition.`
+      );
+    }
+
+    // Define static getters (non-configurable to prevent reassignment).
+    Object.defineProperties(TargetClass, {
+      type: { get: () => type, configurable: false },
+      namespace: { get: () => parsed.namespace, configurable: false },
+      namespaceType: { get: () => parsed.type, configurable: false },
+      sourceType: { get: () => sourceType, configurable: false },
+      argsSchema: { get: () => frozenSchema, configurable: false },
+      constraints: { get: () => frozenConstraints, configurable: false },
+      validateFn: { get: () => validateFn, configurable: false },
+      // validArgKeys combines argsSchema keys with "source" when sourceType !== "none".
+      validArgKeys: { get: () => allKeys, configurable: false },
+    });
+
+    // Track as decorated so Blocks service can verify
+    decoratedConditions.add(TargetClass);
+
+    return TargetClass;
+  };
+}
diff --git a/frontend/discourse/app/blocks/conditions/index.js b/frontend/discourse/app/blocks/conditions/index.js
new file mode 100644
index 0000000000000..83719cfed6f0c
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/index.js
@@ -0,0 +1,12 @@
+// @ts-check
+// BlockCondition class and decorator
+export { BlockCondition } from "./condition";
+export { blockCondition } from "./decorator";
+
+// Built-in condition classes
+// Registered by the freeze-block-registry initializer
+export { default as BlockOutletArgCondition } from "./outlet-arg";
+export { default as BlockRouteCondition } from "./route";
+export { default as BlockUserCondition } from "./user";
+export { default as BlockSettingCondition } from "./setting";
+export { default as BlockViewportCondition } from "./viewport";
diff --git a/frontend/discourse/app/blocks/conditions/outlet-arg.js b/frontend/discourse/app/blocks/conditions/outlet-arg.js
new file mode 100644
index 0000000000000..3b3e2d8b96b12
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/outlet-arg.js
@@ -0,0 +1,148 @@
+// @ts-check
+import { getByPath, matchValue } from "discourse/lib/blocks";
+import { BlockCondition } from "./condition";
+import { blockCondition } from "./decorator";
+
+/**
+ * Maximum allowed length for outlet arg paths.
+ * Prevents potential memory and performance issues from extremely long paths.
+ */
+const MAX_PATH_LENGTH = 255;
+
+/**
+ * A condition that evaluates based on outlet arg values.
+ *
+ * Checks properties passed via `@outletArgs` on the BlockOutlet. Supports
+ * dot-notation paths for nested properties and flexible value matching.
+ *
+ * @class BlockOutletArgCondition
+ * @extends BlockCondition
+ *
+ * @param {string} path - Dot-notation path to the property (required).
+ *   E.g., `"topic.closed"`, `"user.trust_level"`, `"category.id"`.
+ * @param {*} [value] - Value to match against (see matching rules below).
+ * @param {boolean} [exists] - If true, passes when property exists (not undefined);
+ *   if false, passes when property is undefined.
+ *
+ * ## Value Matching Rules
+ *
+ * Uses the shared `matchValue` utility:
+ *
+ * - **Primitive**: Passes if `actual === value` (strict equality)
+ * - **RegExp**: Passes if `actual` (coerced to string) matches the pattern
+ * - **[...values]**: Passes if `actual` matches ANY element (OR logic)
+ * - **`{ not: value }`**: Passes if `actual` does NOT match `value`
+ * - **`{ any: [...] }`**: Passes if `actual` matches ANY spec in array (OR logic)
+ *
+ * @example
+ * // Check if topic is closed
+ * { type: "outlet-arg", path: "topic.closed", value: true }
+ *
+ * @example
+ * // Check user trust level is 2 or higher
+ * { type: "outlet-arg", path: "user.trust_level", value: [2, 3, 4] }
+ *
+ * @example
+ * // Check category is one of several IDs
+ * { type: "outlet-arg", path: "category.id", value: [1, 2, 3] }
+ *
+ * @example
+ * // Check if topic property exists
+ * { type: "outlet-arg", path: "topic", exists: true }
+ *
+ * @example
+ * // Check topic is NOT closed
+ * { type: "outlet-arg", path: "topic.closed", value: { not: true } }
+ *
+ * @example
+ * // Check category slug matches pattern
+ * { type: "outlet-arg", path: "category.slug", value: /^support/ }
+ *
+ * @example
+ * // Check topic is closed OR archived (using any)
+ * { type: "outlet-arg", path: "topic.closed", value: { any: [true, { not: false }] } }
+ */
+@blockCondition({
+  type: "outlet-arg",
+  args: {
+    path: { type: "string", required: true },
+    value: { type: "any" },
+    exists: { type: "boolean" },
+  },
+  constraints: {
+    exactlyOne: ["value", "exists"],
+  },
+  validate(args) {
+    const { path: argPath } = args;
+
+    // Check length first to prevent regex DoS with extremely long strings.
+    if (argPath.length > MAX_PATH_LENGTH) {
+      return (
+        `\`path\` exceeds maximum length of ${MAX_PATH_LENGTH} characters. ` +
+        `Path length: ${argPath.length}.`
+      );
+    }
+
+    // Validate path format (alphanumeric, underscores, dots)
+    if (!/^[\w.]+$/.test(argPath)) {
+      return (
+        `\`path\` "${argPath}" is invalid. ` +
+        `Use dot-notation with alphanumeric characters (e.g., "user.trust_level").`
+      );
+    }
+
+    return null;
+  },
+})
+export default class BlockOutletArgCondition extends BlockCondition {
+  /**
+   * Evaluates whether the outlet arg condition passes.
+   *
+   * @param {Object} args - The condition arguments.
+   * @param {Object} [context] - Evaluation context.
+   * @returns {boolean} True if the condition passes.
+   */
+  evaluate(args, context) {
+    const { path, value, exists } = args;
+    const outletArgs = context?.outletArgs;
+
+    // Get the value at the path
+    const targetValue = getByPath(outletArgs, path);
+
+    // Check existence if specified
+    if (exists !== undefined) {
+      const doesExist = targetValue !== undefined;
+      return exists ? doesExist : !doesExist;
+    }
+
+    // The exactlyOne constraint ensures value or exists is always specified
+    return matchValue({ actual: targetValue, expected: value });
+  }
+
+  /**
+   * Returns the resolved value at the path for debug logging.
+   *
+   * @param {Object} args - The condition arguments containing `path`, `value`, `exists`.
+   * @param {Object} [context] - Evaluation context containing outletArgs.
+   * @returns {{
+   *   hasValue: true,
+   *   formatted: {
+   *     path: string,
+   *     actual: *,
+   *     configured: * | { exists: boolean }
+   *   }
+   * }} Object with formatted log data showing path, actual value, and configured expectation.
+   */
+  // @ts-ignore - TS2416: Override returns formatted object instead of base class value structure
+  getResolvedValueForLogging(args, context) {
+    const { path, value, exists } = args;
+    return {
+      hasValue: true,
+      formatted: {
+        path,
+        actual: getByPath(context?.outletArgs, path),
+        configured: exists !== undefined ? { exists } : value,
+      },
+    };
+  }
+}
diff --git a/frontend/discourse/app/blocks/conditions/route.js b/frontend/discourse/app/blocks/conditions/route.js
new file mode 100644
index 0000000000000..3d7618d5e033b
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/route.js
@@ -0,0 +1,511 @@
+// @ts-check
+import { service } from "@ember/service";
+import {
+  getCurrentPageType,
+  getPageContext,
+  getParamsForPageType,
+  isValidPageType,
+  VALID_PAGE_TYPES,
+  validateParamsAgainstPages,
+  validateParamType,
+} from "discourse/lib/blocks/-internals/matching/page-definitions";
+import {
+  matchesAnyPattern,
+  normalizePath,
+} from "discourse/lib/blocks/-internals/matching/url-matcher";
+import {
+  matchParams,
+  validateParamSpec,
+} from "discourse/lib/blocks/-internals/matching/value-matcher";
+import { isValidGlobPattern } from "discourse/lib/glob-utils";
+import { BlockCondition } from "./condition";
+import { blockCondition } from "./decorator";
+
+/**
+ * A condition that evaluates based on the current URL path, semantic page types,
+ * route parameters, and query parameters.
+ *
+ * URL patterns use picomatch glob syntax:
+ * - `*` matches a single path segment (no slashes)
+ * - `**` matches zero or more path segments
+ * - `?` matches a single character
+ * - `[abc]` matches any character in the brackets
+ * - `{a,b}` matches any of the comma-separated patterns
+ *
+ * Page types match semantic page contexts without requiring knowledge of URL structure:
+ * - `CATEGORY_PAGES` - any category page (when `discovery.category` is set)
+ * - `TAG_PAGES` - any tag page (when `discovery.tag` is set)
+ * - `DISCOVERY_PAGES` - discovery routes (latest, top, etc.) excluding custom homepage
+ * - `HOMEPAGE` - custom homepage only
+ * - `TOP_MENU` - discovery routes that appear in the top navigation menu
+ * - `TOPIC_PAGES` - individual topic pages
+ * - `USER_PAGES` - user profile pages
+ * - `ADMIN_PAGES` - admin section pages
+ * - `GROUP_PAGES` - group pages
+ *
+ * URL matching automatically handles Discourse subfolder installations by
+ * normalizing URLs before matching. Theme authors don't need to know if
+ * Discourse runs on `/forum` or root - patterns like `/c/**` work everywhere.
+ *
+ * @class BlockRouteCondition
+ * @extends BlockCondition
+ *
+ * @param {string[]} [urls] - URL patterns to match (passes if ANY match).
+ * @param {string[]} [pages] - Page types to match (passes if ANY match).
+ * @param {Object} [params] - Page parameters to match (only valid with `pages`).
+ * @param {Object} [queryParams] - Query parameters to match. Note: queryParams alone
+ *   is not sufficient - the condition requires `urls` or `pages` to match first.
+ *   This creates implicit AND behavior between route and query params.
+ *
+ * @example
+ * // Match category pages using page type
+ * { type: "route", pages: ["CATEGORY_PAGES"] }
+ *
+ * @example
+ * // Match category pages using URL pattern
+ * { type: "route", urls: ["/c/**"] }
+ *
+ * @example
+ * // Match multiple page types (OR logic)
+ * { type: "route", pages: ["CATEGORY_PAGES", "TAG_PAGES"] }
+ *
+ * @example
+ * // Match specific category by ID
+ * { type: "route", pages: ["CATEGORY_PAGES"], params: { categoryId: 5 } }
+ *
+ * @example
+ * // Match with query params
+ * { type: "route", urls: ["/latest"], queryParams: { filter: "solved" } }
+ *
+ * @example
+ * // Exclude pages using NOT combinator
+ * { not: { type: "route", pages: ["ADMIN_PAGES"] } }
+ */
+@blockCondition({
+  type: "route",
+  args: {
+    urls: { type: "array", itemType: "string" },
+    pages: { type: "array", itemType: "string", itemEnum: VALID_PAGE_TYPES },
+    params: { type: "any" },
+    queryParams: { type: "any" },
+  },
+  constraints: {
+    atLeastOne: ["urls", "pages"],
+    requires: { params: "pages" },
+    atMostOne: ["params", "urls"],
+  },
+  validate(args) {
+    const { urls, pages, params, queryParams } = args;
+
+    // Validate urls
+    if (urls?.length) {
+      for (let i = 0; i < urls.length; i++) {
+        const pattern = urls[i];
+
+        // Check for page type names mistakenly used in urls
+        if (isValidPageType(pattern)) {
+          return (
+            `Page shortcuts like '${pattern}' are not supported in \`urls\`.\n` +
+            `Use the \`pages\` option instead:\n` +
+            `  { type: "route", pages: ["${pattern}"] }`
+          );
+        }
+
+        // Validate glob pattern syntax
+        if (!isValidGlobPattern(pattern)) {
+          return (
+            `Invalid glob pattern "${pattern}". ` +
+            `Check for unbalanced brackets or braces.`
+          );
+        }
+      }
+    }
+
+    // Validate params
+    if (params) {
+      // Handle any/not operators in params
+      const paramsError = validateParamsWithOperators(params, pages, "params");
+      if (paramsError) {
+        return paramsError;
+      }
+    }
+
+    // Validate queryParams for operator typos (e.g., "an" vs "any")
+    if (queryParams) {
+      let queryParamsError = null;
+      validateParamSpec(queryParams, "queryParams", (msg) => {
+        queryParamsError = msg;
+      });
+      if (queryParamsError) {
+        return queryParamsError;
+      }
+    }
+
+    return null;
+  },
+})
+export default class BlockRouteCondition extends BlockCondition {
+  @service router;
+  @service discovery;
+
+  /**
+   * Returns the current URL path, normalized for matching.
+   *
+   * Normalization strips the subfolder prefix, query strings, hash fragments,
+   * and trailing slashes. This allows patterns to work consistently regardless
+   * of Discourse's installation configuration.
+   *
+   * @returns {string} The normalized URL path.
+   */
+  get currentPath() {
+    return normalizePath(this.router.currentURL);
+  }
+
+  /**
+   * Evaluates whether the current route matches the condition.
+   *
+   * Evaluation logic:
+   * - With `urls`: passes if ANY URL pattern matches
+   * - With `pages`: passes if ANY page type matches
+   * - With `params`: additionally requires all params to match (only with `pages`)
+   * - With `queryParams`: additionally requires all query params to match
+   *
+   * **Important:** `queryParams` alone is not sufficient to match. The condition
+   * will only pass if BOTH the route (via `urls` or `pages`) AND the queryParams
+   * match. This is implicit AND behavior. To match only based on query parameters,
+   * use `urls: ["**"]` to match all routes first.
+   *
+   * @param {Object} args - The condition arguments.
+   * @param {Object} [context={}] - Evaluation context (for debugging).
+   * @returns {boolean} True if the condition passes.
+   */
+  evaluate(args, context = {}) {
+    const { urls, pages, params, queryParams } = args;
+    const currentPath = this.currentPath;
+
+    // Debug context for nested logging
+    const isDebugging = context.debug ?? false;
+    const logger = context.logger;
+    const childDepth = (context._depth ?? 0) + 1;
+    const debugContext = { debug: isDebugging, _depth: childDepth, logger };
+
+    // Get actual query params for matching
+    const actualQueryParams = this.router.currentRoute?.queryParams;
+
+    let routeMatched = false;
+    let matchedPageType = null;
+    let actualPageContext = null;
+
+    // Check urls (passes if ANY match)
+    if (urls?.length) {
+      if (matchesAnyPattern(currentPath, urls)) {
+        routeMatched = true;
+      }
+    }
+
+    // Check pages (passes if ANY match)
+    const services = { router: this.router, discovery: this.discovery };
+    if (pages?.length && !routeMatched) {
+      for (const pageType of pages) {
+        const pageContext = getPageContext(pageType, services);
+        if (pageContext !== null) {
+          // Track page context for debugging (shows what values were checked)
+          if (isDebugging) {
+            actualPageContext = { pageType, ...pageContext };
+          }
+
+          // Page type matches, now check params if provided
+          if (params) {
+            // Pass debug=false here - logging happens in dedicated block below
+            if (this.#matchPageParams(params, pageContext, { debug: false })) {
+              routeMatched = true;
+              matchedPageType = pageType;
+              break;
+            }
+          } else {
+            routeMatched = true;
+            matchedPageType = pageType;
+            break;
+          }
+        }
+      }
+    }
+
+    // Log route state for conditions using pages or queryParams with urls
+    if (isDebugging && (pages?.length || (urls?.length && queryParams))) {
+      logger?.logRouteState?.({
+        currentPath,
+        expectedUrls: urls,
+        pages,
+        matchedPageType,
+        actualPageType: actualPageContext ? null : getCurrentPageType(services),
+        actualPageContext,
+        depth: childDepth,
+        result: routeMatched,
+      });
+    }
+
+    // Log params with nesting (like queryParams)
+    if (isDebugging && params && actualPageContext) {
+      // Log params summary before nested checks (result updated after)
+      const paramsSpec = { _isParams: true };
+      logger?.logCondition?.({
+        type: "params",
+        args: {
+          actual: this.#extractParamValues(params, actualPageContext),
+          expected: params,
+        },
+        result: null,
+        depth: childDepth,
+        conditionSpec: paramsSpec,
+      });
+
+      // Call #matchPageParams with debug=true to log nested OR/NOT/param checks
+      const paramsContext = { debug: true, _depth: childDepth + 1, logger };
+      const paramsMatched = this.#matchPageParams(
+        params,
+        actualPageContext,
+        paramsContext
+      );
+
+      // Update params summary result
+      logger?.updateConditionResult?.(paramsSpec, paramsMatched);
+    }
+
+    // Return early if URL/page didn't match (unless debugging, where we show queryParams)
+    if (!routeMatched && !isDebugging) {
+      return false;
+    }
+
+    // Check query params (uses shared matcher with AND/OR/NOT support)
+    if (queryParams) {
+      // Log queryParams summary before matchParams (result updated after)
+      // Use an object as conditionSpec so we can update the result
+      const queryParamsSpec = isDebugging ? { _isQueryParams: true } : null;
+      if (isDebugging) {
+        logger?.logCondition?.({
+          type: "queryParams",
+          args: { actual: actualQueryParams, expected: queryParams },
+          result: null, // Will be updated after matchParams
+          depth: childDepth,
+          conditionSpec: queryParamsSpec,
+        });
+      }
+
+      // Pass deeper context so OR/AND/NOT logs nest under the queryParams summary
+      const queryParamsContext = {
+        ...debugContext,
+        _depth: childDepth + 1,
+      };
+
+      const queryParamsMatched = matchParams({
+        actualParams: actualQueryParams,
+        expectedParams: queryParams,
+        context: queryParamsContext,
+        label: "queryParams",
+      });
+
+      // Update the queryParams summary result
+      if (isDebugging) {
+        logger?.updateConditionResult?.(queryParamsSpec, queryParamsMatched);
+      }
+
+      // Both URL/page AND queryParams must match
+      if (!routeMatched || !queryParamsMatched) {
+        return false;
+      }
+    }
+
+    return routeMatched;
+  }
+
+  /**
+   * Matches page parameters against the current context.
+   * Supports any/not operators for complex matching.
+   *
+   * @param {Object} params - The expected params from the condition.
+   * @param {Object} pageContext - The actual context values from the current page.
+   * @param {Object} debugContext - Debug context for logging.
+   * @returns {boolean} True if params match.
+   */
+  #matchPageParams(params, pageContext, debugContext) {
+    // Recursive matching with operators:
+    // - { any: [...] } - OR logic, passes if any spec matches
+    // - { not: {...} } - Negation, passes if inner spec does NOT match
+    // - { key: value } - Simple match, all keys must match (AND logic)
+    const isLoggingEnabled = debugContext.debug ?? false;
+    const depth = debugContext._depth ?? 0;
+    const logger = debugContext.logger;
+
+    // Handle any operator: { any: [{ categoryId: 1 }, { categoryId: 2 }] }
+    if (params.any !== undefined) {
+      const specs = params.any;
+
+      // Log combinator BEFORE children so it appears first in tree
+      if (isLoggingEnabled) {
+        logger?.logCondition?.({
+          type: "OR",
+          args: `${specs.length} params specs`,
+          result: null,
+          depth,
+          conditionSpec: params,
+        });
+      }
+
+      const results = specs.map((spec) =>
+        this.#matchPageParams(spec, pageContext, {
+          debug: isLoggingEnabled,
+          _depth: depth + 1,
+          logger,
+        })
+      );
+      const anyPassed = results.some(Boolean);
+
+      // Update combinator result after children evaluated
+      if (isLoggingEnabled) {
+        logger?.updateCombinatorResult?.(params, anyPassed);
+      }
+      return anyPassed;
+    }
+
+    // Handle not operator: { not: { categoryId: 3 } }
+    if (params.not !== undefined) {
+      // Log combinator BEFORE children so it appears first in tree
+      if (isLoggingEnabled) {
+        logger?.logCondition?.({
+          type: "NOT",
+          args: null,
+          result: null,
+          depth,
+          conditionSpec: params,
+        });
+      }
+
+      const innerResult = this.#matchPageParams(params.not, pageContext, {
+        debug: isLoggingEnabled,
+        _depth: depth + 1,
+        logger,
+      });
+      const result = !innerResult;
+
+      // Update combinator result after children evaluated
+      if (isLoggingEnabled) {
+        logger?.updateCombinatorResult?.(params, result);
+      }
+      return result;
+    }
+
+    // Simple params object - all must match
+    // Log individual param checks
+    const matches = [];
+    for (const [paramName, expectedValue] of Object.entries(params)) {
+      const actualValue = pageContext[paramName];
+      const result = actualValue === expectedValue;
+      matches.push({
+        key: paramName,
+        expected: expectedValue,
+        actual: actualValue,
+        result,
+      });
+    }
+
+    const allPassed = matches.every((m) => m.result);
+
+    // Log as a nested group with all param matches
+    if (isLoggingEnabled) {
+      logger?.logParamGroup?.({
+        label: "params",
+        matches,
+        result: allPassed,
+        depth,
+      });
+    }
+
+    return allPassed;
+  }
+
+  /**
+   * Extracts param values from page context for the specified params.
+   * Handles any/not operators by extracting from nested param objects.
+   *
+   * @param {Object} params - The expected params (keys to extract).
+   * @param {Object} pageContext - The page context containing actual values.
+   * @returns {Object} Object with only the requested param keys and their actual values.
+   */
+  #extractParamValues(params, pageContext) {
+    // Handle any/not operators - extract from first nested object for display
+    if (params.any !== undefined && params.any.length > 0) {
+      return this.#extractParamValues(params.any[0], pageContext);
+    }
+    if (params.not !== undefined) {
+      return this.#extractParamValues(params.not, pageContext);
+    }
+
+    const result = {};
+    for (const key of Object.keys(params)) {
+      result[key] = pageContext[key];
+    }
+    return result;
+  }
+}
+
+/**
+ * Validates params with support for any/not operators.
+ * This is a standalone function to keep decorator config clean.
+ *
+ * @param {Object} params - The params to validate.
+ * @param {Array<string>} pages - The page types to validate against.
+ * @param {string} [path="params"] - Path for error messages.
+ * @returns {string|null} Error or null if valid.
+ */
+function validateParamsWithOperators(params, pages, path = "params") {
+  // Handle any operator: { any: [{ categoryId: 1 }, { categoryId: 2 }] }
+  if (params.any !== undefined) {
+    if (!Array.isArray(params.any)) {
+      return `\`any\` in params must be an array of param objects.`;
+    }
+    for (let i = 0; i < params.any.length; i++) {
+      const nestedError = validateParamsWithOperators(
+        params.any[i],
+        pages,
+        `${path}.any[${i}]`
+      );
+      if (nestedError) {
+        return nestedError;
+      }
+    }
+    return null;
+  }
+
+  // Handle not operator: { not: { categoryId: 3 } }
+  if (params.not !== undefined) {
+    return validateParamsWithOperators(params.not, pages, `${path}.not`);
+  }
+
+  // Simple params object - validate against page types
+  const { valid, errors } = validateParamsAgainstPages(params, pages);
+  if (!valid) {
+    return errors.join("\n");
+  }
+
+  // Validate param types
+  for (const [paramName, value] of Object.entries(params)) {
+    const pageType = pages.find((p) => {
+      const pageParams = getParamsForPageType(p);
+      return pageParams && paramName in pageParams;
+    });
+
+    if (pageType) {
+      const { valid: typeValid, error } = validateParamType(
+        paramName,
+        value,
+        pageType
+      );
+      if (!typeValid) {
+        return error;
+      }
+    }
+  }
+
+  return null;
+}
diff --git a/frontend/discourse/app/blocks/conditions/setting.js b/frontend/discourse/app/blocks/conditions/setting.js
new file mode 100644
index 0000000000000..1d3f640b8ded2
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/setting.js
@@ -0,0 +1,220 @@
+// @ts-check
+import { service } from "@ember/service";
+import { findClosestMatch } from "discourse/lib/string-similarity";
+import { BlockCondition } from "./condition";
+import { blockCondition } from "./decorator";
+
+/**
+ * A condition that evaluates based on site setting or custom settings object values.
+ *
+ * Supports multiple condition types for different setting formats:
+ * - `enabled` - For boolean settings (truthy/falsy check)
+ * - `equals` - For exact value matching (strings, numbers, enums)
+ * - `includes` - When setting is a single value: check if it matches one of YOUR provided options
+ * - `contains` - When setting is a list: check if it contains YOUR single value
+ * - `containsAny` - When setting is a list: check if it contains ANY of YOUR provided values
+ *
+ * **`includes` vs `contains` - Key Difference:**
+ *
+ * | Condition    | Setting type               | Question answered                        |
+ * |--------------|----------------------------|------------------------------------------|
+ * | `includes`   | Single value (enum/string) | Is the setting value IN my list?         |
+ * | `contains`   | List (pipe-separated)      | Does the setting list CONTAIN my value?  |
+ *
+ * **Theme Settings Support:**
+ * Pass a custom settings object via `source` (e.g., from `import { settings } from "virtual:theme"`)
+ * to check theme-specific settings instead of site settings.
+ *
+ * **Note:** Setting name validation is deferred to evaluate time since it requires
+ * access to the siteSettings service. Unknown settings will cause the condition to
+ * return false rather than throw an error at registration time.
+ *
+ * @class BlockSettingCondition
+ * @extends BlockCondition
+ *
+ * @param {string} name - The setting key to check (required).
+ * @param {Object} [source] - Custom settings object (e.g., theme settings). If not provided, uses siteSettings.
+ * @param {boolean} [enabled] - If true, passes when setting is truthy; if false, passes when falsy.
+ * @param {*} [equals] - Passes when setting exactly equals this value.
+ * @param {Array<*>} [includes] - For single-value settings: passes when setting value is in this array.
+ * @param {string} [contains] - For list settings: passes when the setting list contains this value.
+ * @param {Array<string>} [containsAny] - For list settings: passes when setting list contains ANY of these.
+ *
+ * @example
+ * // Boolean setting check
+ * { type: "setting", name: "enable_badges", enabled: true }
+ *
+ * @example
+ * // Exact value match
+ * { type: "setting", name: "desktop_category_page_style", equals: "categories_and_latest_topics" }
+ *
+ * @example
+ * // Setting is one of several values
+ * { type: "setting", name: "desktop_category_page_style", includes: ["categories_and_latest_topics", "categories_and_top_topics"] }
+ *
+ * @example
+ * // List setting contains value
+ * { type: "setting", name: "top_menu", contains: "hot" }
+ *
+ * @example
+ * // List setting contains any of values
+ * { type: "setting", name: "share_links", containsAny: ["twitter", "facebook"] }
+ *
+ * @example
+ * // Theme setting check (pass settings object from "virtual:theme")
+ * import { settings } from "virtual:theme";
+ * { type: "setting", source: settings, name: "show_sidebar", enabled: true }
+ */
+@blockCondition({
+  type: "setting",
+  sourceType: "object",
+  args: {
+    name: { type: "string", required: true },
+    enabled: { type: "boolean" },
+    equals: { type: "any" },
+    includes: { type: "array" },
+    contains: { type: "string" },
+    containsAny: { type: "array" },
+  },
+  constraints: {
+    // Exactly one condition type required
+    exactlyOne: ["enabled", "equals", "includes", "contains", "containsAny"],
+  },
+  // No custom validate - setting name existence checked at evaluate time
+  // (since it requires service access to siteSettings)
+})
+export default class BlockSettingCondition extends BlockCondition {
+  @service siteSettings;
+
+  /**
+   * Returns the siteSettings service as the default source.
+   *
+   * @returns {Object} The siteSettings service.
+   */
+  get defaultSource() {
+    return this.siteSettings;
+  }
+
+  /**
+   * Evaluates whether the setting condition passes.
+   *
+   * @param {Object} args - The condition arguments.
+   * @param {Object} [context] - Evaluation context.
+   * @returns {boolean} True if the condition passes.
+   */
+  evaluate(args, context) {
+    const { name, enabled, equals, includes, contains, containsAny } = args;
+
+    const settingsSource = this.getSourceValue(args, context);
+
+    // Handle null/undefined settings source gracefully
+    if (settingsSource == null) {
+      return false;
+    }
+
+    // Return false for unknown settings (deferred validation)
+    if (!(name in settingsSource)) {
+      return false;
+    }
+
+    const value = settingsSource?.[name];
+
+    // Check enabled/disabled (boolean check)
+    if (enabled !== undefined) {
+      return enabled ? !!value : !value;
+    }
+
+    // Check exact equality
+    if (equals !== undefined) {
+      return value === equals;
+    }
+
+    // Check if value is in the includes array (for enum settings)
+    if (includes?.length) {
+      return includes.includes(value);
+    }
+
+    // Check if list setting contains a specific value
+    if (contains !== undefined) {
+      return this.#settingContains(value, contains);
+    }
+
+    // Check if list setting contains any of the provided values
+    if (containsAny?.length) {
+      return containsAny.some((item) => this.#settingContains(value, item));
+    }
+
+    return false;
+  }
+
+  /**
+   * Checks if a list setting contains a specific value.
+   * Handles both array and pipe-separated string formats.
+   *
+   * Values are converted to strings before comparison to handle cases where
+   * `searchValue` might be a number but the setting stores string values
+   * (e.g., checking for `123` in `"123|456"`).
+   *
+   * @param {string|Array} settingValue - The setting value (may be "a|b|c" or ["a", "b", "c"]).
+   * @param {string|number} searchValue - The value to search for.
+   * @returns {boolean} True if the setting contains the search value.
+   */
+  #settingContains(settingValue, searchValue) {
+    if (Array.isArray(settingValue)) {
+      // Convert all values to strings for consistent matching
+      return settingValue.map(String).includes(String(searchValue));
+    }
+
+    if (typeof settingValue === "string") {
+      // List settings are often pipe-separated strings like "latest|new|unread"
+      const items = settingValue.split("|").map((s) => s.trim());
+      return items.includes(String(searchValue));
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns the resolved setting value for debug logging.
+   * Includes a warning note with "did you mean" suggestion if the setting doesn't exist.
+   *
+   * @param {Object} args - The condition arguments.
+   * @param {Object} [context] - Evaluation context.
+   * @returns {{ value: *, hasValue: true, note?: string }}
+   */
+  getResolvedValueForLogging(args, context) {
+    const { name } = args;
+
+    const settingsSource = this.getSourceValue(args, context);
+
+    // Handle null/undefined settings source
+    if (settingsSource == null) {
+      return {
+        value: undefined,
+        hasValue: true,
+        note: "settings source is null/undefined",
+      };
+    }
+
+    // Check if setting exists
+    if (!(name in settingsSource)) {
+      const availableSettings = Object.keys(settingsSource);
+      const suggestion = findClosestMatch(name, availableSettings);
+      const noteText = suggestion
+        ? `"${name}" does not exist (did you mean "${suggestion}"?)`
+        : `"${name}" does not exist`;
+
+      return {
+        value: undefined,
+        hasValue: true,
+        note: noteText,
+      };
+    }
+
+    // Return the actual value
+    return {
+      value: settingsSource[name],
+      hasValue: true,
+    };
+  }
+}
diff --git a/frontend/discourse/app/blocks/conditions/user.js b/frontend/discourse/app/blocks/conditions/user.js
new file mode 100644
index 0000000000000..abdaa3fc1f8a1
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/user.js
@@ -0,0 +1,281 @@
+// @ts-check
+import { service } from "@ember/service";
+import { BlockCondition } from "./condition";
+import { blockCondition } from "./decorator";
+
+/**
+ * A condition that evaluates based on user state.
+ *
+ * Supports checking login status, trust level, admin/moderator status, and group membership.
+ * By default, checks the current logged-in user. Use `source` to check a different user
+ * object from outlet args.
+ *
+ * **Important: Multiple conditions use AND logic.** All specified conditions must be satisfied
+ * for the condition to pass. For example, `{ minTrustLevel: 2, groups: ["beta-testers"] }` requires
+ * the user to have trust level 2+ AND be a member of the beta-testers group.
+ *
+ * The only exception is the `groups` array itself, which uses OR logic internally
+ * (user must be in at least ONE of the specified groups).
+ *
+ * @class BlockUserCondition
+ * @extends BlockCondition
+ *
+ * ## Condition Configuration Properties
+ *
+ * These properties are passed as an args object to `evaluate()`:
+ *
+ * | Property        | Type       | Description                                                           |
+ * |-----------------|------------|-----------------------------------------------------------------------|
+ * | `source`        | `string`   | Optional. Path to user object in outlet args (e.g., `@outletArgs.user`)|
+ * | `loggedIn`      | `boolean`  | If true, passes for logged-in users (or if source matches currentUser)|
+ * | `admin`         | `boolean`  | If true, passes only for admin users                                  |
+ * | `moderator`     | `boolean`  | If true, passes only for moderators (includes admins)                 |
+ * | `staff`         | `boolean`  | If true, passes only for staff members                                |
+ * | `minTrustLevel` | `number`   | Minimum trust level required (0-4)                                    |
+ * | `maxTrustLevel` | `number`   | Maximum trust level allowed (0-4)                                     |
+ * | `groups`        | `string[]` | User must be in at least one of these groups (OR logic)               |
+ *
+ * @example
+ * // Logged-in users only
+ * { type: "user", loggedIn: true }
+ *
+ * @example
+ * // Anonymous users only
+ * { type: "user", loggedIn: false }
+ *
+ * @example
+ * // Admin users only
+ * { type: "user", admin: true }
+ *
+ * @example
+ * // Trust level 2+ AND in specific groups
+ * { type: "user", minTrustLevel: 2, groups: ["beta-testers", "power-users"] }
+ *
+ * @example
+ * // Check a user from outlet args instead of currentUser
+ * { type: "user", source: "@outletArgs.topicAuthor", admin: true }
+ *
+ * @example
+ * // Check if source user IS the current logged-in user
+ * { type: "user", source: "@outletArgs.post.user", loggedIn: true }
+ *
+ * @example
+ * // Check if source user is NOT the current user (e.g., for "follow" button)
+ * { type: "user", source: "@outletArgs.user", loggedIn: false }
+ */
+@blockCondition({
+  type: "user",
+  sourceType: "outletArgs",
+  args: {
+    loggedIn: { type: "boolean" },
+    admin: { type: "boolean" },
+    moderator: { type: "boolean" },
+    staff: { type: "boolean" },
+    minTrustLevel: { type: "number", min: 0, max: 4, integer: true },
+    maxTrustLevel: { type: "number", min: 0, max: 4, integer: true },
+    groups: { type: "array", itemType: "string" },
+  },
+  constraints: {
+    atLeastOne: [
+      "loggedIn",
+      "admin",
+      "moderator",
+      "staff",
+      "minTrustLevel",
+      "maxTrustLevel",
+      "groups",
+    ],
+  },
+  validate(args) {
+    const {
+      loggedIn,
+      admin,
+      moderator,
+      staff,
+      minTrustLevel,
+      maxTrustLevel,
+      groups,
+    } = args;
+
+    // Check for loggedIn: false with user-specific conditions
+    if (loggedIn === false) {
+      const hasUserConditions =
+        admin !== undefined ||
+        moderator !== undefined ||
+        staff !== undefined ||
+        minTrustLevel !== undefined ||
+        maxTrustLevel !== undefined ||
+        groups?.length;
+
+      if (hasUserConditions) {
+        return (
+          "Cannot use `loggedIn: false` with user-specific conditions " +
+          "(admin, moderator, staff, minTrustLevel, maxTrustLevel, groups). " +
+          "Anonymous users cannot have these properties."
+        );
+      }
+    }
+
+    // Check for minTrustLevel > maxTrustLevel
+    if (
+      minTrustLevel !== undefined &&
+      maxTrustLevel !== undefined &&
+      minTrustLevel > maxTrustLevel
+    ) {
+      return (
+        `\`minTrustLevel\` (${minTrustLevel}) cannot be greater than ` +
+        `\`maxTrustLevel\` (${maxTrustLevel}). No user can satisfy this condition.`
+      );
+    }
+
+    return null;
+  },
+})
+export default class BlockUserCondition extends BlockCondition {
+  @service currentUser;
+
+  /**
+   * Returns the currentUser service as the default source.
+   *
+   * @returns {Object|null} The currentUser service.
+   */
+  get defaultSource() {
+    return this.currentUser;
+  }
+
+  /**
+   * Evaluates whether the user condition passes.
+   *
+   * @param {Object} args - The condition arguments.
+   * @param {Object} [context] - Evaluation context.
+   * @param {Object} [context.outletArgs] - Outlet args for source resolution.
+   * @returns {boolean} True if the condition passes.
+   */
+  evaluate(args, context) {
+    const {
+      loggedIn,
+      admin,
+      moderator,
+      staff,
+      minTrustLevel,
+      maxTrustLevel,
+      groups,
+    } = args;
+
+    const user = this.getSourceValue(args, context);
+
+    // Check login state or current user match (when source is provided)
+    if (loggedIn !== undefined) {
+      if (args.source !== undefined) {
+        // When source is provided, check if source user IS the current user
+        const isCurrentUser = this.#isSameUser(user, this.currentUser);
+        if (loggedIn === true && !isCurrentUser) {
+          return false;
+        }
+        if (loggedIn === false && isCurrentUser) {
+          return false;
+        }
+      } else {
+        // Check if there is a logged-in user
+        if (loggedIn === true && !user) {
+          return false;
+        }
+        if (loggedIn === false && user) {
+          return false;
+        }
+      }
+    }
+
+    // All other checks require a user
+    if (!user) {
+      // If loggedIn: false was specified, no user passes
+      if (loggedIn === false) {
+        return true;
+      }
+
+      // If user-specific conditions are specified, no user cannot satisfy them
+      const hasUserSpecificConditions =
+        admin !== undefined ||
+        moderator !== undefined ||
+        staff !== undefined ||
+        minTrustLevel !== undefined ||
+        maxTrustLevel !== undefined ||
+        groups?.length;
+
+      if (hasUserSpecificConditions) {
+        return false;
+      }
+
+      // This line is effectively unreachable: the `atLeastOne` constraint requires
+      // at least one arg, and all possible args are handled above (loggedIn, user-specific
+      // conditions). It's added just for defensive safety in case any of the constraints are
+      // altered in the future.
+      return loggedIn === undefined;
+    }
+
+    // Check admin status
+    if (admin === true && !user.admin) {
+      return false;
+    }
+
+    // Check moderator status (admins are also moderators)
+    if (moderator === true && !user.moderator && !user.admin) {
+      return false;
+    }
+
+    // Check staff status
+    if (staff === true && !user.staff) {
+      return false;
+    }
+
+    // Check trust level range
+    if (minTrustLevel !== undefined && user.trust_level < minTrustLevel) {
+      return false;
+    }
+    if (maxTrustLevel !== undefined && user.trust_level > maxTrustLevel) {
+      return false;
+    }
+
+    // Check group membership
+    if (groups?.length && !this.#isInAnyGroup(user, groups)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Checks if two user objects represent the same user by comparing their ids.
+   * Used when `source` is provided with `loggedIn` to check if the source user
+   * is the current logged-in user.
+   *
+   * @param {Object} user1 - First user object.
+   * @param {Object} user2 - Second user object.
+   * @returns {boolean} True if both users exist and have the same id.
+   */
+  #isSameUser(user1, user2) {
+    if (!user1 || !user2) {
+      return false;
+    }
+    if (user1.id != null && user2.id != null) {
+      return user1.id === user2.id;
+    }
+    return user1 === user2;
+  }
+
+  /**
+   * Checks if a user is a member of at least one of the specified groups.
+   * This implements OR logic for group membership: if the user belongs to any of
+   * the provided groups, the check passes.
+   *
+   * @param {Object} user - The user object to check.
+   * @param {Array<string>} groupNames - Array of group names to check membership against.
+   * @returns {boolean} True if the user is in at least one of the specified groups.
+   */
+  #isInAnyGroup(user, groupNames) {
+    // Extract the names of all groups the user belongs to
+    const userGroups = user.groups?.map((g) => g.name) || [];
+    // Check if any of the required group names appear in the user's groups
+    return groupNames.some((name) => userGroups.includes(name));
+  }
+}
diff --git a/frontend/discourse/app/blocks/conditions/viewport.js b/frontend/discourse/app/blocks/conditions/viewport.js
new file mode 100644
index 0000000000000..7643de34d47a4
--- /dev/null
+++ b/frontend/discourse/app/blocks/conditions/viewport.js
@@ -0,0 +1,119 @@
+// @ts-check
+import { service } from "@ember/service";
+import { BlockCondition } from "./condition";
+import { blockCondition } from "./decorator";
+
+/**
+ * Available viewport breakpoint names.
+ * Values match the breakpoints defined in capabilities.viewport.
+ *
+ * @constant {ReadonlyArray<string>}
+ */
+const BREAKPOINTS = Object.freeze(["sm", "md", "lg", "xl", "2xl"]);
+
+/**
+ * A condition that evaluates based on viewport size and device capabilities.
+ *
+ * Uses the standard Discourse breakpoints from the capabilities service:
+ * - sm: >= 40rem (640px)
+ * - md: >= 48rem (768px)
+ * - lg: >= 64rem (1024px)
+ * - xl: >= 80rem (1280px)
+ * - 2xl: >= 96rem (1536px)
+ *
+ * **Note:** For simple show/hide based on viewport, CSS media queries are often
+ * more performant. Use this condition when you need to completely remove components
+ * from the DOM on certain viewports, or when the block content differs significantly
+ * between viewports.
+ *
+ * @class BlockViewportCondition
+ * @extends BlockCondition
+ *
+ * @param {string} [min] - Minimum breakpoint required (passes at this size and larger)
+ * @param {string} [max] - Maximum breakpoint allowed (passes at this size and smaller)
+ * @param {boolean} [touch] - If true, passes only on touch devices; if false, only on non-touch
+ *
+ * @example
+ * // Large screens only (lg and up)
+ * { type: "viewport", min: "lg" }
+ *
+ * @example
+ * // Small screens only (below md)
+ * { type: "viewport", max: "sm" }
+ *
+ * @example
+ * // Medium to large screens only
+ * { type: "viewport", min: "md", max: "xl" }
+ *
+ * @example
+ * // Touch devices only
+ * { type: "viewport", touch: true }
+ */
+@blockCondition({
+  type: "viewport",
+  args: {
+    min: { type: "string", enum: BREAKPOINTS },
+    max: { type: "string", enum: BREAKPOINTS },
+    touch: { type: "boolean" },
+  },
+  constraints: {
+    atLeastOne: ["min", "max", "touch"],
+  },
+  validate(args) {
+    const { min, max } = args;
+
+    // Check that min <= max when both are specified
+    if (min && max) {
+      const minIndex = BREAKPOINTS.indexOf(min);
+      const maxIndex = BREAKPOINTS.indexOf(max);
+
+      if (minIndex > maxIndex) {
+        return (
+          `\`min\` breakpoint "${min}" is larger than ` +
+          `\`max\` breakpoint "${max}". No viewport can satisfy this condition.`
+        );
+      }
+    }
+
+    return null;
+  },
+})
+export default class BlockViewportCondition extends BlockCondition {
+  @service capabilities;
+
+  /**
+   * Evaluates whether the viewport condition passes.
+   *
+   * @param {Object} args - The condition arguments.
+   * @returns {boolean} True if the condition passes.
+   */
+  evaluate(args) {
+    const { min, max, touch } = args;
+
+    // Check touch capability
+    if (touch !== undefined && touch !== this.capabilities.touch) {
+      return false;
+    }
+
+    // Check minimum breakpoint (viewport must be at least this size)
+    if (min && !this.capabilities.viewport[min]) {
+      return false;
+    }
+
+    // Check maximum breakpoint (viewport must be at most this size).
+    // For max, we check that the NEXT breakpoint is NOT matched. This works
+    // because BREAKPOINTS is ordered from smallest to largest (sm < md < lg...),
+    // and capabilities.viewport[breakpoint] returns true if the viewport is AT
+    // LEAST that size. So if the next larger breakpoint matches, we're too big.
+    if (max) {
+      const maxIndex = BREAKPOINTS.indexOf(max);
+      const nextBreakpoint = BREAKPOINTS[maxIndex + 1];
+
+      if (nextBreakpoint && this.capabilities.viewport[nextBreakpoint]) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+}
diff --git a/frontend/discourse/app/blocks/index.js b/frontend/discourse/app/blocks/index.js
new file mode 100644
index 0000000000000..316b2303e0820
--- /dev/null
+++ b/frontend/discourse/app/blocks/index.js
@@ -0,0 +1,14 @@
+// @ts-check
+/**
+ * Public API block exports.
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @module discourse/blocks
+ */
+
+// Public API for plugin developers
+
+export { block } from "discourse/lib/blocks/-internals/decorator";
+export { BlockCondition } from "discourse/blocks/conditions";
diff --git a/frontend/discourse/app/components/async-content.gjs b/frontend/discourse/app/components/async-content.gjs
index 8fc67041312ef..e1e202a4288eb 100644
--- a/frontend/discourse/app/components/async-content.gjs
+++ b/frontend/discourse/app/components/async-content.gjs
@@ -52,7 +52,7 @@ export default class AsyncContent extends Component {
         : this.#resolveAsyncData(asyncData, context);
     }
 
-    if (!this.#isPromise(value)) {
+    if (value && !this.#isPromise(value)) {
       throw new Error(
         `\`<AsyncContent />\` expects @asyncData to be an async function or a promise`
       );
diff --git a/frontend/discourse/app/components/d-styles.gjs b/frontend/discourse/app/components/d-styles.gjs
index 6d874df92b58e..a9a9b4ac23c80 100644
--- a/frontend/discourse/app/components/d-styles.gjs
+++ b/frontend/discourse/app/components/d-styles.gjs
@@ -1,9 +1,12 @@
 import Component from "@glimmer/component";
+import { cached } from "@glimmer/tracking";
 import { service } from "@ember/service";
 import htmlClass from "discourse/helpers/html-class";
+import { outletContainerRule } from "discourse/lib/blocks/-internals/css";
 import { getURLWithCDN } from "discourse/lib/get-url";
 
 export default class DStyles extends Component {
+  @service blocks;
   @service session;
   @service site;
   @service interfaceColor;
@@ -81,6 +84,20 @@ export default class DStyles extends Component {
     return css.join("\n");
   }
 
+  /**
+   * Generates the CSS container query rules for all registered block outlets.
+   *
+   * Each outlet gets a rule that sets the `container` property on its container
+   * element, enabling `@container` queries in child blocks. The outlet registry
+   * is frozen after boot, so this value is computed once.
+   *
+   * @returns {string} The concatenated CSS rules for all outlets.
+   */
+  @cached
+  get blockOutletStyles() {
+    return this.blocks.listOutlets().map(outletContainerRule).join("\n");
+  }
+
   <template>
     {{#if this.siteSettings.viewport_based_mobile_mode}}
       {{htmlClass (if this.site.mobileView "mobile-view" "desktop-view")}}
@@ -96,5 +113,8 @@ export default class DStyles extends Component {
         {{this.categoryBadges}}
       {{/if}}
     </style>
+    <style id="d-styles-block-outlets">
+      {{this.blockOutletStyles}}
+    </style>
   </template>
 }
diff --git a/frontend/discourse/app/components/plugin-connector.js b/frontend/discourse/app/components/plugin-connector.js
index 3633496480129..624ae0a90a225 100644
--- a/frontend/discourse/app/components/plugin-connector.js
+++ b/frontend/discourse/app/components/plugin-connector.js
@@ -5,7 +5,7 @@ import { afterRender } from "discourse/lib/decorators";
 import {
   buildArgsWithDeprecations,
   deprecatedArgumentValue,
-} from "discourse/lib/plugin-connectors";
+} from "discourse/lib/outlet-args";
 
 let _decorators = {};
 
diff --git a/frontend/discourse/app/components/plugin-outlet.gjs b/frontend/discourse/app/components/plugin-outlet.gjs
index 1f1a921161620..6ee7bac107c5a 100644
--- a/frontend/discourse/app/components/plugin-outlet.gjs
+++ b/frontend/discourse/app/components/plugin-outlet.gjs
@@ -12,8 +12,8 @@ import PluginOutlet from "discourse/components/plugin-outlet";
 import { bind } from "discourse/lib/decorators";
 import deprecated from "discourse/lib/deprecated";
 import { helperContext } from "discourse/lib/helpers";
+import { buildArgsWithDeprecations } from "discourse/lib/outlet-args";
 import {
-  buildArgsWithDeprecations,
   connectorsExist,
   renderedConnectorsFor,
 } from "discourse/lib/plugin-connectors";
diff --git a/frontend/discourse/app/components/sidebar/user/sections.gjs b/frontend/discourse/app/components/sidebar/user/sections.gjs
index 198cb0d7d8155..f09f57bffa9d0 100644
--- a/frontend/discourse/app/components/sidebar/user/sections.gjs
+++ b/frontend/discourse/app/components/sidebar/user/sections.gjs
@@ -1,5 +1,6 @@
 import Component from "@glimmer/component";
 import { service } from "@ember/service";
+import BlockOutlet from "discourse/blocks/block-outlet";
 import ApiSections from "../api-sections";
 import CategoriesSection from "./categories-section";
 import CustomSections from "./custom-sections";
@@ -10,6 +11,7 @@ export default class SidebarUserSections extends Component {
 
   <template>
     <div class="sidebar-sections">
+      <BlockOutlet @name="sidebar-blocks" />
       <CustomSections
         @collapsable={{@collapsableSections}}
         @toggleNavigationMenu={{@toggleNavigationMenu}}
diff --git a/frontend/discourse/app/controllers/application.js b/frontend/discourse/app/controllers/application.js
index 697c43388d58e..8de1659c1c9e7 100644
--- a/frontend/discourse/app/controllers/application.js
+++ b/frontend/discourse/app/controllers/application.js
@@ -14,8 +14,7 @@ const HIDE_SIDEBAR_KEY = "sidebar-hidden";
 
 export default class ApplicationController extends Controller {
   @service footer;
-  // eslint-disable-next-line discourse/no-unused-services
-  @service router; // used in the route template
+  @service router;
   @service scrollState;
   @service sidebarState;
   @service siteSettings;
@@ -28,6 +27,10 @@ export default class ApplicationController extends Controller {
   _showSiteHeader = true;
   @tracked _showSidebar;
 
+  get isCurrentAdminRoute() {
+    return this.router.currentRouteName?.startsWith("admin");
+  }
+
   get upcomingChangeBodyClasses() {
     if (!this.siteSettings.currentUserUpcomingChanges) {
       return "";
diff --git a/frontend/discourse/app/helpers/css-identifier.js b/frontend/discourse/app/helpers/css-identifier.js
new file mode 100644
index 0000000000000..2e555be6753c9
--- /dev/null
+++ b/frontend/discourse/app/helpers/css-identifier.js
@@ -0,0 +1,12 @@
+import dasherize from "discourse/helpers/dasherize";
+
+/**
+ * Converts a string to a valid CSS identifier (class name, ID, etc.).
+ * Replaces colons and dots with hyphens and converts camelCase to kebab-case.
+ *
+ * @param {string} name - The string to convert.
+ * @returns {string} A CSS-safe kebab-case identifier.
+ */
+export default function cssIdentifier(name = "") {
+  return dasherize(name.replace(/:/g, "-"));
+}
diff --git a/frontend/discourse/app/initializers/freeze-block-registry.js b/frontend/discourse/app/initializers/freeze-block-registry.js
new file mode 100644
index 0000000000000..7005cae7881dc
--- /dev/null
+++ b/frontend/discourse/app/initializers/freeze-block-registry.js
@@ -0,0 +1,58 @@
+import * as BuiltinBlocks from "discourse/blocks/builtin";
+import * as conditions from "discourse/blocks/conditions";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { _freezeBlockRegistry } from "discourse/lib/blocks/-internals/registry/block";
+import {
+  _freezeConditionTypeRegistry,
+  _registerConditionType,
+} from "discourse/lib/blocks/-internals/registry/condition";
+import { _freezeOutletRegistry } from "discourse/lib/blocks/-internals/registry/outlet";
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+/**
+ * Initializes the blocks system by registering built-in blocks and conditions,
+ * then freezing all registries.
+ *
+ * This initializer runs after "discourse-bootstrap" but before "inject-discourse-objects"
+ * to ensure:
+ * - Built-in blocks are registered before the registry is frozen
+ * - Core condition types are registered before the registry is frozen
+ * - All registries are frozen before plugins/themes configure layouts
+ *
+ * Execution order within this initializer:
+ * 1. Register built-in blocks via plugin API
+ * 2. Register core condition types
+ * 3. Freeze block, outlet, and condition type registries
+ */
+export default {
+  name: "freeze-block-registry",
+  after: "discourse-bootstrap",
+  before: "inject-discourse-objects",
+
+  initialize() {
+    // Register built-in blocks
+    withPluginApi((api) => {
+      for (const BlockClass of Object.values(BuiltinBlocks)) {
+        if (typeof BlockClass === "function" && getBlockMetadata(BlockClass)) {
+          api.registerBlock(BlockClass);
+        }
+      }
+    });
+
+    // Register core condition types
+    for (const exported of Object.values(conditions)) {
+      if (
+        typeof exported === "function" &&
+        exported.prototype instanceof conditions.BlockCondition &&
+        exported !== conditions.BlockCondition
+      ) {
+        _registerConditionType(exported);
+      }
+    }
+
+    // Freeze all registries to prevent further registrations
+    _freezeBlockRegistry();
+    _freezeOutletRegistry();
+    _freezeConditionTypeRegistry();
+  },
+};
diff --git a/frontend/discourse/app/lib/ajax-error.js b/frontend/discourse/app/lib/ajax-error.js
index 004df0268c124..c618498353425 100644
--- a/frontend/discourse/app/lib/ajax-error.js
+++ b/frontend/discourse/app/lib/ajax-error.js
@@ -4,15 +4,25 @@ import $ from "jquery";
 import { getOwnerWithFallback } from "discourse/lib/get-owner";
 import { i18n } from "discourse-i18n";
 
-export function extractErrorInfo(error, defaultMessage) {
+export function extractErrorInfo(
+  error,
+  defaultMessage,
+  opts = { skipConsoleError: false }
+) {
+  const skipConsoleError = opts.skipConsoleError ?? false;
+
   if (error instanceof Error) {
-    // eslint-disable-next-line no-console
-    console.error(error.stack);
+    if (!skipConsoleError) {
+      // eslint-disable-next-line no-console
+      console.error(error.stack);
+    }
   }
 
   if (typeof error === "string") {
-    // eslint-disable-next-line no-console
-    console.error(error);
+    if (!skipConsoleError) {
+      // eslint-disable-next-line no-console
+      console.error(error);
+    }
   }
 
   if (error.jqXHR) {
diff --git a/frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjs b/frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjs
new file mode 100644
index 0000000000000..cec4fa1470f21
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjs
@@ -0,0 +1,107 @@
+// @ts-check
+/**
+ * Block layout wrapper for blocks.
+ *
+ * This module provides standard wrapper components for both leaf blocks
+ * (non-container) and container blocks. All blocks rendered through
+ * `BlockOutlet` use these wrappers to ensure consistent BEM-style class
+ * naming and layout structure.
+ *
+ * @module discourse/lib/blocks/-internals/components/block-layout-wrapper
+ */
+import Component from "@glimmer/component";
+import curryComponent from "ember-curry-component";
+import concatClass from "discourse/helpers/concat-class";
+import cssIdentifier from "discourse/helpers/css-identifier";
+
+/**
+ * @typedef {import("ember-curry-component").CurriedComponent} CurriedComponent
+ */
+
+/**
+ * @typedef {Object} WrappedBlockLayoutArgs
+ * @property {string} outletName - The outlet name for class generation.
+ * @property {string} name - The block's full registered name.
+ * @property {string|null} namespace - The block's namespace prefix.
+ * @property {boolean} isContainer - Whether this is a container block.
+ * @property {string|null} [id] - Optional block ID for BEM modifiers and targeting.
+ * @property {CurriedComponent} Component - The curried block component to render.
+ * @property {string} [classNames] - Additional CSS classes from layout entry.
+ * @property {string} [decoratorClassNames] - Extra CSS classes from the @block decorator.
+ */
+
+/**
+ * @typedef {Object} WrappedBlockLayoutSignature
+ * @property {WrappedBlockLayoutArgs} Args
+ */
+
+/**
+ * Wraps a block in a standard layout wrapper with BEM-style classes.
+ *
+ * @param {Object} blockData - Block rendering data.
+ * @param {string} blockData.outletName - The outlet name for class generation.
+ * @param {string} blockData.name - The block's full registered name.
+ * @param {string} blockData.namespace - The block's namespace prefix.
+ * @param {boolean} blockData.isContainer - Whether this is a container block.
+ * @param {string|null} [blockData.id] - Optional block ID for BEM modifiers.
+ * @param {CurriedComponent} blockData.Component - The curried block component.
+ * @param {string} [blockData.classNames] - Additional CSS classes from layout entry.
+ * @param {string} [blockData.decoratorClassNames] - Extra CSS classes from the @block decorator.
+ * @param {import("@ember/owner").default} owner - The application owner for currying.
+ * @returns {CurriedComponent} The wrapped component.
+ */
+export function wrapBlockLayout(blockData, owner) {
+  return curryComponent(WrappedBlockLayout, blockData, owner);
+}
+
+/**
+ * Component that wraps all blocks with a standard class structure.
+ *
+ * All blocks (both containers and non-containers) receive:
+ * - `{outletName}__block` or `{outletName}__block-container` - Outlet-scoped class for styling
+ * - `{outletName}__block--{id}` or `{outletName}__block-container--{id}` - BEM modifier when `id` is provided
+ * - Custom classes from `@decoratorClassNames` (from the @block decorator)
+ * - Custom classes from `@classNames` (from the layout entry)
+ *
+ * Block identity is available via data attributes:
+ * - `data-block-name` - The block's full registered name
+ * - `data-block-namespace` - The block's namespace (if present)
+ * - `data-block-id` - The block's entry ID (if provided)
+ *
+ * @extends {Component<WrappedBlockLayoutSignature>}
+ */
+class WrappedBlockLayout extends Component {
+  /**
+   * Generates the appropriate CSS class based on block type and optional ID.
+   * When an ID is provided, adds a BEM modifier class (e.g., `outlet__block--my-id`).
+   *
+   * @returns {string[]} An array of CSS class names.
+   */
+  get blockClassNames() {
+    const safeOutlet = cssIdentifier(this.args.outletName);
+    const baseClass = this.args.isContainer
+      ? `${safeOutlet}__block-container`
+      : `${safeOutlet}__block`;
+
+    if (this.args.id) {
+      return [baseClass, `${baseClass}--${this.args.id}`];
+    }
+
+    return [baseClass];
+  }
+
+  <template>
+    <div
+      class={{concatClass
+        this.blockClassNames
+        @decoratorClassNames
+        @classNames
+      }}
+      data-block-id={{@id}}
+      data-block-name={{@name}}
+      data-block-namespace={{@namespace}}
+    >
+      <@Component />
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjs b/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjs
new file mode 100644
index 0000000000000..78d76f9421a58
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjs
@@ -0,0 +1,24 @@
+import Component from "@glimmer/component";
+import { htmlSafe } from "@ember/template";
+import FlashMessage from "discourse/components/flash-message";
+import { extractErrorInfo } from "discourse/lib/ajax-error";
+
+/**
+ * Displays an error inline within a block outlet.
+ * Uses FlashMessage to render the error in a consistent format.
+ *
+ * @param {Error|string|Object} error - The error to display. Can be an Error object,
+ *   a string, an HTTP response object with responseJSON/responseText, or a jqXHR object.
+ */
+export default class BlockOutletInlineError extends Component {
+  get errorMessage() {
+    const errorInfo = extractErrorInfo(this.args.error, undefined, {
+      skipConsoleError: true,
+    });
+    return errorInfo.html ? htmlSafe(errorInfo.message) : errorInfo.message;
+  }
+
+  <template>
+    <FlashMessage role="alert" @flash={{this.errorMessage}} @type="error" />
+  </template>
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-root-container.gjs b/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-root-container.gjs
new file mode 100644
index 0000000000000..0e58d686d005c
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-root-container.gjs
@@ -0,0 +1,276 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { cached } from "@glimmer/tracking";
+import { getOwner } from "@ember/owner";
+import { service } from "@ember/service";
+import {
+  outletClassName,
+  outletContainerClassName,
+  outletLayoutClassName,
+} from "discourse/lib/blocks/-internals/css";
+import { withDebugGroup } from "discourse/lib/blocks/-internals/debug-hooks";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { processBlockEntries } from "discourse/lib/blocks/-internals/entry-processing";
+import {
+  FAILURE_TYPE,
+  isOptionalMissing,
+} from "discourse/lib/blocks/-internals/patterns";
+import { tryResolveBlock } from "discourse/lib/blocks/-internals/registry/block";
+
+/**
+ * Internal container component that processes and renders block children.
+ *
+ * This component handles condition evaluation and component creation in a
+ * tracked getter context. By evaluating conditions synchronously in
+ * `processedChildren`, Ember's autotracking establishes dependencies on
+ * services like `router` and `discovery`. Route changes trigger re-evaluation.
+ *
+ * If condition evaluation happened in the async promise chain (as it did
+ * previously), service reads would not be tracked and route navigation
+ * would not trigger re-evaluation.
+ *
+ * The component receives the authorization-dependent function `createChildBlockFn`
+ * as a prop to maintain the authorization model in the main block-outlet module.
+ *
+ * @private
+ */
+export default class BlockOutletRootContainer extends Component {
+  @service blocks;
+
+  /**
+   * Cache for curried components, keyed by their stable block key.
+   *
+   * This cache prevents unnecessary component recreation during navigation.
+   * Components are reused when their class and args haven't changed.
+   *
+   * Memory note: This cache is bounded, not unbounded:
+   * - Keys use stable `__stableKey` values assigned once at registration time
+   * - The same keys are reused on every render/navigation
+   * - This cache instance is garbage collected when the owning component is destroyed
+   *
+   * @type {Map<string, {ComponentClass: typeof Component, args: Object, result: Object}>}
+   */
+  #componentCache = new Map();
+
+  /**
+   * The CSS-safe version of the outlet name, used as the class for the
+   * outermost wrapper `<div>`.
+   *
+   * @see {@link outletClassName} for the naming convention.
+   * @returns {string} The CSS-safe outlet name (e.g., "hero-blocks").
+   */
+  get safeOutletName() {
+    return outletClassName(this.args.outletName);
+  }
+
+  /**
+   * The CSS class name for the container element that establishes the
+   * CSS container query context for child blocks.
+   *
+   * @see {@link outletContainerClassName} for the naming convention.
+   * @returns {string} The container class name (e.g., "hero-blocks__container").
+   */
+  get containerClassName() {
+    return outletContainerClassName(this.args.outletName);
+  }
+
+  /**
+   * The CSS class name for the layout element that wraps the rendered
+   * block children.
+   *
+   * @see {@link outletLayoutClassName} for the naming convention.
+   * @returns {string} The layout class name (e.g., "hero-blocks__layout").
+   */
+  get layoutClassName() {
+    return outletLayoutClassName(this.args.outletName);
+  }
+
+  /**
+   * Processes raw block entries and creates renderable child components.
+   *
+   * This getter is the key to reactive condition evaluation. By accessing
+   * services like `router` and `discovery` during condition evaluation here
+   * (synchronously in a tracked getter), Ember establishes tracking
+   * dependencies. Route changes trigger this getter to re-run.
+   *
+   * @returns {Array<import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult>}
+   */
+  @cached
+  get processedChildren() {
+    const {
+      rawChildren,
+      showGhosts,
+      isLoggingEnabled,
+      outletName,
+      outletArgs,
+      createChildBlockFn,
+    } = this.args;
+
+    // force tracking the value
+    this.args.showVisualOverlay;
+
+    if (!rawChildren?.length) {
+      return [];
+    }
+
+    const owner = getOwner(this);
+    const baseHierarchy = outletName;
+
+    // Step 1: Evaluate conditions - THIS IS NOW TRACKED!
+    // When blocksService.evaluate() reads router.currentURL or discovery.category,
+    // Ember establishes a dependency. Route changes trigger re-evaluation.
+    const processedEntries = this.#preprocessEntries(
+      rawChildren,
+      outletArgs,
+      this.blocks,
+      showGhosts,
+      isLoggingEnabled,
+      baseHierarchy
+    );
+
+    // Step 2: Create components from processed entries
+    // @ts-ignore - TS2322: ChildBlockResult type compatible with return type
+    return processBlockEntries({
+      entries: processedEntries,
+      cache: this.#componentCache,
+      owner,
+      baseHierarchy,
+      outletName,
+      outletArgs,
+      showGhosts,
+      isLoggingEnabled,
+      createChildBlockFn,
+    });
+  }
+
+  /**
+   * Pre-processes block entries to compute visibility for all blocks.
+   *
+   * This method evaluates conditions for all blocks in the tree and adds
+   * visibility metadata to each entry:
+   * - `__visible`: Whether the block should be rendered
+   * - `__failureType`: The failure type constant (debug mode only)
+   *
+   * Container blocks have an implicit condition: they must have at least
+   * one visible child. This is evaluated bottom-up (children first).
+   *
+   * @param {Array<Object>} entries - Array of block entries to process.
+   * @param {Object} outletArgs - Outlet arguments for condition evaluation.
+   * @param {Object} blocksService - Blocks service for condition evaluation.
+   * @param {boolean} showGhosts - If true, keep all blocks for ghost rendering.
+   * @param {boolean} isLoggingEnabled - If true, log condition evaluation.
+   * @param {string} baseHierarchy - Base hierarchy path for logging.
+   * @returns {Array<Object>} Processed entries with visibility metadata.
+   */
+  #preprocessEntries(
+    entries,
+    outletArgs,
+    blocksService,
+    showGhosts,
+    isLoggingEnabled,
+    baseHierarchy
+  ) {
+    const result = [];
+
+    for (const entry of entries) {
+      // Shallow clone to add visibility metadata without mutating the original
+      // layout entry. The layout is immutable after registration, so we create
+      // a copy to attach __visible and __failureReason properties.
+      const entryClone = { ...entry };
+
+      // Resolve block reference
+      const resolvedBlock = tryResolveBlock(entryClone.block);
+
+      // Skip unresolved blocks (optional missing or pending factory resolution)
+      if (!resolvedBlock || isOptionalMissing(resolvedBlock)) {
+        // Keep the entry for ghost handling in the main loop
+        if (showGhosts || isOptionalMissing(resolvedBlock)) {
+          result.push(entryClone);
+        }
+        continue;
+      }
+
+      const blockClass =
+        /** @type {import("discourse/lib/blocks/-internals/registry/block").BlockClass} */ (
+          resolvedBlock
+        );
+      const blockMeta = getBlockMetadata(blockClass);
+      const blockName = blockMeta?.blockName || "unknown";
+      const isContainer = blockMeta?.isContainer ?? false;
+
+      // Evaluate this block's own conditions.
+      // The withDebugGroup wrapper ensures START_GROUP/END_GROUP are always paired.
+      // This is the key reactive line - blocksService.evaluate() reads from router/discovery
+      // services, and since we're in a tracked getter, Ember tracks these reads.
+      const conditionsPassed = entryClone.conditions
+        ? withDebugGroup(
+            blockName,
+            entryClone.id,
+            baseHierarchy,
+            isLoggingEnabled,
+            () =>
+              blocksService.evaluate(entryClone.conditions, {
+                debug: isLoggingEnabled,
+                outletArgs,
+              })
+          )
+        : true;
+
+      // For containers: recursively process children first (bottom-up evaluation)
+      // This determines which children are visible before we check if container has any
+      let hasVisibleChildren = true; // Non-containers always "have" visible children
+      if (isContainer && entryClone.children?.length) {
+        // Recursively preprocess children - this computes their visibility.
+        // Include the container's ID in the hierarchy for better debug identification.
+        const containerSuffix = entryClone.id ? `(#${entryClone.id})` : "";
+        const processedChildren = this.#preprocessEntries(
+          entryClone.children,
+          outletArgs,
+          blocksService,
+          showGhosts,
+          isLoggingEnabled,
+          `${baseHierarchy}/${blockName}${containerSuffix}`
+        );
+
+        hasVisibleChildren = processedChildren.some((child) => child.__visible);
+
+        // Update the cloned entry's children with the processed result
+        entryClone.children = processedChildren;
+      }
+
+      // Final visibility: own conditions must pass AND (not container OR has visible children)
+      // This implements the implicit "container must have visible children" condition
+      const visible = conditionsPassed && hasVisibleChildren;
+      entryClone.__visible = visible;
+
+      // In debug mode, record why the block is hidden for the ghost tooltip.
+      // We store the failure type (a constant) for internal logic comparisons.
+      // Display messages are generated at render time in ghost-block.gjs.
+      if (showGhosts && !visible) {
+        entryClone.__failureType = !conditionsPassed
+          ? FAILURE_TYPE.CONDITION_FAILED
+          : FAILURE_TYPE.NO_VISIBLE_CHILDREN;
+      }
+
+      // In production mode, filter out invisible blocks
+      // In debug mode, keep all blocks for ghost rendering
+      if (visible || showGhosts) {
+        result.push(entryClone);
+      }
+    }
+
+    return result;
+  }
+
+  <template>
+    <div class={{this.safeOutletName}}>
+      <div class={{this.containerClassName}}>
+        <div class={{this.layoutClassName}}>
+          {{#each this.processedChildren key="key" as |child|}}
+            <child.Component />
+          {{/each}}
+        </div>
+      </div>
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/css.js b/frontend/discourse/app/lib/blocks/-internals/css.js
new file mode 100644
index 0000000000000..1ca69d7eaef39
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/css.js
@@ -0,0 +1,54 @@
+// @ts-check
+import cssIdentifier from "discourse/helpers/css-identifier";
+
+/**
+ * Returns the CSS-safe version of an outlet name.
+ *
+ * Converts namespaced outlet names (e.g., "plugin:outlet") to valid CSS
+ * identifiers by replacing colons with hyphens and dasherizing.
+ *
+ * @param {string} outletName - The outlet name (e.g., "hero-blocks", "plugin:sidebar").
+ * @returns {string} The CSS-safe name (e.g., "hero-blocks", "plugin-sidebar").
+ */
+export function outletClassName(outletName) {
+  return cssIdentifier(outletName);
+}
+
+/**
+ * Returns the container CSS class name for a block outlet.
+ *
+ * Follows the BEM-like pattern: `{safe-outlet-name}__container`.
+ * For example, outlet "hero-blocks" produces "hero-blocks__container".
+ *
+ * @param {string} outletName - The outlet name (e.g., "hero-blocks", "plugin:sidebar").
+ * @returns {string} The CSS class name (e.g., "hero-blocks__container").
+ */
+export function outletContainerClassName(outletName) {
+  return `${outletClassName(outletName)}__container`;
+}
+
+/**
+ * Returns the layout CSS class name for a block outlet.
+ *
+ * Follows the BEM-like pattern: `{safe-outlet-name}__layout`.
+ * For example, outlet "hero-blocks" produces "hero-blocks__layout".
+ *
+ * @param {string} outletName - The outlet name (e.g., "hero-blocks", "plugin:sidebar").
+ * @returns {string} The CSS class name (e.g., "hero-blocks__layout").
+ */
+export function outletLayoutClassName(outletName) {
+  return `${outletClassName(outletName)}__layout`;
+}
+
+/**
+ * Returns the CSS container query rule for a block outlet.
+ *
+ * Generates the CSS that enables `@container` queries inside block outlets
+ * by setting the `container` property on the outlet's container element.
+ *
+ * @param {string} outletName - The outlet name (e.g., "hero-blocks").
+ * @returns {string} The CSS rule (e.g., `.hero-blocks__container { container: hero-blocks / inline-size; }`).
+ */
+export function outletContainerRule(outletName) {
+  return `.${outletContainerClassName(outletName)} { container: ${outletName} / inline-size; }`;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/debug-hooks.js b/frontend/discourse/app/lib/blocks/-internals/debug-hooks.js
new file mode 100644
index 0000000000000..0d0460760bea2
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/debug-hooks.js
@@ -0,0 +1,371 @@
+// @ts-check
+/**
+ * Debug hooks for block dev-tools integration.
+ *
+ * This module provides:
+ * - Debug callback hooks for dev-tools integration (visual overlays, logging, outlet boundaries)
+ * - Ghost component creation for visualizing hidden blocks
+ * - Debug console grouping utilities
+ *
+ * The debug hooks use TrackedMap for reactivity, enabling Ember's reactivity system
+ * to trigger re-renders when callbacks are set/cleared.
+ *
+ * @module discourse/lib/blocks/-internals/debug-hooks
+ */
+
+import { TrackedMap } from "@ember-compat/tracked-built-ins";
+import { FAILURE_TYPE } from "discourse/lib/blocks/-internals/patterns";
+
+/**
+ * Callback key constants for the debug hooks registry.
+ * Use these instead of magic strings when calling debugHooks.getCallback/setCallback.
+ */
+export const DEBUG_CALLBACK = Object.freeze({
+  BLOCK_DEBUG: "blockDebug",
+  BLOCK_LOGGING: "blockLogging",
+  VISUAL_OVERLAY: "visualOverlay",
+  GHOST_BLOCKS: "ghostBlocks",
+  OUTLET_INFO_COMPONENT: "outletInfoComponent",
+  CONDITION_LOG: "conditionLog",
+  COMBINATOR_LOG: "combinatorLog",
+  CONDITION_RESULT: "conditionResult",
+  PARAM_GROUP_LOG: "paramGroupLog",
+  ROUTE_STATE_LOG: "routeStateLog",
+  OPTIONAL_MISSING_LOG: "optionalMissingLog",
+  START_GROUP: "startGroup",
+  END_GROUP: "endGroup",
+  LOGGER_INTERFACE: "loggerInterface",
+  GHOST_CHILDREN_CREATOR: "ghostChildrenCreator",
+});
+
+/**
+ * Singleton class that manages debug callback hooks for the block rendering system.
+ * Uses TrackedMap for reactivity, so components accessing these values will re-render
+ * when callbacks are set or cleared.
+ */
+class DebugHooks {
+  /**
+   * Tracked callback registry for debug hooks.
+   * Using TrackedMap enables reactivity when callbacks are set/cleared.
+   *
+   * @type {TrackedMap<string, Function|null>}
+   */
+  #callbacks = new TrackedMap(
+    Object.values(DEBUG_CALLBACK).map((key) => [key, null])
+  );
+
+  /**
+   * Gets a debug callback from the registry.
+   *
+   * @param {string} key - The callback key (use DEBUG_CALLBACK constants).
+   * @returns {Function|null} The callback function, or null if not set.
+   */
+  getCallback(key) {
+    return this.#callbacks.get(key);
+  }
+
+  /**
+   * Sets a debug callback in the registry.
+   * Used by dev-tools to register debug hooks.
+   *
+   * @param {string} key - The callback key (use DEBUG_CALLBACK constants).
+   * @param {Function|null} value - The callback function, or null to clear.
+   * @throws {Error} If the key is not a valid callback key.
+   */
+  setCallback(key, value) {
+    if (!this.#callbacks.has(key)) {
+      const validKeys = Object.values(DEBUG_CALLBACK).join(", ");
+      throw new Error(
+        `[Blocks] Unknown debug callback key: "${key}". Valid keys are: ${validKeys}.`
+      );
+    }
+    this.#callbacks.set(key, value);
+  }
+
+  /**
+   * Returns whether console logging is enabled.
+   * Convenience getter that invokes the blockLogging callback.
+   *
+   * @returns {boolean} True if logging is enabled.
+   */
+  get isBlockLoggingEnabled() {
+    return this.#callbacks.get(DEBUG_CALLBACK.BLOCK_LOGGING)?.() ?? false;
+  }
+
+  /**
+   * Returns the outlet info component if outlet boundaries are enabled.
+   * Invokes the OUTLET_INFO_COMPONENT callback which returns the component
+   * when enabled, or null when disabled.
+   *
+   * @returns {typeof import("@glimmer/component").default|null} The outlet info component, or null.
+   */
+  get outletInfoComponent() {
+    return this.#callbacks.get(DEBUG_CALLBACK.OUTLET_INFO_COMPONENT)?.();
+  }
+
+  /**
+   * Returns whether outlet boundaries should be shown.
+   * Derived from whether the outlet info component is available.
+   *
+   * @returns {boolean} True if boundaries should be shown.
+   */
+  get isOutletBoundaryEnabled() {
+    return !!this.outletInfoComponent;
+  }
+
+  /**
+   * Returns whether visual overlay is enabled.
+   *
+   * @returns {boolean} True if visual overlay is enabled.
+   */
+  get isVisualOverlayEnabled() {
+    return this.#callbacks.get(DEBUG_CALLBACK.VISUAL_OVERLAY)?.() ?? false;
+  }
+
+  /**
+   * Returns whether ghost blocks are enabled.
+   *
+   * @returns {boolean} True if ghost blocks are enabled.
+   */
+  get isGhostBlocksEnabled() {
+    return this.#callbacks.get(DEBUG_CALLBACK.GHOST_BLOCKS)?.() ?? false;
+  }
+
+  /**
+   * Returns the logger interface for conditions to use.
+   * Convenience getter that invokes the loggerInterface callback.
+   *
+   * The interface has methods: logCondition, updateCombinatorResult,
+   * updateConditionResult, logParamGroup, logRouteState.
+   *
+   * @returns {Object|null} The logger interface, or null if not available.
+   */
+  get loggerInterface() {
+    return this.#callbacks.get(DEBUG_CALLBACK.LOGGER_INTERFACE)?.() ?? null;
+  }
+}
+
+/**
+ * Singleton instance of DebugHooks.
+ * Import this to access debug callbacks with tracked reactivity.
+ */
+export const debugHooks = new DebugHooks();
+
+/**
+ * Handles an optional missing block by logging and optionally creating a ghost.
+ *
+ * When a block reference ends with `?` but the block is not registered, this
+ * function handles the logging and ghost component creation.
+ *
+ * @param {Object} options - Options for handling the missing block.
+ * @param {string} options.blockName - The name of the missing block.
+ * @param {Object} options.entry - The block entry.
+ * @param {string} options.hierarchy - The hierarchy path for logging.
+ * @param {boolean} options.isLoggingEnabled - Whether debug logging is enabled.
+ * @param {boolean} options.showGhosts - Whether to show ghost components.
+ * @param {string} options.key - Stable unique key for this block.
+ * @returns {import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult|null}
+ *   Ghost component data with key if showGhosts is true, null otherwise.
+ */
+export function handleOptionalMissingBlock({
+  blockName,
+  entry,
+  hierarchy,
+  isLoggingEnabled,
+  showGhosts,
+  key,
+}) {
+  // Log if debug logging is enabled
+  if (isLoggingEnabled) {
+    debugHooks.getCallback(DEBUG_CALLBACK.OPTIONAL_MISSING_LOG)?.(
+      blockName,
+      entry.id,
+      hierarchy
+    );
+  }
+
+  // Show ghost if ghost blocks are enabled
+  if (showGhosts) {
+    const ghostData = createDebugGhost(
+      {
+        name: blockName,
+        id: entry.id,
+        args: entry.args,
+        conditions: entry.conditions,
+        failureType: FAILURE_TYPE.OPTIONAL_MISSING,
+      },
+      { outletName: hierarchy }
+    );
+    return ghostData ? { ...ghostData, key } : null;
+  }
+
+  return null;
+}
+
+/**
+ * Builds a container path for nested containers.
+ *
+ * Maintains a count map to ensure unique indices for containers of the same type.
+ * For example, if there are two "group" containers without ids, they get paths like:
+ * - `baseHierarchy/group[0]`
+ * - `baseHierarchy/group[1]`
+ *
+ * If a block has an id, it replaces the index (since the id is unique):
+ * - `baseHierarchy/group(#my-id)`
+ *
+ * @param {string} blockName - The block name.
+ * @param {string|null} blockId - The block's unique id (if set).
+ * @param {string} baseHierarchy - The base hierarchy path.
+ * @param {Map<string, number>} containerCounts - Map tracking container counts.
+ * @returns {string} The full container path.
+ */
+export function buildContainerPath(
+  blockName,
+  blockId,
+  baseHierarchy,
+  containerCounts
+) {
+  // Always increment the counter for consistent indexing of blocks without ids.
+  const count = containerCounts.get(blockName) ?? 0;
+  containerCounts.set(blockName, count + 1);
+
+  // Use id if available (unique), otherwise fall back to index.
+  const suffix = blockId ? `(#${blockId})` : `[${count}]`;
+  return `${baseHierarchy}/${blockName}${suffix}`;
+}
+
+/**
+ * Invokes the BLOCK_DEBUG callback to create a ghost component.
+ *
+ * This is the low-level helper that calls the debug callback with block data.
+ * Used by both `createGhostBlock` (entry-processing time) and `asGhost`
+ * (render time) to avoid duplicating the callback invocation logic.
+ *
+ * @param {Object} blockData - Data describing the block to ghost.
+ * @param {string} blockData.name - The block name.
+ * @param {string} [blockData.id] - The block's unique ID (if set).
+ * @param {Object} [blockData.args] - Block arguments.
+ * @param {Object} [blockData.containerArgs] - Container arguments.
+ * @param {Array} [blockData.conditions] - Block conditions.
+ * @param {string} [blockData.failureType] - Type of failure (from FAILURE_TYPE).
+ * @param {string} [blockData.failureReason] - Custom failure reason message.
+ * @param {Array} [blockData.children] - Ghost children for containers.
+ * @param {Object} context - Context for the ghost.
+ * @param {string} context.outletName - The outlet/hierarchy name for display.
+ * @param {Object} [context.outletArgs] - Outlet arguments.
+ * @returns {Object|null} Ghost data with Component property, or null if callback
+ *   not set or didn't return a component.
+ */
+export function createDebugGhost(blockData, context) {
+  const ghostData = debugHooks.getCallback(DEBUG_CALLBACK.BLOCK_DEBUG)?.(
+    {
+      ...blockData,
+      Component: null,
+      conditionsPassed: false,
+    },
+    context
+  );
+
+  return ghostData?.Component ? ghostData : null;
+}
+
+/**
+ * Creates a ghost component for an invisible block.
+ *
+ * Ghost components are shown in debug mode to visualize blocks that failed
+ * their conditions or have no visible children.
+ *
+ * @param {Object} options - Options for creating the ghost.
+ * @param {string} options.blockName - The block name.
+ * @param {Object} options.entry - The block entry.
+ * @param {string} options.hierarchy - The hierarchy path for display.
+ * @param {string|undefined} options.containerPath - Container path for child hierarchies.
+ * @param {boolean} options.isContainer - Whether this block is a container.
+ * @param {import("@ember/owner").default} options.owner - The application owner.
+ * @param {Object} options.outletArgs - Outlet arguments.
+ * @param {boolean} options.isLoggingEnabled - Whether debug logging is enabled.
+ * @param {Function} options.resolveBlockFn - Function to resolve block references.
+ * @param {string} options.key - Stable unique key for this block.
+ * @returns {import("discourse/lib/blocks/-internals/entry-processing").ChildBlockResult|null}
+ *   Ghost component data with key if successful, null otherwise.
+ */
+export function createGhostBlock({
+  blockName,
+  entry,
+  hierarchy,
+  containerPath,
+  isContainer,
+  owner,
+  outletArgs,
+  isLoggingEnabled,
+  resolveBlockFn,
+  key,
+}) {
+  // For container blocks with children that failed due to no visible children,
+  // recursively create ghost children so they appear nested in the debug overlay.
+  let ghostChildren = null;
+  if (
+    isContainer &&
+    entry.children?.length &&
+    entry.__failureType === FAILURE_TYPE.NO_VISIBLE_CHILDREN
+  ) {
+    ghostChildren = debugHooks.getCallback(
+      DEBUG_CALLBACK.GHOST_CHILDREN_CREATOR
+    )?.(
+      entry.children,
+      owner,
+      containerPath,
+      outletArgs,
+      isLoggingEnabled,
+      resolveBlockFn
+    );
+  }
+
+  const ghostData = createDebugGhost(
+    {
+      name: blockName,
+      id: entry.id,
+      args: entry.args,
+      containerArgs: entry.containerArgs,
+      conditions: entry.conditions,
+      failureType: entry.__failureType,
+      failureReason: entry.__failureReason,
+      children: ghostChildren,
+    },
+    { outletName: hierarchy }
+  );
+
+  return ghostData ? { ...ghostData, key } : null;
+}
+
+/**
+ * Executes a function within a debug console group.
+ * Ensures START_GROUP and END_GROUP callbacks are always paired.
+ *
+ * @param {string} blockName - The block name for the group label.
+ * @param {string|null} blockId - The block's unique ID (if set).
+ * @param {string} hierarchy - The hierarchy path for context.
+ * @param {boolean} isLoggingEnabled - Whether debug logging is active.
+ * @param {() => boolean} fn - Function to execute that returns the condition result.
+ * @returns {boolean} The result of the function execution.
+ */
+export function withDebugGroup(
+  blockName,
+  blockId,
+  hierarchy,
+  isLoggingEnabled,
+  fn
+) {
+  if (!isLoggingEnabled) {
+    return fn();
+  }
+
+  debugHooks.getCallback(DEBUG_CALLBACK.START_GROUP)?.(
+    blockName,
+    blockId,
+    hierarchy
+  );
+  const result = fn();
+  debugHooks.getCallback(DEBUG_CALLBACK.END_GROUP)?.(result);
+  return result;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/decorator.js b/frontend/discourse/app/lib/blocks/-internals/decorator.js
new file mode 100644
index 0000000000000..7a48aea5855d8
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/decorator.js
@@ -0,0 +1,376 @@
+// @ts-check
+/**
+ * Block Decorator Module
+ *
+ * This module provides the @block decorator and related authorization utilities.
+ * The authorization model uses private symbols and WeakMaps to prevent external
+ * code from spoofing block authorization or bypassing validation.
+ *
+ * Key concepts:
+ * - AUTH_TOKEN: A private symbol used to verify authorized block rendering contexts
+ * - blockMetadataMap: WeakMap tracking which classes are blocks and their metadata
+ * - rootBlockClass: Single variable holding the root block class (set via registerRootBlock)
+ *
+ * @module discourse/lib/blocks/-internals/decorator
+ */
+import Component from "@glimmer/component";
+import {
+  getInternalComponentManager,
+  setInternalComponentManager,
+  // @ts-ignore - @glimmer/manager types not provided by ember-source
+} from "@glimmer/manager";
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import {
+  validateArgsSchema,
+  validateChildArgsSchema,
+} from "discourse/lib/blocks/-internals/validation/block-args";
+import {
+  validateAndParseBlockName,
+  validateBlockOptions,
+  validateOutletRestrictions,
+} from "discourse/lib/blocks/-internals/validation/block-decorator";
+import { validateConstraintsSchema } from "discourse/lib/blocks/-internals/validation/constraints";
+
+/*
+ * Authorization System
+ *
+ * IMPORTANT: These values MUST NOT be exported.
+ *
+ * The authorization model works as follows:
+ * 1. AUTH_TOKEN is a secret symbol known only to this module
+ * 2. blockMetadataMap tracks which classes are decorated with @block
+ * 3. rootBlockClass holds the single block that can be rendered directly (set via registerRootBlock)
+ * 4. Child blocks receive AUTH_TOKEN via the __block$ arg from their parent
+ * 5. BlockComponentManager verifies authorization before instantiation
+ *
+ * This prevents:
+ * - Using blocks directly in templates (bypassing BlockOutlet)
+ * - Spoofing block authorization by setting properties on classes
+ * - Accessing authorization state from external code
+ */
+
+/**
+ * Secret token used to authorize block rendering.
+ * Passed via __block$ arg from parent containers to child blocks.
+ */
+const AUTH_TOKEN = Symbol("block-auth-token");
+
+/**
+ * @typedef {Object} BlockMetadataEntry
+ * @property {boolean} isContainer - Whether the block is a container.
+ * @property {string} blockName - The block's full name identifier (e.g., "theme:tactile:hero-banner").
+ * @property {string} shortName - The block's plain name without namespace (e.g., "hero-banner").
+ * @property {string|null} namespace - The parsed namespace for CSS (e.g., "my-plugin" or "theme-tactile").
+ * @property {"core"|"plugin"|"theme"} namespaceType - The type of namespace.
+ * @property {string} description - Human-readable description of the block.
+ * @property {string|string[]|Function|null} decoratorClassNames - CSS classNames from decorator.
+ * @property {Object|null} args - Args schema for the block.
+ * @property {Object|null} childArgs - Child args schema (containers only).
+ * @property {Object|null} constraints - Cross-arg validation constraints.
+ * @property {Function|null} validate - Custom validation function.
+ * @property {readonly string[]|null} allowedOutlets - Allowed outlet patterns.
+ * @property {readonly string[]|null} deniedOutlets - Denied outlet patterns.
+ */
+
+/**
+ * Maps block classes to their metadata.
+ * Using WeakMap ensures:
+ * - Classes are garbage collected when no longer referenced
+ * - Authorization state cannot be discovered via Object.getOwnPropertySymbols()
+ *
+ * @type {WeakMap<Function, BlockMetadataEntry>}
+ */
+const blockMetadataMap = new WeakMap();
+
+/**
+ * The single root block class (BlockOutlet).
+ * Only one block can be the root - once set, it cannot be changed.
+ * This prevents any other block from claiming root status.
+ *
+ * @type {Function|null}
+ */
+let rootBlockClass = null;
+
+/**
+ * Registers a block class as the root block that can be rendered directly
+ * without authorization. Only one root block can be registered.
+ *
+ * @param {Function} klass - The block class to register as root.
+ */
+export function registerRootBlock(klass) {
+  if (rootBlockClass !== null) {
+    raiseBlockError(
+      `Only one root block is allowed. ` +
+        `"${rootBlockClass.name}" is already registered as the root block.`
+    );
+  }
+  rootBlockClass = klass;
+}
+
+/**
+ * Custom component manager proxy that enforces block authorization.
+ *
+ * Blocks can only be instantiated in two authorized scenarios:
+ * 1. As a root block - The class is the rootBlockClass (set via registerRootBlock)
+ * 2. As a child of a container - The parent passes __block$ arg with AUTH_TOKEN
+ *
+ * This prevents blocks from being used directly in templates, ensuring they
+ * can only be rendered through the BlockOutlet system.
+ */
+const BlockComponentManager = new Proxy(
+  getInternalComponentManager(Component),
+  {
+    get(target, prop) {
+      if (prop === "create") {
+        return function (owner, klass, args) {
+          // Check if this is the root block (BlockOutlet)
+          const isRootBlock = klass === rootBlockClass;
+
+          // Check if this is an authorized child (parent passes __block$ secret token)
+          let isAuthorizedChild = false;
+          const named = args?.named;
+          if (named?.names?.includes("__block$")) {
+            const ref = named.get("__block$");
+            isAuthorizedChild = ref.compute() === AUTH_TOKEN;
+          }
+
+          if (!isRootBlock && !isAuthorizedChild) {
+            const blockName =
+              blockMetadataMap.get(klass)?.blockName || klass.name;
+            throw new Error(
+              `Block "${blockName}" cannot be used directly in templates. ` +
+                `Blocks can only be rendered inside BlockOutlets or container blocks.`
+            );
+          }
+
+          return target.create(...arguments);
+        };
+      }
+      return Reflect.get(target, prop);
+    },
+  }
+);
+
+/**
+ * Schema for block argument validation.
+ *
+ * @typedef {Object} ArgSchema
+ * @property {"string"|"number"|"boolean"|"array"|"any"} type - The argument type (required)
+ * @property {boolean} [required=false] - Whether the argument is required
+ * @property {*} [default] - Default value for the argument
+ * @property {"string"|"number"|"boolean"} [itemType] - Item type for array arguments
+ * @property {RegExp} [pattern] - Regex pattern for string validation
+ * @property {number} [minLength] - Minimum length for string or array
+ * @property {number} [maxLength] - Maximum length for string or array
+ * @property {number} [min] - Minimum value for number
+ * @property {number} [max] - Maximum value for number
+ * @property {boolean} [integer] - Whether number must be an integer
+ * @property {Array} [enum] - Allowed values for the argument
+ * @property {Array} [itemEnum] - Allowed values for array items
+ */
+
+/**
+ * Decorator that transforms a Glimmer component into a block component.
+ *
+ * Block components have special authorization constraints:
+ * - They can only be rendered inside BlockOutlets or container blocks
+ * - They cannot be used directly in templates
+ * - They receive special args for authorization and hierarchy management
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @param {string} name - Unique identifier for the block. Supports three namespacing formats:
+ *   - Core blocks: `"block-name"` (e.g., "hero-banner", "sidebar-panel")
+ *   - Plugin blocks: `"plugin-name:block-name"` (e.g., "my-plugin:custom-card")
+ *   - Theme blocks: `"theme:theme-name:block-name"` (e.g., "theme:tactile:hero-section")
+ *   Names must use lowercase letters, numbers, and hyphens only.
+ *
+ * @param {Object} [options] - Configuration options for the block.
+ *
+ * @param {boolean} [options.container=false] - If true, this block can contain nested child blocks.
+ *
+ * @param {string} [options.description] - Human-readable description of the block.
+ *
+ * @param {Object.<string, ArgSchema>} [options.args] - Schema for block arguments.
+ *
+ * @param {Object.<string, ArgSchema>} [options.childArgs] - Schema for args passed to children
+ *   of this container block. Only valid when container: true.
+ *
+ * @param {Object} [options.constraints] - Cross-arg validation constraints.
+ *
+ * @param {Function} [options.validate] - Custom validation function.
+ *
+ * @param {string|string[]|((args: Object) => string)} [options.classNames] - Additional CSS classes.
+ *
+ * @param {string[]} [options.allowedOutlets] - Glob patterns for allowed outlets.
+ *
+ * @param {string[]} [options.deniedOutlets] - Glob patterns for denied outlets.
+ *
+ * @returns {Function} Decorator function that returns the decorated class
+ *
+ * @example
+ * // Simple block
+ * @block("my-card")
+ * class MyCard extends Component { ... }
+ *
+ * @example
+ * // Container block
+ * @block("my-section", { container: true })
+ * class MySection extends Component { ... }
+ *
+ */
+export function block(name, options = {}) {
+  // === Decoration-time validation ===
+  validateBlockOptions(name, options);
+  const parsed = validateAndParseBlockName(name);
+
+  // Extract all options with defaults
+  const {
+    container: isContainer = false,
+    classNames: decoratorClassNames = null,
+    description = "",
+    args: argsSchema = null,
+    childArgs: childArgsSchema = null,
+    constraints = null,
+    validate: validateFn = null,
+    allowedOutlets = null,
+    deniedOutlets = null,
+  } = options;
+
+  // Validate arg schema structure and types
+  validateArgsSchema(argsSchema, name);
+
+  // Validate childArgs is only allowed on container blocks
+  if (childArgsSchema && !isContainer) {
+    raiseBlockError(
+      `Block "${name}": "childArgs" is only valid for container blocks (container: true).`
+    );
+  }
+
+  // Validate classNames type (string, array, or function)
+  if (
+    decoratorClassNames != null &&
+    typeof decoratorClassNames !== "string" &&
+    typeof decoratorClassNames !== "function" &&
+    !Array.isArray(decoratorClassNames)
+  ) {
+    raiseBlockError(
+      `Block "${name}": "classNames" must be a string, array, or function.`
+    );
+  }
+
+  // Validate childArgs schema structure and types
+  validateChildArgsSchema(childArgsSchema, name);
+
+  // Validate constraints schema
+  validateConstraintsSchema(constraints, argsSchema, name);
+
+  // Validate that validate is a function if provided
+  if (validateFn !== null && typeof validateFn !== "function") {
+    raiseBlockError(
+      `Block "${name}": "validate" must be a function, got ${typeof validateFn}.`
+    );
+  }
+
+  // Validate outlet restriction patterns
+  validateOutletRestrictions(name, allowedOutlets, deniedOutlets);
+
+  return function (target) {
+    setInternalComponentManager(BlockComponentManager, target);
+
+    if (!(target.prototype instanceof Component)) {
+      raiseBlockError("@block target must be a Glimmer component class");
+      return target;
+    }
+
+    // Create and register metadata object with all block information
+    const metadata = Object.freeze({
+      allowedOutlets: allowedOutlets
+        ? Object.freeze([...allowedOutlets])
+        : null,
+      args: argsSchema ? Object.freeze(argsSchema) : null,
+      blockName: name,
+      childArgs: childArgsSchema ? Object.freeze(childArgsSchema) : null,
+      constraints: constraints ? Object.freeze(constraints) : null,
+      decoratorClassNames,
+      deniedOutlets: deniedOutlets ? Object.freeze([...deniedOutlets]) : null,
+      description,
+      isContainer,
+      namespace: parsed.namespace,
+      namespaceType: parsed.type,
+      shortName: parsed.name,
+      validate: validateFn,
+    });
+
+    blockMetadataMap.set(target, metadata);
+
+    return target;
+  };
+}
+
+/**
+ * Creates the args object for a child block with reactive getters for context args.
+ *
+ * This function embeds the AUTH_TOKEN in the __block$ property, which is how
+ * child blocks are authorized to render. The token is not exposed - it's
+ * embedded in the returned object.
+ *
+ * Context args are defined as getters rather than direct properties. This allows
+ * `curryComponent` to maintain a stable component identity while enabling reactive
+ * updates when the getter values change. Without getters, changing any arg would
+ * require creating a new curried component, breaking Ember's identity-based rendering.
+ *
+ * @param {Object} entryArgs - User-provided args from the layout entry.
+ * @param {Object} contextArgs - Rendering context to define as reactive getters.
+ * @returns {Object} The merged args object ready for `curryComponent`.
+ */
+export function createBlockArgsWithReactiveGetters(entryArgs, contextArgs) {
+  const blockArgs = {
+    ...entryArgs,
+    __block$: AUTH_TOKEN,
+  };
+
+  // Dynamically define reactive getters for each context arg
+  /** @type {PropertyDescriptorMap} */
+  const propertyDescriptors = {};
+  for (const [key, value] of Object.entries(contextArgs)) {
+    propertyDescriptors[key] = {
+      get() {
+        return value;
+      },
+      enumerable: true,
+    };
+  }
+  Object.defineProperties(blockArgs, propertyDescriptors);
+
+  return blockArgs;
+}
+
+/**
+ * Gets all metadata for a component registered with @block.
+ *
+ * Returns a flat object containing all block information:
+ * - `blockName` - Full block name (e.g., "theme:my-theme:heading")
+ * - `shortName` - Plain name without namespace (e.g., "heading")
+ * - `namespace` - Full namespace for CSS ("my-plugin" or "theme-tactile") or null for core
+ * - `namespaceType` - "core" | "plugin" | "theme"
+ * - `isContainer` - Whether block is a container
+ * - `description` - Human-readable description
+ * - `decoratorClassNames` - CSS classNames from decorator
+ * - `args` - Args schema
+ * - `childArgs` - Child args schema (containers only)
+ * - `constraints` - Cross-arg validation constraints
+ * - `validate` - Custom validation function
+ * - `allowedOutlets` - Allowed outlet patterns
+ * - `deniedOutlets` - Denied outlet patterns
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @param {Function} component - The component to get metadata for.
+ * @returns {Object|null} The block metadata object, or null if not a block.
+ */
+export function getBlockMetadata(component) {
+  return blockMetadataMap.get(component) ?? null;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/entry-processing.js b/frontend/discourse/app/lib/blocks/-internals/entry-processing.js
new file mode 100644
index 0000000000000..a087dbf861838
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/entry-processing.js
@@ -0,0 +1,254 @@
+// @ts-check
+/**
+ * Block Entry Processing
+ *
+ * This module contains utilities for processing block entries and creating
+ * renderable components. These functions iterate through pre-processed block
+ * entries and transform them into curried Glimmer components.
+ *
+ * The functions use dependency injection for the authorization-dependent operation
+ * `createChildBlockFn` to maintain the authorization model in the main block-outlet
+ * module.
+ *
+ * @module discourse/lib/blocks/-internals/entry-processing
+ */
+import {
+  buildContainerPath,
+  createGhostBlock,
+  handleOptionalMissingBlock,
+} from "discourse/lib/blocks/-internals/debug-hooks";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { isOptionalMissing } from "discourse/lib/blocks/-internals/patterns";
+import { tryResolveBlock } from "discourse/lib/blocks/-internals/registry/block";
+import { shallowArgsEqual } from "discourse/lib/blocks/-internals/utils";
+
+/**
+ * Gets or creates a curried component for a leaf block, using cache when possible.
+ *
+ * Only leaf blocks (blocks without children) are cached. Container blocks are
+ * always recreated because their children's visibility may change between
+ * renders, and caching would result in stale children being displayed.
+ *
+ * Cache hit conditions:
+ * 1. The component class must be the same reference
+ * 2. The args object must be shallowly equal
+ *
+ * @param {Map<string, {ComponentClass: typeof import("@glimmer/component").default, args: Object, result: Object}>} cache - The component cache keyed by stable block keys.
+ * @param {Object} entry - The block entry with __stableKey and optional children.
+ * @param {typeof import("@glimmer/component").default} resolvedBlock - The resolved block component class.
+ * @param {Object} debugContext - Debug context for visual overlay and hierarchy tracking.
+ * @param {string} debugContext.key - Stable unique key for this block.
+ * @param {string} debugContext.displayHierarchy - Where the block is rendered (for tooltip display).
+ * @param {string} debugContext.outletName - The outlet name for wrapper class generation.
+ * @param {string} [debugContext.containerPath] - Container's full path (for children's __hierarchy).
+ * @param {Object} [debugContext.conditions] - The block's conditions.
+ * @param {Object} debugContext.outletArgs - Outlet arguments passed from the parent.
+ * @param {Array<Object>} [debugContext.processedChildren] - Pre-processed children for container blocks.
+ * @param {import("@ember/owner").default} owner - The application owner for service lookup.
+ * @param {Function} createChildBlockFn - Function to create child block components (injected from block-outlet.gjs).
+ * @returns {ChildBlockResult} The cached or newly created component data with stable key for list rendering.
+ */
+function getOrCreateLeafBlockComponent(
+  cache,
+  entry,
+  resolvedBlock,
+  debugContext,
+  owner,
+  createChildBlockFn
+) {
+  const { key } = debugContext;
+  const cachedEntry = cache.get(key);
+  const hasChildren = entry.children?.length > 0;
+
+  // Only cache leaf blocks (no children). Container blocks are always recreated
+  // to ensure their children reflect current visibility state.
+  if (
+    !hasChildren &&
+    cachedEntry &&
+    cachedEntry.ComponentClass === resolvedBlock &&
+    shallowArgsEqual(cachedEntry.args, entry.args)
+  ) {
+    return cachedEntry.result;
+  }
+
+  // Create new curried component
+  const result = createChildBlockFn(
+    { ...entry, block: resolvedBlock },
+    owner,
+    debugContext
+  );
+
+  // Cache leaf blocks for future reuse
+  if (!hasChildren) {
+    cache.set(key, {
+      ComponentClass: resolvedBlock,
+      args: entry.args,
+      result,
+    });
+  }
+
+  return result;
+}
+
+/**
+ * Processes block entries and creates renderable child components.
+ *
+ * This function iterates through a list of pre-processed block entries and
+ * transforms them into renderable components, handling ghost blocks for
+ * debug mode and optional missing blocks.
+ *
+ * @typedef {Object} BlockEntry
+ * @property {string|typeof import("@glimmer/component").default} block - Block reference (string name or class).
+ * @property {Object} [args] - Arguments to pass to the block.
+ * @property {Object} [containerArgs] - Values for parent container's childArgs schema.
+ * @property {Array<BlockEntry>} [children] - Nested block entries for containers.
+ * @property {Object|Array<Object>} [conditions] - Conditions that must pass for block to render.
+ * @property {string} [classNames] - Additional CSS classes for the block wrapper.
+ * @property {string} [id] - Unique identifier for BEM styling and targeting.
+ * @property {boolean} __visible - Whether the block passed condition evaluation.
+ * @property {number} __stableKey - Stable key assigned at registration time.
+ * @property {string} [__failureType] - The failure type constant (debug mode only).
+ * @property {string} [__failureReason] - Custom failure reason message (debug mode only).
+ *
+ * @typedef {Object} ChildBlockResult
+ * @property {import("ember-curry-component").CurriedComponent} Component - Curried component ready to render.
+ * @property {Object} [containerArgs] - Values for parent container's childArgs schema.
+ * @property {string} key - Stable unique key for list rendering.
+ * @property {boolean} [isGhost] - True if this is a ghost block (debug mode only).
+ * @property {(reason: string) => ChildBlockResult|null} [asGhost] - Returns a ghost version of this child with the given reason.
+ *   For regular children, creates a new ghost component (or null if debug mode is disabled).
+ *   For ghost children, returns self (no-op).
+ *
+ * @param {Object} options - Rendering options.
+ * @param {Array<BlockEntry>} options.entries - Pre-processed block entries with visibility metadata.
+ * @param {Map<string, {ComponentClass: typeof import("@glimmer/component").default, args: Object, result: ChildBlockResult}>} options.cache - Component cache keyed by stable block keys.
+ * @param {import("@ember/owner").default} options.owner - Application owner for service lookup.
+ * @param {string} options.baseHierarchy - Current hierarchy path (e.g., "homepage-blocks/section-1").
+ * @param {string} options.outletName - The outlet name for CSS class generation.
+ * @param {Object} options.outletArgs - Arguments passed from the outlet to blocks.
+ * @param {boolean} options.showGhosts - Whether to render ghost blocks for invisible entries.
+ * @param {boolean} options.isLoggingEnabled - Whether debug logging is active.
+ * @param {Function} options.createChildBlockFn - Function to create child block components (injected from block-outlet.gjs).
+ * @returns {Array<ChildBlockResult>} Array of renderable child objects with Component and containerArgs.
+ */
+export function processBlockEntries({
+  entries,
+  cache,
+  owner,
+  baseHierarchy,
+  outletName,
+  outletArgs,
+  showGhosts,
+  isLoggingEnabled,
+  createChildBlockFn,
+}) {
+  const result = [];
+  const containerCounts = new Map();
+
+  for (const entry of entries) {
+    // @ts-ignore - entry.block can be string or BlockClass
+    const resolvedBlock = tryResolveBlock(entry.block);
+
+    // Handle optional missing block (block ref ended with `?` but not registered)
+    if (isOptionalMissing(resolvedBlock)) {
+      const key = `optional-missing:${resolvedBlock.name}:${entry.__stableKey}`;
+      const ghostData = handleOptionalMissingBlock({
+        blockName: resolvedBlock.name,
+        entry,
+        hierarchy: baseHierarchy,
+        isLoggingEnabled,
+        showGhosts,
+        key,
+      });
+      if (ghostData) {
+        result.push(ghostData);
+      }
+      continue;
+    }
+
+    // Skip blocks that haven't resolved yet. Block factories may be resolving
+    // asynchronously (e.g., lazy-loaded plugins). The component will automatically
+    // re-render when the factory resolves (via TrackedMap reactivity).
+    if (!resolvedBlock) {
+      continue;
+    }
+
+    const blockClass =
+      /** @type {import("discourse/lib/blocks/-internals/registry/block").BlockClass} */ (
+        resolvedBlock
+      );
+    const blockMeta = getBlockMetadata(blockClass);
+    const blockName = blockMeta?.blockName || "unknown";
+    const isContainer = blockMeta?.isContainer ?? false;
+
+    // Use the stable key assigned at registration time. This key survives
+    // shallow cloning and ensures DOM identity is maintained when blocks
+    // are hidden/shown by conditions.
+    const key = `${blockName}:${entry.__stableKey}`;
+
+    // For containers, build their full path for children's hierarchy.
+    // The id is included in the path for easier identification in debug tools.
+    const containerPath = isContainer
+      ? buildContainerPath(blockName, entry.id, baseHierarchy, containerCounts)
+      : undefined;
+
+    // For containers with children, recursively process children FIRST
+    // This creates the child components at the root level, so containers
+    // receive pre-processed children via @children arg instead of raw entries.
+    let processedChildren;
+    if (isContainer && entry.children?.length) {
+      processedChildren = processBlockEntries({
+        entries: entry.children,
+        cache, // Same root cache for all levels
+        owner,
+        baseHierarchy: containerPath,
+        outletName,
+        outletArgs,
+        showGhosts,
+        isLoggingEnabled,
+        createChildBlockFn,
+      });
+    }
+
+    // Render visible blocks
+    if (entry.__visible) {
+      result.push(
+        getOrCreateLeafBlockComponent(
+          cache,
+          entry,
+          blockClass,
+          {
+            displayHierarchy: baseHierarchy,
+            outletName,
+            containerPath,
+            conditions: entry.conditions,
+            outletArgs,
+            key,
+            processedChildren, // Pass pre-processed children for containers
+          },
+          owner,
+          createChildBlockFn
+        )
+      );
+    } else if (showGhosts) {
+      // Show ghost for invisible blocks in debug mode
+      const ghostData = createGhostBlock({
+        blockName,
+        entry,
+        hierarchy: baseHierarchy,
+        containerPath,
+        isContainer,
+        owner,
+        outletArgs,
+        isLoggingEnabled,
+        resolveBlockFn: tryResolveBlock,
+        key,
+      });
+      if (ghostData) {
+        result.push(ghostData);
+      }
+    }
+  }
+
+  return result;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/error.js b/frontend/discourse/app/lib/blocks/-internals/error.js
new file mode 100644
index 0000000000000..01d204aafd103
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/error.js
@@ -0,0 +1,845 @@
+// @ts-check
+/**
+ * Block error handling and entry formatting utilities.
+ *
+ * This module provides error classes, formatting utilities for error display,
+ * and helpers for human-readable console output during block validation.
+ *
+ * @module discourse/lib/blocks/-internals/error
+ */
+import { DEBUG } from "@glimmer/env";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+
+/* Value Display Helpers */
+
+/**
+ * Formats a simple value (primitive, function, or block reference) for display.
+ * Returns null if the value is a complex type (array/object) that needs special handling.
+ *
+ * @param {*} obj - The value to format.
+ * @returns {string|null} String representation, or null if complex type.
+ */
+function formatSimpleValue(obj) {
+  if (obj === undefined) {
+    return "undefined";
+  }
+  if (obj === null) {
+    return "null";
+  }
+  if (typeof obj === "function") {
+    const blockName = getBlockMetadata(obj)?.blockName;
+    return `<${blockName || obj.name || "Function"}>`;
+  }
+  if (typeof obj !== "object") {
+    return JSON.stringify(obj);
+  }
+  const blockName = getBlockMetadata(obj)?.blockName;
+  if (blockName) {
+    return `<${blockName}>`;
+  }
+  return null;
+}
+
+/**
+ * Formats a value as a truncated string for console display.
+ * Returns shallow representations like "{ ... }" or "[ 3 items ]".
+ *
+ * Note: This returns STRINGS for console output. For JSON-serializable
+ * truncation, use truncateForDisplay() instead.
+ *
+ * @param {*} obj - The value to format.
+ * @returns {string} Truncated string representation.
+ */
+function formatTruncatedValue(obj) {
+  const simple = formatSimpleValue(obj);
+  if (simple !== null) {
+    return simple;
+  }
+
+  if (Array.isArray(obj)) {
+    return obj.length === 0 ? "[]" : `[ ${obj.length} items ]`;
+  }
+
+  const keys = Object.keys(obj);
+  return keys.length === 0 ? "{}" : "{ ... }";
+}
+
+/* Path Parsing */
+
+/**
+ * Parses a condition path string into path segments.
+ * Handles both dot notation (`.key`) and bracket notation (`[0]`).
+ *
+ * @param {string} path - The path string (e.g., "conditions.any[0][1].queryParams").
+ * @returns {Array<string|number>} Array of path segments.
+ *
+ * @example
+ * parseConditionPath("conditions.any[0][1].type")
+ * // Returns: ["conditions", "any", 0, 1, "type"]
+ */
+export function parseConditionPath(path) {
+  const segments = [];
+  let current = "";
+
+  for (let i = 0; i < path.length; i++) {
+    const char = path[i];
+
+    if (char === ".") {
+      if (current) {
+        segments.push(current);
+        current = "";
+      }
+    } else if (char === "[") {
+      if (current) {
+        segments.push(current);
+        current = "";
+      }
+      // Find closing bracket
+      let j = i + 1;
+      while (j < path.length && path[j] !== "]") {
+        j++;
+      }
+      const index = path.slice(i + 1, j);
+      segments.push(parseInt(index, 10));
+      i = j; // Skip to after the closing bracket
+    } else {
+      current += char;
+    }
+  }
+
+  if (current) {
+    segments.push(current);
+  }
+
+  return segments;
+}
+
+/* Path-Aware Entry Rendering */
+
+/**
+ * Renders block entries with error path highlighting.
+ * Displays the structure with proper indentation and marks where errors occurred.
+ */
+class PathHighlightRenderer {
+  /** @type {Array<string|number>} */
+  #errorSegments;
+
+  /** @type {string|number} */
+  #errorKey;
+
+  /** @type {string|undefined} */
+  #label;
+
+  /**
+   * @param {string} errorPath - Path to the error (e.g., "conditions.any[0].type").
+   * @param {Object} [options] - Formatting options.
+   * @param {string} [options.prefix] - Prefix to skip in the path.
+   * @param {string} [options.label] - Label to show before the entry.
+   */
+  constructor(errorPath, options = {}) {
+    const { prefix, label } = options;
+    const pathSegments = parseConditionPath(errorPath);
+
+    const startIndex = prefix && pathSegments[0] === prefix ? 1 : 0;
+    this.#errorSegments = pathSegments.slice(startIndex);
+    this.#errorKey = this.#errorSegments.at(-1);
+    this.#label = label;
+  }
+
+  /**
+   * Renders the entry with the error path highlighted.
+   *
+   * @param {Object|Array} entry - The block entry object to render.
+   * @returns {string} Formatted string with error location highlighted.
+   */
+  render(entry) {
+    const rendered = this.#renderValue(entry, 0, []);
+    return this.#label ? `${this.#label} ${rendered}` : rendered;
+  }
+
+  /**
+   * Checks if the current path is on the error path.
+   *
+   * @param {Array<string|number>} currentPath - Current path segments.
+   * @returns {boolean} True if on error path.
+   */
+  #isOnErrorPath(currentPath) {
+    return currentPath.every(
+      (seg, i) =>
+        i >= this.#errorSegments.length || seg === this.#errorSegments[i]
+    );
+  }
+
+  /**
+   * Checks if we've passed the error location in the tree.
+   *
+   * @param {Array<string|number>} currentPath - Current path segments.
+   * @returns {boolean} True if past error location.
+   */
+  #isPastErrorLocation(currentPath) {
+    return currentPath.length > this.#errorSegments.length;
+  }
+
+  /**
+   * Renders any value, dispatching to the appropriate handler.
+   *
+   * @param {*} obj - The value to render.
+   * @param {number} depth - Current indentation depth.
+   * @param {Array<string|number>} currentPath - Path segments to current location.
+   * @returns {string} Rendered string.
+   */
+  #renderValue(obj, depth, currentPath) {
+    if (this.#isPastErrorLocation(currentPath)) {
+      return formatTruncatedValue(obj);
+    }
+
+    const simple = formatSimpleValue(obj);
+    if (simple !== null) {
+      return simple;
+    }
+
+    if (Array.isArray(obj)) {
+      return this.#renderArray(obj, depth, currentPath);
+    }
+
+    return this.#renderObject(obj, depth, currentPath);
+  }
+
+  /**
+   * Renders an array with path highlighting.
+   *
+   * @param {Array} arr - The array to render.
+   * @param {number} depth - Current indentation depth.
+   * @param {Array<string|number>} currentPath - Path segments to current location.
+   * @returns {string} Rendered string.
+   */
+  #renderArray(arr, depth, currentPath) {
+    if (arr.length === 0) {
+      return "[]";
+    }
+
+    const indent = "  ".repeat(depth);
+    const itemOnPathIndex = this.#findItemOnPath(arr, currentPath);
+    const lines = ["["];
+
+    if (itemOnPathIndex >= 0) {
+      this.#renderArrayWithHighlightedItem(
+        arr,
+        itemOnPathIndex,
+        depth,
+        currentPath,
+        indent,
+        lines
+      );
+    } else {
+      this.#renderArrayAllTruncated(arr, indent, lines);
+    }
+
+    lines.push(`${indent}]`);
+    return lines.join("\n");
+  }
+
+  /**
+   * Finds which array item (if any) is on the error path.
+   *
+   * @param {Array} arr - The array to search.
+   * @param {Array<string|number>} currentPath - Current path segments.
+   * @returns {number} Index of item on path, or -1 if none.
+   */
+  #findItemOnPath(arr, currentPath) {
+    for (let i = 0; i < arr.length; i++) {
+      const itemPath = [...currentPath, i];
+      if (this.#isOnErrorPath(itemPath)) {
+        return i;
+      }
+    }
+    return -1;
+  }
+
+  /**
+   * Renders an array with a highlighted item on the error path.
+   *
+   * @param {Array} arr - The array to render.
+   * @param {number} itemIndex - Index of the highlighted item.
+   * @param {number} depth - Current indentation depth.
+   * @param {Array<string|number>} currentPath - Current path segments.
+   * @param {string} indent - Current indentation string.
+   * @param {Array<string>} lines - Output lines array.
+   */
+  #renderArrayWithHighlightedItem(
+    arr,
+    itemIndex,
+    depth,
+    currentPath,
+    indent,
+    lines
+  ) {
+    if (itemIndex > 0) {
+      lines.push(`${indent}  ...`);
+    }
+
+    const itemPath = [...currentPath, itemIndex];
+    const value = this.#renderValue(arr[itemIndex], depth + 1, itemPath);
+    const comma = itemIndex < arr.length - 1 ? "," : "";
+    const errorMarker = this.#isExactErrorLocation(itemPath)
+      ? " // <-- error here"
+      : "";
+
+    lines.push(`${indent}  ${value}${comma}${errorMarker}`);
+
+    if (itemIndex < arr.length - 1) {
+      lines.push(`${indent}  ...`);
+    }
+  }
+
+  /**
+   * Renders all array items as truncated values.
+   *
+   * @param {Array} arr - The array to render.
+   * @param {string} indent - Current indentation string.
+   * @param {Array<string>} lines - Output lines array.
+   */
+  #renderArrayAllTruncated(arr, indent, lines) {
+    for (let i = 0; i < arr.length; i++) {
+      const value = formatTruncatedValue(arr[i]);
+      const comma = i < arr.length - 1 ? "," : "";
+      lines.push(`${indent}  ${value}${comma}`);
+    }
+  }
+
+  /**
+   * Checks if a path is the exact error location.
+   *
+   * @param {Array<string|number>} path - Path to check.
+   * @returns {boolean} True if this is the exact error location.
+   */
+  #isExactErrorLocation(path) {
+    return (
+      path.length === this.#errorSegments.length &&
+      path.every((seg, j) => seg === this.#errorSegments[j])
+    );
+  }
+
+  /**
+   * Renders an object with path highlighting.
+   *
+   * @param {Object} obj - The object to render.
+   * @param {number} depth - Current indentation depth.
+   * @param {Array<string|number>} currentPath - Path segments to current location.
+   * @returns {string} Rendered string.
+   */
+  #renderObject(obj, depth, currentPath) {
+    const indent = "  ".repeat(depth);
+    const keys = Object.keys(obj).filter((k) => !k.startsWith("_"));
+    const isOnPath = this.#isOnErrorPath(currentPath);
+    const nextErrorSegment = this.#errorSegments[currentPath.length];
+    const needsSyntheticEntry =
+      isOnPath &&
+      typeof nextErrorSegment === "string" &&
+      !keys.includes(nextErrorSegment);
+
+    if (keys.length === 0 && !needsSyntheticEntry) {
+      return "{}";
+    }
+
+    const lines = ["{"];
+    this.#renderObjectKeys(
+      obj,
+      keys,
+      depth,
+      currentPath,
+      isOnPath,
+      indent,
+      lines
+    );
+
+    if (needsSyntheticEntry) {
+      this.#renderSyntheticEntry(currentPath, indent, lines);
+    }
+
+    lines.push(`${indent}}`);
+    return lines.join("\n");
+  }
+
+  /**
+   * Renders all keys of an object.
+   *
+   * @param {Object} obj - The object being rendered.
+   * @param {Array<string>} keys - Keys to render.
+   * @param {number} depth - Current indentation depth.
+   * @param {Array<string|number>} currentPath - Current path segments.
+   * @param {boolean} isOnPath - Whether current location is on error path.
+   * @param {string} indent - Current indentation string.
+   * @param {Array<string>} lines - Output lines array.
+   */
+  #renderObjectKeys(obj, keys, depth, currentPath, isOnPath, indent, lines) {
+    for (const key of keys) {
+      const keyPath = [...currentPath, key];
+      const isKeyOnPath = this.#isOnErrorPath(keyPath);
+      const isKeyTheError =
+        isOnPath &&
+        currentPath.length === this.#errorSegments.length - 1 &&
+        key === this.#errorKey;
+
+      const value =
+        isKeyOnPath || isKeyTheError
+          ? this.#renderValue(obj[key], depth + 1, keyPath)
+          : formatTruncatedValue(obj[key]);
+      const errorMarker = isKeyTheError ? " // <-- error here" : "";
+
+      this.#appendKeyValueLine(key, value, errorMarker, indent, lines);
+    }
+  }
+
+  /**
+   * Appends a key-value line to the output, handling multiline values.
+   *
+   * @param {string} key - The object key.
+   * @param {string} value - The rendered value.
+   * @param {string} errorMarker - Error marker string (or empty).
+   * @param {string} indent - Current indentation string.
+   * @param {Array<string>} lines - Output lines array.
+   */
+  #appendKeyValueLine(key, value, errorMarker, indent, lines) {
+    if (value.includes("\n")) {
+      const [firstLine, ...restLines] = value.split("\n");
+      lines.push(`${indent}  ${key}: ${firstLine}${errorMarker}`);
+      lines.push(`${restLines.join("\n")},`);
+    } else {
+      lines.push(`${indent}  ${key}: ${value},${errorMarker}`);
+    }
+  }
+
+  /**
+   * Renders a synthetic entry for missing keys on the error path.
+   *
+   * @param {Array<string|number>} currentPath - Current path segments.
+   * @param {string} indent - Current indentation string.
+   * @param {Array<string>} lines - Output lines array.
+   */
+  #renderSyntheticEntry(currentPath, indent, lines) {
+    const remainingPath = this.#errorSegments.slice(currentPath.length);
+    const nextSegment = remainingPath[0];
+    const isAtFinalKey = remainingPath.length === 1;
+
+    if (isAtFinalKey) {
+      lines.push(`${indent}  ${nextSegment}: <missing>, // <-- error here`);
+    } else {
+      lines.push(`${indent}  ${nextSegment}: { // <-- missing`);
+      lines.push(
+        ...this.#renderMissingPath(
+          remainingPath.slice(1),
+          currentPath.length + 1
+        )
+      );
+      lines.push(`${indent}  },`);
+    }
+  }
+
+  /**
+   * Renders the remaining path segments for a missing key.
+   *
+   * @param {Array<string|number>} segments - Remaining path segments.
+   * @param {number} depth - Current indentation depth.
+   * @returns {Array<string>} Array of formatted lines.
+   */
+  #renderMissingPath(segments, depth) {
+    const indent = "  ".repeat(depth);
+    const lines = [];
+
+    if (segments.length === 0) {
+      return lines;
+    }
+
+    const [seg, ...rest] = segments;
+
+    if (rest.length === 0) {
+      lines.push(`${indent}  ${seg}: <missing>, // <-- error here`);
+    } else {
+      lines.push(`${indent}  ${seg}: { // <-- missing`);
+      lines.push(...this.#renderMissingPath(rest, depth + 1));
+      lines.push(`${indent}  },`);
+    }
+
+    return lines;
+  }
+}
+
+/**
+ * Renders a block entry object with the error path highlighted.
+ * Shows the structure with proper indentation and adds a comment marker
+ * to indicate where the error occurred.
+ *
+ * @param {Object|Array} entry - The block entry object to render.
+ * @param {string} errorPath - The path to the error (e.g., "conditions.any[0][0].queryParams").
+ * @param {Object} [options] - Formatting options.
+ * @param {string} [options.prefix] - Optional prefix to skip in the path (e.g., "conditions").
+ * @param {string} [options.label] - Label to show before the entry (e.g., "conditions:").
+ * @returns {string} Formatted string with the error location highlighted.
+ */
+export function formatEntryWithErrorPath(entry, errorPath, options = {}) {
+  return new PathHighlightRenderer(errorPath, options).render(entry);
+}
+
+/**
+ * Truncates an object for JSON serialization in error messages.
+ * Returns actual objects/arrays with truncated content, not strings.
+ *
+ * Note: This returns OBJECTS for JSON.stringify(). For string representations
+ * in console output, use formatTruncatedValue() instead.
+ *
+ * Handles special cases like block classes, children arrays, and circular references.
+ *
+ * @param {*} obj - The object to truncate.
+ * @param {number} [maxDepth=2] - Maximum nesting depth before truncating.
+ * @param {number} [maxKeys=5] - Maximum number of keys to show per object.
+ * @param {WeakSet} [_seen=null] - Internal parameter for tracking circular references.
+ * @returns {*} Truncated representation of the object.
+ */
+export function truncateForDisplay(
+  obj,
+  maxDepth = 2,
+  maxKeys = 5,
+  _seen = null
+) {
+  if (obj === null || typeof obj !== "object") {
+    return obj;
+  }
+
+  // Initialize seen set on first call to track circular references
+  const seen = _seen ?? new WeakSet();
+
+  // Handle circular references
+  if (seen.has(obj)) {
+    return "[Circular]";
+  }
+  seen.add(obj);
+
+  if (maxDepth <= 0) {
+    return Array.isArray(obj) ? "[...]" : "{...}";
+  }
+
+  if (Array.isArray(obj)) {
+    if (obj.length > maxKeys) {
+      return [
+        ...obj
+          .slice(0, maxKeys)
+          .map((v) => truncateForDisplay(v, maxDepth - 1, maxKeys, seen)),
+        "...",
+      ];
+    }
+    return obj.map((v) => truncateForDisplay(v, maxDepth - 1, maxKeys, seen));
+  }
+
+  // Filter out private keys (starting with _)
+  const keys = Object.keys(obj).filter((k) => !k.startsWith("_"));
+  const result = {};
+  const displayKeys = keys.slice(0, maxKeys);
+
+  for (const key of displayKeys) {
+    // Handle special keys that don't serialize well or are verbose
+    if (key === "block") {
+      result[key] = `<${getBlockMetadata(obj[key])?.blockName || "Component"}>`;
+    } else if (key === "children") {
+      result[key] = `[${obj[key]?.length || 0} children]`;
+    } else {
+      result[key] = truncateForDisplay(obj[key], maxDepth - 1, maxKeys, seen);
+    }
+  }
+
+  if (keys.length > maxKeys) {
+    result["..."] = `(${keys.length - maxKeys} more)`;
+  }
+
+  return result;
+}
+
+/* Error Handling */
+
+/**
+ * Captures the current call site as an Error object, excluding internal frames.
+ * Call this at the entry point (e.g., renderBlocks) to capture where
+ * the user's code called into the block system.
+ *
+ * Uses `Error.captureStackTrace` (V8-specific) to exclude the calling function
+ * and everything above it from the stack trace. This means the stack will
+ * point directly to the user's code, not to internal block system functions.
+ *
+ * @param {Function} callerFn - The function to exclude from the stack trace.
+ *   Pass the function that calls `captureCallSite` (e.g., `_renderBlocks`).
+ * @returns {Error} An Error object with stack trace starting from callerFn's caller.
+ */
+export function captureCallSite(callerFn) {
+  const error = new Error();
+
+  // V8-specific: exclude callerFn and everything above from the stack trace.
+  // In non-V8 browsers, this is a no-op and the full stack is preserved.
+  // @ts-ignore - V8-specific API
+  if (Error.captureStackTrace) {
+    // @ts-ignore - V8-specific API
+    Error.captureStackTrace(error, callerFn);
+  }
+
+  return error;
+}
+
+/**
+ * Builds a tree-style breadcrumb showing the path from root to error.
+ * Uses Unicode box-drawing characters for visual hierarchy.
+ *
+ * @param {Array|Object} rootLayout - The root layout (usually an array of block entries).
+ * @param {string} errorPath - The path to the error (e.g., "[4].children[2].args.nme").
+ * @returns {string} Tree-style breadcrumb string.
+ *
+ * @example
+ * // Returns:
+ * // └─ [4] BlockGroup (name: "callouts")
+ * //    └─ [2] ChildBlockName
+ * //       └─ args.nme  ← error here
+ */
+function buildBreadcrumb(rootLayout, errorPath) {
+  const segments = parseConditionPath(errorPath);
+  const lines = [];
+  let current = rootLayout;
+  let indent = "";
+
+  for (let i = 0; i < segments.length; i++) {
+    const seg = segments[i];
+
+    if (typeof seg === "number" && Array.isArray(current)) {
+      // Array index - show block info
+      const block = current[seg];
+      const blockClass = block?.block;
+      const blockName =
+        getBlockMetadata(blockClass)?.blockName || blockClass?.name || "Block";
+      const nameArg = block?.args?.name ? ` (name: "${block.args.name}")` : "";
+      lines.push(`${indent}└─ [${seg}] ${blockName}${nameArg}`);
+      current = block;
+      indent += "   ";
+    } else if (
+      typeof seg === "string" &&
+      current &&
+      typeof current === "object"
+    ) {
+      // Object key - check if this is a terminal segment or intermediate
+      const isLastSegment = i === segments.length - 1;
+      const nextSeg = segments[i + 1];
+      const value = current[seg];
+
+      if (seg === "children" && typeof nextSeg === "number") {
+        // "children" followed by index - continue traversal
+        current = value;
+      } else if (isLastSegment) {
+        // Final segment - this is the error location
+        lines.push(`${indent}└─ ${seg}  ← error here`);
+      } else if (seg === "args" || seg === "conditions") {
+        // Show remaining path as the error location
+        const remaining = segments.slice(i).join(".");
+        lines.push(`${indent}└─ ${remaining}  ← error here`);
+        break;
+      } else {
+        current = value;
+      }
+    }
+  }
+
+  return lines.join("\n");
+}
+
+/**
+ * Formats the error context into a human-readable string for console output.
+ *
+ * When an `errorPath` is provided, uses the path-aware formatter to show
+ * the error location within the entry with a comment marker.
+ *
+ * @param {Object} context - The error context.
+ * @returns {string} Formatted context string, or empty string if no context.
+ */
+function formatErrorContext(context) {
+  if (!context) {
+    return "";
+  }
+
+  const parts = [];
+
+  // Use errorPath if available, otherwise fall back to path
+  // Many validation calls use "path" for block location in the tree
+  const effectivePath = context.errorPath || context.path;
+
+  // Display the error path location - use tree-style breadcrumb when rootLayout is available
+  if (effectivePath) {
+    if (context.rootLayout) {
+      try {
+        const breadcrumb = buildBreadcrumb(context.rootLayout, effectivePath);
+        parts.push(`Location:\n${breadcrumb}`);
+      } catch {
+        // Fallback to plain path if breadcrumb fails
+        parts.push(`Location: ${effectivePath}`);
+      }
+    } else {
+      parts.push(`Location: ${effectivePath}`);
+    }
+  }
+
+  // Priority: rootLayout tree > conditions > individual entry
+  // Always prefer showing the full tree when rootLayout is available
+  if (context.rootLayout && effectivePath) {
+    // Root layout available - show full nesting path from root to error
+    try {
+      const layoutStr = formatEntryWithErrorPath(
+        context.rootLayout,
+        effectivePath
+      );
+      parts.push(`\nContext:\n${layoutStr}`);
+    } catch {
+      parts.push("Context: [unable to format]");
+    }
+  } else if (context.conditions && context.conditionsPath) {
+    // Fallback: conditions with path-aware formatter
+    // conditionsPath is relative to conditions object (e.g., "params.categoryId")
+    try {
+      const conditionsStr = formatEntryWithErrorPath(
+        context.conditions,
+        context.conditionsPath,
+        { label: "conditions:" }
+      );
+      parts.push(`\nContext:\n${conditionsStr}`);
+    } catch {
+      parts.push("Context: [unable to format]");
+    }
+  } else if (context.entry && effectivePath) {
+    // Fallback: individual block entry - strip path prefix for relative path
+    try {
+      let relativePath = effectivePath;
+      if (context.path && effectivePath.startsWith(context.path)) {
+        relativePath = effectivePath.slice(context.path.length);
+        if (relativePath.startsWith(".")) {
+          relativePath = relativePath.slice(1);
+        }
+      }
+      const entryStr = formatEntryWithErrorPath(context.entry, relativePath);
+      parts.push(`\nContext:\n${entryStr}`);
+    } catch {
+      parts.push("Context: [unable to format]");
+    }
+  } else if (context.conditions) {
+    // Fallback to simple display without path highlighting
+    try {
+      const conditionsStr = JSON.stringify(
+        truncateForDisplay(context.conditions),
+        null,
+        2
+      );
+      parts.push(`Conditions:\n${conditionsStr}`);
+    } catch {
+      parts.push("Conditions: [unable to serialize]");
+    }
+  } else if (context.entry) {
+    try {
+      const entryStr = JSON.stringify(
+        truncateForDisplay(context.entry),
+        null,
+        2
+      );
+      parts.push(`Block entry:\n${entryStr}`);
+    } catch {
+      parts.push("Block entry: [unable to serialize]");
+    }
+  }
+
+  return parts.length > 0 ? `\n\n${parts.join("\n")}` : "";
+}
+
+/**
+ * Error thrown when block validation fails.
+ * Used by block entry and condition validation to report
+ * errors at registration time.
+ *
+ * Supports the standard `cause` option from ES2022 to chain errors together.
+ * Note: `raiseBlockError()` uses a different approach - it reuses the
+ * `callSiteError` directly (mutating its message and name) rather than
+ * passing it as `cause`. This preserves the original stack trace pointing
+ * to where `renderBlocks()` was called.
+ *
+ * @class BlockError
+ * @extends Error
+ */
+export class BlockError extends Error {
+  /**
+   * Creates a new BlockError.
+   *
+   * @param {string} message - The error message.
+   * @param {Object} [options] - Error options.
+   * @param {Error} [options.cause] - The underlying cause of this error.
+   * @param {string} [options.path] - Path to the error within the layout
+   *   (e.g., "[0].conditions.any[0].type" or "[0].args.showIcon").
+   */
+  constructor(message, options) {
+    super(message, options);
+    this.name = "BlockError";
+    this.path = options?.path;
+  }
+}
+
+/**
+ * Raises a block error by throwing a `BlockError`.
+ *
+ * If context is provided, the error message will include the block
+ * entry for debugging.
+ *
+ * If a `callSiteError` is present in the context, it is reused with the
+ * new message. This preserves the original stack trace pointing to where
+ * `renderBlocks()` was called, which is more useful than pointing to this
+ * function. Source maps are applied automatically by the browser.
+ *
+ * @param {string} message - The error message.
+ * @param {Object} [context] - Optional error context for better error messages.
+ * @param {string} [context.outletName] - The outlet name where the block is registered.
+ * @param {string} [context.blockName] - The name of the block being validated.
+ * @param {string} [context.path] - Path within the layout to the error (e.g., "[2].conditions.params.categoryId").
+ *   Used by validation code to indicate where errors occurred. Combined with `errorPath` for display.
+ * @param {Object} [context.entry] - The block entry being validated.
+ * @param {Object} [context.conditions] - The conditions being validated.
+ * @param {string} [context.errorPath] - Full path to the error for display (e.g., "[2].conditions.params.categoryId").
+ * @param {Array<Object>} [context.rootLayout] - The root outlet layout for tree display in errors.
+ * @param {Error | null} [context.callSiteError] - Error object capturing where renderBlocks() was called.
+ * @throws {BlockError} Always throws.
+ */
+export function raiseBlockError(message, context = null) {
+  // Warn in DEBUG mode when entry-related errors are missing rootLayout
+  // This helps catch future validation code that forgets to pass rootLayout
+  if (DEBUG) {
+    const hasPath = context?.path || context?.errorPath;
+    const isEntryError =
+      context?.entry || context?.conditions || context?.outletName;
+
+    if (hasPath && isEntryError && !context?.rootLayout) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        `[Blocks] raiseBlockError called with path but no rootLayout. ` +
+          `Add rootLayout to context for better error display. ` +
+          `Path: ${context?.path || context?.errorPath}`
+      );
+    }
+  }
+
+  const contextInfo = formatErrorContext(context);
+  const fullMessage = `[Blocks] ${message}${contextInfo}`;
+
+  let error;
+
+  // If we have a call site error, reuse it with updated message.
+  // This preserves the stack trace pointing to where renderBlocks() was called,
+  // which is more useful than pointing to raiseBlockError().
+  if (context?.callSiteError) {
+    error = context.callSiteError;
+    error.name = "BlockError";
+    error.message = fullMessage;
+    // @ts-ignore - Adding path property to Error for BlockError compatibility
+    error.path = context.path;
+  } else {
+    error = new BlockError(fullMessage, { path: context?.path });
+  }
+
+  throw error;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/matching/condition-evaluator.js b/frontend/discourse/app/lib/blocks/-internals/matching/condition-evaluator.js
new file mode 100644
index 0000000000000..07168ac6be38b
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/matching/condition-evaluator.js
@@ -0,0 +1,314 @@
+// @ts-check
+import {
+  DEBUG_CALLBACK,
+  debugHooks,
+} from "discourse/lib/blocks/-internals/debug-hooks";
+
+/**
+ * Evaluates condition specs at render time.
+ * Recursively evaluates nested conditions with AND/OR/NOT logic.
+ *
+ * @param {Object|Array<Object>} conditionSpec - Condition spec(s) to evaluate.
+ * @param {Map<string, import("discourse/blocks/conditions").BlockCondition>} conditionTypes - Map of registered condition types.
+ * @param {Object} [context] - Evaluation context.
+ * @param {boolean} [context.debug] - Enable debug logging for this evaluation.
+ * @param {number} [context._depth] - Internal: nesting depth for logging.
+ * @param {Object} [context.outletArgs] - Outlet arguments passed to conditions.
+ * @returns {boolean} True if conditions pass, false otherwise.
+ */
+export function evaluateConditions(
+  conditionSpec,
+  conditionTypes,
+  context = {}
+) {
+  const isLoggingEnabled = context.debug ?? false;
+  const depth = context._depth ?? 0;
+
+  // Get logging callbacks (null if dev tools not loaded or logging disabled)
+  const conditionLog = isLoggingEnabled
+    ? debugHooks.getCallback(DEBUG_CALLBACK.CONDITION_LOG)
+    : null;
+  const combinatorLog = isLoggingEnabled
+    ? debugHooks.getCallback(DEBUG_CALLBACK.COMBINATOR_LOG)
+    : null;
+  const conditionResultLog = isLoggingEnabled
+    ? debugHooks.getCallback(DEBUG_CALLBACK.CONDITION_RESULT)
+    : null;
+  // Get logger interface for conditions (e.g., route condition needs to log params)
+  const logger = isLoggingEnabled ? debugHooks.loggerInterface : null;
+
+  if (!conditionSpec) {
+    return true;
+  }
+
+  // Array of conditions (AND logic - all must pass)
+  if (Array.isArray(conditionSpec)) {
+    return evaluateAndCombinator(
+      conditionSpec,
+      conditionTypes,
+      context,
+      isLoggingEnabled,
+      depth,
+      conditionLog,
+      combinatorLog
+    );
+  }
+
+  // OR combinator (at least one must pass)
+  if (conditionSpec.any !== undefined) {
+    return evaluateOrCombinator(
+      conditionSpec,
+      conditionTypes,
+      context,
+      isLoggingEnabled,
+      depth,
+      conditionLog,
+      combinatorLog
+    );
+  }
+
+  // NOT combinator (must fail)
+  if (conditionSpec.not !== undefined) {
+    return evaluateNotCombinator(
+      conditionSpec,
+      conditionTypes,
+      context,
+      isLoggingEnabled,
+      depth,
+      conditionLog,
+      combinatorLog
+    );
+  }
+
+  // Single condition with type
+  return evaluateSingleCondition(
+    conditionSpec,
+    conditionTypes,
+    context,
+    isLoggingEnabled,
+    depth,
+    conditionLog,
+    conditionResultLog,
+    logger
+  );
+}
+
+/**
+ * Evaluates an array of conditions with AND logic (all must pass).
+ *
+ * @param {Array<Object>} conditionSpec - Array of condition specs.
+ * @param {Map} conditionTypes - Map of registered condition types.
+ * @param {Object} context - Evaluation context.
+ * @param {boolean} isLoggingEnabled - Whether debug logging is enabled.
+ * @param {number} depth - Current nesting depth.
+ * @param {Function|null} conditionLog - Callback for logging conditions.
+ * @param {Function|null} combinatorLog - Callback for logging combinator results.
+ * @returns {boolean} True if all conditions pass.
+ */
+function evaluateAndCombinator(
+  conditionSpec,
+  conditionTypes,
+  context,
+  isLoggingEnabled,
+  depth,
+  conditionLog,
+  combinatorLog
+) {
+  // Empty array is vacuous truth - no conditions to fail
+  if (conditionSpec.length === 0) {
+    return true;
+  }
+
+  // Log combinator BEFORE children (result=null as placeholder)
+  conditionLog?.({
+    type: "AND",
+    args: `${conditionSpec.length} conditions`,
+    result: null,
+    depth,
+    conditionSpec,
+  });
+
+  let andResult = true;
+  for (const condition of conditionSpec) {
+    const result = evaluateConditions(condition, conditionTypes, {
+      debug: isLoggingEnabled,
+      _depth: depth + 1,
+      outletArgs: context.outletArgs,
+    });
+    if (!result) {
+      andResult = false;
+      // Short-circuit only when not debugging - evaluate all for debug visibility
+      if (!isLoggingEnabled) {
+        break;
+      }
+    }
+  }
+
+  // Update combinator with actual result
+  combinatorLog?.({ conditionSpec, result: andResult });
+  return andResult;
+}
+
+/**
+ * Evaluates an OR combinator (at least one must pass).
+ *
+ * @param {Object} conditionSpec - Condition spec containing "any" array.
+ * @param {Map} conditionTypes - Map of registered condition types.
+ * @param {Object} context - Evaluation context.
+ * @param {boolean} isLoggingEnabled - Whether debug logging is enabled.
+ * @param {number} depth - Current nesting depth.
+ * @param {Function|null} conditionLog - Callback for logging conditions.
+ * @param {Function|null} combinatorLog - Callback for logging combinator results.
+ * @returns {boolean} True if at least one condition passes.
+ */
+function evaluateOrCombinator(
+  conditionSpec,
+  conditionTypes,
+  context,
+  isLoggingEnabled,
+  depth,
+  conditionLog,
+  combinatorLog
+) {
+  // Empty OR array means no conditions can pass
+  if (conditionSpec.any.length === 0) {
+    return false;
+  }
+
+  // Log combinator BEFORE children (result=null as placeholder)
+  conditionLog?.({
+    type: "OR",
+    args: `${conditionSpec.any.length} conditions`,
+    result: null,
+    depth,
+    conditionSpec,
+  });
+
+  let orResult = false;
+  for (const condition of conditionSpec.any) {
+    const result = evaluateConditions(condition, conditionTypes, {
+      debug: isLoggingEnabled,
+      _depth: depth + 1,
+      outletArgs: context.outletArgs,
+    });
+    if (result) {
+      orResult = true;
+      // Short-circuit only when not debugging - evaluate all for debug visibility
+      if (!isLoggingEnabled) {
+        break;
+      }
+    }
+  }
+
+  // Update combinator with actual result
+  combinatorLog?.({ conditionSpec, result: orResult });
+  return orResult;
+}
+
+/**
+ * Evaluates a NOT combinator (inner condition must fail).
+ *
+ * @param {Object} conditionSpec - Condition spec containing "not" condition.
+ * @param {Map} conditionTypes - Map of registered condition types.
+ * @param {Object} context - Evaluation context.
+ * @param {boolean} isLoggingEnabled - Whether debug logging is enabled.
+ * @param {number} depth - Current nesting depth.
+ * @param {Function|null} conditionLog - Callback for logging conditions.
+ * @param {Function|null} combinatorLog - Callback for logging combinator results.
+ * @returns {boolean} True if inner condition fails.
+ */
+function evaluateNotCombinator(
+  conditionSpec,
+  conditionTypes,
+  context,
+  isLoggingEnabled,
+  depth,
+  conditionLog,
+  combinatorLog
+) {
+  // Log combinator BEFORE children (result=null as placeholder)
+  conditionLog?.({
+    type: "NOT",
+    args: null,
+    result: null,
+    depth,
+    conditionSpec,
+  });
+
+  const innerResult = evaluateConditions(conditionSpec.not, conditionTypes, {
+    debug: isLoggingEnabled,
+    _depth: depth + 1,
+    outletArgs: context.outletArgs,
+  });
+  const notResult = !innerResult;
+
+  // Update combinator with actual result
+  combinatorLog?.({ conditionSpec, result: notResult });
+  return notResult;
+}
+
+/**
+ * Evaluates a single condition with a type property.
+ *
+ * @param {Object} conditionSpec - Single condition spec with type.
+ * @param {Map} conditionTypes - Map of registered condition types.
+ * @param {Object} context - Evaluation context.
+ * @param {boolean} isLoggingEnabled - Whether debug logging is enabled.
+ * @param {number} depth - Current nesting depth.
+ * @param {Function|null} conditionLog - Callback for logging conditions.
+ * @param {Function|null} conditionResultLog - Callback for logging condition results.
+ * @param {Object|null} logger - Logger interface for conditions.
+ * @returns {boolean} True if condition passes.
+ */
+function evaluateSingleCondition(
+  conditionSpec,
+  conditionTypes,
+  context,
+  isLoggingEnabled,
+  depth,
+  conditionLog,
+  conditionResultLog,
+  logger
+) {
+  const { type, ...args } = conditionSpec;
+  const conditionInstance = conditionTypes.get(type);
+
+  if (!conditionInstance) {
+    conditionLog?.({
+      type: `unknown "${type}"`,
+      args,
+      result: false,
+      depth,
+    });
+    return false;
+  }
+
+  // Resolve value for logging (handles source, path, and other condition-specific values)
+  let resolvedValue;
+  if (isLoggingEnabled) {
+    resolvedValue = conditionInstance.getResolvedValueForLogging(args, context);
+  }
+
+  // Log condition BEFORE evaluate so nested logs appear underneath
+  conditionLog?.({
+    type,
+    args,
+    result: null,
+    depth,
+    resolvedValue,
+    conditionSpec,
+  });
+
+  // Pass context to evaluate so conditions can access outletArgs and log nested items
+  const evalContext = {
+    debug: isLoggingEnabled,
+    _depth: depth,
+    outletArgs: context.outletArgs,
+    logger,
+  };
+  const result = conditionInstance.evaluate(args, evalContext);
+
+  // Update the condition's result after evaluate
+  conditionResultLog?.({ conditionSpec, result });
+  return result;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/matching/outlet-matcher.js b/frontend/discourse/app/lib/blocks/-internals/matching/outlet-matcher.js
new file mode 100644
index 0000000000000..2ff6b26ca7280
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/matching/outlet-matcher.js
@@ -0,0 +1,340 @@
+// @ts-check
+import { DEBUG } from "@glimmer/env";
+import picomatch from "picomatch";
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import { getAllOutlets } from "discourse/lib/blocks/-internals/registry/outlet";
+import { isValidGlobPattern } from "discourse/lib/glob-utils";
+
+/**
+ * Checks if a pattern targets a namespaced outlet.
+ *
+ * Namespaced outlets use a colon separator to identify outlets defined by
+ * plugins or themes (e.g., `plugin-name:outlet-name`, `theme-name:outlet-name`).
+ * These patterns bypass known-outlet validation since they reference outlets
+ * that may not be in the core `BLOCK_OUTLETS` registry.
+ *
+ * @param {string} pattern - The pattern to check.
+ * @returns {boolean} True if the pattern contains a namespace separator.
+ *
+ * @example
+ * isNamespacedPattern("my-plugin:dashboard");      // true
+ * isNamespacedPattern("my-theme:hero-section");    // true
+ * isNamespacedPattern("sidebar-blocks");           // false
+ * isNamespacedPattern("sidebar-*");                // false
+ */
+export function isNamespacedPattern(pattern) {
+  return pattern.includes(":");
+}
+
+/**
+ * Matches an outlet name against a glob pattern using picomatch.
+ *
+ * Outlet names follow kebab-case (lowercase letters, numbers, hyphens).
+ * Supported glob syntax:
+ * - `*` matches any characters
+ * - `?` matches a single character
+ * - `[abc]` matches any character in the brackets
+ * - `{a,b}` matches any of the comma-separated patterns
+ * - `!(pattern)` negative match (matches anything except pattern)
+ *
+ * @param {string} outlet - The outlet name to test.
+ * @param {string} pattern - The glob pattern to match against.
+ * @returns {boolean} True if the outlet matches the pattern.
+ *
+ * @example
+ * // Exact match
+ * matchOutletPattern("sidebar-blocks", "sidebar-blocks");   // true
+ *
+ * @example
+ * // Wildcard matching
+ * matchOutletPattern("sidebar-left", "sidebar-*");          // true
+ * matchOutletPattern("sidebar-left-top", "sidebar-*");      // true
+ *
+ * @example
+ * // Brace expansion
+ * matchOutletPattern("sidebar-blocks", "{sidebar,footer}-*"); // true
+ *
+ * @example
+ * // Character class
+ * matchOutletPattern("modal-1", "modal-[0-9]");             // true
+ *
+ * @example
+ * // Negation
+ * matchOutletPattern("sidebar-blocks", "!(*-debug)");       // true
+ */
+export function matchOutletPattern(outlet, pattern) {
+  // Use dot: true to match dots in outlet names (e.g., namespaced outlets)
+  const isMatch = picomatch(pattern, { dot: true });
+  return isMatch(outlet);
+}
+
+/**
+ * Validates that outlet patterns are a valid array of strings with valid picomatch syntax.
+ *
+ * This function is called at decoration time to catch configuration errors early.
+ * It validates:
+ * 1. The patterns parameter is an array (or null/undefined for no restrictions)
+ * 2. Each pattern in the array is a string
+ * 3. Each pattern can be compiled by picomatch
+ *
+ * @param {*} patterns - The patterns to validate.
+ * @param {string} blockName - Block name for error messages.
+ * @param {string} propertyName - Property name ("allowedOutlets" or "deniedOutlets").
+ *
+ * @example
+ * validateOutletPatterns(["sidebar-*", "homepage-blocks"], "my-block", "allowedOutlets");
+ * validateOutletPatterns(null, "my-block", "allowedOutlets"); // null means no restrictions
+ */
+export function validateOutletPatterns(patterns, blockName, propertyName) {
+  // null/undefined means "no restrictions" - this is valid
+  if (patterns == null) {
+    return;
+  }
+
+  // Must be an array
+  if (!Array.isArray(patterns)) {
+    raiseBlockError(
+      `Block "${blockName}": ${propertyName} must be an array of strings, got ${typeof patterns}.`
+    );
+    return;
+  }
+
+  // Validate each pattern in the array
+  for (let i = 0; i < patterns.length; i++) {
+    const pattern = patterns[i];
+
+    // Each pattern must be a string
+    if (typeof pattern !== "string") {
+      raiseBlockError(
+        `Block "${blockName}": ${propertyName}[${i}] must be a string, got ${typeof pattern}.`
+      );
+      continue;
+    }
+
+    // Each pattern must be valid picomatch syntax
+    if (!isValidGlobPattern(pattern)) {
+      raiseBlockError(
+        `Block "${blockName}": ${propertyName}[${i}] "${pattern}" is not valid glob syntax.`
+      );
+    }
+  }
+}
+
+/**
+ * Detects if allowed and denied patterns could match the same outlet name.
+ *
+ * This function uses two strategies to detect conflicts:
+ *
+ * 1. **Known outlets check**: Tests each registered outlet (core and custom)
+ *    against both pattern lists. This catches conflicts for outlets that
+ *    actually exist.
+ *
+ * 2. **Synthetic test strings**: Generates test strings by replacing wildcards
+ *    in patterns with concrete characters. This catches conflicts for outlets
+ *    that don't exist yet (e.g., plugin-defined outlets).
+ *
+ * @param {string[]|null} allowedPatterns - Patterns for allowed outlets.
+ * @param {string[]|null} deniedPatterns - Patterns for denied outlets.
+ * @returns {{ conflict: boolean, details?: { outlet: string, allowed: string, denied: string } }}
+ *   Returns conflict: true with details if a conflict is detected.
+ *
+ * @example
+ * // No conflict
+ * detectPatternConflicts(["sidebar-*"], ["homepage-*"]);
+ * // { conflict: false }
+ *
+ * @example
+ * // Conflict detected
+ * detectPatternConflicts(["*-blocks"], ["sidebar-*"]);
+ * // { conflict: true, details: { outlet: "sidebar-blocks", allowed: "*-blocks", denied: "sidebar-*" } }
+ */
+export function detectPatternConflicts(allowedPatterns, deniedPatterns) {
+  // Early exit: No conflict possible if either list is empty/null
+  if (!allowedPatterns?.length || !deniedPatterns?.length) {
+    return { conflict: false };
+  }
+
+  // Strategy 1: Check against all registered outlets (core and custom)
+  // This is fast and catches conflicts for outlets that actually exist.
+  const allOutlets = getAllOutlets();
+  for (const outlet of allOutlets) {
+    const allowedMatch = allowedPatterns.find((p) =>
+      matchOutletPattern(outlet, p)
+    );
+    const deniedMatch = deniedPatterns.find((p) =>
+      matchOutletPattern(outlet, p)
+    );
+    if (allowedMatch && deniedMatch) {
+      return {
+        conflict: true,
+        details: { outlet, allowed: allowedMatch, denied: deniedMatch },
+      };
+    }
+  }
+
+  // Strategy 2: Generate synthetic test strings from patterns
+  // This catches conflicts for outlets that don't exist yet (e.g., plugin outlets).
+  // We derive test strings by replacing glob wildcards with concrete characters.
+  const testStrings = new Set();
+  [...allowedPatterns, ...deniedPatterns].forEach((pattern) => {
+    // Replace all glob special chars with 'x' to get a literal string
+    // e.g., "sidebar-*" -> "sidebar-x"
+    const literal = pattern.replace(/[*?[\]{}!()]/g, "x");
+    testStrings.add(literal);
+
+    // Replace single wildcards with a test word
+    // e.g., "sidebar-*" -> "sidebar-test"
+    testStrings.add(pattern.replace(/\*/g, "test"));
+
+    // Replace double wildcards with a hyphenated string
+    // e.g., "admin-**" -> "admin-a-b-c"
+    testStrings.add(pattern.replace(/\*\*/g, "a-b-c"));
+  });
+
+  // Test each synthetic string against both pattern lists
+  for (const test of testStrings) {
+    const allowedMatch = allowedPatterns.find((p) =>
+      matchOutletPattern(test, p)
+    );
+    const deniedMatch = deniedPatterns.find((p) => matchOutletPattern(test, p));
+    if (allowedMatch && deniedMatch) {
+      return {
+        conflict: true,
+        details: { outlet: test, allowed: allowedMatch, denied: deniedMatch },
+      };
+    }
+  }
+
+  return { conflict: false };
+}
+
+/**
+ * Checks if a block is permitted to render in a specific outlet.
+ *
+ * The permission check follows these rules:
+ * 1. If `deniedPatterns` is specified and the outlet matches any pattern, deny.
+ * 2. If `allowedPatterns` is specified and the outlet doesn't match any pattern, deny.
+ * 3. Otherwise, permit.
+ *
+ * Denial takes precedence over allowance. An empty `allowedOutlets` array means
+ * "no outlets allowed" (strict whitelist).
+ *
+ * @param {string} outlet - The outlet name to check.
+ * @param {string[]|null} allowedPatterns - Patterns for allowed outlets.
+ * @param {string[]|null} deniedPatterns - Patterns for denied outlets.
+ * @returns {{ permitted: boolean, reason?: string }}
+ *   Returns permitted: true if allowed, or permitted: false with a reason if denied.
+ *
+ * @example
+ * // No restrictions
+ * isBlockPermittedInOutlet("sidebar-blocks", null, null);
+ * // { permitted: true }
+ *
+ * @example
+ * // Allowed by pattern
+ * isBlockPermittedInOutlet("sidebar-blocks", ["sidebar-*"], null);
+ * // { permitted: true }
+ *
+ * @example
+ * // Denied by pattern
+ * isBlockPermittedInOutlet("sidebar-blocks", null, ["sidebar-*"]);
+ * // { permitted: false, reason: 'outlet "sidebar-blocks" matches deniedOutlets pattern "sidebar-*"' }
+ *
+ * @example
+ * // Not in allowed list
+ * isBlockPermittedInOutlet("homepage-blocks", ["sidebar-*"], null);
+ * // { permitted: false, reason: 'outlet "homepage-blocks" does not match any allowedOutlets pattern' }
+ */
+export function isBlockPermittedInOutlet(
+  outlet,
+  allowedPatterns,
+  deniedPatterns
+) {
+  // Check denied list first (explicit deny always wins)
+  // This ensures that even if a pattern appears in both lists (shouldn't happen
+  // due to conflict detection), denial takes precedence for safety.
+  if (deniedPatterns?.length > 0) {
+    const deniedMatch = deniedPatterns.find((p) =>
+      matchOutletPattern(outlet, p)
+    );
+    if (deniedMatch) {
+      return {
+        permitted: false,
+        reason: `outlet "${outlet}" matches deniedOutlets pattern "${deniedMatch}"`,
+      };
+    }
+  }
+
+  // If allowed list is specified, outlet must match at least one pattern.
+  // An empty allowedOutlets array means "no outlets allowed" (strict whitelist).
+  if (allowedPatterns !== null && allowedPatterns !== undefined) {
+    // Empty array = strict whitelist with no allowed outlets
+    if (allowedPatterns.length === 0) {
+      return {
+        permitted: false,
+        reason: `outlet "${outlet}" does not match any allowedOutlets pattern (allowedOutlets is empty)`,
+      };
+    }
+
+    const allowedMatch = allowedPatterns.find((p) =>
+      matchOutletPattern(outlet, p)
+    );
+    if (!allowedMatch) {
+      return {
+        permitted: false,
+        reason: `outlet "${outlet}" does not match any allowedOutlets pattern`,
+      };
+    }
+  }
+
+  // No restrictions, or passed all checks
+  return { permitted: true };
+}
+
+/**
+ * Warns if patterns don't match any known outlet (helps catch typos).
+ *
+ * This function is called at decoration time to help developers catch
+ * configuration mistakes. It checks patterns against all registered outlets
+ * (both core and custom).
+ *
+ * Warnings are only printed in development builds (when DEBUG is true).
+ * This prevents noise in production.
+ *
+ * @param {string[]|null} patterns - The patterns to check.
+ * @param {string} blockName - Block name for warning messages.
+ * @param {string} propertyName - Property name ("allowedOutlets" or "deniedOutlets").
+ *
+ * @example
+ * // Warns about typo
+ * warnUnknownOutletPatterns(["sidbar-*"], "my-block", "allowedOutlets");
+ * // Console: [Blocks] Block "my-block": allowedOutlets pattern "sidbar-*" does not match any known outlet...
+ */
+export function warnUnknownOutletPatterns(patterns, blockName, propertyName) {
+  if (!patterns?.length) {
+    return;
+  }
+
+  // Do not show the warnings in production builds
+  if (!DEBUG) {
+    return;
+  }
+
+  const allOutlets = getAllOutlets();
+
+  for (const pattern of patterns) {
+    // Check if pattern matches at least one registered outlet
+    const matchesKnown = allOutlets.some((outlet) =>
+      matchOutletPattern(outlet, pattern)
+    );
+
+    if (!matchesKnown) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        `[Blocks] Block "${blockName}": ${propertyName} pattern "${pattern}" ` +
+          `does not match any registered outlet. This may be a typo. ` +
+          `Registered outlets: ${allOutlets.join(", ")}`
+      );
+    }
+  }
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/matching/page-definitions.js b/frontend/discourse/app/lib/blocks/-internals/matching/page-definitions.js
new file mode 100644
index 0000000000000..2bf25ffdae72f
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/matching/page-definitions.js
@@ -0,0 +1,441 @@
+// @ts-check
+import { findClosestMatch } from "discourse/lib/string-similarity";
+
+/**
+ * Page type definitions for the route condition.
+ *
+ * This is a pure data structure that defines the available page types
+ * and their parameters. The evaluation logic is in route.js.
+ *
+ * @typedef {Object} ParamDefinition
+ * @property {"string"|"number"} type - The expected type of the parameter.
+ * @property {string} description - A description of the parameter.
+ *
+ * @typedef {Object} PageDefinition
+ * @property {string} description - A description of the page type.
+ * @property {Object<string, ParamDefinition>} params - The parameters for this page type.
+ */
+
+/**
+ * Definitions for all supported page types.
+ *
+ * Each page type has:
+ * - `description`: A human-readable description of what pages this matches.
+ * - `params`: An object mapping parameter names to their definitions.
+ *
+ * @type {Object<string, PageDefinition>}
+ */
+export const PAGE_DEFINITIONS = {
+  /**
+   * Category listing pages (/c/slug, /c/parent/child).
+   * Matches when discovery.category is set.
+   */
+  CATEGORY_PAGES: {
+    description: "Category listing pages",
+    params: {
+      categoryId: {
+        type: "number",
+        description: "Category ID",
+      },
+      categorySlug: {
+        type: "string",
+        description: "Category slug (URL-safe name)",
+      },
+      parentCategoryId: {
+        type: "number",
+        description: "Parent category ID (for subcategories)",
+      },
+    },
+  },
+
+  /**
+   * Tag listing pages (/tag/name, /tags/intersection/tag1/tag2).
+   * Matches when discovery.tag is set.
+   */
+  TAG_PAGES: {
+    description: "Tag listing pages",
+    params: {
+      tagId: {
+        type: "string",
+        description: "Tag name/ID",
+      },
+      categoryId: {
+        type: "number",
+        description: "Category ID (when tag is filtered by category)",
+      },
+      categorySlug: {
+        type: "string",
+        description: "Category slug (when tag is filtered by category)",
+      },
+      parentCategoryId: {
+        type: "number",
+        description: "Parent category ID (when tag is filtered by subcategory)",
+      },
+    },
+  },
+
+  /**
+   * Discovery routes (latest, top, new, unread, hot, etc.).
+   * Excludes custom homepage.
+   */
+  DISCOVERY_PAGES: {
+    description:
+      "Discovery routes (latest, top, new, etc.) excluding custom homepage",
+    params: {
+      filter: {
+        type: "string",
+        description: "The discovery filter type (e.g., 'latest', 'top', 'new')",
+      },
+    },
+  },
+
+  /**
+   * Custom homepage only (discovery.custom route).
+   */
+  HOMEPAGE: {
+    description: "Custom homepage only",
+    params: {},
+  },
+
+  /**
+   * Top navigation discovery routes.
+   * Excludes category pages, tag pages, and custom homepage.
+   */
+  TOP_MENU: {
+    description:
+      "Top navigation discovery routes (excludes category, tag, homepage)",
+    params: {
+      filter: {
+        type: "string",
+        description: "The filter type (e.g., 'latest', 'top', 'new')",
+      },
+    },
+  },
+
+  /**
+   * Individual topic pages (/t/slug/id).
+   */
+  TOPIC_PAGES: {
+    description: "Individual topic pages",
+    params: {
+      id: {
+        type: "number",
+        description: "Topic ID",
+      },
+      slug: {
+        type: "string",
+        description: "Topic slug",
+      },
+    },
+  },
+
+  /**
+   * User profile pages (/u/username).
+   */
+  USER_PAGES: {
+    description: "User profile pages",
+    params: {
+      username: {
+        type: "string",
+        description: "Username being viewed",
+      },
+    },
+  },
+
+  /**
+   * Admin section pages (/admin/**).
+   */
+  ADMIN_PAGES: {
+    description: "Admin section pages",
+    params: {},
+  },
+
+  /**
+   * Group pages (/g/groupname).
+   */
+  GROUP_PAGES: {
+    description: "Group pages",
+    params: {
+      name: {
+        type: "string",
+        description: "Group name",
+      },
+    },
+  },
+};
+
+/**
+ * Array of all valid page type names.
+ *
+ * @type {string[]}
+ */
+export const VALID_PAGE_TYPES = Object.keys(PAGE_DEFINITIONS);
+
+/**
+ * Checks if a page type is valid.
+ *
+ * @param {string} pageType - The page type to check.
+ * @returns {boolean} True if the page type is valid.
+ */
+export function isValidPageType(pageType) {
+  return pageType in PAGE_DEFINITIONS;
+}
+
+/**
+ * Gets the parameter definitions for a page type.
+ *
+ * @param {string} pageType - The page type.
+ * @returns {Object<string, ParamDefinition>|null} The parameter definitions, or null if invalid.
+ */
+export function getParamsForPageType(pageType) {
+  const definition = PAGE_DEFINITIONS[pageType];
+  return definition ? definition.params : null;
+}
+
+/**
+ * Gets all valid parameter names for a page type.
+ *
+ * @param {string} pageType - The page type.
+ * @returns {string[]} Array of valid parameter names.
+ */
+export function getValidParamNames(pageType) {
+  const params = getParamsForPageType(pageType);
+  return params ? Object.keys(params) : [];
+}
+
+/**
+ * Suggests a page type for a potential typo using fuzzy matching.
+ *
+ * @param {string} typo - The potentially misspelled page type.
+ * @returns {string|null} The suggested page type, or null if no good match found.
+ */
+export function suggestPageType(typo) {
+  return findClosestMatch(typo, VALID_PAGE_TYPES);
+}
+
+/**
+ * Validates that all provided params are valid for ALL listed page types.
+ *
+ * @param {Object} params - The params object to validate.
+ * @param {string[]} pages - The array of page types.
+ * @returns {{valid: boolean, errors: string[]}} Validation result with any errors.
+ */
+export function validateParamsAgainstPages(params, pages) {
+  const errors = [];
+
+  if (!params || typeof params !== "object") {
+    return { valid: true, errors: [] };
+  }
+
+  const paramNames = Object.keys(params);
+  if (paramNames.length === 0) {
+    return { valid: true, errors: [] };
+  }
+
+  for (const paramName of paramNames) {
+    const validFor = [];
+    const invalidFor = [];
+
+    for (const pageType of pages) {
+      const pageParams = getParamsForPageType(pageType);
+      if (pageParams && paramName in pageParams) {
+        validFor.push(pageType);
+      } else {
+        invalidFor.push(pageType);
+      }
+    }
+
+    if (invalidFor.length > 0) {
+      if (validFor.length > 0) {
+        // Param is valid for some but not all page types
+        errors.push(
+          `Parameter '${paramName}' is not valid for all listed page types.\n` +
+            `'${paramName}' is valid for: ${validFor.join(", ")}\n` +
+            `'${paramName}' is NOT valid for: ${invalidFor.join(", ")}\n` +
+            `All params must be valid for ALL page types when multiple pages are listed.`
+        );
+      } else {
+        // Param is not valid for any page type
+        const validParams = pages
+          .flatMap((p) => getValidParamNames(p))
+          .filter((v, i, a) => a.indexOf(v) === i); // unique
+        errors.push(
+          `Parameter '${paramName}' is not valid for any of the listed page types.\n` +
+            `Valid parameters across listed pages: ${validParams.join(", ") || "(none)"}`
+        );
+      }
+    }
+  }
+
+  return { valid: errors.length === 0, errors };
+}
+
+/**
+ * Validates the type of a parameter value against its definition.
+ *
+ * @param {string} paramName - The parameter name.
+ * @param {*} value - The value to validate.
+ * @param {string} pageType - The page type (for error messages).
+ * @returns {{valid: boolean, error: string|null}} Validation result.
+ */
+export function validateParamType(paramName, value, pageType) {
+  const params = getParamsForPageType(pageType);
+  if (!params || !(paramName in params)) {
+    return { valid: false, error: `Unknown parameter '${paramName}'` };
+  }
+
+  const definition = params[paramName];
+  const actualType = typeof value;
+
+  if (definition.type === "number") {
+    if (actualType !== "number") {
+      return {
+        valid: false,
+        error:
+          `Parameter '${paramName}' must be a number, got ${actualType} '${value}'.\n` +
+          `Hint: Use numeric value: { params: { ${paramName}: ${parseInt(value, 10) || 123} } }`,
+      };
+    }
+  } else if (definition.type === "string") {
+    if (actualType !== "string") {
+      return {
+        valid: false,
+        error: `Parameter '${paramName}' must be a string, got ${actualType} '${value}'.`,
+      };
+    }
+  }
+
+  return { valid: true, error: null };
+}
+
+/**
+ * Gets the current context values for a page type.
+ *
+ * Returns an object with the current values for all parameters defined for
+ * this page type, or null if the page type doesn't match the current route.
+ *
+ * @param {string} pageType - The page type (e.g., "CATEGORY_PAGES").
+ * @param {Object} services - Injected services for context extraction.
+ * @param {Object} services.router - The Ember router service.
+ * @param {Object} services.discovery - The Discourse discovery service.
+ * @returns {Object|null} The context object with param values, or null if page type doesn't match.
+ *
+ * @example
+ * const context = getPageContext("CATEGORY_PAGES", { router, discovery });
+ * // Returns { categoryId: 5, categorySlug: "general", parentCategoryId: null }
+ * // or null if not on a category page
+ */
+export function getPageContext(pageType, { router, discovery }) {
+  switch (pageType) {
+    case "CATEGORY_PAGES": {
+      const category = discovery.category;
+      if (!category) {
+        return null;
+      }
+      return {
+        categoryId: category.id,
+        categorySlug: category.slug,
+        parentCategoryId: category.parent_category_id,
+      };
+    }
+
+    case "TAG_PAGES": {
+      const tag = discovery.tag;
+      if (!tag) {
+        return null;
+      }
+      const category = discovery.category;
+      return {
+        tagId: tag.name,
+        categoryId: category?.id,
+        categorySlug: category?.slug,
+        parentCategoryId: category?.parent_category_id,
+      };
+    }
+
+    case "DISCOVERY_PAGES": {
+      if (!discovery.onDiscoveryRoute || discovery.custom) {
+        return null;
+      }
+      const filter = router.currentRouteName
+        ?.replace(/^discovery\./, "")
+        .split(".")[0];
+      return { filter };
+    }
+
+    case "HOMEPAGE":
+      return discovery.custom ? {} : null;
+
+    case "TOP_MENU": {
+      if (
+        !discovery.onDiscoveryRoute ||
+        discovery.category ||
+        discovery.tag ||
+        discovery.custom
+      ) {
+        return null;
+      }
+      const filter = router.currentRouteName
+        ?.replace(/^discovery\./, "")
+        .split(".")[0];
+      return { filter };
+    }
+
+    case "TOPIC_PAGES": {
+      if (!router.currentRouteName?.startsWith("topic.")) {
+        return null;
+      }
+      const routeParams = router.currentRoute?.params || {};
+      return {
+        id: routeParams.id ? parseInt(routeParams.id, 10) : undefined,
+        slug: routeParams.slug,
+      };
+    }
+
+    case "USER_PAGES": {
+      if (!router.currentRouteName?.startsWith("user.")) {
+        return null;
+      }
+      const routeParams = router.currentRoute?.params || {};
+      return { username: routeParams.username };
+    }
+
+    case "ADMIN_PAGES":
+      return router.currentRouteName?.startsWith("admin") ? {} : null;
+
+    case "GROUP_PAGES": {
+      if (!router.currentRouteName?.startsWith("group.")) {
+        return null;
+      }
+      const routeParams = router.currentRoute?.params || {};
+      return { name: routeParams.name };
+    }
+
+    default:
+      return null;
+  }
+}
+
+/**
+ * Determines the current page type by checking all known page types.
+ *
+ * Iterates through all valid page types and returns the first one that matches
+ * the current route. Useful for debugging to show what page the user is on.
+ *
+ * @param {Object} services - Injected services for context extraction.
+ * @param {Object} services.router - The Ember router service.
+ * @param {Object} services.discovery - The Discourse discovery service.
+ * @returns {string|null} The current page type, or null if no match.
+ *
+ * @example
+ * const pageType = getCurrentPageType({ router, discovery });
+ * // Returns "CATEGORY_PAGES", "TOPIC_PAGES", etc., or null
+ */
+export function getCurrentPageType({ router, discovery }) {
+  for (const pageType of VALID_PAGE_TYPES) {
+    if (getPageContext(pageType, { router, discovery }) !== null) {
+      return pageType;
+    }
+  }
+  return null;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/matching/url-matcher.js b/frontend/discourse/app/lib/blocks/-internals/matching/url-matcher.js
new file mode 100644
index 0000000000000..292dd4c4c7e99
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/matching/url-matcher.js
@@ -0,0 +1,103 @@
+// @ts-check
+import picomatch from "picomatch";
+import { withoutPrefix } from "discourse/lib/get-url";
+
+/**
+ * Normalizes a URL path for matching.
+ *
+ * This function prepares a URL for glob pattern matching by:
+ * 1. Stripping the Discourse subfolder prefix (if Discourse runs on `/forum`, etc.)
+ * 2. Removing query strings and hash fragments
+ * 3. Removing trailing slashes (except for root `/`)
+ *
+ * This ensures theme authors don't need to know about subfolder configurations
+ * and can write patterns like `/c/**` that work universally.
+ *
+ * @param {string} url - The URL to normalize (typically `router.currentURL`).
+ * @returns {string} The normalized path, ready for pattern matching.
+ *
+ * @example
+ * // Subfolder stripping
+ * normalizePath("/forum/c/general");     // "/c/general"
+ *
+ * // Query string removal
+ * normalizePath("/c/general?foo=bar");   // "/c/general"
+ *
+ * // Hash fragment removal
+ * normalizePath("/c/general#section");   // "/c/general"
+ *
+ * // Trailing slash removal
+ * normalizePath("/c/general/");          // "/c/general"
+ *
+ * // Root path preserved
+ * normalizePath("/");                    // "/"
+ *
+ * // Empty/null handling
+ * normalizePath("");                     // "/"
+ * normalizePath(null);                   // "/"
+ */
+export function normalizePath(url) {
+  if (!url) {
+    return "/";
+  }
+
+  // Strip subfolder prefix first (e.g., /forum -> "")
+  let path = withoutPrefix(url);
+
+  // Strip query string and hash fragment
+  path = path.split("?")[0].split("#")[0];
+
+  // Remove trailing slash (except for root)
+  if (path.length > 1 && path.endsWith("/")) {
+    path = path.slice(0, -1);
+  }
+
+  return path || "/";
+}
+
+/**
+ * Matches a URL path against a glob pattern using picomatch.
+ *
+ * Supports full picomatch glob syntax:
+ * - `*` matches a single path segment (no slashes)
+ * - `**` matches zero or more path segments
+ * - `?` matches a single character
+ * - `[abc]` matches any character in the brackets
+ * - `{a,b}` matches any of the comma-separated patterns
+ *
+ * @param {string} path - The normalized URL path to test.
+ * @param {string} pattern - The glob pattern to match against.
+ * @returns {boolean} True if the path matches the pattern.
+ *
+ * @example
+ * // Single wildcard
+ * matchUrlPattern("/c/general", "/c/*");      // true
+ * matchUrlPattern("/c/general/sub", "/c/*");  // false
+ *
+ * @example
+ * // Double wildcard
+ * matchUrlPattern("/c/general/sub", "/c/**"); // true
+ *
+ * @example
+ * // Brace expansion
+ * matchUrlPattern("/latest", "/{latest,top}"); // true
+ */
+export function matchUrlPattern(path, pattern) {
+  const isMatch = picomatch(pattern, { dot: true });
+  return isMatch(path);
+}
+
+/**
+ * Checks if any URL pattern in the array matches the given path.
+ *
+ * @param {string} path - The normalized URL path to test.
+ * @param {string[]} patterns - Array of URL patterns.
+ * @returns {boolean} True if any pattern matches the path.
+ *
+ * @example
+ * matchesAnyPattern("/c/general", ["/c/**", "/t/**"]); // true (matches /c/**)
+ * matchesAnyPattern("/latest", ["/c/**", "/t/**"]);    // false
+ */
+export function matchesAnyPattern(path, patterns) {
+  return patterns.some((pattern) => matchUrlPattern(path, pattern));
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/matching/value-matcher.js b/frontend/discourse/app/lib/blocks/-internals/matching/value-matcher.js
new file mode 100644
index 0000000000000..dfb635ad7945f
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/matching/value-matcher.js
@@ -0,0 +1,323 @@
+// @ts-check
+import { findClosestMatch } from "discourse/lib/string-similarity";
+
+/**
+ * Evaluates a value matcher spec against an actual value.
+ * Supports the same AND/OR/NOT logic as condition evaluation.
+ *
+ * Supports:
+ * - Exact match: `123`, `"foo"`
+ * - Array of simple values (OR): `[123, 456]` matches if actual is any of these
+ * - Array of complex specs (AND): `[{ not: "a" }, { not: "b" }]` all specs must match
+ * - RegExp: `/^foo/` matches if actual matches the pattern
+ * - NOT: `{ not: value }` matches if actual does NOT match value
+ * - ANY (OR): `{ any: [...] }` matches if actual matches any spec in array
+ *
+ * @param {Object} options - Options object.
+ * @param {*} options.actual - The actual value to test.
+ * @param {*} options.expected - The expected value spec (exact, array, regex, or AND/OR/NOT spec).
+ * @returns {boolean} True if the actual value matches the expected spec.
+ */
+export function matchValue({ actual, expected }) {
+  // Handle arrays first (before checking for `any`/`not` properties)
+  // because Ember prototype extensions add `any()` method to arrays
+  if (Array.isArray(expected)) {
+    if (expected.length > 0 && !isSimpleValueArray(expected)) {
+      // AND logic: Array of non-primitive conditions, all must pass
+      return expected.every((exp) => matchValue({ actual, expected: exp }));
+    }
+    // Simple array of values (OR - match any)
+    return matchSimpleValue(actual, expected);
+  }
+
+  // OR logic: { any: [...] }
+  if (expected?.any !== undefined) {
+    return expected.any.some((exp) => matchValue({ actual, expected: exp }));
+  }
+
+  // NOT logic: { not: ... }
+  if (expected?.not !== undefined) {
+    return !matchValue({ actual, expected: expected.not });
+  }
+
+  // Simple value matching (leaf node)
+  return matchSimpleValue(actual, expected);
+}
+
+/**
+ * Checks if an array is a simple value array (for OR matching) vs a condition
+ * array (for AND matching). Simple value arrays contain only primitives (strings,
+ * numbers, booleans, null, undefined) or RegExp objects.
+ *
+ * @param {Array} arr - The array to check.
+ * @returns {boolean} True if all items are primitives or RegExp.
+ */
+function isSimpleValueArray(arr) {
+  return arr.every(
+    (item) =>
+      typeof item !== "object" || item === null || item instanceof RegExp
+  );
+}
+
+/**
+ * Matches a simple value (exact, array of primitives, or regex).
+ *
+ * Note: When `expected` is a RegExp, `actual` is converted to a string before
+ * testing. This means numeric values like `123` will match patterns like `/1/`
+ * (because 123 is converted to "123").
+ *
+ * @param {*} actual - The actual value.
+ * @param {*} expected - The expected value (primitive, array of primitives/RegExp, or RegExp).
+ * @returns {boolean} True if matches.
+ */
+function matchSimpleValue(actual, expected) {
+  // RegExp pattern - coerce actual to string for testing
+  if (expected instanceof RegExp) {
+    return expected.test(String(actual));
+  }
+
+  // Array of values (OR - match any)
+  if (Array.isArray(expected)) {
+    return expected.some((exp) => matchSimpleValue(actual, exp));
+  }
+
+  // Exact match (strict equality)
+  return actual === expected;
+}
+
+/**
+ * Checks if a failed match is due to a string/number type mismatch.
+ * Used to provide helpful debug hints.
+ *
+ * @param {*} actual - The actual value.
+ * @param {*} expected - The expected value.
+ * @returns {boolean} True if the values would match with type coercion.
+ */
+export function isTypeMismatch(actual, expected) {
+  // Already matches - not a mismatch
+  if (actual === expected) {
+    return false;
+  }
+
+  // Check if string/number coercion would make them equal
+  if (
+    (typeof actual === "string" && typeof expected === "number") ||
+    (typeof actual === "number" && typeof expected === "string")
+  ) {
+    return String(actual) === String(expected);
+  }
+
+  // Check arrays for type mismatches
+  if (Array.isArray(expected)) {
+    return expected.some((exp) => isTypeMismatch(actual, exp));
+  }
+
+  // Check { any: [...] } for type mismatches
+  if (expected?.any !== undefined) {
+    return expected.any.some((exp) => isTypeMismatch(actual, exp));
+  }
+
+  return false;
+}
+
+/**
+ * Evaluates params/queryParams object matching with full AND/OR/NOT support.
+ *
+ * Supports:
+ * - Object with keys: AND logic (all keys must match)
+ * - Array of objects: AND logic (all must match)
+ * - `{ any: [...] }`: OR logic (any must match)
+ * - `{ not: {...} }`: NOT logic (must NOT match)
+ *
+ * Keys starting with backslash are escaped (e.g., `"\\any"` matches literal param `"any"`).
+ *
+ * @param {Object} options - Options object.
+ * @param {Object} options.actualParams - Current params from router.
+ * @param {Object|Array} options.expectedParams - Expected params spec.
+ * @param {Object} [options.context] - Debug context.
+ * @param {boolean} [options.context.debug] - Enable debug logging.
+ * @param {number} [options.context._depth] - Nesting depth for logging.
+ * @param {Object} [options.context.logger] - Logger interface from dev-tools (optional).
+ * @param {string} [options.label] - Label for debug output (e.g., "params", "queryParams").
+ * @returns {boolean} True if params match.
+ */
+export function matchParams({
+  actualParams,
+  expectedParams,
+  context = {},
+  label = "params",
+}) {
+  const isLoggingEnabled = context.debug ?? false;
+  const depth = context._depth ?? 0;
+  const logger = context.logger;
+
+  if (!expectedParams) {
+    return true; // No expected params, always pass
+  }
+
+  // Array of param specs = AND logic (all must match)
+  if (Array.isArray(expectedParams)) {
+    // Log combinator BEFORE children so it appears first in tree
+    logger?.logCondition?.({
+      type: "AND",
+      args: `${expectedParams.length} ${label} specs`,
+      result: null,
+      depth,
+      conditionSpec: expectedParams,
+    });
+
+    const results = expectedParams.map((spec, i) =>
+      matchParams({
+        actualParams,
+        expectedParams: spec,
+        context: { debug: isLoggingEnabled, _depth: depth + 1, logger },
+        label: `${label}[${i}]`,
+      })
+    );
+    const allPassed = results.every(Boolean);
+
+    // Update combinator result after children evaluated
+    logger?.updateCombinatorResult?.(expectedParams, allPassed);
+    return allPassed;
+  }
+
+  // OR logic: { any: [...] }
+  if (expectedParams.any !== undefined) {
+    const specs = expectedParams.any;
+
+    // Log combinator BEFORE children so it appears first in tree
+    logger?.logCondition?.({
+      type: "OR",
+      args: `${specs.length} ${label} specs`,
+      result: null,
+      depth,
+      conditionSpec: expectedParams,
+    });
+
+    const results = specs.map((spec, i) =>
+      matchParams({
+        actualParams,
+        expectedParams: spec,
+        context: { debug: isLoggingEnabled, _depth: depth + 1, logger },
+        label: `${label}[${i}]`,
+      })
+    );
+    const anyPassed = results.some(Boolean);
+
+    // Update combinator result after children evaluated
+    logger?.updateCombinatorResult?.(expectedParams, anyPassed);
+    return anyPassed;
+  }
+
+  // NOT logic: { not: {...} }
+  if (expectedParams.not !== undefined) {
+    // Log combinator BEFORE children so it appears first in tree
+    logger?.logCondition?.({
+      type: "NOT",
+      args: null,
+      result: null,
+      depth,
+      conditionSpec: expectedParams,
+    });
+
+    const innerResult = matchParams({
+      actualParams,
+      expectedParams: expectedParams.not,
+      context: { debug: isLoggingEnabled, _depth: depth + 1, logger },
+      label,
+    });
+    const result = !innerResult;
+
+    // Update combinator result after children evaluated
+    logger?.updateCombinatorResult?.(expectedParams, result);
+    return result;
+  }
+
+  // Plain object with keys = AND logic across all keys
+  // Note: keys starting with \ are escaped (e.g., "\\any" matches literal param "any")
+  const keys = Object.keys(expectedParams);
+  if (keys.length === 0) {
+    return true;
+  }
+
+  // Collect match results for debug logging
+  const matches = [];
+
+  for (const key of keys) {
+    // Strip leading backslash for escaped keys (e.g., "\\any" -> "any")
+    const actualKey = key.startsWith("\\") ? key.slice(1) : key;
+    const expected = expectedParams[key];
+    const actual = actualParams?.[actualKey];
+    const result = matchValue({ actual, expected });
+    matches.push({ key: actualKey, expected, actual, result });
+  }
+
+  const allPassed = matches.every((m) => m.result);
+
+  // Log as a nested group with all param matches
+  logger?.logParamGroup?.({
+    label,
+    matches,
+    result: allPassed,
+    depth,
+  });
+
+  return allPassed;
+}
+
+/**
+ * Valid operator keys for param/queryParam specs.
+ * These are the only keys with special meaning in param matching.
+ */
+const VALID_OPERATOR_KEYS = Object.freeze(["any", "not"]);
+
+/**
+ * Validates a param spec for typos in operator keys.
+ *
+ * Recursively checks that any object key that looks like an operator typo
+ * (e.g., "an" instead of "any", "nto" instead of "not") is flagged.
+ *
+ * @param {*} spec - The param spec to validate.
+ * @param {string} path - Current path for error messages.
+ * @param {Function} raiseError - Function to call with error message.
+ */
+export function validateParamSpec(spec, path, raiseError) {
+  if (spec === null || spec === undefined) {
+    return;
+  }
+
+  // Skip primitives and RegExp - they're just values
+  if (typeof spec !== "object" || spec instanceof RegExp) {
+    return;
+  }
+
+  // Arrays: validate each item
+  if (Array.isArray(spec)) {
+    spec.forEach((item, i) => {
+      validateParamSpec(item, `${path}[${i}]`, raiseError);
+    });
+    return;
+  }
+
+  // Objects: check keys for operator typos
+  const keys = Object.keys(spec);
+
+  for (const key of keys) {
+    // Check if this key looks like a typo of a valid operator
+    // Skip if it's a valid operator or an escaped key (starts with \)
+    if (!VALID_OPERATOR_KEYS.includes(key) && !key.startsWith("\\")) {
+      const suggestion = findClosestMatch(key, VALID_OPERATOR_KEYS, {
+        minSimilarity: 0.7,
+      });
+
+      if (suggestion) {
+        raiseError(
+          `Unknown key "${key}" at ${path}. Did you mean "${suggestion}"?`
+        );
+      }
+    }
+
+    // Recursively validate the value
+    validateParamSpec(spec[key], `${path}.${key}`, raiseError);
+  }
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/patterns.js b/frontend/discourse/app/lib/blocks/-internals/patterns.js
new file mode 100644
index 0000000000000..55cbad78ccd89
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/patterns.js
@@ -0,0 +1,206 @@
+// @ts-check
+/**
+ * Pattern constants for block name validation.
+ *
+ * @module discourse/lib/blocks/-internals/patterns
+ */
+
+/**
+ * Maximum allowed nesting depth for block layouts.
+ *
+ * Prevents stack overflow from deeply nested configurations. This limit is
+ * enforced at layout validation time with a clear error message, and as a
+ * defense-in-depth measure during ghost component rendering.
+ *
+ * A depth of 20 is generous for real-world use cases while protecting against
+ * malicious or buggy configurations that could cause infinite recursion.
+ *
+ * @type {number}
+ */
+export const MAX_LAYOUT_DEPTH = 20;
+
+/**
+ * Maximum allowed length for block names.
+ *
+ * Prevents potential memory and performance issues from extremely long names.
+ * A limit of 100 characters is generous for real-world use cases while
+ * protecting against malicious or buggy configurations.
+ *
+ * This applies to the full namespaced name (e.g., "theme:my-theme:my-block").
+ *
+ * @type {number}
+ */
+export const MAX_BLOCK_NAME_LENGTH = 100;
+
+/**
+ * Symbol used to mark a block reference as optional and missing from the registry.
+ * When this marker is returned from resolution functions, it signals that the block
+ * should be silently skipped rather than throwing an error.
+ *
+ * Used in layout validation and block registration to identify optional
+ * blocks that aren't registered and should be skipped during validation and rendering.
+ *
+ * @type {symbol}
+ */
+export const OPTIONAL_MISSING = Symbol("optional-missing");
+
+/**
+ * Constants for failure type codes used by ghost blocks.
+ *
+ * These are internal codes for logic comparisons (e.g., determining which
+ * section to show in the ghost tooltip). Display messages are generated
+ * at render time in ghost-block.gjs based on these types.
+ *
+ * Custom failure reasons (like "hidden by priority" from the head block)
+ * don't need a type constant - they're passed as display strings directly
+ * via the `failureReason` field.
+ */
+export const FAILURE_TYPE = Object.freeze({
+  /** Block's conditions evaluated to false. */
+  CONDITION_FAILED: "condition-failed",
+  /** Container block has no children that passed their conditions. */
+  NO_VISIBLE_CHILDREN: "no-visible-children",
+  /** Block reference uses `?` suffix but isn't registered. */
+  OPTIONAL_MISSING: "optional-missing",
+});
+
+/**
+ * Checks if a resolved block is an optional missing block marker.
+ *
+ * @param {*} resolvedBlock - The result from tryResolveBlock.
+ * @returns {boolean} True if the block is an optional missing marker.
+ */
+export function isOptionalMissing(resolvedBlock) {
+  return resolvedBlock?.optionalMissing === OPTIONAL_MISSING;
+}
+
+/**
+ * Valid block name pattern: lowercase letters, numbers, and hyphens.
+ * Must start with a letter. Examples: "hero-banner", "sidebar-blocks", "my-block-1"
+ *
+ * Used for both block names and outlet names since they follow the same format.
+ */
+export const VALID_BLOCK_NAME_PATTERN = /^[a-z][a-z0-9-]*$/;
+
+/**
+ * Valid block ID pattern for the `id` entry property.
+ * Same format as block names: lowercase letters, numbers, and hyphens,
+ * must start with a letter.
+ *
+ * Examples: "featured-banner", "sidebar-1", "main-content"
+ */
+export const VALID_BLOCK_ID_PATTERN = VALID_BLOCK_NAME_PATTERN;
+
+/**
+ * Valid namespaced block name pattern. Supports three formats:
+ *
+ * - **Core blocks**: `block-name` (no prefix)
+ * - **Plugin blocks**: `plugin-name:block-name` (where plugin-name is not "theme")
+ * - **Theme blocks**: `theme:theme-name:block-name`
+ *
+ * Each segment must start with a letter and contain only lowercase letters,
+ * numbers, and hyphens.
+ *
+ * @example
+ * // Valid patterns:
+ * "group"                      // Core block
+ * "chat:message-widget"        // Plugin block
+ * "theme:tactile:hero-banner"  // Theme block
+ *
+ * // Invalid patterns:
+ * "Theme:Name:block"           // Uppercase not allowed
+ * "theme:block"                // Theme requires namespace segment
+ * "my_block"                   // Underscores not allowed
+ */
+export const VALID_NAMESPACED_BLOCK_PATTERN =
+  /^(?:theme:[a-z][a-z0-9-]*:[a-z][a-z0-9-]*|(?!theme:)[a-z][a-z0-9-]*:[a-z][a-z0-9-]*|[a-z][a-z0-9-]*)$/;
+
+/**
+ * The parsed components of a block name.
+ *
+ * @typedef {{
+ *   type: "core"|"plugin"|"theme",
+ *   namespace: string|null,
+ *   name: string
+ * }} ParsedBlockName
+ */
+
+/**
+ * Parses a full block name into its components.
+ *
+ * @param {string} fullName - The full block name.
+ * @returns {ParsedBlockName|null}
+ *   An object with the parsed components, or `null` if the name is invalid.
+ *
+ * @example
+ * parseBlockName("group")
+ * // => { type: "core", namespace: null, name: "group" }
+ *
+ * parseBlockName("chat:message-widget")
+ * // => { type: "plugin", namespace: "chat", name: "message-widget" }
+ *
+ * parseBlockName("theme:tactile:hero-banner")
+ * // => { type: "theme", namespace: "theme:tactile", name: "hero-banner" }
+ *
+ * parseBlockName("Invalid_Name")
+ * // => null
+ */
+export function parseBlockName(fullName) {
+  // Theme: theme:namespace:name
+  const themeMatch = fullName.match(
+    /^theme:([a-z][a-z0-9-]*):([a-z][a-z0-9-]*)$/
+  );
+  if (themeMatch) {
+    return {
+      type: "theme",
+      namespace: `theme:${themeMatch[1]}`,
+      name: themeMatch[2],
+    };
+  }
+
+  // Plugin: namespace:name (where namespace is NOT "theme")
+  const pluginMatch = fullName.match(/^([a-z][a-z0-9-]*):([a-z][a-z0-9-]*)$/);
+  if (pluginMatch && pluginMatch[1] !== "theme") {
+    return { type: "plugin", namespace: pluginMatch[1], name: pluginMatch[2] };
+  }
+
+  // Core: just name
+  const coreMatch = fullName.match(/^[a-z][a-z0-9-]*$/);
+  if (coreMatch) {
+    return { type: "core", namespace: null, name: fullName };
+  }
+
+  return null;
+}
+
+/**
+ * Parses a block reference string to extract the block name and optional flag.
+ *
+ * Block references can be marked as optional by appending a `?` suffix to the
+ * name. Optional blocks that are not registered will be silently skipped
+ * instead of throwing an error.
+ *
+ * Supports all namespaced formats:
+ * - Core: `"block-name"` or `"block-name?"`
+ * - Plugin: `"plugin:block"` or `"plugin:block?"`
+ * - Theme: `"theme:namespace:block"` or `"theme:namespace:block?"`
+ *
+ * @param {string|Object} blockRef - The block reference. If a string, may have an
+ *   optional `?` suffix. Non-string references (e.g., component classes) are
+ *   returned as-is in the `name` property with `optional: false`.
+ * @returns {{ name: string|Object, optional: boolean }} Parsed result with the clean
+ *   block name (or original reference) and whether it's optional.
+ *
+ * @example
+ * parseBlockReference("chat:widget?")
+ * // => { name: "chat:widget", optional: true }
+ *
+ * parseBlockReference("hero-banner")
+ * // => { name: "hero-banner", optional: false }
+ */
+export function parseBlockReference(blockRef) {
+  if (typeof blockRef === "string" && blockRef.endsWith("?")) {
+    return { name: blockRef.slice(0, -1), optional: true };
+  }
+  return { name: blockRef, optional: false };
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/registry/block.js b/frontend/discourse/app/lib/blocks/-internals/registry/block.js
new file mode 100644
index 0000000000000..a24d3868d6133
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/registry/block.js
@@ -0,0 +1,527 @@
+// @ts-check
+import { DEBUG } from "@glimmer/env";
+import { TrackedMap } from "@ember-compat/tracked-built-ins";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import {
+  OPTIONAL_MISSING,
+  parseBlockReference,
+} from "discourse/lib/blocks/-internals/patterns";
+import { isTesting } from "discourse/lib/environment";
+import {
+  assertNotDuplicate,
+  assertRegistryNotFrozen,
+  createTestRegistrationWrapper,
+  validateNamePattern,
+  validateSourceNamespace,
+} from "./helpers";
+
+/**
+ * A block class decorated with `@block`.
+ *
+ * Block metadata is stored in an internal WeakMap and accessed via the
+ * `getBlockMetadata()` function from the decorator module.
+ *
+ * @typedef {typeof import("@glimmer/component").default} BlockClass
+ */
+
+/**
+ * Metadata object containing block configuration set by the `@block` decorator.
+ * Includes args schema, container settings, validation, and outlet restrictions.
+ *
+ * @typedef {{
+ *   blockName: string,
+ *   shortName: string,
+ *   namespace: string|null,
+ *   namespaceType: "core"|"plugin"|"theme",
+ *   description: string,
+ *   isContainer: boolean,
+ *   decoratorClassNames: string|Array<string>|Function|null,
+ *   args: Object|null,
+ *   childArgs: Object|null,
+ *   constraints: Object|null,
+ *   validate: Function|null,
+ *   allowedOutlets: ReadonlyArray<string>|null,
+ *   deniedOutlets: ReadonlyArray<string>|null
+ * }} BlockMetadata
+ */
+
+/**
+ * A factory function that returns a Promise resolving to a BlockClass or module with default export.
+ *
+ * @typedef {() => Promise<BlockClass | { default: BlockClass }>} BlockFactory
+ */
+
+/**
+ * Registry entry: either a resolved BlockClass or a factory function for lazy loading.
+ *
+ * @typedef {BlockClass | BlockFactory} BlockRegistryEntry
+ */
+
+/*
+ * Registry State
+ */
+
+/**
+ * Registry of block components registered via `api.registerBlock()`.
+ * Maps block names to their component classes or factory functions.
+ *
+ * @type {Map<string, BlockRegistryEntry>}
+ */
+const blockRegistry = new Map();
+
+/**
+ * Cache for resolved factory functions.
+ * Once a factory is resolved, the result is stored here to avoid re-resolving.
+ *
+ * This is a TrackedMap so that components calling `tryResolveBlock()` will
+ * automatically re-render when a factory they depend on finishes resolving.
+ * TrackedMap tracks per-key, so only components waiting on specific blocks
+ * are invalidated.
+ *
+ * @type {TrackedMap<string, BlockClass>}
+ */
+const resolvedFactoryCache = new TrackedMap();
+
+/**
+ * Tracks in-flight resolution promises to prevent duplicate concurrent attempts.
+ *
+ * @type {Map<string, Promise<BlockClass|undefined>>}
+ */
+const pendingResolutions = new Map();
+
+/**
+ * Caches failed resolution attempts to prevent infinite retry loops.
+ *
+ * @type {Set<string>}
+ */
+const failedResolutions = new Set();
+
+/**
+ * Whether the block registry is frozen (no new registrations allowed).
+ */
+let registryFrozen = false;
+
+/**
+ * Stores the initial frozen state to allow correct reset after tests.
+ * @type {boolean | null}
+ */
+let testRegistryFrozenState = null;
+
+/*
+ * Public Functions
+ */
+
+/**
+ * Returns whether the block registry is frozen.
+ *
+ * @returns {boolean}
+ */
+export function isBlockRegistryFrozen() {
+  return registryFrozen;
+}
+
+/**
+ * Checks if a block is registered (by name or class reference).
+ *
+ * This is a synchronous check that does not resolve factory functions.
+ * Use this to verify a block exists before attempting resolution.
+ *
+ * @param {string | BlockClass} nameOrClass - Block name string or BlockClass.
+ * @returns {boolean} True if the block is registered.
+ */
+export function hasBlock(nameOrClass) {
+  if (typeof nameOrClass === "string") {
+    return blockRegistry.has(nameOrClass);
+  }
+  const blockName = getBlockMetadata(nameOrClass)?.blockName;
+  return blockName && blockRegistry.has(blockName);
+}
+
+/**
+ * Returns the registry entry for a block (class or factory).
+ *
+ * @param {string} name - The block name.
+ * @returns {BlockRegistryEntry | undefined} The registry entry, or undefined if not found.
+ */
+export function getBlockEntry(name) {
+  return blockRegistry.get(name);
+}
+
+/**
+ * Returns all block entries with their names as [name, entry] pairs.
+ * Used by Blocks service for listing and introspection.
+ *
+ * @returns {Array<[string, BlockRegistryEntry]>} Array of [name, entry] pairs.
+ */
+export function getAllBlockEntries() {
+  return Array.from(blockRegistry.entries());
+}
+
+/**
+ * Checks if a block is registered and fully resolved (not a pending factory).
+ *
+ * @param {string} name - The block name to check.
+ * @returns {boolean} True if registered and resolved.
+ */
+export function isBlockResolved(name) {
+  if (!blockRegistry.has(name)) {
+    return false;
+  }
+  const entry = blockRegistry.get(name);
+  return !isBlockFactory(entry);
+}
+
+/**
+ * Checks if a registry entry is a factory function (not a resolved class).
+ *
+ * Factory functions are plain functions not registered in the block metadata WeakMap.
+ * BlockClasses are tracked by the `@block` decorator.
+ *
+ * @param {BlockRegistryEntry} entry - The registry entry to check.
+ * @returns {entry is BlockFactory} True if the entry is a factory function.
+ */
+export function isBlockFactory(entry) {
+  return typeof entry === "function" && !getBlockMetadata(entry);
+}
+
+/**
+ * Resolves a block reference (string name or class) to a BlockClass.
+ *
+ * - If given a BlockClass, returns it directly.
+ * - If given a string, looks up in registry and resolves factory if needed.
+ * - Caches resolved factories to avoid re-resolving.
+ *
+ * @param {string | BlockClass} nameOrClass - Block name string or BlockClass.
+ * @returns {Promise<BlockClass|undefined>} The resolved block class, or undefined if resolution previously failed.
+ * @throws {Error} If block not registered or factory resolution fails on first attempt.
+ *
+ * @example
+ * ```javascript
+ * const BlockClass = await resolveBlock("hero-banner");
+ * const BlockClass = await resolveBlock(HeroBanner); // Returns directly
+ * ```
+ */
+export async function resolveBlock(nameOrClass) {
+  if (typeof nameOrClass !== "string") {
+    if (!getBlockMetadata(nameOrClass)) {
+      raiseBlockError(
+        `Invalid block reference: expected string name or @block-decorated class, ` +
+          `got ${typeof nameOrClass}.`
+      );
+    }
+    return nameOrClass;
+  }
+
+  const name = nameOrClass;
+
+  if (resolvedFactoryCache.has(name)) {
+    return resolvedFactoryCache.get(name);
+  }
+
+  if (failedResolutions.has(name)) {
+    return undefined;
+  }
+
+  if (pendingResolutions.has(name)) {
+    return pendingResolutions.get(name);
+  }
+
+  if (!blockRegistry.has(name)) {
+    raiseBlockError(
+      `Block "${name}" is not registered. ` +
+        `Use api.registerBlock() in a pre-initializer before any renderBlocks() configuration.`
+    );
+  }
+
+  const entry = blockRegistry.get(name);
+
+  if (!isBlockFactory(entry)) {
+    return entry;
+  }
+
+  const resolutionPromise = resolveFactory(name, entry);
+  pendingResolutions.set(name, resolutionPromise);
+  return resolutionPromise;
+}
+
+/**
+ * Attempts to resolve a block reference to a BlockClass synchronously.
+ *
+ * If the block is already resolved, returns the BlockClass immediately.
+ * If the block is a factory that hasn't resolved yet, triggers async resolution
+ * and returns null. The calling component will automatically re-render when the
+ * factory resolves.
+ *
+ * @param {string | BlockClass} blockRef - Block reference (string name or class).
+ *   String names may include a trailing "?" to mark the block as optional.
+ * @returns {BlockClass | { optionalMissing: symbol, name: string } | null}
+ *   - The BlockClass if found and resolved
+ *   - An object with `optionalMissing` marker if the block is optional and not registered
+ *   - null if the block is not registered (non-optional) or is a factory awaiting resolution
+ */
+export function tryResolveBlock(blockRef) {
+  if (typeof blockRef !== "string") {
+    return blockRef;
+  }
+
+  const { name: blockName, optional } = parseBlockReference(blockRef);
+
+  // Check cache first - ALWAYS call .get() to establish tracking dependency.
+  // TrackedMap establishes tracking even when key doesn't exist (returns undefined).
+  // This ensures component re-renders when factory resolves and calls .set().
+  const cachedClass = resolvedFactoryCache.get(blockName);
+  if (cachedClass) {
+    return cachedClass;
+  }
+
+  if (!blockRegistry.has(blockName)) {
+    if (optional) {
+      return { optionalMissing: OPTIONAL_MISSING, name: blockName };
+    }
+    // eslint-disable-next-line no-console
+    console.error(`[Blocks] Block "${blockName}" is not registered.`);
+    return null;
+  }
+
+  const entry = blockRegistry.get(blockName);
+
+  if (!isBlockFactory(entry)) {
+    return entry;
+  }
+
+  // Trigger async resolution. Returns null for this render cycle - the component
+  // will re-render automatically when the factory resolves (tracked via TrackedMap).
+  resolveBlock(blockName).catch((error) => {
+    // TODO (blocks-api) Consider returning an error marker and rendering an error
+    // placeholder component for admin visibility, rather than silently returning null.
+    document.dispatchEvent(
+      new CustomEvent("discourse-error", {
+        detail: { messageKey: "broken_block_factory_alert", error },
+      })
+    );
+  });
+
+  return null;
+}
+
+/*
+ * Internal Functions
+ */
+
+/**
+ * Freezes the registry, preventing further registrations.
+ * Called by the "freeze-block-registry" initializer during app boot.
+ *
+ * @internal
+ */
+export function _freezeBlockRegistry() {
+  registryFrozen = true;
+}
+
+/**
+ * Registers a block component in the registry.
+ * Must be called before any renderBlocks() configuration is registered.
+ *
+ * The block component must be decorated with `@block`. Block metadata
+ * (including `blockName`) is stored in an internal WeakMap and accessed
+ * via `getBlockMetadata()`.
+ *
+ * @param {BlockClass} BlockClass - The block component class
+ * @throws {Error} If called after registry is locked, or if block is invalid
+ *
+ * @example
+ * ```javascript
+ * // In a plugin's pre-initializer (plugins/my-plugin/assets/javascripts/pre-initializers/...)
+ * import { withPluginApi } from "discourse/lib/plugin-api";
+ * import MyBlock from "../blocks/my-block";
+ *
+ * export default {
+ *   initialize() {
+ *     withPluginApi("1.0", (api) => {
+ *       api.registerBlock(MyBlock);
+ *     });
+ *   },
+ * };
+ * ```
+ */
+export function _registerBlock(BlockClass) {
+  const blockName = getBlockMetadata(BlockClass)?.blockName;
+
+  if (
+    !assertRegistryNotFrozen({
+      frozen: registryFrozen,
+      apiMethod: "api.registerBlock()",
+      entityType: "Block",
+      entityName: blockName || BlockClass?.name,
+    })
+  ) {
+    return;
+  }
+
+  if (!blockName) {
+    raiseBlockError(
+      `Block class "${BlockClass?.name}" must be decorated with @block to be registered.`
+    );
+    return;
+  }
+
+  if (!validateNamePattern(blockName, "Block")) {
+    return;
+  }
+
+  if (!validateSourceNamespace({ name: blockName, entityType: "block" })) {
+    return;
+  }
+
+  if (!assertNotDuplicate(blockRegistry, blockName, "Block")) {
+    return;
+  }
+
+  blockRegistry.set(blockName, BlockClass);
+}
+
+/**
+ * Registers a factory function for lazy loading a block.
+ *
+ * The factory will be called when the block is first needed. It must return
+ * a Promise that resolves to a BlockClass (or a module with a default export).
+ *
+ * @param {string} name - The name to register the block under.
+ * @param {BlockFactory} factory - Factory function returning Promise<BlockClass>.
+ * @throws {Error} If registry is locked, name is invalid, or factory is not a function.
+ *
+ * @example
+ * ```javascript
+ * api.registerBlock("hero-banner", () => import("../blocks/hero-banner"));
+ * ```
+ *
+ * @internal
+ */
+export function _registerBlockFactory(name, factory) {
+  if (
+    !assertRegistryNotFrozen({
+      frozen: registryFrozen,
+      apiMethod: "api.registerBlock()",
+      entityType: "Block",
+      entityName: name,
+    })
+  ) {
+    return;
+  }
+
+  if (!validateNamePattern(name, "Block")) {
+    return;
+  }
+
+  if (typeof factory !== "function") {
+    raiseBlockError(
+      `Block factory for "${name}" must be a function that returns a Promise<BlockClass>.`
+    );
+    return;
+  }
+
+  if (!validateSourceNamespace({ name, entityType: "block" })) {
+    return;
+  }
+
+  if (!assertNotDuplicate(blockRegistry, name, "Block")) {
+    return;
+  }
+
+  blockRegistry.set(name, factory);
+}
+
+/**
+ * Resolves a factory function and caches the result.
+ *
+ * @param {string} name - The block name.
+ * @param {BlockFactory} factory - The factory function to resolve.
+ * @returns {Promise<BlockClass>} The resolved block class.
+ * @throws {BlockError} If the factory returns an invalid class or the resolved name doesn't match.
+ */
+async function resolveFactory(name, factory) {
+  try {
+    const result = await factory();
+    // @ts-ignore - result may be a module with .default or direct BlockClass
+    const BlockClass = result?.default ?? result;
+    const resolvedBlockName = getBlockMetadata(BlockClass)?.blockName;
+
+    if (!resolvedBlockName) {
+      raiseBlockError(
+        `Block factory for "${name}" did not return a valid @block-decorated class.`
+      );
+    }
+
+    if (resolvedBlockName !== name) {
+      raiseBlockError(
+        `Block factory registered as "${name}" resolved to a block with ` +
+          `blockName "${resolvedBlockName}". The registered name must match ` +
+          `the block's @block decorator name.`
+      );
+    }
+
+    resolvedFactoryCache.set(name, BlockClass);
+    blockRegistry.set(name, BlockClass);
+
+    return BlockClass;
+  } catch (error) {
+    failedResolutions.add(name);
+
+    if (error.name === "BlockError") {
+      throw error;
+    }
+    raiseBlockError(
+      `Failed to resolve block factory for "${name}": ${error.message}`
+    );
+    return undefined;
+  } finally {
+    pendingResolutions.delete(name);
+  }
+}
+
+/*
+ * Test Utilities
+ */
+
+/**
+ * Temporarily unfreezes the block registry for testing.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @param {Function} callback - Function to execute with unfrozen registry.
+ */
+export const withTestBlockRegistration = createTestRegistrationWrapper({
+  getFrozen: () => registryFrozen,
+  setFrozen: (value) => {
+    registryFrozen = value;
+  },
+  getSavedState: () => testRegistryFrozenState,
+  setSavedState: (value) => {
+    testRegistryFrozenState = value;
+  },
+  name: "withTestBlockRegistration",
+});
+
+/**
+ * Resets the block registry state for testing.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @internal Called by `resetBlockRegistryForTesting`, not meant for direct use.
+ */
+export function _resetBlockRegistryState() {
+  // allows tree-shaking in production builds
+  if (!DEBUG) {
+    return;
+  }
+  if (!isTesting()) {
+    throw new Error("_resetBlockRegistryState can only be used in tests.");
+  }
+  blockRegistry.clear();
+  resolvedFactoryCache.clear();
+  pendingResolutions.clear();
+  failedResolutions.clear();
+  registryFrozen = false;
+  testRegistryFrozenState = null;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/registry/condition.js b/frontend/discourse/app/lib/blocks/-internals/registry/condition.js
new file mode 100644
index 0000000000000..83f6cf5e83f25
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/registry/condition.js
@@ -0,0 +1,201 @@
+// @ts-check
+import { DEBUG } from "@glimmer/env";
+import { isDecoratedCondition } from "discourse/blocks/conditions/decorator";
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import { isTesting } from "discourse/lib/environment";
+import {
+  assertRegistryNotFrozen,
+  createTestRegistrationWrapper,
+  validateNamePattern,
+  validateSourceNamespace,
+} from "./helpers";
+
+/*
+ * Registry State
+ */
+
+/**
+ * Registry of condition type classes registered by core, plugins, and themes.
+ * Maps condition type names to their class constructors.
+ *
+ * Unlike blocks which store component classes, conditions are stored as classes
+ * and instantiated by the Blocks service when first needed. This allows the
+ * service to set the owner for dependency injection.
+ *
+ * @type {Map<string, typeof import("discourse/blocks/conditions").BlockCondition>}
+ */
+const conditionTypeRegistry = new Map();
+
+/**
+ * Whether the condition type registry is frozen (no new registrations allowed).
+ */
+let conditionTypeRegistryFrozen = false;
+
+/**
+ * Stores the initial frozen state for condition registry to allow correct reset after tests.
+ * @type {boolean | null}
+ */
+let testConditionRegistryFrozenState = null;
+
+/*
+ * Public Functions
+ */
+
+/**
+ * Returns whether the condition type registry is frozen.
+ *
+ * @returns {boolean}
+ */
+export function isConditionTypeRegistryFrozen() {
+  return conditionTypeRegistryFrozen;
+}
+
+/**
+ * Checks if a condition type is registered.
+ *
+ * @param {string} type - The condition type name.
+ * @returns {boolean}
+ */
+export function hasConditionType(type) {
+  return conditionTypeRegistry.has(type);
+}
+
+/**
+ * Returns all condition type entries as [type, ConditionClass] pairs.
+ * Used by Blocks service for lazy initialization.
+ *
+ * @returns {Array<[string, typeof import("discourse/blocks/conditions").BlockCondition]>}
+ */
+export function getAllConditionTypeEntries() {
+  return Array.from(conditionTypeRegistry.entries());
+}
+
+/*
+ * Internal Functions
+ */
+
+/**
+ * Freezes the condition type registry, preventing further registrations.
+ * Called by the "freeze-block-registry" initializer during app boot.
+ *
+ * @internal
+ */
+export function _freezeConditionTypeRegistry() {
+  conditionTypeRegistryFrozen = true;
+}
+
+/**
+ * Registers a condition type class in the registry.
+ * Must be called before the registry is frozen by the "freeze-block-registry" initializer.
+ *
+ * The condition class must be decorated with `@blockCondition`
+ *
+ * @param {typeof import("discourse/blocks/conditions").BlockCondition} ConditionClass - The condition class to register.
+ *
+ * @example
+ * ```javascript
+ * import { withPluginApi } from "discourse/lib/plugin-api";
+ * import MyCondition from "../conditions/my-condition";
+ *
+ * export default {
+ *   initialize() {
+ *     withPluginApi((api) => {
+ *       api.registerBlockConditionType(MyCondition);
+ *     });
+ *   },
+ * };
+ * ```
+ *
+ * @internal
+ */
+export function _registerConditionType(ConditionClass) {
+  if (
+    !assertRegistryNotFrozen({
+      frozen: conditionTypeRegistryFrozen,
+      apiMethod: "api.registerBlockConditionType()",
+      entityType: "Condition",
+      entityName: ConditionClass?.type || ConditionClass?.name,
+    })
+  ) {
+    return;
+  }
+
+  // Ensure the class was created by the @blockCondition decorator
+  if (!isDecoratedCondition(ConditionClass)) {
+    raiseBlockError(
+      `${ConditionClass.name} must use the @blockCondition decorator. ` +
+        `Manual inheritance from BlockCondition is not allowed.`
+    );
+    return;
+  }
+
+  const type = ConditionClass.type;
+
+  // Validate condition type follows the namespaced pattern
+  if (!validateNamePattern(type, "Condition")) {
+    return;
+  }
+
+  // Validate namespace requirements for plugins/themes and enforce consistency
+  if (!validateSourceNamespace({ name: type, entityType: "condition" })) {
+    return;
+  }
+
+  if (conditionTypeRegistry.has(type)) {
+    raiseBlockError(`Condition type "${type}" is already registered`);
+    return;
+  }
+
+  conditionTypeRegistry.set(type, ConditionClass);
+}
+
+/*
+ * Test Utilities
+ */
+
+/**
+ * Temporarily unfreezes the condition type registry for testing purposes.
+ * Call this before registering condition types in tests.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @param {Function} callback - Function to execute with unfrozen registry.
+ *
+ * @example
+ * ```javascript
+ * withTestConditionRegistration(() => {
+ *   _registerConditionType(MyTestCondition);
+ * });
+ * ```
+ */
+export const withTestConditionRegistration = createTestRegistrationWrapper({
+  getFrozen: () => conditionTypeRegistryFrozen,
+  setFrozen: (value) => {
+    conditionTypeRegistryFrozen = value;
+  },
+  getSavedState: () => testConditionRegistryFrozenState,
+  setSavedState: (value) => {
+    testConditionRegistryFrozenState = value;
+  },
+  name: "withTestConditionRegistration",
+});
+
+/**
+ * Resets the condition registry state for testing.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @internal Called by `resetBlockRegistryForTesting`, not meant for direct use.
+ */
+export function _resetConditionRegistryState() {
+  // allows tree-shaking in production builds
+  if (!DEBUG) {
+    return;
+  }
+  if (!isTesting()) {
+    throw new Error("_resetConditionRegistryState can only be used in tests.");
+  }
+  conditionTypeRegistry.clear();
+  conditionTypeRegistryFrozen = false;
+  testConditionRegistryFrozenState = null;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/registry/helpers.js b/frontend/discourse/app/lib/blocks/-internals/registry/helpers.js
new file mode 100644
index 0000000000000..5f1d4f0035465
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/registry/helpers.js
@@ -0,0 +1,311 @@
+// @ts-check
+import { DEBUG } from "@glimmer/env";
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import {
+  MAX_BLOCK_NAME_LENGTH,
+  parseBlockName,
+  VALID_NAMESPACED_BLOCK_PATTERN,
+} from "discourse/lib/blocks/-internals/patterns";
+import { isTesting } from "discourse/lib/environment";
+import identifySource from "discourse/lib/source-identifier";
+
+/**
+ * Tracks which namespace each source (theme/plugin) has used.
+ * Enforces that each source can only register blocks with a single namespace.
+ *
+ * Key: source identifier (e.g., "theme:Tactile Theme" or "plugin:chat")
+ * Value: the namespace prefix used (e.g., "theme:tactile" or "chat")
+ *
+ * @type {Map<string, string|null>}
+ */
+const sourceNamespaceMap = new Map();
+
+/**
+ * Override for source identifier in tests.
+ * @type {string|null|undefined}
+ */
+let testSourceIdentifier;
+
+/*
+ * Public Functions
+ */
+
+/**
+ * Asserts that a registry is not frozen before registration.
+ *
+ * @param {Object} options - Validation options.
+ * @param {boolean} options.frozen - Whether the registry is frozen.
+ * @param {string} options.apiMethod - The API method name for the error message.
+ * @param {string} options.entityType - Type of entity (e.g., "Block", "Outlet", "Condition").
+ * @param {string} options.entityName - Name of the entity being registered.
+ * @returns {boolean} True if not frozen, false if frozen (error was raised).
+ */
+export function assertRegistryNotFrozen({
+  frozen,
+  apiMethod,
+  entityType,
+  entityName,
+}) {
+  if (frozen) {
+    raiseBlockError(
+      `${apiMethod} was called after the ${entityType.toLowerCase()} registry was frozen. ` +
+        `Move your code to a pre-initializer that runs before "freeze-block-registry". ` +
+        `${entityType}: "${entityName}"`
+    );
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Validates that a name follows the namespaced block/outlet name pattern.
+ *
+ * Checks both the pattern format and maximum length to prevent memory and
+ * performance issues from extremely long names.
+ *
+ * @param {string} name - The name to validate.
+ * @param {string} entityType - Type of entity for error messages (e.g., "Block", "Outlet").
+ * @returns {boolean} True if valid, false if invalid (error was raised).
+ */
+export function validateNamePattern(name, entityType) {
+  // Check length first to avoid regex issues with extremely long strings.
+  if (name.length > MAX_BLOCK_NAME_LENGTH) {
+    raiseBlockError(
+      `${entityType} name exceeds maximum length of ${MAX_BLOCK_NAME_LENGTH} characters. ` +
+        `Name length: ${name.length}.`
+    );
+    return false;
+  }
+
+  if (!VALID_NAMESPACED_BLOCK_PATTERN.test(name)) {
+    const entityLower = entityType.toLowerCase();
+    raiseBlockError(
+      `${entityType} name "${name}" is invalid. ` +
+        `Valid formats: "${entityLower}-name" (core), "plugin:${entityLower}-name" (plugin), ` +
+        `"theme:namespace:${entityLower}-name" (theme).`
+    );
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Asserts that an entry is not already registered.
+ *
+ * @param {Map} registry - The registry to check.
+ * @param {string} name - The name to check.
+ * @param {string} entityType - Type of entity for error messages.
+ * @returns {boolean} True if not duplicate, false if duplicate (error was raised).
+ */
+export function assertNotDuplicate(registry, name, entityType) {
+  if (registry.has(name)) {
+    raiseBlockError(`${entityType} "${name}" is already registered.`);
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Validates that a block or outlet name follows namespace requirements for themes and plugins.
+ *
+ * This helper enforces the following rules:
+ * - Themes must use `theme:namespace:name` format
+ * - Plugins must use `namespace:name` format
+ * - Optionally enforces that each source uses a consistent namespace across all registrations
+ *
+ * @param {Object} options - Validation options.
+ * @param {string} options.name - The name being registered.
+ * @param {"block"|"outlet"|"condition"} options.entityType - Type of entity for error messages.
+ * @param {boolean} [options.enforceConsistency=true] - Whether to enforce single namespace per source.
+ * @returns {boolean} True if validation passes, false if it failed (error was raised).
+ */
+export function validateSourceNamespace({
+  name,
+  entityType,
+  enforceConsistency = true,
+}) {
+  const sourceId = getSourceIdentifier();
+  if (!sourceId) {
+    return true;
+  }
+
+  const namespacePrefix = getNamespacePrefix(name);
+
+  const ENTITY_PLURALS = {
+    block: "blocks",
+    outlet: "outlets",
+    condition: "conditions",
+  };
+  const entityPlural = ENTITY_PLURALS[entityType] ?? "conditions";
+
+  const entityCapitalized =
+    entityType.charAt(0).toUpperCase() + entityType.slice(1);
+
+  // Themes must use theme:namespace:name format
+  if (sourceId.startsWith("theme:") && !namespacePrefix?.startsWith("theme:")) {
+    raiseBlockError(
+      `Theme ${entityPlural} must use the "theme:namespace:${entityType}-name" format. ` +
+        `${entityCapitalized} "${name}" should be renamed to "theme:<your-theme>:${name}".`
+    );
+    return false;
+  }
+
+  // Plugins must use namespace:name format
+  if (sourceId.startsWith("plugin:") && !namespacePrefix) {
+    const pluginName = sourceId.replace("plugin:", "");
+    raiseBlockError(
+      `Plugin ${entityPlural} must use the "namespace:${entityType}-name" format. ` +
+        `${entityCapitalized} "${name}" should be renamed to "${pluginName}:${name}".`
+    );
+    return false;
+  }
+
+  // Enforce single namespace per source (shared across blocks, outlets, and conditions)
+  if (enforceConsistency) {
+    const existingNamespace = sourceNamespaceMap.get(sourceId);
+    if (
+      existingNamespace !== undefined &&
+      existingNamespace !== namespacePrefix
+    ) {
+      raiseBlockError(
+        `${entityCapitalized} "${name}" uses namespace "${namespacePrefix ?? "(core)"}" but ` +
+          `${sourceId} already used namespace "${existingNamespace ?? "(core)"}". ` +
+          `Each theme/plugin must use a single consistent namespace for all blocks, outlets, and conditions.`
+      );
+      return false;
+    }
+    sourceNamespaceMap.set(sourceId, namespacePrefix);
+  }
+
+  return true;
+}
+
+/**
+ * Creates a test registration wrapper function for temporarily unfreezing a registry.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @param {Object} options - Options object.
+ * @param {() => boolean} options.getFrozen - Function to get frozen state.
+ * @param {(value: boolean) => void} options.setFrozen - Function to set frozen state.
+ * @param {() => boolean|null} options.getSavedState - Function to get saved test state.
+ * @param {(value: boolean|null) => void} options.setSavedState - Function to set saved test state.
+ * @param {string} options.name - Name for error message.
+ * @returns {((callback: Function) => void)|undefined} The wrapper function.
+ */
+export function createTestRegistrationWrapper({
+  getFrozen,
+  setFrozen,
+  getSavedState,
+  setSavedState,
+  name,
+}) {
+  // allows tree-shaking in production builds
+  if (!DEBUG) {
+    return; // this won't be called in production builds
+  }
+  return function (callback) {
+    if (!isTesting()) {
+      throw new Error(`Use \`${name}\` only in tests.`);
+    }
+
+    if (getSavedState() === null) {
+      setSavedState(getFrozen());
+    }
+
+    setFrozen(false);
+    try {
+      callback();
+    } finally {
+      setFrozen(getSavedState());
+    }
+  };
+}
+
+/*
+ * Internal Functions
+ */
+
+/**
+ * Gets a unique identifier for the current source from the call stack.
+ * Returns null for core code (no theme or plugin detected).
+ *
+ * @returns {string|null} Source identifier like "theme:Tactile" or "plugin:chat"
+ */
+function getSourceIdentifier() {
+  if (DEBUG && testSourceIdentifier !== undefined) {
+    return testSourceIdentifier;
+  }
+
+  const source = identifySource();
+  if (!source) {
+    return null;
+  }
+  if (source.type === "theme") {
+    return `theme:${source.name}`;
+  }
+  if (source.type === "plugin") {
+    return `plugin:${source.name}`;
+  }
+  return null;
+}
+
+/**
+ * Extracts the namespace prefix from a block name.
+ *
+ * @param {string} blockName - The full block name.
+ * @returns {string|null} The namespace prefix, or null for core blocks.
+ *
+ * @example
+ * getNamespacePrefix("theme:tactile:banner") // => "theme:tactile"
+ * getNamespacePrefix("chat:widget")          // => "chat"
+ * getNamespacePrefix("group")                // => null (core)
+ */
+function getNamespacePrefix(blockName) {
+  const parsed = parseBlockName(blockName);
+  if (!parsed) {
+    return null;
+  }
+  if (parsed.type === "theme") {
+    return `theme:${parsed.namespace}`;
+  }
+  if (parsed.type === "plugin") {
+    return parsed.namespace;
+  }
+  return null;
+}
+
+/**
+ * Internal implementation for setting the test source identifier.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @param {string|null} sourceId - Source identifier to use, or null to clear.
+ * @internal Called by `setTestSourceIdentifier` in block-testing.js.
+ */
+export function _setTestSourceIdentifierInternal(sourceId) {
+  // allows tree-shaking in production builds
+  if (!DEBUG) {
+    return;
+  }
+  testSourceIdentifier = sourceId;
+}
+
+/**
+ * Resets the source namespace map and test source identifier.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @internal Called by `resetBlockRegistryForTesting`, not meant for direct use.
+ */
+export function _resetSourceNamespaceState() {
+  // allows tree-shaking in production builds
+  if (!DEBUG) {
+    return;
+  }
+  if (!isTesting()) {
+    throw new Error("_resetSourceNamespaceState can only be used in tests.");
+  }
+  sourceNamespaceMap.clear();
+  testSourceIdentifier = undefined;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/registry/outlet.js b/frontend/discourse/app/lib/blocks/-internals/registry/outlet.js
new file mode 100644
index 0000000000000..f29bb212bc952
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/registry/outlet.js
@@ -0,0 +1,166 @@
+// @ts-check
+import { DEBUG } from "@glimmer/env";
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import { isTesting } from "discourse/lib/environment";
+import { BLOCK_OUTLETS } from "discourse/lib/registry/block-outlets";
+import {
+  assertRegistryNotFrozen,
+  validateNamePattern,
+  validateSourceNamespace,
+} from "./helpers";
+
+/*
+ * Registry State
+ */
+
+/**
+ * Registry of custom block outlets registered by plugins and themes.
+ * Maps outlet names to their metadata.
+ *
+ * @type {Map<string, { name: string, description?: string }>}
+ */
+const customOutletRegistry = new Map();
+
+/**
+ * Whether the outlet registry is frozen (no new registrations allowed).
+ */
+let outletRegistryFrozen = false;
+
+/*
+ * Public Functions
+ */
+
+/**
+ * Returns whether the outlet registry is frozen.
+ *
+ * @returns {boolean}
+ */
+export function isOutletRegistryFrozen() {
+  return outletRegistryFrozen;
+}
+
+/**
+ * Returns all valid outlet names (both core and custom).
+ *
+ * @returns {string[]} Array of all outlet names.
+ */
+export function getAllOutlets() {
+  return [...BLOCK_OUTLETS, ...customOutletRegistry.keys()];
+}
+
+/**
+ * Checks if an outlet name is valid (registered as core or custom).
+ *
+ * @param {string} name - The outlet name to check.
+ * @returns {boolean} True if the outlet is registered.
+ */
+export function isValidOutlet(name) {
+  return BLOCK_OUTLETS.includes(name) || customOutletRegistry.has(name);
+}
+
+/**
+ * Gets metadata for a custom outlet.
+ *
+ * @param {string} name - The outlet name.
+ * @returns {{ name: string, description?: string } | undefined} Outlet metadata or undefined.
+ */
+export function getCustomOutlet(name) {
+  return customOutletRegistry.get(name);
+}
+
+/*
+ * Internal Functions
+ */
+
+/**
+ * Freezes the outlet registry, preventing further registrations.
+ * Called by the "freeze-block-registry" initializer during app boot.
+ *
+ * @internal
+ */
+export function _freezeOutletRegistry() {
+  outletRegistryFrozen = true;
+}
+
+/**
+ * Registers a custom block outlet.
+ *
+ * Custom outlets follow the same naming conventions as blocks:
+ * - Core outlets: `outlet-name` (kebab-case)
+ * - Plugin outlets: `namespace:outlet-name`
+ * - Theme outlets: `theme:namespace:outlet-name`
+ *
+ * @param {string} outletName - The outlet name (must follow naming conventions).
+ * @param {Object} [options] - Outlet options.
+ * @param {string} [options.description] - Human-readable description.
+ *
+ * @internal
+ */
+export function _registerOutlet(outletName, options = {}) {
+  if (
+    !assertRegistryNotFrozen({
+      frozen: outletRegistryFrozen,
+      apiMethod: "api.registerBlockOutlet()",
+      entityType: "Outlet",
+      entityName: outletName,
+    })
+  ) {
+    return;
+  }
+
+  if (!validateNamePattern(outletName, "Outlet")) {
+    return;
+  }
+
+  // Check for duplicates against core outlets
+  if (BLOCK_OUTLETS.includes(outletName)) {
+    raiseBlockError(
+      `Outlet "${outletName}" is already registered as a core outlet.`
+    );
+    return;
+  }
+
+  // Check for duplicates against custom outlets
+  if (customOutletRegistry.has(outletName)) {
+    raiseBlockError(`Outlet "${outletName}" is already registered.`);
+    return;
+  }
+
+  // Validate namespace requirements (shared consistency check with blocks and conditions)
+  if (
+    !validateSourceNamespace({
+      name: outletName,
+      entityType: "outlet",
+    })
+  ) {
+    return;
+  }
+
+  customOutletRegistry.set(outletName, {
+    name: outletName,
+    description: options.description,
+  });
+}
+
+/*
+ * Test Utilities
+ */
+
+/**
+ * Resets the outlet registry state for testing.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @internal Called by `resetBlockRegistryForTesting`, not meant for direct use.
+ */
+export function _resetOutletRegistryState() {
+  // allows tree-shaking in production builds
+  if (!DEBUG) {
+    return;
+  }
+  if (!isTesting()) {
+    throw new Error("_resetOutletRegistryState can only be used in tests.");
+  }
+  customOutletRegistry.clear();
+  outletRegistryFrozen = false;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/utils.js b/frontend/discourse/app/lib/blocks/-internals/utils.js
new file mode 100644
index 0000000000000..7826d36fad883
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/utils.js
@@ -0,0 +1,170 @@
+// @ts-check
+/**
+ * Utility functions for the block system.
+ *
+ * @module discourse/lib/blocks/-internals/utils
+ */
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+
+/**
+ * @typedef {Object} ValidationContext
+ * @property {string} outletName - The name of the outlet being validated.
+ * @property {string|null} [blockName=null] - The name of the block, if resolved.
+ * @property {string} path - The hierarchical path to this entry (e.g., "layout[0].children[1]").
+ * @property {Object|null} [entry=null] - The block entry object being validated.
+ * @property {Error|null} [callSiteError=null] - Error captured at the call site for stack traces.
+ * @property {Array|null} [rootLayout=null] - The root layout array for error display.
+ *
+ * The following properties are added by validation code after initial context creation:
+ * @property {string} [errorPath] - Full path to the error (e.g., "layout[0].conditions.params.categoryId").
+ * @property {string} [conditionsPath] - Path within conditions (e.g., "params.categoryId").
+ * @property {Object} [conditions] - The conditions object for error display.
+ */
+
+/**
+ * Creates a validation context object for error reporting.
+ * Centralizes context creation to ensure consistent structure across
+ * all validation functions.
+ *
+ * @param {Object} params - Context parameters.
+ * @param {string} params.outletName - The name of the outlet being validated.
+ * @param {string|null} [params.blockName=null] - The name of the block, if resolved.
+ * @param {string} params.path - The hierarchical path to this entry.
+ * @param {Object|null} [params.entry=null] - The block entry object being validated.
+ * @param {Error|null} [params.callSiteError=null] - Error captured at the call site.
+ * @param {Array|null} [params.rootLayout=null] - The root layout array for error display.
+ * @returns {ValidationContext} A validation context object.
+ */
+export function createValidationContext({
+  outletName,
+  blockName = null,
+  path,
+  entry = null,
+  callSiteError = null,
+  rootLayout = null,
+}) {
+  return { outletName, blockName, path, entry, callSiteError, rootLayout };
+}
+
+/**
+ * Builds a hierarchical error path by joining path segments.
+ * Used to construct full paths for error messages (e.g., "layout[0].args.title").
+ *
+ * @param {string} basePath - The base path (e.g., "layout[0]").
+ * @param {string} segment - The segment to append (e.g., "args.title").
+ * @returns {string} Combined path with dot separator, or the non-empty path if one is missing.
+ *
+ * @example
+ * buildErrorPath("layout[0]", "args.title")
+ * // => "layout[0].args.title"
+ *
+ * buildErrorPath("", "args")
+ * // => "args"
+ */
+export function buildErrorPath(basePath, segment) {
+  if (!basePath) {
+    return segment;
+  }
+  if (!segment) {
+    return basePath;
+  }
+  return `${basePath}.${segment}`;
+}
+
+/**
+ * Applies default values from block metadata to provided args.
+ *
+ * When a block is configured with args, this function merges the provided
+ * args with default values from the block's metadata schema. Default values
+ * are only applied when the arg is undefined in the provided args.
+ *
+ * @param {import("discourse/lib/blocks/-internals/registry/block").BlockClass} ComponentClass - The block component class.
+ * @param {Object} providedArgs - The args provided in the layout entry.
+ * @returns {Readonly<Object>} A new object with defaults applied for missing args.
+ *
+ * @example
+ * ```javascript
+ * // Block metadata: { args: { title: { default: "Hello" }, count: { default: 0 } } }
+ * applyArgDefaults(MyBlock, { title: "Custom" });
+ * // => { title: "Custom", count: 0 }
+ * ```
+ */
+export function applyArgDefaults(ComponentClass, providedArgs) {
+  const schema = getBlockMetadata(ComponentClass)?.args;
+
+  const result = { ...providedArgs };
+
+  // apply default values
+  if (schema) {
+    for (const [argName, argDef] of Object.entries(schema)) {
+      if (result[argName] === undefined && argDef.default !== undefined) {
+        result[argName] = argDef.default;
+      }
+    }
+  }
+
+  return Object.freeze(result);
+}
+
+/**
+ * Performs a shallow comparison of two args objects.
+ *
+ * Compares top-level values using strict equality (===). Does not perform
+ * deep comparison of nested objects. Used to determine if cached curried
+ * components can be reused.
+ *
+ * @param {Object|null|undefined} a - First args object.
+ * @param {Object|null|undefined} b - Second args object.
+ * @returns {boolean} True if the args are shallowly equal, false otherwise.
+ */
+export function shallowArgsEqual(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (a == null || b == null) {
+    return false;
+  }
+  const keysA = Object.keys(a);
+  const keysB = Object.keys(b);
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+  return keysA.every((key) => a[key] === b[key]);
+}
+
+/**
+ * Retrieves a value from a nested object using dot-notation path.
+ *
+ * This utility safely navigates through nested object properties using a
+ * dot-separated path string. It handles null/undefined values gracefully
+ * at any level of the path.
+ *
+ * @param {Object} obj - The object to get the value from.
+ * @param {string} path - Dot-notation path (e.g., "user.trust_level").
+ * @returns {*} The value at the path, or undefined if not found or if any
+ *              intermediate value is null/undefined.
+ *
+ * @example
+ * const user = { profile: { name: "Alice", settings: { theme: "dark" } } };
+ * getByPath(user, "profile.name"); // "Alice"
+ * getByPath(user, "profile.settings.theme"); // "dark"
+ * getByPath(user, "profile.missing"); // undefined
+ * getByPath(user, "profile.settings.missing.deep"); // undefined (safe)
+ */
+export function getByPath(obj, path) {
+  if (!obj || !path) {
+    return undefined;
+  }
+
+  const parts = path.split(".");
+  let current = obj;
+
+  for (const part of parts) {
+    if (current === null || current === undefined) {
+      return undefined;
+    }
+    current = current[part];
+  }
+
+  return current;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/validation/args.js b/frontend/discourse/app/lib/blocks/-internals/validation/args.js
new file mode 100644
index 0000000000000..2255e184c3b14
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/validation/args.js
@@ -0,0 +1,1030 @@
+// @ts-check
+/**
+ * Shared arg validation utilities.
+ *
+ * This module provides generic validation functions for argument schemas
+ * used by both blocks and conditions. Entity-specific validation logic
+ * lives in separate modules:
+ * - block-args.js - block-specific validation
+ * - condition-args.js - condition-specific validation
+ *
+ * @module discourse/lib/blocks/-internals/validation/args
+ */
+
+import {
+  BlockError,
+  raiseBlockError,
+} from "discourse/lib/blocks/-internals/error";
+import { formatWithSuggestion } from "discourse/lib/string-similarity";
+import RestModel from "discourse/models/rest";
+
+/**
+ * A validation error result containing the error message and the path
+ * to the argument that failed validation.
+ *
+ * @typedef {Object} ValidationError
+ * @property {string} message - The formatted error message.
+ * @property {string} path - The path to the invalid argument (e.g., "test.name").
+ */
+
+/**
+ * Valid arg name pattern: must be a valid JavaScript identifier.
+ * Starts with a letter, followed by letters, numbers, or underscores.
+ * Note: Names starting with underscore are reserved for internal use.
+ */
+export const VALID_ARG_NAME_PATTERN = /^[a-zA-Z][a-zA-Z0-9_]*$/;
+
+/**
+ * Reserved argument names that cannot be used in block/condition arg schemas.
+ * These are used internally by the block system and would conflict with
+ * user-provided args. Names starting with underscore are also reserved.
+ */
+export const RESERVED_ARG_NAMES = Object.freeze([
+  "args",
+  "block",
+  "classNames",
+  "containerArgs",
+  "id",
+  "outletArgs",
+  "outletName",
+  "children",
+  "conditions",
+  // Note: Names starting with underscore (e.g., __block$, __visible, __hierarchy)
+  // are automatically reserved via the argName.startsWith("_") check in isReservedArgName()
+]);
+
+/**
+ * Checks if an argument name is reserved for internal use.
+ * Reserved names include explicit names in RESERVED_ARG_NAMES and
+ * any name starting with underscore (private by convention).
+ *
+ * @param {string} argName - The argument name to check
+ * @returns {boolean} True if the name is reserved
+ */
+export function isReservedArgName(argName) {
+  return RESERVED_ARG_NAMES.includes(argName) || argName.startsWith("_");
+}
+
+/**
+ * Valid arg types for schema definitions.
+ */
+export const VALID_ARG_TYPES = Object.freeze([
+  "string",
+  "number",
+  "boolean",
+  "array",
+  "object",
+  "any",
+]);
+
+/**
+ * Valid item types for array args.
+ */
+export const VALID_ITEM_TYPES = Object.freeze(["string", "number", "boolean"]);
+
+/**
+ * Valid properties for arg schema definitions.
+ */
+export const VALID_ARG_SCHEMA_PROPERTIES = Object.freeze([
+  "type",
+  "required",
+  "default",
+  "itemType",
+  "itemEnum",
+  "pattern",
+  "minLength",
+  "maxLength",
+  "min",
+  "max",
+  "integer",
+  "enum",
+  "properties",
+  "instanceOf",
+  "instanceOfName",
+]);
+
+/**
+ * Schema property rules for declarative validation.
+ * Each rule defines:
+ * - allowedTypes: arg types that can use this property
+ * - valueCheck: function to validate the property value
+ * - valueError: error message if value check fails
+ * - typeErrorSuffix: text to append for type restriction errors (e.g., "string or array")
+ */
+export const SCHEMA_PROPERTY_RULES = Object.freeze({
+  min: {
+    allowedTypes: ["number"],
+    valueCheck: (v) => typeof v === "number",
+    valueError: "Must be a number.",
+    typeErrorSuffix: "number",
+  },
+  max: {
+    allowedTypes: ["number"],
+    valueCheck: (v) => typeof v === "number",
+    valueError: "Must be a number.",
+    typeErrorSuffix: "number",
+  },
+  integer: {
+    allowedTypes: ["number"],
+    valueCheck: (v) => typeof v === "boolean",
+    valueError: "Must be a boolean.",
+    typeErrorSuffix: "number",
+  },
+  minLength: {
+    allowedTypes: ["string", "array"],
+    valueCheck: (v) => Number.isInteger(v) && v >= 0,
+    valueError: "Must be a non-negative integer.",
+    typeErrorSuffix: "string or array",
+  },
+  maxLength: {
+    allowedTypes: ["string", "array"],
+    valueCheck: (v) => Number.isInteger(v) && v >= 0,
+    valueError: "Must be a non-negative integer.",
+    typeErrorSuffix: "string or array",
+  },
+  pattern: {
+    allowedTypes: ["string"],
+    valueCheck: (v) => v instanceof RegExp,
+    valueError: "Must be a RegExp.",
+    typeErrorSuffix: "string",
+  },
+  itemType: {
+    allowedTypes: ["array"],
+    // valueCheck handled separately (uses formatWithSuggestion for better error message)
+    typeErrorSuffix: "array",
+  },
+  enum: {
+    allowedTypes: ["string", "number"],
+    // valueCheck handled separately (uses validateEnumArray)
+    typeErrorSuffix: "string or number",
+  },
+  itemEnum: {
+    allowedTypes: ["array"],
+    // valueCheck handled separately (uses validateEnumArray)
+    typeErrorSuffix: "array",
+  },
+  properties: {
+    allowedTypes: ["object"],
+    // valueCheck handled separately (recursive schema validation)
+    typeErrorSuffix: "object",
+  },
+  instanceOf: {
+    allowedTypes: ["object"],
+    // valueCheck handled separately (function or "model:*" string)
+    typeErrorSuffix: "object",
+  },
+});
+
+/**
+ * Validates a schema property against its rule.
+ *
+ * @param {Object} argDef - The argument definition.
+ * @param {string} argName - The argument name.
+ * @param {string} prop - The property name.
+ * @param {Object} [options] - Optional configuration.
+ * @param {string} [options.entityName] - The entity name for error messages.
+ * @param {string} [options.entityType="Block"] - The entity type for error messages.
+ */
+export function validateSchemaProperty(argDef, argName, prop, options = {}) {
+  const { entityName, entityType = "Block" } = options;
+
+  const rule = SCHEMA_PROPERTY_RULES[prop];
+  if (!rule || argDef[prop] === undefined) {
+    return;
+  }
+
+  // Check type restriction
+  if (!rule.allowedTypes.includes(argDef.type)) {
+    raiseBlockError(
+      `${entityType} "${entityName}": arg "${argName}" has "${prop}" but type is "${argDef.type}". ` +
+        `"${prop}" is only valid for ${rule.typeErrorSuffix} type.`
+    );
+  }
+
+  // Check value validity (if valueCheck is defined)
+  if (rule.valueCheck && !rule.valueCheck(argDef[prop])) {
+    raiseBlockError(
+      `${entityType} "${entityName}": arg "${argName}" has invalid "${prop}" value. ${rule.valueError}`
+    );
+  }
+}
+
+/**
+ * Validates that at most one of the specified schema properties is defined (mutually exclusive).
+ *
+ * @param {Object} argDef - The argument definition.
+ * @param {string} argName - The argument name for error messages.
+ * @param {string[]} properties - Array of property names that are mutually exclusive.
+ * @param {Object} [options] - Optional configuration.
+ * @param {string} [options.entityName] - The entity name for error messages.
+ * @param {string} [options.entityType="Block"] - The entity type (e.g., "Block", "Condition").
+ * @param {string} [options.argLabel="arg"] - Label for the argument (e.g., "arg", "childArgs arg").
+ * @param {string} [options.reason] - Custom reason message.
+ */
+export function validateMutuallyExclusive(
+  argDef,
+  argName,
+  properties,
+  options = {}
+) {
+  const {
+    entityName,
+    entityType = "Block",
+    argLabel = "arg",
+    reason = "These are mutually exclusive - use only one.",
+  } = options;
+
+  const definedProps = properties.filter((prop) => argDef[prop] !== undefined);
+
+  if (definedProps.length > 1) {
+    // Format the list of conflicting properties
+    const propList =
+      definedProps.length === 2
+        ? `"${definedProps[0]}" and "${definedProps[1]}"`
+        : definedProps.map((p) => `"${p}"`).join(", ");
+
+    raiseBlockError(
+      `${entityType} "${entityName}": ${argLabel} "${argName}" has ${propList}. ${reason}`
+    );
+  }
+}
+
+/**
+ * Validates a min/max range pair in the schema.
+ *
+ * @param {Object} argDef - The argument definition.
+ * @param {string} argName - The argument name.
+ * @param {string} minProp - The min property name.
+ * @param {string} maxProp - The max property name.
+ * @param {Object} [options] - Optional configuration.
+ * @param {string} [options.entityName] - The entity name for error messages.
+ * @param {string} [options.entityType="Block"] - The entity type for error messages.
+ */
+export function validateRangePair(
+  argDef,
+  argName,
+  minProp,
+  maxProp,
+  options = {}
+) {
+  const { entityName, entityType = "Block" } = options;
+
+  if (
+    argDef[minProp] !== undefined &&
+    argDef[maxProp] !== undefined &&
+    argDef[minProp] > argDef[maxProp]
+  ) {
+    raiseBlockError(
+      `${entityType} "${entityName}": arg "${argName}" has ${minProp} (${argDef[minProp]}) greater than ${maxProp} (${argDef[maxProp]}).`
+    );
+  }
+}
+
+/**
+ * Validates an enum-like array property (enum or itemEnum).
+ * Checks that the value is a non-empty array and all items match the expected type.
+ *
+ * @param {Object} options - Validation options.
+ * @param {*} options.enumValue - The enum array value to validate.
+ * @param {string} options.propName - Property name ("enum" or "itemEnum").
+ * @param {string|undefined} options.expectedType - Expected type for values, or undefined to skip type check.
+ * @param {string} options.argName - The argument name for error messages.
+ * @param {string} options.entityName - The entity name for error messages.
+ * @param {string} options.entityType - The entity type.
+ */
+function validateEnumArray({
+  enumValue,
+  propName,
+  expectedType,
+  argName,
+  entityName,
+  entityType,
+}) {
+  if (!Array.isArray(enumValue) || enumValue.length === 0) {
+    raiseBlockError(
+      `${entityType} "${entityName}": arg "${argName}" has invalid "${propName}" value. Must be an array with at least one element.`
+    );
+    return;
+  }
+
+  if (expectedType !== undefined) {
+    for (const value of enumValue) {
+      if (typeof value !== expectedType) {
+        raiseBlockError(
+          `${entityType} "${entityName}": arg "${argName}" ${propName} contains invalid value "${value}". All values must be ${expectedType}s.`
+        );
+      }
+    }
+  }
+}
+
+/**
+ * Validates the common schema properties that are shared between blocks and conditions.
+ * This includes itemType, schema property rules, range pairs, enum, itemEnum, and required.
+ *
+ * Does NOT validate:
+ * - "type is required" - blocks require it, conditions allow empty schemas for "any type"
+ * - "default" validation - blocks validate default values, conditions reject the property entirely
+ * - "required + default contradiction" - only relevant for blocks
+ *
+ * @param {Object} argDef - The argument definition.
+ * @param {string} argName - The argument name.
+ * @param {Object} [options] - Optional configuration.
+ * @param {string} [options.entityName] - The entity name for error messages.
+ * @param {string} [options.entityType="Block"] - The entity type for error messages.
+ */
+export function validateCommonSchemaProperties(argDef, argName, options = {}) {
+  const { entityName, entityType = "Block" } = options;
+  const context = { entityName, entityType };
+
+  // Validate schema properties using declarative rules (type restrictions + value checks)
+  for (const prop of Object.keys(SCHEMA_PROPERTY_RULES)) {
+    validateSchemaProperty(argDef, argName, prop, context);
+  }
+
+  // Validate range pairs
+  validateRangePair(argDef, argName, "min", "max", context);
+  validateRangePair(argDef, argName, "minLength", "maxLength", context);
+
+  // Validate itemType value (uses formatWithSuggestion for better error messages)
+  if (argDef.type === "array" && argDef.itemType !== undefined) {
+    if (!VALID_ITEM_TYPES.includes(argDef.itemType)) {
+      const suggestion = formatWithSuggestion(
+        argDef.itemType,
+        VALID_ITEM_TYPES
+      );
+      raiseBlockError(
+        `${entityType} "${entityName}": arg "${argName}" has invalid itemType ${suggestion}. ` +
+          `Valid item types are: ${VALID_ITEM_TYPES.join(", ")}.`
+      );
+    }
+  }
+
+  // Validate enum array contents
+  if (argDef.enum !== undefined) {
+    const expectedType = argDef.type === "string" ? "string" : "number";
+    validateEnumArray({
+      enumValue: argDef.enum,
+      propName: "enum",
+      expectedType,
+      argName,
+      entityName,
+      entityType,
+    });
+  }
+
+  // Validate itemEnum array contents
+  if (argDef.itemEnum !== undefined) {
+    validateEnumArray({
+      enumValue: argDef.itemEnum,
+      propName: "itemEnum",
+      expectedType: argDef.itemType, // undefined skips type check
+      argName,
+      entityName,
+      entityType,
+    });
+  }
+
+  // Validate properties schema for object types
+  if (argDef.type === "object" && argDef.properties !== undefined) {
+    if (
+      !argDef.properties ||
+      typeof argDef.properties !== "object" ||
+      Array.isArray(argDef.properties)
+    ) {
+      raiseBlockError(
+        `${entityType} "${entityName}": arg "${argName}" has invalid "properties" value. Must be an object.`
+      );
+    } else {
+      // Recursively validate each property schema
+      for (const [propName, propDef] of Object.entries(argDef.properties)) {
+        validateArgName(propName, {
+          ...context,
+          argLabel: `arg "${argName}" property`,
+        });
+
+        // Validate the property definition recursively
+        const nestedArgName = `${argName}.properties.${propName}`;
+        validateArgSchemaEntry(propDef, nestedArgName, {
+          ...context,
+          validProperties: VALID_ARG_SCHEMA_PROPERTIES,
+          allowAnyType: false,
+          argLabel: "property",
+        });
+      }
+    }
+  }
+
+  // Validate instanceOf for object types
+  if (argDef.type === "object" && argDef.instanceOf !== undefined) {
+    // Check mutual exclusivity with properties
+    validateMutuallyExclusive(
+      argDef,
+      argName,
+      ["instanceOf", "properties"],
+      context
+    );
+
+    // Validate instanceOf value: must be a function (constructor) or "model:*" string
+    const isFunction = typeof argDef.instanceOf === "function";
+    const isModelString =
+      typeof argDef.instanceOf === "string" &&
+      argDef.instanceOf.startsWith("model:");
+
+    if (!isFunction && !isModelString) {
+      raiseBlockError(
+        `${entityType} "${entityName}": arg "${argName}" has invalid "instanceOf" value. ` +
+          `Must be a class constructor or a "model:*" string (e.g., "model:user").`
+      );
+    }
+  }
+
+  // Validate instanceOfName for object types (only valid when instanceOf is a class reference)
+  if (argDef.instanceOfName !== undefined) {
+    if (argDef.instanceOf === undefined) {
+      raiseBlockError(
+        `${entityType} "${entityName}": arg "${argName}" has "instanceOfName" but no "instanceOf". ` +
+          `"instanceOfName" is only valid when "instanceOf" is also specified.`
+      );
+    }
+    if (typeof argDef.instanceOf === "string") {
+      raiseBlockError(
+        `${entityType} "${entityName}": arg "${argName}" has "instanceOfName" with a "model:*" instanceOf. ` +
+          `"instanceOfName" is only valid for class references, not model strings.`
+      );
+    }
+    if (typeof argDef.instanceOfName !== "string") {
+      raiseBlockError(
+        `${entityType} "${entityName}": arg "${argName}" has invalid "instanceOfName" value. ` +
+          `Must be a string.`
+      );
+    }
+  }
+
+  // Validate required is boolean
+  if (argDef.required !== undefined && typeof argDef.required !== "boolean") {
+    raiseBlockError(
+      `${entityType} "${entityName}": arg "${argName}" has invalid "required" value. Must be a boolean.`
+    );
+  }
+}
+
+/* Arg Schema Entry Validation Helpers */
+
+/**
+ * Validates an argument name format.
+ *
+ * @param {string} argName - The argument name to validate.
+ * @param {Object} [options] - Optional configuration.
+ * @param {string} [options.entityName] - The entity name for error messages.
+ * @param {string} [options.entityType="Block"] - The entity type for error messages.
+ * @param {string} [options.argLabel="arg"] - Label for error messages (e.g., "childArgs arg").
+ * @returns {boolean} True if valid, false if invalid (and error raised).
+ */
+export function validateArgName(argName, options = {}) {
+  const { entityName, entityType = "Block", argLabel = "arg" } = options;
+
+  if (!VALID_ARG_NAME_PATTERN.test(argName)) {
+    raiseBlockError(
+      `${entityType} "${entityName}": ${argLabel} name "${argName}" is invalid. ` +
+        `Arg names must start with a letter and contain only letters, numbers, and underscores.`
+    );
+    return false;
+  }
+
+  // Check for reserved names (entry-level properties and underscore-prefixed names)
+  if (isReservedArgName(argName)) {
+    raiseBlockError(
+      `${entityType} "${entityName}": ${argLabel} name "${argName}" is reserved. ` +
+        `Reserved names are used as entry-level properties (id, children, conditions, etc.) or for internal use.`
+    );
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Validates a single arg schema entry (argDef).
+ * Shared logic between block args, childArgs, and condition args validation.
+ *
+ * @param {Object} argDef - The argument definition.
+ * @param {string} argName - The argument name.
+ * @param {Object} options - Configuration options.
+ * @param {string} [options.entityName] - The entity name for error messages.
+ * @param {string} [options.entityType="Block"] - The entity type for error messages.
+ * @param {readonly string[]} options.validProperties - List of valid schema properties.
+ * @param {Object<string, string>} [options.disallowedProperties={}] - Map of property names to their
+ *   specific error messages. Properties in this map trigger a "disallowed" error instead of "unknown".
+ * @param {boolean} [options.allowAnyType=false] - If true, allow type: "any" (for conditions only).
+ * @param {string} [options.argLabel="arg"] - Label for error messages (e.g., "childArgs arg").
+ * @returns {boolean} True if validation should continue with caller-specific logic, false if
+ *   validation should stop (e.g., missing type, type: "any" with allowAnyType).
+ */
+export function validateArgSchemaEntry(argDef, argName, options) {
+  const {
+    entityName,
+    entityType = "Block",
+    validProperties,
+    disallowedProperties = {},
+    allowAnyType = false,
+    argLabel = "arg",
+  } = options;
+
+  // Check argDef is object
+  if (!argDef || typeof argDef !== "object") {
+    raiseBlockError(
+      `${entityType} "${entityName}": ${argLabel} "${argName}" must be an object with a "type" property.`
+    );
+    return false;
+  }
+
+  // Check for unknown/disallowed properties
+  const disallowedPropNames = Object.keys(disallowedProperties);
+  const unknownProps = Object.keys(argDef).filter(
+    (prop) => !validProperties.includes(prop)
+  );
+  if (unknownProps.length > 0) {
+    const disallowed = unknownProps.filter((p) =>
+      disallowedPropNames.includes(p)
+    );
+    if (disallowed.length > 0) {
+      const prop = disallowed[0];
+      raiseBlockError(
+        `${entityType} "${entityName}": ${argLabel} "${argName}" has disallowed property "${prop}". ` +
+          disallowedProperties[prop]
+      );
+    } else {
+      const suggestions = unknownProps.map((prop) =>
+        formatWithSuggestion(prop, validProperties)
+      );
+      raiseBlockError(
+        `${entityType} "${entityName}": ${argLabel} "${argName}" has unknown properties: ${suggestions.join(", ")}. ` +
+          `Valid properties are: ${validProperties.join(", ")}.`
+      );
+    }
+  }
+
+  // Type is required
+  if (!argDef.type) {
+    raiseBlockError(
+      `${entityType} "${entityName}": ${argLabel} "${argName}" is missing required "type" property.`
+    );
+    return false;
+  }
+
+  // Build valid types list based on whether "any" is allowed
+  const validTypes = allowAnyType
+    ? VALID_ARG_TYPES
+    : VALID_ARG_TYPES.filter((t) => t !== "any");
+
+  // Validate type
+  if (!validTypes.includes(argDef.type)) {
+    const suggestion = formatWithSuggestion(argDef.type, validTypes);
+    raiseBlockError(
+      `${entityType} "${entityName}": ${argLabel} "${argName}" has invalid type ${suggestion}. ` +
+        `Valid types are: ${validTypes.join(", ")}.`
+    );
+  }
+
+  // "any" type skips further validation (enum, itemType checks don't apply)
+  if (argDef.type === "any") {
+    return false;
+  }
+
+  // Validate common schema properties
+  validateCommonSchemaProperties(argDef, argName, { entityName, entityType });
+
+  return true;
+}
+
+/* Formatting Helpers */
+
+/**
+ * Creates a validation error with a formatted message and path.
+ * Used to generate consistent error objects that vary based on context:
+ * - Schema validation (at decoration time): includes entity context
+ * - Runtime validation (in renderBlocks): no context prefix
+ *
+ * @param {string} argName - The argument name (used as the path).
+ * @param {string} message - The error message (without arg prefix).
+ * @param {Object} [options] - Optional configuration.
+ * @param {string|null} [options.contextName] - Optional entity name for context (e.g., block name).
+ * @param {string} [options.contextType] - The entity type for the prefix (e.g., "Block", "Condition").
+ * @returns {ValidationError} The validation error object with message and path.
+ */
+function argValidationError(argName, message, options = {}) {
+  const { contextName, contextType } = options;
+  const formattedMessage = contextName
+    ? `${contextType} "${contextName}": arg "${argName}" ${message}`
+    : `Arg "${argName}" ${message}`;
+  return { message: formattedMessage, path: argName };
+}
+
+/**
+ * Validates a single argument value against its schema definition.
+ *
+ * @param {*} value - The argument value.
+ * @param {Object} argSchema - The schema definition for this arg.
+ * @param {string} argName - The argument name for error messages.
+ * @param {Object} [options] - Optional configuration.
+ * @param {string|null} [options.contextName] - Optional entity name for context.
+ * @param {string} [options.contextType] - The entity type for error prefix (e.g., "Block", "Condition").
+ * @param {Object} [options.owner] - Ember owner for registry lookups (used for "model:*" instanceOf).
+ * @returns {ValidationError|null} Validation error if validation fails, null otherwise.
+ */
+export function validateArgValue(value, argSchema, argName, options = {}) {
+  const { owner } = options;
+
+  const {
+    type,
+    itemType,
+    itemEnum,
+    pattern,
+    minLength,
+    maxLength,
+    min,
+    max,
+    integer,
+    enum: enumValues,
+    instanceOf,
+  } = argSchema;
+
+  // Skip validation if value is undefined (handled by required check)
+  if (value === undefined) {
+    return null;
+  }
+
+  switch (type) {
+    case "string":
+      if (typeof value !== "string") {
+        return argValidationError(
+          argName,
+          `must be a string, got ${typeof value}.`,
+          options
+        );
+      }
+      if (pattern && !pattern.test(value)) {
+        return argValidationError(
+          argName,
+          `value "${value}" does not match required pattern ${pattern}.`,
+          options
+        );
+      }
+      if (minLength !== undefined && value.length < minLength) {
+        return argValidationError(
+          argName,
+          `must be at least ${minLength} characters, got ${value.length}.`,
+          options
+        );
+      }
+      if (maxLength !== undefined && value.length > maxLength) {
+        return argValidationError(
+          argName,
+          `must be at most ${maxLength} characters, got ${value.length}.`,
+          options
+        );
+      }
+      if (enumValues !== undefined && !enumValues.includes(value)) {
+        const suggestion = formatWithSuggestion(value, enumValues);
+        return argValidationError(
+          argName,
+          `must be one of: ${enumValues.map((v) => `"${v}"`).join(", ")}. Got ${suggestion}.`,
+          options
+        );
+      }
+      break;
+
+    case "number":
+      if (typeof value !== "number" || Number.isNaN(value)) {
+        return argValidationError(
+          argName,
+          `must be a number, got ${typeof value}.`,
+          options
+        );
+      }
+      if (integer && !Number.isInteger(value)) {
+        return argValidationError(
+          argName,
+          `must be an integer, got ${value}.`,
+          options
+        );
+      }
+      if (min !== undefined && value < min) {
+        return argValidationError(
+          argName,
+          `must be at least ${min}, got ${value}.`,
+          options
+        );
+      }
+      if (max !== undefined && value > max) {
+        return argValidationError(
+          argName,
+          `must be at most ${max}, got ${value}.`,
+          options
+        );
+      }
+      if (enumValues !== undefined && !enumValues.includes(value)) {
+        return argValidationError(
+          argName,
+          `must be one of: ${enumValues.join(", ")}. Got ${value}.`,
+          options
+        );
+      }
+      break;
+
+    case "boolean":
+      if (typeof value !== "boolean") {
+        return argValidationError(
+          argName,
+          `must be a boolean, got ${typeof value}.`,
+          options
+        );
+      }
+      break;
+
+    case "array":
+      if (!Array.isArray(value)) {
+        return argValidationError(
+          argName,
+          `must be an array, got ${typeof value}.`,
+          options
+        );
+      }
+      if (minLength !== undefined && value.length < minLength) {
+        return argValidationError(
+          argName,
+          `must have at least ${minLength} items, got ${value.length}.`,
+          options
+        );
+      }
+      if (maxLength !== undefined && value.length > maxLength) {
+        return argValidationError(
+          argName,
+          `must have at most ${maxLength} items, got ${value.length}.`,
+          options
+        );
+      }
+      if (itemType) {
+        for (let i = 0; i < value.length; i++) {
+          const item = value[i];
+          const itemError = validateArrayItemType(
+            item,
+            itemType,
+            argName,
+            i,
+            options
+          );
+          if (itemError) {
+            return itemError;
+          }
+        }
+      }
+      if (itemEnum !== undefined) {
+        for (let i = 0; i < value.length; i++) {
+          const item = value[i];
+          if (!itemEnum.includes(item)) {
+            const suggestion = formatWithSuggestion(
+              String(item),
+              itemEnum.map(String)
+            );
+            const indexedArgName = `${argName}[${i}]`;
+            return argValidationError(
+              indexedArgName,
+              `must be one of: ${itemEnum.map((v) => `"${v}"`).join(", ")}. Got ${suggestion}.`,
+              options
+            );
+          }
+        }
+      }
+      break;
+
+    case "object": {
+      // Check for plain object (not array, null, or other types)
+      // Note: For instanceOf validation, we allow non-plain objects (class instances)
+      if (!instanceOf) {
+        if (
+          value === null ||
+          typeof value !== "object" ||
+          Array.isArray(value)
+        ) {
+          let actualType;
+          if (value === null) {
+            actualType = "null";
+          } else if (Array.isArray(value)) {
+            actualType = "array";
+          } else {
+            actualType = typeof value;
+          }
+          return argValidationError(
+            argName,
+            `must be an object, got ${actualType}.`,
+            options
+          );
+        }
+      }
+
+      // Validate instanceOf if specified
+      if (instanceOf) {
+        if (typeof instanceOf === "function") {
+          // Direct class reference
+          if (!(value instanceof instanceOf)) {
+            // Use instanceOfName if provided, otherwise fall back to generic message.
+            // The generic fallback handles two edge cases:
+            // 1. ES6 "named evaluation" - bundlers may inline anonymous classes into object literals,
+            //    causing the class to inherit the property key name "instanceOf" instead of its
+            //    original name (per ECMAScript SetFunctionName semantics).
+            // 2. Minification - production builds mangle class names to short identifiers like "ge".
+            // See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/name
+            const expectedName = argSchema.instanceOfName;
+            return argValidationError(
+              argName,
+              expectedName
+                ? `must be an instance of ${expectedName}.`
+                : "must match the required class type.",
+              options
+            );
+          }
+        } else if (typeof instanceOf === "string") {
+          // Model string format: "model:user"
+          const modelType = instanceOf.replace(/^model:/, "");
+
+          // Try to look up the model class via registry
+          const klass = owner?.factoryFor?.(`model:${modelType}`)?.class;
+          if (klass && klass !== RestModel) {
+            // Specific model class exists, use instanceof
+            if (!(value instanceof klass)) {
+              return argValidationError(
+                argName,
+                `must be an instance of ${modelType} model.`,
+                options
+              );
+            }
+          } else {
+            // No specific class or RestModel fallback, check RestModel + __type
+            if (
+              !(value instanceof RestModel) ||
+              value["__type"] !== modelType
+            ) {
+              return argValidationError(
+                argName,
+                `must be an instance of ${modelType} model.`,
+                options
+              );
+            }
+          }
+        }
+      }
+
+      // Validate properties if schema is defined
+      if (argSchema.properties) {
+        for (const [propName, propDef] of Object.entries(
+          argSchema.properties
+        )) {
+          const propValue = value[propName];
+
+          // Check required properties
+          if (propDef.required && propValue === undefined) {
+            const propPath = `${argName}.${propName}`;
+            return argValidationError(propPath, `is required.`, options);
+          }
+
+          // Recursively validate property value
+          if (propValue !== undefined) {
+            const propError = validateArgValue(
+              propValue,
+              propDef,
+              `${argName}.${propName}`,
+              options
+            );
+            if (propError) {
+              return propError;
+            }
+          }
+        }
+      }
+      break;
+    }
+
+    case "any":
+      // Any value is valid, no type checking needed
+      break;
+  }
+
+  return null;
+}
+
+/**
+ * Validates an array item against the specified item type.
+ *
+ * @param {*} item - The array item.
+ * @param {string} itemType - The expected type ("string", "number", "boolean").
+ * @param {string} argName - The argument name for error messages.
+ * @param {number} index - The array index for error messages.
+ * @param {Object} [options] - Optional configuration.
+ * @param {string|null} [options.contextName] - Optional entity name for context.
+ * @param {string} [options.contextType] - The entity type for error prefix (e.g., "Block", "Condition").
+ * @returns {ValidationError|null} Validation error if validation fails, null otherwise.
+ */
+export function validateArrayItemType(
+  item,
+  itemType,
+  argName,
+  index,
+  options = {}
+) {
+  const indexedArgName = `${argName}[${index}]`;
+
+  switch (itemType) {
+    case "string":
+      if (typeof item !== "string") {
+        return argValidationError(
+          indexedArgName,
+          `must be a string, got ${typeof item}.`,
+          options
+        );
+      }
+      break;
+
+    case "number":
+      if (typeof item !== "number" || Number.isNaN(item)) {
+        return argValidationError(
+          indexedArgName,
+          `must be a number, got ${typeof item}.`,
+          options
+        );
+      }
+      break;
+
+    case "boolean":
+      if (typeof item !== "boolean") {
+        return argValidationError(
+          indexedArgName,
+          `must be a boolean, got ${typeof item}.`,
+          options
+        );
+      }
+      break;
+  }
+
+  return null;
+}
+
+/**
+ * Validates provided arguments against a schema.
+ * This is the core validation logic used by both block args and container args validation.
+ *
+ * Validation order:
+ * 1. Check for unknown args (catches typos before missing required)
+ * 2. Check required args
+ * 3. Validate type if value is provided
+ *
+ * The unknown args check is done FIRST so that typos like "nam" produce
+ * "unknown arg 'nam' (did you mean 'name'?)" instead of "missing required arg 'name'".
+ *
+ * @param {Object} providedArgs - The arguments to validate.
+ * @param {Object} schema - The schema to validate against.
+ * @param {string} pathPrefix - Prefix for error paths (e.g., "args" or "containerArgs").
+ * @param {Object} [options={}] - Optional configuration.
+ * @param {Object} [options.owner] - Ember owner for registry lookups (used for "model:*" instanceOf).
+ * @throws {BlockError} If validation fails.
+ */
+export function validateArgsAgainstSchema(
+  providedArgs,
+  schema,
+  pathPrefix,
+  options = {}
+) {
+  // 1. Check for unknown args FIRST (catches typos before missing required)
+  const declaredArgs = Object.keys(schema);
+  for (const argName of Object.keys(providedArgs)) {
+    if (!Object.hasOwn(schema, argName)) {
+      const suggestion = formatWithSuggestion(argName, declaredArgs);
+      throw new BlockError(
+        `unknown ${pathPrefix} ${suggestion}. Declared args are: ${declaredArgs.join(", ") || "none"}.`,
+        { path: `${pathPrefix}.${argName}` }
+      );
+    }
+  }
+
+  for (const [argName, argDef] of Object.entries(schema)) {
+    const value = providedArgs[argName];
+
+    // 2. Check required args
+    if (argDef.required && value === undefined) {
+      throw new BlockError(`missing required ${pathPrefix}.${argName}.`, {
+        path: `${pathPrefix}.${argName}`,
+      });
+    }
+
+    // 3. Validate type if value is provided
+    if (value !== undefined) {
+      const typeError = validateArgValue(value, argDef, argName, options);
+      if (typeError) {
+        throw new BlockError(typeError.message, {
+          path: `${pathPrefix}.${typeError.path}`,
+        });
+      }
+    }
+  }
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/validation/block-args.js b/frontend/discourse/app/lib/blocks/-internals/validation/block-args.js
new file mode 100644
index 0000000000000..19f0ee3fb2c28
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/validation/block-args.js
@@ -0,0 +1,195 @@
+// @ts-check
+/**
+ * Block-specific arg validation.
+ *
+ * This module adapts the shared arg validation utilities from args.js
+ * for use with blocks. Key differences from condition arg validation:
+ * - Supports "default" values (conditions don't use defaults)
+ * - Validates "required + default" contradiction
+ * - Supports childArgs with "unique" property
+ *
+ * @module discourse/lib/blocks/-internals/validation/block-args
+ */
+
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import {
+  BlockError,
+  raiseBlockError,
+} from "discourse/lib/blocks/-internals/error";
+import {
+  VALID_ARG_SCHEMA_PROPERTIES,
+  validateArgName,
+  validateArgsAgainstSchema,
+  validateArgSchemaEntry,
+  validateArgValue,
+} from "discourse/lib/blocks/-internals/validation/args";
+
+/**
+ * Valid properties for childArgs schema definitions.
+ * Includes all standard arg properties plus "unique" for sibling uniqueness validation.
+ */
+export const VALID_CHILD_ARG_SCHEMA_PROPERTIES = Object.freeze([
+  ...VALID_ARG_SCHEMA_PROPERTIES,
+  "unique",
+]);
+
+/**
+ * Validates block-specific default value rules:
+ * - "required + default" is contradictory (an arg with a default is never missing)
+ * - Default value must match the arg's type schema
+ *
+ * @param {Object} argDef - The argument definition.
+ * @param {string} argName - The argument name.
+ * @param {string} blockName - Block name for error messages.
+ * @param {string} [argLabel="arg"] - Label for error messages (e.g., "childArgs arg").
+ */
+function validateBlockDefaultValue(
+  argDef,
+  argName,
+  blockName,
+  argLabel = "arg"
+) {
+  // Check for required + default contradiction (value-based, not presence-based)
+  // An arg with required: false + default is valid, so we check required === true
+  if (argDef.required === true && argDef.default !== undefined) {
+    raiseBlockError(
+      `Block "${blockName}": ${argLabel} "${argName}" has both "required: true" and "default". ` +
+        `These options are contradictory - an arg with a default value is never missing.`
+    );
+  }
+
+  if (argDef.default !== undefined) {
+    const defaultError = validateArgValue(argDef.default, argDef, argName, {
+      contextName: blockName,
+      contextType: "Block",
+    });
+    if (defaultError) {
+      raiseBlockError(
+        `Block "${blockName}": ${argLabel} "${argName}" has invalid default value. ${defaultError.message}`
+      );
+    }
+  }
+}
+
+/**
+ * Validates the arg schema definition passed to the @block decorator.
+ * Enforces strict schema format - unknown properties are not allowed.
+ *
+ * @param {Object} argsSchema - The args schema object from decorator options.
+ * @param {string} blockName - Block name for error messages.
+ * @throws {Error} If schema is invalid.
+ */
+export function validateArgsSchema(argsSchema, blockName) {
+  if (!argsSchema || typeof argsSchema !== "object") {
+    return;
+  }
+
+  for (const [argName, argDef] of Object.entries(argsSchema)) {
+    if (
+      !validateArgName(argName, { entityName: blockName, entityType: "Block" })
+    ) {
+      continue;
+    }
+
+    const shouldContinue = validateArgSchemaEntry(argDef, argName, {
+      entityName: blockName,
+      entityType: "Block",
+      validProperties: VALID_ARG_SCHEMA_PROPERTIES,
+    });
+
+    if (!shouldContinue) {
+      continue;
+    }
+
+    validateBlockDefaultValue(argDef, argName, blockName);
+  }
+}
+
+/**
+ * Validates block arguments against the block's metadata arg schema.
+ * Checks for required args and validates types.
+ *
+ * @param {Object} entry - The block entry.
+ * @param {Object} blockClass - The resolved block class (must be a class, not a string reference).
+ * @param {Object} [options={}] - Optional configuration.
+ * @param {Object} [options.owner] - Ember owner for registry lookups (used for "model:*" instanceOf).
+ * @throws {BlockError} If args are invalid.
+ */
+export function validateBlockArgs(entry, blockClass, options = {}) {
+  const metadata = getBlockMetadata(blockClass);
+  const providedArgs = entry.args || {};
+  const hasProvidedArgs = Object.keys(providedArgs).length > 0;
+  const argsSchema = metadata?.args;
+
+  // If args are provided but no schema exists, reject them
+  if (hasProvidedArgs && !argsSchema) {
+    const argNames = Object.keys(providedArgs).join(", ");
+    throw new BlockError(
+      `args were provided (${argNames}) but this block does not declare an args schema. ` +
+        `Add an args schema to the @block decorator or remove the args.`,
+      { path: "args" }
+    );
+  }
+
+  // No schema and no args - nothing to validate
+  if (!argsSchema) {
+    return;
+  }
+
+  validateArgsAgainstSchema(providedArgs, argsSchema, "args", options);
+}
+
+/**
+ * Validates the childArgs schema definition passed to the @block decorator.
+ * Similar to validateArgsSchema but supports the additional "unique" property
+ * for enforcing uniqueness across sibling children.
+ *
+ * @param {Object} childArgsSchema - The childArgs schema object from decorator options.
+ * @param {string} blockName - Block name for error messages.
+ * @throws {Error} If schema is invalid.
+ */
+export function validateChildArgsSchema(childArgsSchema, blockName) {
+  if (!childArgsSchema || typeof childArgsSchema !== "object") {
+    return;
+  }
+
+  for (const [argName, argDef] of Object.entries(childArgsSchema)) {
+    if (
+      !validateArgName(argName, {
+        entityName: blockName,
+        entityType: "Block",
+        argLabel: "childArgs arg",
+      })
+    ) {
+      continue;
+    }
+
+    const shouldContinue = validateArgSchemaEntry(argDef, argName, {
+      entityName: blockName,
+      entityType: "Block",
+      validProperties: VALID_CHILD_ARG_SCHEMA_PROPERTIES,
+      argLabel: "childArgs arg",
+    });
+
+    if (!shouldContinue) {
+      continue;
+    }
+
+    // childArgs-specific: validate "unique" is a boolean if provided
+    if (argDef.unique !== undefined && typeof argDef.unique !== "boolean") {
+      raiseBlockError(
+        `Block "${blockName}": childArgs arg "${argName}" has invalid "unique" value. Must be a boolean.`
+      );
+    }
+
+    // childArgs-specific: validate "unique" is only used with primitive types
+    if (argDef.unique === true && argDef.type === "array") {
+      raiseBlockError(
+        `Block "${blockName}": childArgs arg "${argName}" has "unique: true" but type is "array". ` +
+          `Uniqueness validation is only supported for primitive types (string, number, boolean).`
+      );
+    }
+
+    validateBlockDefaultValue(argDef, argName, blockName, "childArgs arg");
+  }
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/validation/block-decorator.js b/frontend/discourse/app/lib/blocks/-internals/validation/block-decorator.js
new file mode 100644
index 0000000000000..a9c33a5f8a52e
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/validation/block-decorator.js
@@ -0,0 +1,119 @@
+/**
+ * Block Decorator Validation
+ *
+ * This module contains validation functions used by the @block decorator.
+ * These validations run at decoration time (not render time) for fail-fast behavior.
+ */
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import {
+  detectPatternConflicts,
+  validateOutletPatterns,
+  warnUnknownOutletPatterns,
+} from "discourse/lib/blocks/-internals/matching/outlet-matcher";
+import {
+  parseBlockName,
+  VALID_NAMESPACED_BLOCK_PATTERN,
+} from "discourse/lib/blocks/-internals/patterns";
+import { formatWithSuggestion } from "discourse/lib/string-similarity";
+
+/**
+ * Valid keys for the @block decorator options (block schema).
+ *
+ * @constant {ReadonlyArray<string>}
+ */
+export const VALID_BLOCK_OPTIONS = Object.freeze([
+  "container",
+  "classNames",
+  "description",
+  "args",
+  "childArgs",
+  "constraints",
+  "validate",
+  "allowedOutlets",
+  "deniedOutlets",
+]);
+
+/**
+ * Validates the options object passed to the @block decorator.
+ * Checks for unknown keys and provides suggestions for typos.
+ *
+ * @param {string} name - The block name (for error messages).
+ * @param {Object} options - The options object to validate.
+ */
+export function validateBlockOptions(name, options) {
+  if (options && typeof options === "object") {
+    const unknownKeys = Object.keys(options).filter(
+      (key) => !VALID_BLOCK_OPTIONS.includes(key)
+    );
+    if (unknownKeys.length > 0) {
+      const suggestions = unknownKeys
+        .map((key) => formatWithSuggestion(key, VALID_BLOCK_OPTIONS))
+        .join(", ");
+      raiseBlockError(
+        `@block("${name}"): unknown option(s): ${suggestions}. ` +
+          `Valid options are: ${VALID_BLOCK_OPTIONS.join(", ")}.`
+      );
+    }
+  }
+}
+
+/**
+ * Validates and parses the block name.
+ * Ensures the name follows the required format for core, plugin, or theme blocks.
+ *
+ * @param {string} name - The block name to validate.
+ * @returns {import("discourse/lib/blocks/-internals/patterns").ParsedBlockName} Parsed name components.
+ */
+export function validateAndParseBlockName(name) {
+  if (!VALID_NAMESPACED_BLOCK_PATTERN.test(name)) {
+    raiseBlockError(
+      `Block name "${name}" is invalid. ` +
+        `Valid formats: "block-name" (core), "plugin:block-name" (plugin), ` +
+        `"theme:namespace:block-name" (theme).`
+    );
+  }
+
+  const parsed = parseBlockName(name);
+  if (!parsed) {
+    // This shouldn't happen if VALID_NAMESPACED_BLOCK_PATTERN passed, but be defensive
+    raiseBlockError(`Block name "${name}" could not be parsed.`);
+  }
+
+  return parsed;
+}
+
+/**
+ * Validates outlet restriction patterns (allowedOutlets and deniedOutlets).
+ * Checks for valid picomatch syntax and detects conflicts between patterns.
+ *
+ * @param {string} name - The block name (for error messages).
+ * @param {string[]|null} allowedOutlets - Allowed outlet patterns.
+ * @param {string[]|null} deniedOutlets - Denied outlet patterns.
+ */
+export function validateOutletRestrictions(
+  name,
+  allowedOutlets,
+  deniedOutlets
+) {
+  // Validate outlet patterns are valid picomatch syntax (arrays of strings)
+  validateOutletPatterns(allowedOutlets, name, "allowedOutlets");
+  validateOutletPatterns(deniedOutlets, name, "deniedOutlets");
+
+  // Detect conflicts between allowed and denied patterns.
+  // This prevents configurations where a block is both allowed AND denied
+  // in the same outlet, which would be confusing and likely a mistake.
+  const conflict = detectPatternConflicts(allowedOutlets, deniedOutlets);
+  if (conflict.conflict) {
+    raiseBlockError(
+      `Block "${name}": outlet "${conflict.details.outlet}" matches both ` +
+        `allowedOutlets pattern "${conflict.details.allowed}" and ` +
+        `deniedOutlets pattern "${conflict.details.denied}".`
+    );
+  }
+
+  // Warn if patterns don't match any known outlet (possible typos).
+  // This checks against both core outlets and custom outlets registered
+  // by plugins/themes.
+  warnUnknownOutletPatterns(allowedOutlets, name, "allowedOutlets");
+  warnUnknownOutletPatterns(deniedOutlets, name, "deniedOutlets");
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/validation/condition-args.js b/frontend/discourse/app/lib/blocks/-internals/validation/condition-args.js
new file mode 100644
index 0000000000000..f238eafe33fb2
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/validation/condition-args.js
@@ -0,0 +1,134 @@
+// @ts-check
+/**
+ * Condition-specific arg validation.
+ *
+ * This module adapts the shared arg validation utilities from args.js
+ * for use with block conditions. Key differences from block arg validation:
+ * - Error messages use "Condition" instead of "Block"
+ * - The "default" property is not allowed (conditions don't use defaults)
+ * - Type validation happens at registration time
+ *
+ * @module discourse/lib/blocks/-internals/validation/condition-args
+ */
+
+import { BlockError } from "discourse/lib/blocks/-internals/error";
+import {
+  VALID_ARG_SCHEMA_PROPERTIES,
+  validateArgName,
+  validateArgSchemaEntry,
+  validateArgValue,
+} from "discourse/lib/blocks/-internals/validation/args";
+
+/**
+ * Disallowed properties for condition arg schemas.
+ * Maps property names to their specific error messages.
+ * The "default" property is disallowed because conditions don't apply defaults -
+ * they check explicitly for undefined values to determine what was provided.
+ */
+const DISALLOWED_CONDITION_PROPERTIES = Object.freeze({
+  default: "Conditions do not support default values.",
+});
+
+/**
+ * Valid properties for condition arg schemas.
+ * Includes all standard arg properties except those in DISALLOWED_CONDITION_PROPERTIES.
+ */
+export const VALID_CONDITION_ARG_PROPERTIES = Object.freeze(
+  VALID_ARG_SCHEMA_PROPERTIES.filter(
+    (p) => !Object.hasOwn(DISALLOWED_CONDITION_PROPERTIES, p)
+  )
+);
+
+/**
+ * Validates the arg schema definition passed to the @blockCondition decorator.
+ * Enforces strict schema format - unknown properties are not allowed.
+ * Called at decoration time to catch schema errors early.
+ *
+ * @param {Object} argsSchema - The args schema object from decorator options.
+ * @param {string} conditionType - Condition type name for error messages.
+ * @throws {Error} If schema is invalid.
+ */
+export function validateConditionArgsSchema(argsSchema, conditionType) {
+  if (!argsSchema || typeof argsSchema !== "object") {
+    return;
+  }
+
+  for (const [argName, argDef] of Object.entries(argsSchema)) {
+    if (
+      !validateArgName(argName, {
+        entityName: conditionType,
+        entityType: "Condition",
+      })
+    ) {
+      continue;
+    }
+
+    // Conditions have no additional validation after the shared entry validation
+    validateArgSchemaEntry(argDef, argName, {
+      entityName: conditionType,
+      entityType: "Condition",
+      validProperties: VALID_CONDITION_ARG_PROPERTIES,
+      disallowedProperties: DISALLOWED_CONDITION_PROPERTIES,
+      allowAnyType: true,
+    });
+  }
+}
+
+/**
+ * Formats an error message for condition arg validation.
+ *
+ * @param {string} argName - The argument name.
+ * @param {string} message - The error message.
+ * @param {string} conditionType - The condition type name.
+ * @returns {string} Formatted error message.
+ */
+function formatConditionArgError(argName, message, conditionType) {
+  return `Condition "${conditionType}": arg "${argName}" ${message}`;
+}
+
+/**
+ * Validates provided arg values against the condition's schema.
+ * Called at block registration time to catch invalid values early.
+ *
+ * @param {Object} args - The arguments provided to the condition.
+ * @param {Object} argsSchema - The condition's args schema.
+ * @param {string} conditionType - The condition type for error messages.
+ * @param {string} path - The path to this condition in the block tree.
+ * @throws {BlockError} If validation fails.
+ */
+export function validateConditionArgValues(
+  args,
+  argsSchema,
+  conditionType,
+  path
+) {
+  for (const [argName, argDef] of Object.entries(argsSchema)) {
+    const value = args[argName];
+
+    // Check required args
+    if (argDef.required && value === undefined) {
+      throw new BlockError(
+        `Condition "${conditionType}": missing required arg "${argName}".`,
+        { path: path ? `${path}.${argName}` : argName }
+      );
+    }
+
+    // Skip validation for undefined values or "any" type
+    if (value === undefined || argDef.type === "any") {
+      continue;
+    }
+
+    // Validate type if value is provided
+    const typeError = validateArgValue(value, argDef, argName);
+    if (typeError) {
+      throw new BlockError(
+        formatConditionArgError(
+          typeError.path,
+          typeError.message.replace(/^Arg "[^"]+" /, ""),
+          conditionType
+        ),
+        { path: path ? `${path}.${typeError.path}` : typeError.path }
+      );
+    }
+  }
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/validation/conditions.js b/frontend/discourse/app/lib/blocks/-internals/validation/conditions.js
new file mode 100644
index 0000000000000..419843c079812
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/validation/conditions.js
@@ -0,0 +1,299 @@
+// @ts-check
+import { BlockError } from "discourse/lib/blocks/-internals/error";
+import { validateConditionArgValues } from "discourse/lib/blocks/-internals/validation/condition-args";
+import {
+  runCustomValidation,
+  validateConstraints,
+} from "discourse/lib/blocks/-internals/validation/constraints";
+import { formatWithSuggestion } from "discourse/lib/string-similarity";
+
+/**
+ * Regex for validating source path format: `@outletArgs.propertyName` or
+ * `@outletArgs.nested.path`.
+ */
+const OUTLET_ARGS_SOURCE_PATTERN = /^@outletArgs\.[\w.]+$/;
+
+/**
+ * Validates the `source` parameter based on the condition's `sourceType`.
+ *
+ * - `sourceType: "none"`: Returns error if `source` is provided
+ * - `sourceType: "outletArgs"`: Validates format is `@outletArgs.propertyPath`
+ * - `sourceType: "object"`: Validates `source` is an object if provided
+ *
+ * @param {"none"|"outletArgs"|"object"} sourceType - The condition's source type.
+ * @param {Object} args - The condition arguments from the layout entry.
+ * @returns {{ message: string, path?: string } | null} Error info or null if valid.
+ */
+export function validateConditionSource(sourceType, args) {
+  const { source } = args;
+
+  if (source === undefined) {
+    return null; // source is always optional
+  }
+
+  switch (sourceType) {
+    case "none":
+      return {
+        message: `\`source\` parameter is not supported for this condition type.`,
+        path: "source",
+      };
+
+    case "outletArgs":
+      if (typeof source !== "string") {
+        return {
+          message: `\`source\` must be a string in format "@outletArgs.propertyName".`,
+          path: "source",
+        };
+      }
+      if (!OUTLET_ARGS_SOURCE_PATTERN.test(source)) {
+        return {
+          message: `\`source\` must be in format "@outletArgs.propertyName", got "${source}".`,
+          path: "source",
+        };
+      }
+      break;
+
+    case "object":
+      if (source !== null && typeof source !== "object") {
+        return {
+          message: `\`source\` must be an object.`,
+          path: "source",
+        };
+      }
+      break;
+  }
+
+  return null;
+}
+
+/**
+ * Validates that all provided args are recognized by a condition.
+ * Suggests corrections for typos using fuzzy string matching.
+ *
+ * @param {import("discourse/blocks/conditions").BlockCondition} instance - The condition instance.
+ * @param {string} type - The condition type name.
+ * @param {Object} args - The args provided to the condition.
+ * @param {string} path - The path to this condition in the block tree.
+ * @throws {BlockError} If an unrecognized arg key is found.
+ */
+export function validateConditionArgKeys(instance, type, args, path) {
+  // validArgKeys already includes "source" when sourceType !== "none"
+  // (computed by the @blockCondition decorator)
+  // @ts-ignore - Static property defined on condition classes
+  const validKeys = instance.constructor.validArgKeys;
+
+  for (const key of Object.keys(args)) {
+    if (!validKeys.includes(key)) {
+      const suggestion = formatWithSuggestion(key, validKeys);
+      throw new BlockError(
+        `Condition type "${type}": unknown arg ${suggestion}. ` +
+          `Valid args: ${validKeys.join(", ")}`,
+        { path: path ? `${path}.${key}` : key }
+      );
+    }
+  }
+}
+
+/**
+ * Validates condition specs at block registration time.
+ * Recursively validates nested conditions in `any` and `not` combinators.
+ *
+ * Throws BlockError objects with a `path` property indicating where in the
+ * conditions the error occurred. Callers can use this path combined with
+ * their context path to build full error location.
+ *
+ * Note: Paths are constructed via simple string concatenation (e.g.,
+ * `${path}.${key}`, `${path}[${i}]`). Keys are not escaped, so special
+ * characters in user-provided keys may cause confusing path displays.
+ * This is acceptable since condition keys come from theme/plugin layouts
+ * where unusual characters are rare.
+ *
+ * @param {Object|Array<Object>} conditionSpec - Condition spec(s) to validate.
+ * @param {Map<string, import("discourse/blocks/conditions").BlockCondition>} conditionTypes - Map of registered condition types.
+ * @param {string} [path=""] - The path to this condition relative to conditions root
+ *   (e.g., "", "[0]", "any[1]", "params.categoryId").
+ * @throws {BlockError} If validation fails.
+ */
+export function validateConditions(conditionSpec, conditionTypes, path = "") {
+  if (!conditionSpec) {
+    return;
+  }
+
+  // Array of conditions (AND logic)
+  if (Array.isArray(conditionSpec)) {
+    for (let i = 0; i < conditionSpec.length; i++) {
+      validateConditions(conditionSpec[i], conditionTypes, `${path}[${i}]`);
+    }
+    return;
+  }
+
+  // OR combinator
+  if (conditionSpec.any !== undefined) {
+    validateAnyCombinator(conditionSpec, conditionTypes, path);
+    return;
+  }
+
+  // NOT combinator
+  if (conditionSpec.not !== undefined) {
+    validateNotCombinator(conditionSpec, conditionTypes, path);
+    return;
+  }
+
+  // Single condition with type
+  validateSingleCondition(conditionSpec, conditionTypes, path);
+}
+
+/**
+ * Validates an "any" (OR) combinator.
+ *
+ * @param {Object} conditionSpec - The condition spec containing "any".
+ * @param {Map<string, import("discourse/blocks/conditions").BlockCondition>} conditionTypes - Map of registered condition types.
+ * @param {string} path - The path to this condition in the block tree.
+ * @throws {BlockError} If validation fails.
+ */
+function validateAnyCombinator(conditionSpec, conditionTypes, path) {
+  // Validate no extra keys alongside "any"
+  const extraKeys = Object.keys(conditionSpec).filter((k) => k !== "any");
+  if (extraKeys.length > 0) {
+    throw new BlockError(
+      `"any" combinator has extra keys: ${extraKeys.join(", ")}. ` +
+        `Only "any" is allowed.`,
+      { path }
+    );
+  }
+
+  if (!Array.isArray(conditionSpec.any)) {
+    throw new BlockError('"any" must be an array of conditions', {
+      path: `${path}.any`,
+    });
+  }
+
+  for (let i = 0; i < conditionSpec.any.length; i++) {
+    validateConditions(
+      conditionSpec.any[i],
+      conditionTypes,
+      `${path}.any[${i}]`
+    );
+  }
+}
+
+/**
+ * Validates a "not" (NOT) combinator.
+ *
+ * @param {Object} conditionSpec - The condition spec containing "not".
+ * @param {Map<string, import("discourse/blocks/conditions").BlockCondition>} conditionTypes - Map of registered condition types.
+ * @param {string} path - The path to this condition in the block tree.
+ * @throws {BlockError} If validation fails.
+ */
+function validateNotCombinator(conditionSpec, conditionTypes, path) {
+  // Validate no extra keys alongside "not"
+  const extraKeys = Object.keys(conditionSpec).filter((k) => k !== "not");
+  if (extraKeys.length > 0) {
+    throw new BlockError(
+      `"not" combinator has extra keys: ${extraKeys.join(", ")}. ` +
+        `Only "not" is allowed.`,
+      { path }
+    );
+  }
+
+  if (
+    typeof conditionSpec.not !== "object" ||
+    Array.isArray(conditionSpec.not)
+  ) {
+    throw new BlockError('"not" must be a single condition object', {
+      path: `${path}.not`,
+    });
+  }
+
+  validateConditions(conditionSpec.not, conditionTypes, `${path}.not`);
+}
+
+/**
+ * Validates a single condition with a type property.
+ *
+ * Validation order:
+ * 1. Validate unknown args (typo detection) - checked FIRST so typos like "nam"
+ *    produce "unknown arg 'nam' (did you mean 'name'?)" instead of "missing required arg 'name'"
+ * 2. Validate arg values against schema (type, min/max, pattern, etc.)
+ * 3. Validate constraints (atLeastOne, exactlyOne, allOrNone, atMostOne)
+ * 4. Validate source parameter (based on sourceType)
+ * 5. Run custom validate function from decorator config
+ *
+ * @param {Object} conditionSpec - The condition spec with a type property.
+ * @param {Map<string, import("discourse/blocks/conditions").BlockCondition>} conditionTypes - Map of registered condition types.
+ * @param {string} path - The path to this condition in the block tree.
+ * @throws {BlockError} If validation fails.
+ */
+function validateSingleCondition(conditionSpec, conditionTypes, path) {
+  const { type, ...args } = conditionSpec;
+
+  if (!type) {
+    throw new BlockError(
+      `Condition is missing "type" property: ${JSON.stringify(conditionSpec)}`,
+      { path: path || undefined }
+    );
+  }
+
+  const conditionInstance = conditionTypes.get(type);
+
+  if (!conditionInstance) {
+    const availableTypes = [...conditionTypes.keys()];
+    const suggestion = formatWithSuggestion(type, availableTypes);
+    throw new BlockError(
+      `Unknown condition type: ${suggestion}. Available types: ${availableTypes.join(", ")}`,
+      { path: path ? `${path}.type` : "type" }
+    );
+  }
+
+  // @ts-ignore - Static properties defined on condition classes
+  const argsSchema = conditionInstance.constructor.argsSchema;
+  // @ts-ignore - Static properties defined on condition classes
+  const constraints = conditionInstance.constructor.constraints;
+  // @ts-ignore - Static properties defined on condition classes
+  const validateFn = conditionInstance.constructor.validateFn;
+
+  // 1. Validate unknown args (catches typos like "nam" instead of "name")
+  // This is checked FIRST so typos produce helpful suggestions rather than
+  // confusing "missing required arg" errors
+  validateConditionArgKeys(conditionInstance, type, args, path);
+
+  // 2. Validate arg values against schema (type, min/max, pattern, etc.)
+  if (argsSchema && Object.keys(argsSchema).length > 0) {
+    validateConditionArgValues(args, argsSchema, type, path);
+  }
+
+  // 3. Validate constraints (atLeastOne, exactlyOne, allOrNone, atMostOne)
+  if (constraints) {
+    const constraintError = validateConstraints(
+      constraints,
+      args,
+      `Condition "${type}"`
+    );
+    if (constraintError) {
+      // Point to the condition's `type` property so the error location isn't empty.
+      // This tells users which condition has the constraint violation.
+      const typePath = path ? `${path}.type` : "type";
+      throw new BlockError(constraintError, { path: typePath });
+    }
+  }
+
+  // 4. Validate source parameter (based on sourceType)
+  // @ts-ignore - Static property defined on condition classes
+  const sourceType = conditionInstance.constructor.sourceType;
+  const sourceError = validateConditionSource(sourceType, args);
+  if (sourceError) {
+    throw new BlockError(sourceError.message, {
+      path: sourceError.path ? `${path}.${sourceError.path}` : path,
+    });
+  }
+
+  // 5. Run custom validate function from decorator config
+  if (validateFn) {
+    const customErrors = runCustomValidation(validateFn, args);
+    if (customErrors?.length > 0) {
+      throw new BlockError(`Condition "${type}": ${customErrors.join("; ")}`, {
+        path,
+      });
+    }
+  }
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/validation/constraints.js b/frontend/discourse/app/lib/blocks/-internals/validation/constraints.js
new file mode 100644
index 0000000000000..3b619ea1cbcc6
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/validation/constraints.js
@@ -0,0 +1,488 @@
+// @ts-check
+/**
+ * Cross-arg constraint validation for blocks.
+ *
+ * This module handles validation rules that span multiple arguments, such as
+ * "at least one of these args must be provided" or "these args must be provided together."
+ *
+ * Supported constraint types:
+ * - atLeastOne: At least one of the specified args must be provided
+ * - exactlyOne: Exactly one of the specified args must be provided
+ * - allOrNone: Either all or none of the specified args must be provided
+ * - atMostOne: At most one of the specified args may be provided (0 or 1)
+ * - requires: If a dependent arg is provided, its required arg must also be provided
+ *
+ * @module discourse/lib/blocks/-internals/validation/constraints
+ */
+
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+import { formatWithSuggestion } from "discourse/lib/string-similarity";
+
+/**
+ * Valid constraint types for cross-arg validation.
+ */
+export const VALID_CONSTRAINT_TYPES = Object.freeze([
+  "atLeastOne",
+  "exactlyOne",
+  "allOrNone",
+  "atMostOne",
+  "requires",
+]);
+
+/**
+ * Formats an array of arg names as a quoted, comma-separated list.
+ *
+ * @param {string[]} argNames - Array of argument names.
+ * @returns {string} Formatted string like `"a", "b", "c"`.
+ */
+function formatArgList(argNames) {
+  return argNames.map((n) => `"${n}"`).join(", ");
+}
+
+/**
+ * Validates the constraints schema at decoration time.
+ * Checks for:
+ * - Valid constraint types
+ * - Arg references exist in the args schema
+ * - Constraint arrays have at least 2 elements
+ * - Incompatible constraints (exactlyOne + allOrNone, exactlyOne + atLeastOne)
+ * - Vacuous constraints (constraints rendered always true/false by defaults)
+ *
+ * @param {Object} constraints - The constraints object from decorator options.
+ * @param {Object} argsSchema - The args schema object from decorator options.
+ * @param {string} blockName - Block name for error messages.
+ */
+export function validateConstraintsSchema(constraints, argsSchema, blockName) {
+  if (!constraints || typeof constraints !== "object") {
+    return;
+  }
+
+  const declaredArgs = argsSchema ? Object.keys(argsSchema) : [];
+  const constraintsByArgs = new Map();
+
+  for (const [constraintType, argNames] of Object.entries(constraints)) {
+    // Check for unknown constraint types with fuzzy matching
+    if (!VALID_CONSTRAINT_TYPES.includes(constraintType)) {
+      const suggestion = formatWithSuggestion(
+        constraintType,
+        VALID_CONSTRAINT_TYPES
+      );
+      raiseBlockError(
+        `Block "${blockName}": unknown constraint type ${suggestion}. ` +
+          `Valid constraint types are: ${VALID_CONSTRAINT_TYPES.join(", ")}.`
+      );
+      continue;
+    }
+
+    // Handle requires constraint (object format instead of array)
+    if (constraintType === "requires") {
+      if (
+        typeof argNames !== "object" ||
+        Array.isArray(argNames) ||
+        argNames == null
+      ) {
+        raiseBlockError(
+          `Block "${blockName}": constraint "requires" must be an object mapping dependent args to required args.`
+        );
+        continue;
+      }
+
+      for (const [dependentArg, requiredArg] of Object.entries(argNames)) {
+        // Validate dependent arg exists
+        if (!declaredArgs.includes(dependentArg)) {
+          const suggestion = formatWithSuggestion(dependentArg, declaredArgs);
+          raiseBlockError(
+            `Block "${blockName}": constraint "requires" references unknown arg ${suggestion}.`
+          );
+        }
+        // Validate required arg is a string
+        if (typeof requiredArg !== "string") {
+          raiseBlockError(
+            `Block "${blockName}": constraint "requires" value for "${dependentArg}" must be a string arg name.`
+          );
+          continue;
+        }
+        // Validate required arg exists
+        if (!declaredArgs.includes(requiredArg)) {
+          const suggestion = formatWithSuggestion(requiredArg, declaredArgs);
+          raiseBlockError(
+            `Block "${blockName}": constraint "requires" references unknown arg ${suggestion}.`
+          );
+        }
+      }
+      continue; // Skip array-based validation for requires
+    }
+
+    // Constraint value must be an array
+    if (!Array.isArray(argNames)) {
+      raiseBlockError(
+        `Block "${blockName}": constraint "${constraintType}" must be an array of arg names.`
+      );
+      continue;
+    }
+
+    // Constraint array must have at least 2 elements
+    if (argNames.length < 2) {
+      raiseBlockError(
+        `Block "${blockName}": constraint "${constraintType}" must reference at least 2 args.`
+      );
+      continue;
+    }
+
+    // Check that all referenced args exist in the schema
+    for (const argName of argNames) {
+      if (typeof argName !== "string") {
+        raiseBlockError(
+          `Block "${blockName}": constraint "${constraintType}" contains non-string value "${argName}".`
+        );
+        continue;
+      }
+      if (!declaredArgs.includes(argName)) {
+        const suggestion = formatWithSuggestion(argName, declaredArgs);
+        raiseBlockError(
+          `Block "${blockName}": constraint "${constraintType}" references unknown arg ${suggestion}. ` +
+            `Declared args are: ${declaredArgs.join(", ") || "none"}.`
+        );
+      }
+    }
+
+    // Track constraints by their arg sets for incompatibility detection
+    const sortedArgs = [...argNames].sort().join(",");
+    if (!constraintsByArgs.has(sortedArgs)) {
+      constraintsByArgs.set(sortedArgs, []);
+    }
+    constraintsByArgs.get(sortedArgs).push(constraintType);
+
+    // Check for vacuous constraints (always true or always false due to defaults)
+    if (argsSchema) {
+      checkVacuousConstraint(constraintType, argNames, argsSchema, blockName);
+    }
+  }
+
+  // Check for incompatible constraints on the same args
+  for (const [argSet, constraintTypes] of constraintsByArgs) {
+    if (constraintTypes.length > 1) {
+      checkIncompatibleConstraints(constraintTypes, argSet, blockName);
+    }
+  }
+}
+
+/**
+ * Checks if a constraint is vacuous (always true or always false) due to default values.
+ *
+ * @param {string} constraintType - The constraint type.
+ * @param {string[]} argNames - The arg names in the constraint.
+ * @param {Object} argsSchema - The args schema.
+ * @param {string} blockName - Block name for error messages.
+ */
+function checkVacuousConstraint(
+  constraintType,
+  argNames,
+  argsSchema,
+  blockName
+) {
+  const argsWithDefaults = argNames.filter(
+    (name) => argsSchema[name]?.default !== undefined
+  );
+  const argsWithoutDefaults = argNames.filter(
+    (name) => argsSchema[name]?.default === undefined
+  );
+
+  switch (constraintType) {
+    case "atLeastOne":
+      // Always true if any arg has a default
+      if (argsWithDefaults.length > 0) {
+        raiseBlockError(
+          `Block "${blockName}": constraint atLeastOne([${formatArgList(argNames)}]) ` +
+            `is always true because "${argsWithDefaults[0]}" has a default value.`
+        );
+      }
+      break;
+
+    case "exactlyOne":
+      // Always false if 2+ args have defaults (both will always be provided)
+      if (argsWithDefaults.length >= 2) {
+        raiseBlockError(
+          `Block "${blockName}": constraint exactlyOne([${formatArgList(argNames)}]) ` +
+            `is always false because multiple args have default values: ${formatArgList(argsWithDefaults)}.`
+        );
+      }
+      // Always true if exactly one arg has a default and all others have no default
+      // (the one with default is always provided, others never are unless explicitly set)
+      // This is NOT vacuous - it's a valid constraint that forces users to not provide
+      // any of the other args, or to provide exactly one of the non-default args
+      break;
+
+    case "allOrNone":
+      // Always false if some but not all args have defaults
+      if (argsWithDefaults.length > 0 && argsWithoutDefaults.length > 0) {
+        raiseBlockError(
+          `Block "${blockName}": constraint allOrNone([${formatArgList(argNames)}]) ` +
+            `is always false because only some args have defaults: ${formatArgList(argsWithDefaults)} ` +
+            `have defaults but ${formatArgList(argsWithoutDefaults)} do not.`
+        );
+      }
+      // If all have defaults or none have defaults, constraint is not vacuous
+      break;
+
+    case "atMostOne":
+      // Always false if 2+ args have defaults (both will always be provided)
+      if (argsWithDefaults.length >= 2) {
+        raiseBlockError(
+          `Block "${blockName}": constraint atMostOne([${formatArgList(argNames)}]) ` +
+            `is always false because multiple args have default values: ${formatArgList(argsWithDefaults)}.`
+        );
+      }
+      break;
+  }
+}
+
+/**
+ * Checks for incompatible constraint types on the same arg set.
+ *
+ * @param {string[]} constraintTypes - The constraint types applied to the same args.
+ * @param {string} argSet - The sorted arg names (for error message).
+ * @param {string} blockName - Block name for error messages.
+ */
+function checkIncompatibleConstraints(constraintTypes, argSet, blockName) {
+  const argList = argSet
+    .split(",")
+    .map((n) => `"${n}"`)
+    .join(", ");
+
+  // exactlyOne + allOrNone = contradiction (XOR vs all-or-nothing)
+  if (
+    constraintTypes.includes("exactlyOne") &&
+    constraintTypes.includes("allOrNone")
+  ) {
+    raiseBlockError(
+      `Block "${blockName}": constraints "exactlyOne" and "allOrNone" conflict for args [${argList}]. ` +
+        `"exactlyOne" requires exactly one arg, but "allOrNone" requires all or none.`
+    );
+  }
+
+  // exactlyOne + atLeastOne = redundant (exactlyOne implies atLeastOne)
+  if (
+    constraintTypes.includes("exactlyOne") &&
+    constraintTypes.includes("atLeastOne")
+  ) {
+    raiseBlockError(
+      `Block "${blockName}": constraint "atLeastOne" is redundant with "exactlyOne" for args [${argList}]. ` +
+        `"exactlyOne" already implies at least one must be provided.`
+    );
+  }
+
+  // atMostOne + atLeastOne = redundant (equivalent to exactlyOne)
+  if (
+    constraintTypes.includes("atMostOne") &&
+    constraintTypes.includes("atLeastOne")
+  ) {
+    raiseBlockError(
+      `Block "${blockName}": constraints "atMostOne" and "atLeastOne" together for args [${argList}] ` +
+        `are equivalent to "exactlyOne". Use "exactlyOne" instead.`
+    );
+  }
+
+  // atMostOne + exactlyOne = redundant (exactlyOne implies atMostOne)
+  if (
+    constraintTypes.includes("atMostOne") &&
+    constraintTypes.includes("exactlyOne")
+  ) {
+    raiseBlockError(
+      `Block "${blockName}": constraint "atMostOne" is redundant with "exactlyOne" for args [${argList}]. ` +
+        `"exactlyOne" already implies at most one may be provided.`
+    );
+  }
+}
+
+/**
+ * Validates constraints against the provided args at runtime.
+ * Called after defaults are applied.
+ *
+ * @param {Object} constraints - The constraints from block metadata.
+ * @param {Object} args - The resolved args (with defaults applied).
+ * @param {string} blockName - Block name for error messages.
+ * @returns {string|null} Error message if validation fails, null otherwise.
+ */
+export function validateConstraints(constraints, args, blockName) {
+  if (!constraints || typeof constraints !== "object") {
+    return null;
+  }
+
+  for (const [constraintType, argNames] of Object.entries(constraints)) {
+    let error = null;
+
+    // Handle requires constraint (object format)
+    if (constraintType === "requires") {
+      if (typeof argNames === "object" && !Array.isArray(argNames)) {
+        error = validateRequires(argNames, args, blockName);
+      }
+    } else if (Array.isArray(argNames)) {
+      // Handle array-based constraints
+      switch (constraintType) {
+        case "atLeastOne":
+          error = validateAtLeastOne(argNames, args, blockName);
+          break;
+        case "exactlyOne":
+          error = validateExactlyOne(argNames, args, blockName);
+          break;
+        case "allOrNone":
+          error = validateAllOrNone(argNames, args, blockName);
+          break;
+        case "atMostOne":
+          error = validateAtMostOne(argNames, args, blockName);
+          break;
+      }
+    }
+
+    if (error) {
+      return error;
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Validates that at least one of the specified args is provided.
+ *
+ * @param {string[]} argNames - The arg names to check.
+ * @param {Object} args - The resolved args.
+ * @param {string} blockName - The block name for error messages.
+ * @returns {string|null} Error message if validation fails, null otherwise.
+ */
+function validateAtLeastOne(argNames, args, blockName) {
+  const providedCount = argNames.filter(
+    (name) => args[name] !== undefined
+  ).length;
+
+  if (providedCount === 0) {
+    const argList = formatArgList(argNames);
+    return `Block "${blockName}": at least one of ${argList} must be provided.`;
+  }
+
+  return null;
+}
+
+/**
+ * Validates that exactly one of the specified args is provided.
+ *
+ * @param {string[]} argNames - The arg names to check.
+ * @param {Object} args - The resolved args.
+ * @param {string} blockName - The block name for error messages.
+ * @returns {string|null} Error message if validation fails, null otherwise.
+ */
+function validateExactlyOne(argNames, args, blockName) {
+  const providedArgs = argNames.filter((name) => args[name] !== undefined);
+  const argList = formatArgList(argNames);
+
+  if (providedArgs.length === 0) {
+    return `Block "${blockName}": exactly one of ${argList} must be provided, but got none.`;
+  }
+
+  if (providedArgs.length > 1) {
+    const providedList = formatArgList(providedArgs);
+    return `Block "${blockName}": exactly one of ${argList} must be provided, but got ${providedArgs.length}: ${providedList}.`;
+  }
+
+  return null;
+}
+
+/**
+ * Validates that either all or none of the specified args are provided.
+ *
+ * @param {string[]} argNames - The arg names to check.
+ * @param {Object} args - The resolved args.
+ * @param {string} blockName - The block name for error messages.
+ * @returns {string|null} Error message if validation fails, null otherwise.
+ */
+function validateAllOrNone(argNames, args, blockName) {
+  const providedCount = argNames.filter(
+    (name) => args[name] !== undefined
+  ).length;
+
+  // Valid: all provided or none provided
+  if (providedCount === 0 || providedCount === argNames.length) {
+    return null;
+  }
+
+  // Invalid: some but not all
+  const providedArgs = argNames.filter((name) => args[name] !== undefined);
+  const missingArgs = argNames.filter((name) => args[name] === undefined);
+  const argList = formatArgList(argNames);
+
+  return (
+    `Block "${blockName}": args ${argList} must be provided together or not at all. ` +
+    `Got ${formatArgList(providedArgs)} but missing ${formatArgList(missingArgs)}.`
+  );
+}
+
+/**
+ * Validates that at most one of the specified args is provided (0 or 1).
+ *
+ * @param {string[]} argNames - The arg names to check.
+ * @param {Object} args - The resolved args.
+ * @param {string} blockName - The block name for error messages.
+ * @returns {string|null} Error message if validation fails, null otherwise.
+ */
+function validateAtMostOne(argNames, args, blockName) {
+  const providedArgs = argNames.filter((name) => args[name] !== undefined);
+
+  if (providedArgs.length > 1) {
+    const providedList = formatArgList(providedArgs);
+    const argList = formatArgList(argNames);
+    return `Block "${blockName}": at most one of ${argList} may be provided, but got ${providedArgs.length}: ${providedList}.`;
+  }
+
+  return null;
+}
+
+/**
+ * Validates that if a dependent arg is provided, its required arg must also be provided.
+ *
+ * @param {Object} requiresMap - Object mapping dependent args to required args.
+ * @param {Object} args - The resolved args.
+ * @param {string} blockName - The block name for error messages.
+ * @returns {string|null} Error message if validation fails, null otherwise.
+ */
+function validateRequires(requiresMap, args, blockName) {
+  for (const [dependentArg, requiredArg] of Object.entries(requiresMap)) {
+    if (args[dependentArg] !== undefined && args[requiredArg] === undefined) {
+      return `Block "${blockName}": "${dependentArg}" requires "${requiredArg}" to be specified.`;
+    }
+  }
+  return null;
+}
+
+/**
+ * Runs a custom validation function if provided.
+ *
+ * @param {Function} validateFn - The custom validate function.
+ * @param {Object} args - The resolved args (with defaults applied).
+ * @returns {string[]|null} Array of error messages if validation fails, null otherwise.
+ */
+export function runCustomValidation(validateFn, args) {
+  if (typeof validateFn !== "function") {
+    return null;
+  }
+
+  const result = validateFn(args);
+
+  if (result == null) {
+    return null;
+  }
+
+  // Normalize to array
+  if (typeof result === "string") {
+    return [result];
+  }
+
+  if (Array.isArray(result)) {
+    // Filter out non-string values and empty strings
+    const errors = result.filter((e) => typeof e === "string" && e.length > 0);
+    return errors.length > 0 ? errors : null;
+  }
+
+  // Invalid return type - ignore
+  return null;
+}
diff --git a/frontend/discourse/app/lib/blocks/-internals/validation/layout.js b/frontend/discourse/app/lib/blocks/-internals/validation/layout.js
new file mode 100644
index 0000000000000..978fcb586e7aa
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/-internals/validation/layout.js
@@ -0,0 +1,948 @@
+// @ts-check
+/**
+ * Outlet layout validation utilities.
+ *
+ * This module provides validation for outlet layouts passed to renderBlocks().
+ * It validates block entries, container/children relationships, args against
+ * block schemas, and conditions.
+ *
+ * Terminology:
+ * - **Block Entry**: An object in a layout that specifies how to use a block.
+ * - **Outlet Layout**: An array of block entries defining which blocks appear in an outlet.
+ *
+ * @module discourse/lib/blocks/-internals/validation/layout
+ */
+
+import { DEBUG } from "@glimmer/env";
+import { getOwner } from "@ember/owner";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import {
+  BlockError,
+  raiseBlockError,
+} from "discourse/lib/blocks/-internals/error";
+import { isBlockPermittedInOutlet } from "discourse/lib/blocks/-internals/matching/outlet-matcher";
+import {
+  MAX_LAYOUT_DEPTH,
+  OPTIONAL_MISSING,
+  parseBlockReference,
+  VALID_BLOCK_ID_PATTERN,
+} from "discourse/lib/blocks/-internals/patterns";
+import {
+  hasBlock,
+  isBlockResolved,
+  resolveBlock,
+} from "discourse/lib/blocks/-internals/registry/block";
+import {
+  getAllOutlets,
+  isValidOutlet,
+} from "discourse/lib/blocks/-internals/registry/outlet";
+import {
+  applyArgDefaults,
+  buildErrorPath,
+  createValidationContext,
+} from "discourse/lib/blocks/-internals/utils";
+import { validateArgsAgainstSchema } from "discourse/lib/blocks/-internals/validation/args";
+import { validateBlockArgs } from "discourse/lib/blocks/-internals/validation/block-args";
+import {
+  runCustomValidation,
+  validateConstraints,
+} from "discourse/lib/blocks/-internals/validation/constraints";
+import { formatWithSuggestion } from "discourse/lib/string-similarity";
+
+/**
+ * Wraps a validation function call with BlockError handling.
+ * Catches errors with a `path` property and re-raises with full context.
+ *
+ * @param {Function} validationFn - The validation function to call.
+ * @param {string} errorPrefix - Prefix for the error message.
+ * @param {Object} context - Error context including outletName, blockName, path, etc.
+ */
+function wrapValidationError(validationFn, errorPrefix, context) {
+  try {
+    validationFn();
+  } catch (error) {
+    // Errors with path property need context enrichment
+    if (error.path) {
+      raiseBlockError(`${errorPrefix}: ${error.message}`, {
+        ...context,
+        errorPath: buildErrorPath(context.path, error.path),
+      });
+    }
+    throw error;
+  }
+}
+
+/**
+ * Validates that a block is permitted in the specified outlet.
+ * Checks allowedOutlets and deniedOutlets metadata if present.
+ *
+ * @param {Object} metadata - Block metadata with outlet restrictions.
+ * @param {string} outletName - The outlet being validated.
+ * @param {string} blockName - The block name for error messages.
+ * @param {Object} context - Error context for raiseBlockError.
+ * @returns {boolean} True if validation passed, false if error was raised.
+ */
+function validateOutletPermission(metadata, outletName, blockName, context) {
+  if (!metadata?.allowedOutlets && !metadata?.deniedOutlets) {
+    return true;
+  }
+
+  const permission = isBlockPermittedInOutlet(
+    outletName,
+    metadata.allowedOutlets,
+    metadata.deniedOutlets
+  );
+
+  if (!permission.permitted) {
+    raiseBlockError(
+      `Block "${blockName}" at ${context.path} cannot be rendered in outlet "${outletName}": ${permission.reason}.`,
+      context
+    );
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Validates container/children relationship.
+ * Containers must have children, non-containers cannot have children.
+ *
+ * @param {Object} entry - The block entry.
+ * @param {boolean} isContainer - Whether the block is a container.
+ * @param {string} blockName - The block name for error messages.
+ * @param {string} outletName - The outlet name for error messages.
+ * @param {Object} context - Error context for raiseBlockError.
+ * @returns {boolean} True if validation passed, false if error was raised.
+ */
+function validateContainerChildren(
+  entry,
+  isContainer,
+  blockName,
+  outletName,
+  context
+) {
+  const hasChildren = entry.children?.length > 0;
+
+  if (hasChildren && !isContainer) {
+    raiseBlockError(
+      `Block component ${blockName} in layout ${outletName} cannot have children`,
+      context
+    );
+    return false;
+  }
+
+  if (isContainer && !hasChildren) {
+    raiseBlockError(
+      `Block component ${blockName} in layout ${outletName} must have children`,
+      context
+    );
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Validates block constraints and custom validation functions.
+ * Applies arg defaults before validation.
+ *
+ * @param {Object} metadata - Block metadata with constraints/validate.
+ * @param {Object} resolvedBlock - The resolved block class.
+ * @param {Object} entry - The block entry.
+ * @param {string} blockName - The block name for error messages.
+ * @param {Object} context - Error context for raiseBlockError.
+ */
+function validateBlockConstraints(
+  metadata,
+  resolvedBlock,
+  entry,
+  blockName,
+  context
+) {
+  if (!metadata?.constraints && !metadata?.validate) {
+    return;
+  }
+
+  const argsWithDefaults = applyArgDefaults(resolvedBlock, entry.args || {});
+
+  // Validate declarative constraints
+  if (metadata.constraints) {
+    const constraintError = validateConstraints(
+      metadata.constraints,
+      argsWithDefaults,
+      blockName
+    );
+    if (constraintError) {
+      raiseBlockError(
+        `Invalid block "${blockName}" at ${context.path} for outlet "${context.outletName}": ${constraintError}`,
+        { ...context, errorPath: "constraints" }
+      );
+    }
+  }
+
+  // Run custom validation function
+  if (metadata.validate) {
+    const customErrors = runCustomValidation(
+      metadata.validate,
+      argsWithDefaults
+    );
+    if (customErrors?.length > 0) {
+      const errorMessage =
+        customErrors.length === 1
+          ? customErrors[0]
+          : customErrors.map((e) => `  - ${e}`).join("\n");
+      raiseBlockError(
+        `Invalid block "${blockName}" at ${context.path} for outlet "${context.outletName}": ${errorMessage}`,
+        { ...context, errorPath: "validate" }
+      );
+    }
+  }
+}
+
+/**
+ * Validates a child block's containerArgs against the parent container's childArgs schema.
+ * Reuses the shared validateArgsAgainstSchema function for core validation logic.
+ *
+ * @param {Object} childEntry - The child block entry.
+ * @param {Object} parentChildArgsSchema - The parent's childArgs schema.
+ * @param {string} parentName - Parent block name for error messages.
+ * @param {Object} context - Error context.
+ */
+function validateContainerArgs(
+  childEntry,
+  parentChildArgsSchema,
+  parentName,
+  context
+) {
+  const providedArgs = childEntry.containerArgs || {};
+
+  try {
+    validateArgsAgainstSchema(
+      providedArgs,
+      parentChildArgsSchema,
+      "containerArgs"
+    );
+  } catch (error) {
+    // Enhance error message with parent context
+    raiseBlockError(
+      `Child block at ${context.path} ${error.message} (required by parent "${parentName}").`,
+      {
+        ...context,
+        errorPath: buildErrorPath(context.path, error.path),
+      }
+    );
+  }
+}
+
+/**
+ * Validates uniqueness constraints for containerArgs across all sibling children.
+ *
+ * @param {Array<Object>} childEntries - Array of child block entries.
+ * @param {Object} childArgsSchema - The parent's childArgs schema.
+ * @param {string} parentName - Parent block name for error messages.
+ * @param {string} parentPath - Path to parent for error context.
+ * @param {Object} context - Error context.
+ */
+function validateContainerArgsUniqueness(
+  childEntries,
+  childArgsSchema,
+  parentName,
+  parentPath,
+  context
+) {
+  // Find args with unique: true
+  const uniqueArgs = Object.entries(childArgsSchema)
+    .filter(([, schema]) => schema.unique)
+    .map(([name]) => name);
+
+  for (const argName of uniqueArgs) {
+    const seenValues = new Map(); // value -> index of first occurrence
+
+    for (let i = 0; i < childEntries.length; i++) {
+      const childEntry = childEntries[i];
+      const value = childEntry.containerArgs?.[argName];
+
+      // Skip undefined values (uniqueness only applies to provided values)
+      if (value === undefined) {
+        continue;
+      }
+
+      if (seenValues.has(value)) {
+        const firstIndex = seenValues.get(value);
+        raiseBlockError(
+          `Duplicate value "${value}" for containerArgs.${argName} in children of "${parentName}". ` +
+            `Found at children[${firstIndex}] and children[${i}]. ` +
+            `The "${argName}" arg must be unique among siblings.`,
+          {
+            ...context,
+            path: `${parentPath}.children[${i}]`,
+            errorPath: `${parentPath}.children[${i}].containerArgs.${argName}`,
+          }
+        );
+      }
+
+      seenValues.set(value, i);
+    }
+  }
+}
+
+/**
+ * Validates that a block entry's `id` matches the required pattern.
+ * IDs must start with a lowercase letter and contain only lowercase letters,
+ * numbers, and hyphens (same format as block names).
+ *
+ * @param {Object} entry - The block entry.
+ * @throws {BlockError} If the id format is invalid.
+ */
+export function validateEntryIdFormat(entry) {
+  if (!entry.id) {
+    return;
+  }
+
+  if (!VALID_BLOCK_ID_PATTERN.test(entry.id)) {
+    throw new BlockError(
+      `"id" value "${entry.id}" is invalid. ` +
+        `IDs must start with a lowercase letter and contain only lowercase letters, numbers, and hyphens.`,
+      { path: "id" }
+    );
+  }
+}
+
+/**
+ * Validates that containerArgs is not provided when parent has no childArgs.
+ * Follows the pattern: error in dev/test, warn in production.
+ *
+ * @param {Object} entry - The block entry.
+ * @param {Object} parentChildArgsSchema - The parent's childArgs schema (null if none).
+ * @param {Object} context - Error context.
+ */
+function validateOrphanContainerArgs(entry, parentChildArgsSchema, context) {
+  if (entry.containerArgs && !parentChildArgsSchema) {
+    const message =
+      `Block at ${context.path} has "containerArgs" but parent container does not declare "childArgs". ` +
+      `Remove the containerArgs or add a childArgs schema to the parent.`;
+
+    if (DEBUG) {
+      raiseBlockError(message, context);
+    } else {
+      // eslint-disable-next-line no-console
+      console.warn(`[Blocks] ${message}`);
+    }
+  }
+}
+
+/**
+ * Validates block conditions and raises errors with proper context.
+ *
+ * @param {Object} blocksService - The blocks service with validate method.
+ * @param {Object} entry - The block entry containing conditions.
+ * @param {string} outletName - The outlet name for error messages.
+ * @param {string} blockName - The block name for error messages.
+ * @param {string} path - The path in the layout tree for error messages.
+ * @param {Error | null} [callSiteError] - Error object capturing where renderBlocks() was called.
+ * @param {Array<Object>} [rootLayout] - The root blocks array for error context display.
+ */
+function validateBlockConditions(
+  blocksService,
+  entry,
+  outletName,
+  blockName,
+  path,
+  callSiteError = null,
+  rootLayout = null
+) {
+  if (!entry.conditions || !blocksService) {
+    return;
+  }
+
+  try {
+    blocksService.validate(entry.conditions);
+  } catch (error) {
+    // Build context for error message - include rootLayout for tree display
+    const context = {
+      ...createValidationContext({
+        outletName,
+        blockName,
+        path,
+        entry,
+        callSiteError,
+        rootLayout,
+      }),
+      conditions: entry.conditions,
+    };
+
+    // If error has a path property, build the full errorPath and conditionsPath
+    // error.path is relative to conditions (e.g., "params.categoryId")
+    if (error.path) {
+      context.errorPath = buildErrorPath(
+        path,
+        buildErrorPath("conditions", error.path)
+      );
+      // conditionsPath is relative to the conditions object (for formatter)
+      context.conditionsPath = error.path;
+    }
+
+    raiseBlockError(
+      `Invalid conditions for block "${blockName}" in outlet "${outletName}": ${error.message}`,
+      context
+    );
+  }
+}
+
+/**
+ * Resolves a block reference (string or class) to a BlockClass for validation.
+ *
+ * This function handles the dual-mode resolution strategy:
+ *
+ * - **Development/Test mode**: Eagerly resolves all block references including
+ *   factory functions. This ensures errors surface early at boot time with clear
+ *   stack traces.
+ *
+ * - **Production mode**: Only resolves if the block is already resolved (not a
+ *   pending factory). Factories are left unresolved, with validation deferred to
+ *   render time. This enables true lazy loading.
+ *
+ * **Optional blocks**: Block references ending with `?` are treated as optional.
+ * If an optional block is not registered, an object with `OPTIONAL_MISSING`
+ * is returned instead of throwing an error. The calling code should check for this
+ * marker and skip validation/rendering for the block.
+ *
+ * @param {string | Object} blockRef - Block name string (possibly with `?` suffix) or BlockClass.
+ * @param {string} outletName - Outlet name for error messages.
+ * @param {Object} [context] - Context for error messages.
+ * @param {string} [context.path] - Path to this entry in the block tree.
+ * @param {Object} [context.entry] - The block entry object.
+ * @param {Error} [context.callSiteError] - Error capturing call site location.
+ * @param {Array} [context.rootLayout] - Root layout array for error display.
+ * @returns {Promise<Object | string | { [OPTIONAL_MISSING]: true, name: string }>}
+ *   Resolved BlockClass, string name if deferred, or optional missing marker object.
+ * @throws {Error} If required block is not registered.
+ */
+export async function resolveBlockForValidation(
+  blockRef,
+  outletName,
+  context = {}
+) {
+  // Class reference - return as-is (classes always exist)
+  if (typeof blockRef !== "string") {
+    return blockRef;
+  }
+
+  // Parse optional suffix from block reference
+  const { name, optional } = parseBlockReference(blockRef);
+
+  // String reference - check registration
+  if (!hasBlock(name)) {
+    if (optional) {
+      // Optional block not registered - return marker to skip validation
+      return { [OPTIONAL_MISSING]: true, name };
+    }
+    raiseBlockError(
+      `Block "${name}" at ${context.path || "unknown"} for outlet "${outletName}" is not registered. ` +
+        `Use api.registerBlock() in a pre-initializer before any renderBlocks() configuration.`,
+      createValidationContext({
+        outletName,
+        blockName: name,
+        path: context.path,
+        entry: context.entry,
+        callSiteError: context.callSiteError,
+        rootLayout: context.rootLayout,
+      })
+    );
+    return null;
+  }
+
+  if (DEBUG) {
+    // In dev/test, eagerly resolve to catch factory errors early
+    return await resolveBlock(name);
+  }
+
+  // In production, only resolve if already resolved (avoid triggering lazy load)
+  if (isBlockResolved(name)) {
+    return await resolveBlock(name);
+  }
+
+  // Return the string name - full validation deferred to render time
+  return name;
+}
+
+/**
+ * Valid top-level keys in block entry objects.
+ * Any key not in this list will trigger a validation error, helping catch
+ * common typos like `condition` instead of `conditions`.
+ */
+export const VALID_ENTRY_KEYS = Object.freeze([
+  "block", // Block class or name (required)
+  "conditions", // Conditions for rendering
+  "args", // Arguments to pass to the block
+  "containerArgs", // Arguments required by parent container's childArgs schema
+  "classNames", // CSS classes to add to wrapper
+  "children", // Nested block entries
+  "id", // Unique identifier for targeting and BEM styling
+]);
+
+/**
+ * Declarative type validation rules for block entry fields.
+ * Each rule specifies how to validate a field's type and generate error messages.
+ *
+ * @type {Object<string, {
+ *   validate: (value: any) => boolean,
+ *   expected: string,
+ *   actual?: (value: any) => string
+ * }>}
+ */
+const ENTRY_TYPE_RULES = {
+  args: {
+    validate: (v) => typeof v === "object" && !Array.isArray(v),
+    expected: "an object",
+    actual: (v) => (Array.isArray(v) ? "array" : typeof v),
+  },
+  containerArgs: {
+    validate: (v) => typeof v === "object" && !Array.isArray(v),
+    expected: "an object",
+    actual: (v) => (Array.isArray(v) ? "array" : typeof v),
+  },
+  children: {
+    validate: (v) => Array.isArray(v),
+    expected: "an array",
+    actual: (v) => typeof v,
+  },
+  classNames: {
+    validate: (v) =>
+      typeof v === "string" ||
+      (Array.isArray(v) && v.every((item) => typeof item === "string")),
+    expected: "a string or array of strings",
+    actual: (v) =>
+      Array.isArray(v) ? "array with non-string items" : typeof v,
+  },
+  conditions: {
+    validate: (v) => typeof v === "object",
+    expected: "an object or array",
+    actual: (v) => typeof v,
+  },
+  id: {
+    validate: (v) => typeof v === "string",
+    expected: "a string",
+    actual: (v) => typeof v,
+  },
+};
+
+/**
+ * Validates that a block entry only uses known keys.
+ * Uses fuzzy matching to suggest corrections for typos like "condition",
+ * "codition", or "conditons" instead of "conditions".
+ *
+ * Internal keys (starting with `__`) are skipped as they are added by the
+ * system during preprocessing (e.g., `__visible`, `__failureReason`).
+ *
+ * @param {Object} entry - The block entry object.
+ * @throws {BlockError} If unknown keys are found.
+ */
+export function validateEntryKeys(entry) {
+  const unknownKeys = Object.keys(entry).filter(
+    (key) => !key.startsWith("__") && !VALID_ENTRY_KEYS.includes(key)
+  );
+
+  if (unknownKeys.length > 0) {
+    // Build helpful suggestions using fuzzy matching from shared lib
+    const suggestions = unknownKeys.map((key) =>
+      formatWithSuggestion(key, VALID_ENTRY_KEYS)
+    );
+
+    const keyWord = unknownKeys.length > 1 ? "keys" : "key";
+    // Throw BlockError directly - wrapValidationError will add context
+    throw new BlockError(
+      `Unknown entry ${keyWord}: ${suggestions.join(", ")}. ` +
+        `Valid keys are: ${VALID_ENTRY_KEYS.join(", ")}.`,
+      { path: unknownKeys[0] }
+    );
+  }
+}
+
+/**
+ * Validates the types of optional entry fields.
+ * Iterates over ENTRY_TYPE_RULES to check each field's type.
+ *
+ * @param {Object} entry - The block entry object.
+ * @throws {BlockError} If any field has an invalid type.
+ */
+export function validateEntryTypes(entry) {
+  for (const [field, rule] of Object.entries(ENTRY_TYPE_RULES)) {
+    const value = entry[field];
+    if (value != null && !rule.validate(value)) {
+      const actualType = rule.actual?.(value) ?? typeof value;
+      // Throw BlockError directly - wrapValidationError will add context
+      throw new BlockError(
+        `"${field}" must be ${rule.expected}, got ${actualType}.`,
+        { path: field }
+      );
+    }
+  }
+}
+
+/**
+ * Validation context passed through layout validation recursion.
+ * Created at the root level and shared across all entries to enable
+ * cross-cutting validation (e.g., ID uniqueness across the entire tree).
+ *
+ * @typedef {Object} LayoutValidationContext
+ * @property {Map<string, {path: string}>} seenIds - Map of entry IDs to their paths for uniqueness validation.
+ */
+
+/**
+ * Recursively validates an outlet layout (array of block entries).
+ * Validates each block entry and traverses nested children.
+ *
+ * This function is async to support lazy-loaded blocks:
+ * - In dev/test: Eagerly resolves all factories for early error detection.
+ * - In production: Defers factory resolution to render time.
+ *
+ * @param {Array<Object>} layout - The outlet layout (array of block entries) to validate.
+ * @param {string} outletName - The outlet these blocks belong to.
+ * @param {import("discourse/services/blocks").default} blocksService - Service for validating conditions.
+ * @param {string} [parentPath=""] - JSON-path style parent location for error context.
+ * @param {Error | null} [callSiteError] - Where renderBlocks() was called from.
+ * @param {Array<Object>} [rootLayout] - The root layout array for error context display.
+ * @param {Object|null} [parentChildArgsSchema=null] - The parent container's childArgs schema, if any.
+ * @param {string|null} [parentBlockName=null] - The parent container's block name for error messages.
+ * @param {number} [depth=0] - Current nesting depth for recursion limit checking.
+ * @param {LayoutValidationContext} [context] - Validation context for cross-cutting concerns like ID uniqueness.
+ * @returns {Promise<void>} Resolves when validation completes.
+ * @throws {Error} If any block entry is invalid or nesting depth exceeds MAX_LAYOUT_DEPTH.
+ */
+export async function validateLayout(
+  layout,
+  outletName,
+  blocksService,
+  parentPath = "",
+  callSiteError = null,
+  rootLayout = null,
+  parentChildArgsSchema = null,
+  parentBlockName = null,
+  depth = 0,
+  context = { seenIds: new Map() }
+) {
+  // On first call, capture the root layout for error display
+  const effectiveRootLayout = rootLayout ?? layout;
+
+  // Check recursion depth limit to prevent stack overflow from deeply nested layouts
+  if (depth >= MAX_LAYOUT_DEPTH) {
+    raiseBlockError(
+      `Layout exceeds maximum nesting depth of ${MAX_LAYOUT_DEPTH}. ` +
+        `Deeply nested layouts may indicate a configuration issue.`,
+      createValidationContext({
+        outletName,
+        path: parentPath,
+        callSiteError,
+        rootLayout: effectiveRootLayout,
+      })
+    );
+  }
+
+  // Validate containerArgs uniqueness across siblings if parent has childArgs with unique constraints
+  if (parentChildArgsSchema) {
+    validateContainerArgsUniqueness(
+      layout,
+      parentChildArgsSchema,
+      parentBlockName,
+      parentPath.replace(/\.children$/, ""),
+      createValidationContext({
+        outletName,
+        path: parentPath,
+        callSiteError,
+        rootLayout: effectiveRootLayout,
+      })
+    );
+  }
+
+  // Use Promise.all for parallel validation (faster in dev when resolving factories)
+  const validationPromises = layout.map(async (entry, index) => {
+    const currentPath = `${parentPath}[${index}]`;
+
+    // Check ID uniqueness across the entire layout using shared context
+    if (entry.id) {
+      if (context.seenIds.has(entry.id)) {
+        const first = context.seenIds.get(entry.id);
+        raiseBlockError(
+          `Duplicate block id "${entry.id}" in outlet "${outletName}". ` +
+            `Found at ${first.path} and ${currentPath}. Block IDs must be unique per layout.`,
+          {
+            ...createValidationContext({
+              outletName,
+              path: currentPath,
+              entry,
+              callSiteError,
+              rootLayout: effectiveRootLayout,
+            }),
+            errorPath: `${currentPath}.id`,
+          }
+        );
+      }
+      context.seenIds.set(entry.id, { path: currentPath });
+    }
+
+    // Validate the block entry itself (whether it has children or not)
+    // Returns the block's childArgsSchema if it's a container with childArgs
+    const childArgsSchema = await validateEntry(
+      entry,
+      outletName,
+      blocksService,
+      currentPath,
+      callSiteError,
+      effectiveRootLayout,
+      parentChildArgsSchema,
+      parentBlockName
+    );
+
+    // Recursively validate nested children
+    if (entry.children) {
+      // Get the block name for error messages when passing childArgs to children
+      let blockName = null;
+      if (childArgsSchema) {
+        // We need the block name for error messages - resolve it
+        const resolved = await resolveBlockForValidation(
+          entry.block,
+          outletName,
+          createValidationContext({
+            outletName,
+            path: currentPath,
+            entry,
+            callSiteError,
+            rootLayout: effectiveRootLayout,
+          })
+        );
+        if (
+          resolved &&
+          typeof resolved !== "string" &&
+          !resolved[OPTIONAL_MISSING]
+        ) {
+          blockName = getBlockMetadata(resolved)?.blockName;
+        }
+      }
+
+      await validateLayout(
+        entry.children,
+        outletName,
+        blocksService,
+        `${currentPath}.children`,
+        callSiteError,
+        effectiveRootLayout,
+        childArgsSchema,
+        blockName,
+        depth + 1,
+        context
+      );
+    }
+  });
+
+  await Promise.all(validationPromises);
+}
+
+/**
+ * Validates a single block entry object.
+ *
+ * Performs comprehensive validation including:
+ * - Outlet name is a valid registered outlet (core or custom)
+ * - Block reference is valid (string name or @block-decorated class)
+ * - Block is registered in the registry
+ * - Container/children relationship is valid
+ * - No reserved arg names are used
+ * - containerArgs match parent's childArgs schema (if applicable)
+ * - Conditions are valid (if blocksService is provided)
+ *
+ * This function is async to support lazy-loaded blocks. In production mode,
+ * if a block reference is a string pointing to an unresolved factory, full
+ * validation is deferred to render time.
+ *
+ * @param {Object} entry - The block entry object.
+ * @param {typeof import("@glimmer/component").default | string} entry.block - Block class or name string.
+ * @param {Object} [entry.args] - Args to pass to the block.
+ * @param {Object} [entry.containerArgs] - Args required by parent container's childArgs schema.
+ * @param {Array<Object>} [entry.children] - Nested block entries.
+ * @param {Array<Object>|Object} [entry.conditions] - Conditions for rendering.
+ * @param {string} outletName - The outlet this block belongs to.
+ * @param {import("discourse/services/blocks").default} blocksService - Service for validating conditions.
+ * @param {string} [path] - JSON-path style location in layout (e.g., "[3].children[0]").
+ * @param {Error | null} [callSiteError] - Where renderBlocks() was called from.
+ * @param {Array<Object>} [rootLayout] - The root layout array for error context display.
+ * @param {Object|null} [parentChildArgsSchema=null] - The parent container's childArgs schema, if any.
+ * @param {string|null} [parentBlockName=null] - The parent container's block name for error messages.
+ * @returns {Promise<Object|null>} The block's childArgsSchema if it's a container with childArgs, otherwise null.
+ * @throws {Error} If validation fails.
+ */
+export async function validateEntry(
+  entry,
+  outletName,
+  blocksService,
+  path,
+  callSiteError = null,
+  rootLayout = null,
+  parentChildArgsSchema = null,
+  parentBlockName = null
+) {
+  // Create context without blockName for early validation errors
+  const earlyContext = createValidationContext({
+    outletName,
+    path,
+    entry,
+    callSiteError,
+    rootLayout,
+  });
+
+  if (!isValidOutlet(outletName)) {
+    const allOutlets = getAllOutlets();
+    const suggestion = formatWithSuggestion(outletName, allOutlets);
+    raiseBlockError(
+      `Unknown block outlet: ${suggestion}. ` +
+        `Register custom outlets with api.registerBlockOutlet() in a pre-initializer. ` +
+        `Available outlets: ${allOutlets.join(", ")}`,
+      earlyContext
+    );
+    return null;
+  }
+
+  // Validate entry structure (keys, types, and id format) with error tracing
+  wrapValidationError(
+    () => {
+      validateEntryKeys(entry);
+      validateEntryTypes(entry);
+      validateEntryIdFormat(entry);
+    },
+    `Invalid block entry at ${path} for outlet "${outletName}"`,
+    earlyContext
+  );
+
+  if (!entry.block) {
+    raiseBlockError(
+      `Block entry at ${path} for outlet "${outletName}" is missing required "block" property.`,
+      earlyContext
+    );
+    return null;
+  }
+
+  // Resolve block reference (string name or class)
+  // In dev: eagerly resolves factories
+  // In prod: returns string if factory is unresolved (defers to render time)
+  const resolvedBlock = await resolveBlockForValidation(
+    entry.block,
+    outletName,
+    earlyContext
+  );
+
+  // If resolution returned null (error was raised), exit early
+  if (resolvedBlock === null) {
+    return null;
+  }
+
+  // Optional block not registered - skip validation entirely
+  if (resolvedBlock?.[OPTIONAL_MISSING]) {
+    return null;
+  }
+
+  // In production with unresolved factory, defer full validation to render time
+  // We've already verified the block name is registered in resolveBlockForValidation
+  if (typeof resolvedBlock === "string") {
+    const blockName = resolvedBlock;
+
+    // Validate conditions since they don't depend on the block class
+    validateBlockConditions(
+      blocksService,
+      entry,
+      outletName,
+      blockName,
+      path,
+      callSiteError,
+      rootLayout
+    );
+
+    // Skip class-specific validation (will happen at render time)
+    return null;
+  }
+
+  // Full validation with resolved class
+  const blockMeta = getBlockMetadata(resolvedBlock);
+  if (!blockMeta) {
+    raiseBlockError(
+      `Block "${resolvedBlock?.name || "unknown"}" at ${path} for outlet "${outletName}" is not a valid @block-decorated component.`,
+      earlyContext
+    );
+    return null;
+  }
+
+  const blockName = blockMeta.blockName;
+
+  // Build base context for all validation errors in this block
+  const baseContext = createValidationContext({
+    outletName,
+    blockName,
+    path,
+    entry,
+    callSiteError,
+    rootLayout,
+  });
+
+  // Validate outlet permission (allowedOutlets/deniedOutlets)
+  if (
+    !validateOutletPermission(blockMeta, outletName, blockName, baseContext)
+  ) {
+    return null;
+  }
+
+  // Validate container/children relationship
+  const isContainer = blockMeta.isContainer;
+  if (
+    !validateContainerChildren(
+      entry,
+      isContainer,
+      blockName,
+      outletName,
+      baseContext
+    )
+  ) {
+    return null;
+  }
+
+  // Validate block args against schema
+  const errorPrefix = `Invalid block "${blockName}" at ${path} for outlet "${outletName}"`;
+  const owner = blocksService ? getOwner(blocksService) : null;
+  wrapValidationError(
+    () => validateBlockArgs(entry, resolvedBlock, { owner }),
+    errorPrefix,
+    baseContext
+  );
+
+  // Validate constraints and custom validation (after applying defaults)
+  validateBlockConstraints(
+    blockMeta,
+    resolvedBlock,
+    entry,
+    blockName,
+    baseContext
+  );
+
+  // Validate conditions if service is available
+  validateBlockConditions(
+    blocksService,
+    entry,
+    outletName,
+    blockName,
+    path,
+    callSiteError,
+    rootLayout
+  );
+
+  // Validate containerArgs against parent's childArgs schema
+  if (parentChildArgsSchema) {
+    validateContainerArgs(
+      entry,
+      parentChildArgsSchema,
+      parentBlockName,
+      baseContext
+    );
+  }
+
+  // Validate orphan containerArgs (containerArgs without parent's childArgs)
+  validateOrphanContainerArgs(entry, parentChildArgsSchema, baseContext);
+
+  // Return the block's childArgsSchema for validating its children
+  return isContainer ? blockMeta.childArgs : null;
+}
diff --git a/frontend/discourse/app/lib/blocks/index.js b/frontend/discourse/app/lib/blocks/index.js
new file mode 100644
index 0000000000000..5e6bced7b14fb
--- /dev/null
+++ b/frontend/discourse/app/lib/blocks/index.js
@@ -0,0 +1,142 @@
+// @ts-check
+/**
+ * Public API for the Discourse Block system.
+ *
+ * This module exposes constants and utilities that plugin and theme developers
+ * can use when working with blocks. Internal implementation details are kept
+ * in the `-internals/` directory and should not be imported directly.
+ *
+ * @module discourse/lib/blocks
+ *
+ * @example
+ * import {
+ *   VALID_BLOCK_NAME_PATTERN,
+ *   parseBlockName,
+ *   VALID_ARG_TYPES,
+ *   matchValue,
+ * } from "discourse/lib/blocks";
+ */
+
+/* Pattern Validation */
+
+/**
+ * Valid block name pattern: lowercase letters, numbers, and hyphens.
+ * Must start with a letter. Examples: "hero-banner", "sidebar-blocks", "my-block-1"
+ *
+ * Used for both block names and outlet names since they follow the same format.
+ */
+export { VALID_BLOCK_NAME_PATTERN } from "discourse/lib/blocks/-internals/patterns";
+
+/**
+ * Valid namespaced block name pattern. Supports three formats:
+ *
+ * - **Core blocks**: `block-name` (no prefix)
+ * - **Plugin blocks**: `plugin-name:block-name` (where plugin-name is not "theme")
+ * - **Theme blocks**: `theme:theme-name:block-name`
+ *
+ * @example
+ * // Valid patterns:
+ * "group"                      // Core block
+ * "chat:message-widget"        // Plugin block
+ * "theme:tactile:hero-banner"  // Theme block
+ */
+export { VALID_NAMESPACED_BLOCK_PATTERN } from "discourse/lib/blocks/-internals/patterns";
+
+/**
+ * Parses a full block name into its components.
+ *
+ * @example
+ * parseBlockName("group")
+ * // => { type: "core", namespace: null, name: "group" }
+ *
+ * parseBlockName("chat:message-widget")
+ * // => { type: "plugin", namespace: "chat", name: "message-widget" }
+ *
+ * parseBlockName("theme:tactile:hero-banner")
+ * // => { type: "theme", namespace: "tactile", name: "hero-banner" }
+ */
+export { parseBlockName } from "discourse/lib/blocks/-internals/patterns";
+
+/**
+ * Parses a block reference string to extract the block name and optional flag.
+ *
+ * Block references can be marked as optional by appending a `?` suffix to the
+ * name. Optional blocks that are not registered will be silently skipped
+ * instead of throwing an error.
+ *
+ * @example
+ * parseBlockReference("chat:widget?")
+ * // => { name: "chat:widget", optional: true }
+ *
+ * parseBlockReference("hero-banner")
+ * // => { name: "hero-banner", optional: false }
+ */
+export { parseBlockReference } from "discourse/lib/blocks/-internals/patterns";
+
+/* Arg Schema Constants */
+
+/**
+ * Valid arg types for schema definitions.
+ * Types: "string", "number", "boolean", "array", "any"
+ */
+export { VALID_ARG_TYPES } from "discourse/lib/blocks/-internals/validation/args";
+
+/**
+ * Valid item types for array args.
+ * Types: "string", "number", "boolean"
+ */
+export { VALID_ITEM_TYPES } from "discourse/lib/blocks/-internals/validation/args";
+
+/* Constraint Types */
+
+/**
+ * Valid constraint types for cross-arg validation.
+ * Types: "atLeastOne", "exactlyOne", "allOrNone", "atMostOne", "requires"
+ */
+export { VALID_CONSTRAINT_TYPES } from "discourse/lib/blocks/-internals/validation/constraints";
+
+/* Page Types (for Route Condition) */
+
+/**
+ * Array of all valid page type names for the route condition.
+ * Types: "CATEGORY_PAGES", "TAG_PAGES", "DISCOVERY_PAGES", "HOMEPAGE",
+ *        "TOP_MENU", "TOPIC_PAGES", "USER_PAGES", "ADMIN_PAGES", "GROUP_PAGES"
+ */
+export { VALID_PAGE_TYPES } from "discourse/lib/blocks/-internals/matching/page-definitions";
+
+/* Utilities for Custom Conditions */
+
+/**
+ * Retrieves a value from a nested object using dot-notation path.
+ *
+ * This utility safely navigates through nested object properties using a
+ * dot-separated path string. It handles null/undefined values gracefully
+ * at any level of the path.
+ *
+ * @example
+ * const user = { profile: { name: "Alice", settings: { theme: "dark" } } };
+ * getByPath(user, "profile.name"); // "Alice"
+ * getByPath(user, "profile.settings.theme"); // "dark"
+ * getByPath(user, "profile.missing"); // undefined
+ */
+export { getByPath } from "discourse/lib/blocks/-internals/utils";
+
+/**
+ * Evaluates a value matcher spec against an actual value.
+ * Supports the same AND/OR/NOT logic as condition evaluation.
+ *
+ * Supports:
+ * - Exact match: `123`, `"foo"`
+ * - Array of simple values (OR): `[123, 456]` matches if actual is any of these
+ * - Array of complex specs (AND): `[{ not: "a" }, { not: "b" }]` all specs must match
+ * - RegExp: `/^foo/` matches if actual matches the pattern
+ * - NOT: `{ not: value }` matches if actual does NOT match value
+ * - ANY (OR): `{ any: [...] }` matches if actual matches any spec in array
+ *
+ * @example
+ * matchValue({ actual: 5, expected: 5 }) // true
+ * matchValue({ actual: 5, expected: [3, 5, 7] }) // true (OR)
+ * matchValue({ actual: "hello", expected: /^hel/ }) // true
+ * matchValue({ actual: 5, expected: { not: 3 } }) // true
+ */
+export { matchValue } from "discourse/lib/blocks/-internals/matching/value-matcher";
diff --git a/frontend/discourse/app/lib/glob-utils.js b/frontend/discourse/app/lib/glob-utils.js
new file mode 100644
index 0000000000000..09df5adb47962
--- /dev/null
+++ b/frontend/discourse/app/lib/glob-utils.js
@@ -0,0 +1,29 @@
+// @ts-check
+import picomatch from "picomatch";
+
+/**
+ * Validates that a glob pattern can be compiled by picomatch.
+ *
+ * Instead of using a restrictive regex, this function attempts to compile
+ * the pattern with picomatch using strict mode. This allows full picomatch
+ * syntax including advanced features like brace expansion, character classes,
+ * and negation, while catching syntax errors like unbalanced brackets.
+ *
+ * @param {string} pattern - The pattern to validate.
+ * @returns {boolean} True if the pattern is valid picomatch syntax.
+ *
+ * @example
+ * isValidGlobPattern("sidebar-*");         // true
+ * isValidGlobPattern("{a,b}-blocks");      // true
+ * isValidGlobPattern("[unclosed");         // false (unbalanced bracket)
+ */
+export function isValidGlobPattern(pattern) {
+  try {
+    // Compile with strictBrackets to throw on imbalanced brackets/braces/parens.
+    // Without this option, picomatch treats malformed patterns as literals.
+    picomatch(pattern, { strictBrackets: true });
+    return true;
+  } catch {
+    return false;
+  }
+}
diff --git a/frontend/discourse/app/lib/outlet-args.js b/frontend/discourse/app/lib/outlet-args.js
new file mode 100644
index 0000000000000..e9236805867b3
--- /dev/null
+++ b/frontend/discourse/app/lib/outlet-args.js
@@ -0,0 +1,155 @@
+/**
+ * Shared utilities for outlet args with deprecation support.
+ *
+ * These utilities are used by both PluginOutlet and BlockOutlet to handle
+ * deprecated args with lazy evaluation and warning messages.
+ *
+ * @module discourse/lib/outlet-args
+ */
+
+import { isDeprecatedOutletArgument } from "discourse/helpers/deprecated-outlet-argument";
+import deprecated, { withSilencedDeprecations } from "discourse/lib/deprecated";
+
+/**
+ * Key used to store the raw deprecatedArgs object as a non-enumerable
+ * property on the combined args object. This is used by dev-tools to display
+ * deprecation info without triggering the deprecation warnings.
+ */
+export const DEPRECATED_ARGS_KEY = "__deprecatedArgs__";
+
+/**
+ * Flag to control whether buildArgsWithDeprecations includes the raw
+ * deprecatedArgs object as a non-enumerable property. This is enabled
+ * by dev-tools when outlet debugging is active.
+ */
+let _includeDeprecatedArgsProperty = false;
+
+/**
+ * Enables or disables including the raw deprecatedArgs object as a
+ * non-enumerable property in buildArgsWithDeprecations output.
+ *
+ * @param {boolean} value - Whether to include the property.
+ */
+export function _setIncludeDeprecatedArgsProperty(value) {
+  _includeDeprecatedArgsProperty = value;
+}
+
+/**
+ * Builds an args object that combines current args with deprecated args.
+ *
+ * Both current and deprecated args are accessed via property getters for lazy
+ * evaluation. Deprecated args trigger a deprecation warning when accessed.
+ *
+ * @param {Object} args - Current outlet args.
+ * @param {Object} deprecatedArgs - Deprecated args created with `deprecatedOutletArgument` helper.
+ * @param {Object} [opts={}] - Options passed to deprecation warnings.
+ * @param {string} [opts.outletName] - The outlet name for warning messages.
+ * @returns {Object} Combined args object with lazy property getters.
+ *
+ * @example
+ * const argsWithDeprecations = buildArgsWithDeprecations(
+ *   { topic: this.topic },
+ *   { oldTopic: deprecatedOutletArgument({ value: this.topic, message: "Use 'topic'" }) },
+ *   { outletName: "topic-sidebar" }
+ * );
+ */
+export function buildArgsWithDeprecations(args, deprecatedArgs, opts = {}) {
+  const output = {};
+
+  if (args) {
+    Object.keys(args).forEach((key) => {
+      Object.defineProperty(output, key, {
+        enumerable: true,
+        get() {
+          return args[key];
+        },
+      });
+    });
+  }
+
+  if (deprecatedArgs) {
+    Object.keys(deprecatedArgs).forEach((argumentName) => {
+      // Skip if this key already exists in args (e.g., from a parent outlet's
+      // outletArgsWithDeprecations that already includes deprecatedArgs)
+      if (args && argumentName in args) {
+        return;
+      }
+
+      Object.defineProperty(output, argumentName, {
+        enumerable: true,
+        get() {
+          const deprecatedArg = deprecatedArgs[argumentName];
+
+          return deprecatedArgumentValue(deprecatedArg, {
+            ...opts,
+            argumentName,
+          });
+        },
+      });
+    });
+
+    // When dev-tools outlet debugging is enabled, include the raw deprecatedArgs
+    // as a non-enumerable property so ArgsTable can display deprecation info.
+    if (_includeDeprecatedArgsProperty) {
+      Object.defineProperty(output, DEPRECATED_ARGS_KEY, {
+        enumerable: false,
+        value: deprecatedArgs,
+      });
+    }
+  }
+
+  return output;
+}
+
+/**
+ * Evaluates a deprecated argument, triggering a deprecation warning.
+ *
+ * The warning is triggered each time the value is accessed. If the deprecated
+ * arg has a `silence` option, the warning is silenced under that deprecation ID.
+ *
+ * @param {Object} deprecatedArg - A deprecated arg created with `deprecatedOutletArgument` helper.
+ * @param {Object} options - Options for the deprecation warning.
+ * @param {string} options.argumentName - The name of the deprecated arg.
+ * @param {string} [options.outletName] - The outlet name for the warning message.
+ * @param {string} [options.classModuleName] - Module name for connector class.
+ * @param {string} [options.templateModule] - Module name for connector template.
+ * @param {string} [options.connectorName] - Connector name.
+ * @param {string} [options.layoutName] - Layout name.
+ * @returns {*} The value of the deprecated arg.
+ * @throws {Error} If the deprecated arg was not created with `deprecatedOutletArgument`.
+ */
+export function deprecatedArgumentValue(deprecatedArg, options) {
+  if (!isDeprecatedOutletArgument(deprecatedArg)) {
+    throw new Error(
+      "deprecated argument is not defined properly, use helper `deprecatedOutletArgument` from discourse/helpers/deprecated-outlet-argument"
+    );
+  }
+
+  let message = deprecatedArg.message;
+  if (!message) {
+    if (options.outletName) {
+      message = `outlet arg \`${options.argumentName}\` is deprecated on the outlet \`${options.outletName}\``;
+    } else {
+      message = `${options.argumentName} is deprecated`;
+    }
+  }
+
+  const connectorModule =
+    options.classModuleName || options.templateModule || options.connectorName;
+
+  if (connectorModule) {
+    message += ` [used on connector ${connectorModule}]`;
+  } else if (options.layoutName) {
+    message += ` [used on ${options.layoutName}]`;
+  }
+
+  if (!deprecatedArg.silence) {
+    deprecated(message, deprecatedArg.options);
+    return deprecatedArg.value;
+  }
+
+  return withSilencedDeprecations(deprecatedArg.silence, () => {
+    deprecated(message, deprecatedArg.options);
+    return deprecatedArg.value;
+  });
+}
diff --git a/frontend/discourse/app/lib/plugin-api.gjs b/frontend/discourse/app/lib/plugin-api.gjs
index 989823c4297b5..de9a55a11877d 100644
--- a/frontend/discourse/app/lib/plugin-api.gjs
+++ b/frontend/discourse/app/lib/plugin-api.gjs
@@ -1,5 +1,6 @@
 /* eslint-disable ember/no-jquery */
 import $ from "jquery";
+import { _renderBlocks } from "discourse/blocks/block-outlet";
 import { addAboutPageActivity } from "discourse/components/about-page";
 import { addBulkDropdownButton } from "discourse/components/bulk-select-topics-dropdown";
 import { addCardClickListenerSelector } from "discourse/components/card-contents-base";
@@ -55,6 +56,13 @@ import { addBeforeAuthCompleteCallback } from "discourse/instance-initializers/a
 import { registerAdminPluginConfigNav } from "discourse/lib/admin-plugin-config-nav";
 import { registerPluginHeaderActionComponent } from "discourse/lib/admin-plugin-header-actions";
 import { registerReportModeComponent } from "discourse/lib/admin-report-additional-modes";
+import { captureCallSite } from "discourse/lib/blocks/-internals/error";
+import {
+  _registerBlock,
+  _registerBlockFactory,
+} from "discourse/lib/blocks/-internals/registry/block";
+import { _registerConditionType } from "discourse/lib/blocks/-internals/registry/condition";
+import { _registerOutlet } from "discourse/lib/blocks/-internals/registry/outlet";
 import classPrepend, {
   withPrependsRolledBack,
 } from "discourse/lib/class-prepend";
@@ -3372,6 +3380,201 @@ class _PluginApi {
     registeredEditCategoryTabs.push(tab);
   }
 
+  /**
+   * Registers block components to render in a designated outlet.
+   *
+   * **IMPORTANT:** Must be called in an initializer that runs after "freeze-block-registry".
+   * All blocks must be registered via `registerBlock()` before this is called.
+   *
+   * Block outlets are extension points where themes and plugins can render custom
+   * content layouts. Each block must be decorated with `@block` from "discourse/blocks".
+   *
+   * Blocks can have conditions that determine when they render. Conditions support
+   * AND logic (array), OR logic (`any`), and NOT logic (`not`).
+   *
+   * @experimental This API is under active development and may change or be removed
+   * in future releases without prior notice. Use with caution in production environments.
+   *
+   * @param {string} outletName - The block outlet identifier
+   * @param {Array<import("discourse/blocks/block-outlet").LayoutEntry>} blocks - Array of layout entries
+   *
+   * @example
+   * ```javascript
+   * import { block } from "discourse/blocks";
+   *
+   * @block("my-banner")
+   * class MyBanner extends Component {
+   *   <template>
+   *     <h1>{{@title}}</h1>
+   *   </template>
+   * }
+   *
+   * api.renderBlocks("homepage-blocks", [
+   *   // Simple block without conditions
+   *   {
+   *     block: MyBanner,
+   *     args: { title: "Welcome!" },
+   *   },
+   *   // Block with conditions (AND logic - all must pass)
+   *   {
+   *     block: MyBanner,
+   *     args: { title: "Admin Banner" },
+   *     conditions: [
+   *       { type: "route", pages: ["DISCOVERY_PAGES"] },
+   *       { type: "user", admin: true }
+   *     ],
+   *   },
+   *   // Block with OR conditions
+   *   {
+   *     block: MyBanner,
+   *     args: { title: "Staff Banner" },
+   *     conditions: [
+   *       { any: [
+   *         { type: "user", admin: true },
+   *         { type: "user", moderator: true }
+   *       ]}
+   *     ],
+   *   },
+   * ]);
+   * ```
+   */
+  renderBlocks(outletName, blocks) {
+    // Capture call site here, excluding this method, so the stack trace
+    // points directly to the user's code that called api.renderBlocks().
+    const callSiteError = captureCallSite(this.renderBlocks);
+    _renderBlocks(outletName, blocks, this.container, callSiteError);
+  }
+
+  /**
+   * Registers a block component for use with `renderBlocks()`.
+   *
+   * **IMPORTANT:** Must be called in a pre-initializer that runs before "freeze-block-registry".
+   * The block registry is frozen by the "freeze-block-registry" initializer, preventing
+   * late registrations.
+   *
+   * Supports two registration patterns:
+   *
+   * 1. **Direct class registration**: `registerBlock(BlockClass)`
+   *    Registers using the block's own `blockName` from its `@block` decorator.
+   *
+   * 2. **Lazy loading with factory**: `registerBlock("name", () => import(...))`
+   *    Registers a factory function for lazy loading. The block module won't be
+   *    loaded until actually needed. The resolved block's `blockName` must match
+   *    the registered name.
+   *
+   * @experimental This API is under active development and may change or be removed
+   * in future releases without prior notice. Use with caution in production environments.
+   *
+   * @param {typeof import("@glimmer/component").default | string} blockOrName - Block class or name string for lazy loading.
+   * @param {Function} [factory] - Factory function returning Promise<BlockClass> (required when first arg is name).
+   *
+   * @example Direct class registration
+   * ```javascript
+   * import HeroBanner from "../blocks/hero-banner";
+   * api.registerBlock(HeroBanner);
+   * ```
+   *
+   * @example Lazy loading with factory
+   * ```javascript
+   * api.registerBlock("sidebar-widget", () => import("../blocks/sidebar-widget"));
+   * ```
+   */
+  registerBlock(blockOrName, factory) {
+    if (typeof blockOrName === "string") {
+      // Lazy loading: registerBlock("name", () => import(...))
+      if (typeof factory !== "function") {
+        throw new Error(
+          `registerBlock("${blockOrName}", ...) requires a factory function as second argument.`
+        );
+      }
+      _registerBlockFactory(blockOrName, factory);
+    } else {
+      // Direct class: registerBlock(BlockClass)
+      _registerBlock(blockOrName);
+    }
+  }
+
+  /**
+   * Registers a custom block outlet where blocks can be rendered.
+   *
+   * This allows plugins and themes to define their own block outlets that can be
+   * used with `renderBlocks()`. Custom outlets must follow naming conventions:
+   * - Core outlets: `outlet-name` (kebab-case)
+   * - Plugin outlets: `namespace:outlet-name` (e.g., `chat:message-actions`)
+   * - Theme outlets: `theme:namespace:outlet-name` (e.g., `theme:my-theme:hero`)
+   *
+   * **IMPORTANT:** Must be called in a pre-initializer before "freeze-block-registry".
+   *
+   * @experimental This API is under active development and may change or be removed
+   * in future releases without prior notice. Use with caution in production environments.
+   *
+   * @param {string} outletName - The outlet name (must follow naming conventions).
+   * @param {Object} [options] - Outlet configuration options.
+   * @param {string} [options.description] - Human-readable description of the outlet.
+   *
+   * @example
+   * ```javascript
+   * // In a pre-initializer
+   * api.registerBlockOutlet("chat:message-actions", {
+   *   description: "Actions displayed below chat messages",
+   * });
+   *
+   * // Later, in an api-initializer
+   * api.renderBlocks("chat:message-actions", [...]);
+   * ```
+   */
+  registerBlockOutlet(outletName, options) {
+    _registerOutlet(outletName, options);
+  }
+
+  /**
+   * Registers a custom block condition type.
+   *
+   * Custom conditions must use the `@blockCondition` decorator from "discourse/blocks/conditions"
+   * and extend `BlockCondition`. The class must implement the `evaluate(args)` method.
+   *
+   * **Note: The `evaluate()` method MUST be pure and idempotent.** It may be called
+   * multiple times during a single render cycle, especially when debug logging
+   * is enabled, and should not perform any side effects or state mutations.
+   *
+   * @experimental This API is under active development and may change or be removed
+   * in future releases without prior notice. Use with caution in production environments.
+   *
+   * @param {typeof import("discourse/blocks/conditions").BlockCondition} ConditionClass - The condition class decorated with `@blockCondition`.
+   *
+   * @example
+   * ```javascript
+   * import { blockCondition, BlockCondition } from "discourse/blocks/conditions";
+   *
+   * @blockCondition({
+   *   type: "feature-flag",
+   *   args: {
+   *     flag: { type: "string", required: true },
+   *   },
+   * })
+   * class BlockFeatureFlagCondition extends BlockCondition {
+   *   @service currentUser;
+   *
+   *   evaluate(args) {
+   *     return this.currentUser?.feature_flags?.[args.flag] === true;
+   *   }
+   * }
+   *
+   * api.registerBlockConditionType(BlockFeatureFlagCondition);
+   *
+   * // Then use it in renderBlocks:
+   * api.renderBlocks("homepage-blocks", [
+   *   {
+   *     block: MyBlock,
+   *     conditions: [{ type: "feature-flag", flag: "new_feature" }]
+   *   }
+   * ]);
+   * ```
+   */
+  registerBlockConditionType(ConditionClass) {
+    _registerConditionType(ConditionClass);
+  }
+
   // eslint-disable-next-line no-unused-vars
   #deprecateModifyClass(className) {
     // display notification messages for deprecated classes
diff --git a/frontend/discourse/app/lib/plugin-connectors.js b/frontend/discourse/app/lib/plugin-connectors.js
index 468df1217e5eb..e41358a50101c 100644
--- a/frontend/discourse/app/lib/plugin-connectors.js
+++ b/frontend/discourse/app/lib/plugin-connectors.js
@@ -4,8 +4,7 @@ import {
   setComponentTemplate,
 } from "@glimmer/manager";
 import templateOnly from "@ember/component/template-only";
-import { isDeprecatedOutletArgument } from "discourse/helpers/deprecated-outlet-argument";
-import deprecated, { withSilencedDeprecations } from "discourse/lib/deprecated";
+import deprecated from "discourse/lib/deprecated";
 
 let _connectorCache;
 let _extraConnectorClasses = {};
@@ -213,18 +212,20 @@ export function connectorsExist(outletName) {
   return Boolean(_connectorCache[outletName] || debugOutletCallback);
 }
 
-export function connectorsFor(outletName) {
+export function connectorsFor(outletName, outletArgs) {
   if (!_connectorCache) {
     buildConnectorCache();
   }
   if (debugOutletCallback) {
-    return debugOutletCallback(outletName, _connectorCache[outletName]);
+    return debugOutletCallback(outletName, _connectorCache[outletName], {
+      outletArgs,
+    });
   }
   return _connectorCache[outletName] || [];
 }
 
 export function renderedConnectorsFor(outletName, args, context, owner) {
-  return connectorsFor(outletName).filter((con) => {
+  return connectorsFor(outletName, args).filter((con) => {
     return (
       !con.connectorClass?.shouldRender ||
       con.connectorClass?.shouldRender(args, context, owner)
@@ -232,73 +233,6 @@ export function renderedConnectorsFor(outletName, args, context, owner) {
   });
 }
 
-export function buildArgsWithDeprecations(args, deprecatedArgs, opts = {}) {
-  const output = {};
-
-  if (args) {
-    Object.keys(args).forEach((key) => {
-      Object.defineProperty(output, key, {
-        get() {
-          return args[key];
-        },
-      });
-    });
-  }
-
-  if (deprecatedArgs) {
-    Object.keys(deprecatedArgs).forEach((argumentName) => {
-      Object.defineProperty(output, argumentName, {
-        get() {
-          const deprecatedArg = deprecatedArgs[argumentName];
-
-          return deprecatedArgumentValue(deprecatedArg, {
-            ...opts,
-            argumentName,
-          });
-        },
-      });
-    });
-  }
-
-  return output;
-}
-
-export function deprecatedArgumentValue(deprecatedArg, options) {
-  if (!isDeprecatedOutletArgument(deprecatedArg)) {
-    throw new Error(
-      "deprecated argument is not defined properly, use helper `deprecatedOutletArgument` from discourse/helpers/deprecated-outlet-argument"
-    );
-  }
-
-  let message = deprecatedArg.message;
-  if (!message) {
-    if (options.outletName) {
-      message = `outlet arg \`${options.argumentName}\` is deprecated on the outlet \`${options.outletName}\``;
-    } else {
-      message = `${options.argumentName} is deprecated`;
-    }
-  }
-
-  const connectorModule =
-    options.classModuleName || options.templateModule || options.connectorName;
-
-  if (connectorModule) {
-    message += ` [used on connector ${connectorModule}]`;
-  } else if (options.layoutName) {
-    message += ` [used on ${options.layoutName}]`;
-  }
-
-  if (!deprecatedArg.silence) {
-    deprecated(message, deprecatedArg.options);
-    return deprecatedArg.value;
-  }
-
-  return withSilencedDeprecations(deprecatedArg.silence, () => {
-    deprecated(message, deprecatedArg.options);
-    return deprecatedArg.value;
-  });
-}
-
 export function _setOutletDebugCallback(callback) {
   debugOutletCallback = callback;
 }
diff --git a/frontend/discourse/app/lib/registry/block-outlets.js b/frontend/discourse/app/lib/registry/block-outlets.js
new file mode 100644
index 0000000000000..5cf7d441a3a65
--- /dev/null
+++ b/frontend/discourse/app/lib/registry/block-outlets.js
@@ -0,0 +1,56 @@
+import { DEBUG } from "@glimmer/env";
+import { VALID_BLOCK_NAME_PATTERN } from "discourse/lib/blocks";
+
+/**
+ * Registry of CORE block outlet names in the application.
+ *
+ * Block outlets provide extension points where plugins and themes can render
+ * custom block layouts. Each outlet represents a specific location in the UI
+ * where blocks can be rendered.
+ *
+ * Outlet names must follow kebab-case: lowercase letters, numbers, and hyphens,
+ * starting with a letter. Examples: "sidebar-blocks", "hero-blocks", "main-outlet-1"
+ *
+ * ## IMPORTANT: Plugin Outlets DO NOT Belong Here
+ *
+ * **This file is ONLY for core Discourse outlets that are always available.**
+ *
+ * If you are adding an outlet for a plugin (including core plugins like chat,
+ * AI, polls, etc.), you MUST use the Plugin API instead:
+ *
+ * ```javascript
+ * // In a pre-initializer
+ * api.registerBlockOutlet("chat:message-actions", {
+ *   description: "Actions below chat messages",
+ * });
+ * ```
+ *
+ * **Why?** Plugin outlets added here will cause issues because:
+ * 1. The outlet will be "registered" even when the plugin is disabled
+ * 2. Themes/plugins may try to render blocks to outlets that don't exist
+ * 3. The outlet validation will pass but the actual rendering location won't exist
+ *
+ * **Rule of thumb:** If the outlet depends on ANY plugin being enabled, it MUST
+ * be registered via `api.registerBlockOutlet()` in that plugin's code, not here.
+ *
+ * @constant {ReadonlyArray<string>} BLOCK_OUTLETS - An immutable array of core block outlet identifiers
+ */
+// eslint-discourse keep-array-sorted
+export const BLOCK_OUTLETS = Object.freeze([
+  "hero-blocks",
+  "homepage-blocks",
+  "main-outlet-blocks",
+  "sidebar-blocks",
+]);
+
+// Validate outlet names follow the kebab-case pattern.
+if (DEBUG) {
+  BLOCK_OUTLETS.forEach((name) => {
+    if (!VALID_BLOCK_NAME_PATTERN.test(name)) {
+      throw new Error(
+        `Block outlet name "${name}" is invalid. ` +
+          `Names must be kebab-case: lowercase letters, numbers, and hyphens, starting with a letter.`
+      );
+    }
+  });
+}
diff --git a/frontend/discourse/app/lib/transformer/registry.js b/frontend/discourse/app/lib/registry/transformers.js
similarity index 75%
rename from frontend/discourse/app/lib/transformer/registry.js
rename to frontend/discourse/app/lib/registry/transformers.js
index 48e9a7c2ebc40..408cd410ea894 100644
--- a/frontend/discourse/app/lib/transformer/registry.js
+++ b/frontend/discourse/app/lib/registry/transformers.js
@@ -1,5 +1,14 @@
+/**
+ * Registry of available behavior transformers in the application.
+ * Behavior transformers allow plugins and themes to modify or enhance the specific behaviors and interactions.
+ * These transformers are invoked at key points to allow customization of the application behavior.
+ *
+ * USE ONLY lowercase names
+ *
+ * @constant {ReadonlyArray<string>} BEHAVIOR_TRANSFORMERS - An immutable array of behavior transformer identifiers
+ */
+// eslint-discourse keep-array-sorted
 export const BEHAVIOR_TRANSFORMERS = Object.freeze([
-  // use only lowercase names
   "composer-position:correct-scroll-position",
   "composer-position:editor-touch-move",
   "discovery-topic-list-load-more",
@@ -10,11 +19,20 @@ export const BEHAVIOR_TRANSFORMERS = Object.freeze([
   "topic-list-item-click",
 ]);
 
+/**
+ * Registry of available value transformers in the application.
+ * Value transformers allow plugins and themes to modify or replace specific values before they are used by the application.
+ * Each transformer represents a specific value or computation that can be customized.
+ *
+ * USE ONLY lowercase names
+ *
+ * @constant {ReadonlyArray<string>} VALUE_TRANSFORMERS - An immutable array of value transformer identifiers
+ */
+// eslint-discourse keep-array-sorted
 export const VALUE_TRANSFORMERS = Object.freeze([
-  // use only lowercase names
+  "admin-onboarding-start-posting-options",
   "admin-plugin-icon",
   "admin-reports-show-query-params",
-  "admin-onboarding-start-posting-options",
   "bulk-select-in-nav-controls",
   "category-available-views",
   "category-default-colors",
@@ -26,13 +44,13 @@ export const VALUE_TRANSFORMERS = Object.freeze([
   "composer-editor-reply-placeholder",
   "composer-force-editor-mode",
   "composer-message-components",
-  "composer-reply-options-user-link-name",
   "composer-reply-options-user-avatar-template",
+  "composer-reply-options-user-link-name",
   "composer-save-button-label",
   "composer-service-cannot-submit-post",
   "composer-toggles-class",
-  "create-topic-label",
   "create-topic-button-class",
+  "create-topic-label",
   "flag-button-disabled-state",
   "flag-button-dynamic-class",
   "flag-button-render-decision",
diff --git a/frontend/discourse/app/lib/string-similarity.js b/frontend/discourse/app/lib/string-similarity.js
new file mode 100644
index 0000000000000..ce84c1182dc68
--- /dev/null
+++ b/frontend/discourse/app/lib/string-similarity.js
@@ -0,0 +1,166 @@
+/**
+ * String similarity utilities for fuzzy matching.
+ *
+ * This module provides functions for computing string similarity using
+ * Jaro-Winkler similarity. It is used for typo suggestions in validation
+ * error messages throughout Discourse.
+ *
+ * @module discourse/lib/string-similarity
+ */
+
+/**
+ * Calculates Jaro-Winkler similarity between two strings.
+ *
+ * Returns a score from 0 to 1, where 1 is an exact match. This algorithm
+ * gives bonus weight to strings that share a common prefix, making it
+ * ideal for detecting typos where someone forgets a suffix (e.g., "DISCOVERY"
+ * instead of "DISCOVERY_PAGES").
+ *
+ * The algorithm works in two steps:
+ * 1. Jaro similarity: Measures matching characters and transpositions
+ * 2. Winkler modification: Adds bonus for matching prefix (up to 4 chars)
+ *
+ * @param {string} a - First string.
+ * @param {string} b - Second string.
+ * @returns {number} Similarity score between 0 and 1.
+ *
+ * @example
+ * jaroWinklerSimilarity("DISCOVERY", "DISCOVERY_PAGES") // ~0.88 (prefix match)
+ * jaroWinklerSimilarity("condition", "conditions")      // ~0.97 (1 char diff)
+ * jaroWinklerSimilarity("foobar", "HOMEPAGE")           // ~0.40 (unrelated)
+ */
+export function jaroWinklerSimilarity(a, b) {
+  if (a === b) {
+    return 1;
+  }
+  if (a.length === 0 || b.length === 0) {
+    return 0;
+  }
+
+  // Calculate the match window - characters can match if within this distance
+  const matchWindow = Math.floor(Math.max(a.length, b.length) / 2) - 1;
+  const aMatches = new Array(a.length).fill(false);
+  const bMatches = new Array(b.length).fill(false);
+
+  let matches = 0;
+  let transpositions = 0;
+
+  // Find matching characters within the match window
+  for (let i = 0; i < a.length; i++) {
+    const start = Math.max(0, i - matchWindow);
+    const end = Math.min(i + matchWindow + 1, b.length);
+
+    for (let j = start; j < end; j++) {
+      if (bMatches[j] || a[i] !== b[j]) {
+        continue;
+      }
+      aMatches[i] = true;
+      bMatches[j] = true;
+      matches++;
+      break;
+    }
+  }
+
+  if (matches === 0) {
+    return 0;
+  }
+
+  // Count transpositions (matched chars that appear in different order)
+  let k = 0;
+  for (let i = 0; i < a.length; i++) {
+    if (!aMatches[i]) {
+      continue;
+    }
+    while (!bMatches[k]) {
+      k++;
+    }
+    if (a[i] !== b[k]) {
+      transpositions++;
+    }
+    k++;
+  }
+
+  // Calculate Jaro similarity
+  const jaro =
+    (matches / a.length +
+      matches / b.length +
+      (matches - transpositions / 2) / matches) /
+    3;
+
+  // Winkler modification: add bonus for common prefix (up to 4 characters)
+  let prefix = 0;
+  for (let i = 0; i < Math.min(4, a.length, b.length); i++) {
+    if (a[i] === b[i]) {
+      prefix++;
+    } else {
+      break;
+    }
+  }
+
+  return jaro + prefix * 0.1 * (1 - jaro);
+}
+
+/**
+ * Finds the closest match for a string from a list of candidates.
+ *
+ * Uses Jaro-Winkler similarity with a threshold to avoid suggesting
+ * completely unrelated strings. The Jaro-Winkler algorithm gives bonus
+ * weight to strings with matching prefixes, making it ideal for detecting
+ * typos like "DISCOVERY" instead of "DISCOVERY_PAGES".
+ *
+ * @param {string} input - The string to find a match for.
+ * @param {readonly string[]} candidates - List of valid strings to match against.
+ * @param {Object} [options] - Options.
+ * @param {number} [options.minSimilarity=0.8] - Minimum similarity (0-1) to consider a match.
+ * @param {boolean} [options.caseSensitive=false] - Whether to compare case-sensitively.
+ * @returns {string|null} The closest matching string, or null if none is similar enough.
+ *
+ * @example
+ * findClosestMatch("conditon", ["block", "args", "conditions"]) // => "conditions"
+ * findClosestMatch("DISCOVERY", ["DISCOVERY_PAGES", "HOMEPAGE"]) // => "DISCOVERY_PAGES"
+ * findClosestMatch("foo", ["block", "args", "conditions"])      // => null
+ */
+export function findClosestMatch(input, candidates, options = {}) {
+  const { minSimilarity = 0.8, caseSensitive = false } = options;
+  let closestMatch = null;
+  let highestSimilarity = 0;
+
+  const normalizedInput = caseSensitive ? input : input.toLowerCase();
+
+  for (const candidate of candidates) {
+    const normalizedCandidate = caseSensitive
+      ? candidate
+      : candidate.toLowerCase();
+    const similarity = jaroWinklerSimilarity(
+      normalizedInput,
+      normalizedCandidate
+    );
+
+    if (similarity > highestSimilarity && similarity >= minSimilarity) {
+      highestSimilarity = similarity;
+      closestMatch = candidate;
+    }
+  }
+
+  return closestMatch;
+}
+
+/**
+ * Formats an unknown value with a "did you mean?" suggestion if a close match exists.
+ *
+ * @param {string} value - The unknown/invalid value.
+ * @param {readonly string[]} validValues - List of valid values to match against.
+ * @param {Object} [options] - Options passed to findClosestMatch.
+ * @returns {string} Formatted string like '"foo" (did you mean "bar"?)' or just '"foo"'.
+ *
+ * @example
+ * formatWithSuggestion("conditon", ["conditions"]) // => '"conditon" (did you mean "conditions"?)'
+ * formatWithSuggestion("xyz", ["conditions"])      // => '"xyz"'
+ */
+export function formatWithSuggestion(value, validValues, options = {}) {
+  const suggestion = findClosestMatch(value, validValues, options);
+  if (suggestion) {
+    return `"${value}" (did you mean "${suggestion}"?)`;
+  }
+  return `"${value}"`;
+}
diff --git a/frontend/discourse/app/lib/transformer.js b/frontend/discourse/app/lib/transformer.js
index bb3eff3ecc044..11d8456fe9384 100644
--- a/frontend/discourse/app/lib/transformer.js
+++ b/frontend/discourse/app/lib/transformer.js
@@ -1,11 +1,11 @@
 import { DEBUG } from "@glimmer/env";
 import { capitalize } from "@ember/string";
 import { isTesting } from "discourse/lib/environment";
-import { consolePrefix } from "discourse/lib/source-identifier";
 import {
   BEHAVIOR_TRANSFORMERS,
   VALUE_TRANSFORMERS,
-} from "discourse/lib/transformer/registry";
+} from "discourse/lib/registry/transformers";
+import { consolePrefix } from "discourse/lib/source-identifier";
 
 const CORE_TRANSFORMER = "CORE";
 const PLUGIN_TRANSFORMER = "PLUGIN";
@@ -28,7 +28,7 @@ let skipApplyExceptionOnTests = false;
  *
  * Some checks are performed to ensure there are no repeated names between the multiple transformer types.
  *
- * The list can be edited in `discourse/lib/transformer/registry`
+ * The list can be edited in `discourse/lib/registry/transformers`
  */
 let validTransformerNames = new Map();
 
diff --git a/frontend/discourse/app/loader-shims.js b/frontend/discourse/app/loader-shims.js
index 43829b6bc520d..e5581d0b99940 100644
--- a/frontend/discourse/app/loader-shims.js
+++ b/frontend/discourse/app/loader-shims.js
@@ -116,3 +116,6 @@ loaderShim("truth-helpers/helpers/or", () =>
 );
 loaderShim("virtual-dom", () => importSync("discourse/widgets/virtual-dom"));
 loaderShim("xss", () => importSync("xss"));
+loaderShim("discourse/lib/transformer/registry", () =>
+  importSync("discourse/lib/registry/transformers")
+);
diff --git a/frontend/discourse/app/services/blocks.js b/frontend/discourse/app/services/blocks.js
new file mode 100644
index 0000000000000..64a4f8da257bc
--- /dev/null
+++ b/frontend/discourse/app/services/blocks.js
@@ -0,0 +1,353 @@
+// @ts-check
+import { getOwner, setOwner } from "@ember/owner";
+import Service from "@ember/service";
+import { debugHooks } from "discourse/lib/blocks/-internals/debug-hooks";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { evaluateConditions } from "discourse/lib/blocks/-internals/matching/condition-evaluator";
+import {
+  getAllBlockEntries,
+  getBlockEntry,
+  hasBlock,
+  isBlockFactory,
+  resolveBlock,
+} from "discourse/lib/blocks/-internals/registry/block";
+import { getAllConditionTypeEntries } from "discourse/lib/blocks/-internals/registry/condition";
+import { getAllOutlets } from "discourse/lib/blocks/-internals/registry/outlet";
+import { validateConditions } from "discourse/lib/blocks/-internals/validation/conditions";
+
+/**
+ * Unified service for block registry and condition evaluation.
+ *
+ * ## Block Registry
+ *
+ * Provides introspection for registered block components:
+ * - `getBlock(name)` - Get a block by name
+ * - `hasBlock(name)` - Check if a block is registered
+ * - `listBlocks()` - Get all registered blocks
+ * - `listBlocksWithMetadata()` - Get all blocks with their metadata
+ *
+ * Core blocks are auto-discovered from `discourse/blocks/builtin`.
+ * Theme/plugin blocks are registered via `api.registerBlock()` in pre-initializers.
+ *
+ * ## Condition Evaluation
+ *
+ * Evaluates block render conditions at runtime:
+ * - `evaluate(conditionSpec)` - Evaluate condition(s)
+ * - `validate(conditionSpec)` - Validate condition(s) at registration time
+ *
+ * Custom condition types are registered via `api.registerBlockConditionType()` in pre-initializers.
+ * Built-in condition types are auto-discovered from `discourse/blocks/conditions`.
+ *
+ * Supports boolean combinators:
+ * - Array of conditions: AND logic (all must pass)
+ * - `{ any: [...] }`: OR logic (at least one must pass)
+ * - `{ not: {...} }`: NOT logic (must fail)
+ *
+ * ## Debug Support
+ *
+ * - `showGhosts` - Check if visual overlay is enabled (for rendering ghost blocks)
+ *
+ * @experimental This API is under active development and may change or be removed
+ * in future releases without prior notice. Use with caution in production environments.
+ *
+ * @class Blocks
+ * @extends Service
+ */
+export default class Blocks extends Service {
+  /**
+   * Map of condition type names to their instances.
+   * Built lazily from the condition type registry when first accessed.
+   *
+   * @type {Map<string, import("discourse/blocks/conditions").BlockCondition>}
+   */
+  #conditionInstances = new Map();
+
+  /**
+   * Tracks the registry size at last initialization to detect new registrations.
+   *
+   * We use size-based detection (rather than tracking individual type names) because:
+   * 1. Condition types are only ever added, never removed
+   * 2. Size comparison is O(1) vs O(n) for set difference
+   * 3. Avoids allocating a Set<string> for tracking
+   *
+   * When registry.size > #lastKnownRegistrySize, we know new types were registered
+   * and need to create instances for them.
+   *
+   * @type {number}
+   */
+  #lastKnownRegistrySize = 0;
+
+  /*
+   * Block Outlet Methods
+   */
+
+  /**
+   * Returns all registered block outlet names (both core and custom).
+   *
+   * Core outlets are defined in `lib/registry/block-outlets.js`. Custom outlets
+   * are registered by plugins and themes via `api.registerBlockOutlet()`.
+   *
+   * @returns {string[]} Array of outlet names (e.g., ["hero-blocks", "homepage-blocks", ...]).
+   *
+   * @example
+   * ```javascript
+   * const outlets = this.blocks.listOutlets();
+   * ```
+   */
+  listOutlets() {
+    return getAllOutlets();
+  }
+
+  /*
+   * Block Registry Methods
+   */
+
+  /**
+   * Gets a registered block by name.
+   *
+   * @param {string} name - The block name (e.g., "hero-banner")
+   * @returns {import("discourse/lib/blocks/-internals/registry/block").BlockRegistryEntry|undefined} The block entry, or undefined if not found
+   *
+   * @example
+   * ```javascript
+   * const HeroBanner = this.blocks.getBlock("hero-banner");
+   * ```
+   */
+  getBlock(name) {
+    return getBlockEntry(name);
+  }
+
+  /**
+   * Checks if a block is registered.
+   *
+   * @param {string} name - The block name
+   * @returns {boolean}
+   *
+   * @example
+   * ```javascript
+   * if (this.blocks.hasBlock("hero-banner")) {
+   *   // Block is available
+   * }
+   * ```
+   */
+  hasBlock(name) {
+    return hasBlock(name);
+  }
+
+  /**
+   * Returns all registered block entries.
+   *
+   * @returns {Array<import("discourse/lib/blocks/-internals/registry/block").BlockRegistryEntry>}
+   *
+   * @example
+   * ```javascript
+   * const allBlocks = this.blocks.listBlocks();
+   * ```
+   */
+  listBlocks() {
+    return getAllBlockEntries().map(([, entry]) => entry);
+  }
+
+  /**
+   * Returns all registered blocks with their metadata.
+   * Useful for admin UIs and documentation generation.
+   *
+   * @returns {Array<{name: string, component: import("discourse/lib/blocks/-internals/registry/block").BlockRegistryEntry, metadata: Object}>}
+   *
+   * @example
+   * ```javascript
+   * const blocksInfo = this.blocks.listBlocksWithMetadata();
+   * blocksInfo.forEach(({ name, metadata }) => {
+   *   console.log(name, metadata.description, metadata.args);
+   * });
+   * ```
+   */
+  listBlocksWithMetadata() {
+    return getAllBlockEntries().map(([name, component]) => ({
+      name,
+      component,
+      metadata: getBlockMetadata(component),
+    }));
+  }
+
+  /**
+   * Asynchronously gets a registered block by name, resolving factories if needed.
+   *
+   * Unlike `getBlock()` which returns the raw registry entry (which may be a factory),
+   * this method ensures the returned value is always a resolved BlockClass.
+   *
+   * @param {string} name - The block name (e.g., "hero-banner").
+   * @returns {Promise<import("discourse/lib/blocks/-internals/registry/block").BlockClass|undefined>}
+   *   The resolved block class, or undefined if not found.
+   *
+   * @example
+   * ```javascript
+   * const HeroBanner = await this.blocks.getBlockAsync("hero-banner");
+   * if (HeroBanner) {
+   *   // Block is ready to use
+   * }
+   * ```
+   */
+  async getBlockAsync(name) {
+    if (!hasBlock(name)) {
+      return undefined;
+    }
+    try {
+      return await resolveBlock(name);
+    } catch {
+      return undefined;
+    }
+  }
+
+  /**
+   * Checks if a block is registered and fully resolved (not a pending factory).
+   *
+   * Use this to check if a block is immediately available without needing async resolution.
+   * Returns false for unregistered blocks or blocks that are registered as factory functions
+   * but haven't been resolved yet.
+   *
+   * @param {string} name - The block name.
+   * @returns {boolean} True if registered and immediately available.
+   *
+   * @example
+   * ```javascript
+   * if (this.blocks.isBlockReady("hero-banner")) {
+   *   // Block is available synchronously
+   *   const HeroBanner = this.blocks.getBlock("hero-banner");
+   * } else {
+   *   // Block needs async resolution
+   *   const HeroBanner = await this.blocks.getBlockAsync("hero-banner");
+   * }
+   * ```
+   */
+  isBlockReady(name) {
+    if (!hasBlock(name)) {
+      return false;
+    }
+    const entry = getBlockEntry(name);
+    return !isBlockFactory(entry);
+  }
+
+  /*
+   * Condition Evaluation Methods
+   */
+
+  /**
+   * Lazily initializes condition instances from the registry.
+   *
+   * This deferred initialization pattern handles the timing issue where:
+   * 1. Service is instantiated early (e.g., during plugin API usage)
+   * 2. Core conditions are registered later by the pre-initializer
+   * 3. Service needs to pick up the newly registered conditions
+   *
+   * Called at the start of validate(), evaluate(), and other condition methods.
+   */
+  #lazilyInitializeConditionInstances() {
+    const entries = getAllConditionTypeEntries();
+
+    // Only rebuild if registry has grown since last check
+    if (entries.length === this.#lastKnownRegistrySize) {
+      return;
+    }
+
+    // Create instances for any new condition types
+    for (const [type, ConditionClass] of entries) {
+      if (!this.#conditionInstances.has(type)) {
+        this.#createConditionInstance(type, ConditionClass);
+      }
+    }
+
+    this.#lastKnownRegistrySize = entries.length;
+  }
+
+  /**
+   * Creates an instance of a condition class and stores it in the instances map.
+   * Sets the owner on the instance to enable service injection.
+   *
+   * @param {string} type - The condition type name.
+   * @param {typeof import("discourse/blocks/conditions").BlockCondition} ConditionClass - The condition class.
+   */
+  #createConditionInstance(type, ConditionClass) {
+    const instance = new ConditionClass();
+    setOwner(instance, getOwner(this));
+    this.#conditionInstances.set(type, instance);
+  }
+
+  /**
+   * Validates condition specs at block registration time.
+   * Recursively validates nested conditions in `any` and `not` combinators.
+   *
+   * Throws BlockError objects so callers can decide how to format
+   * the final error with appropriate context. The error object includes a
+   * `path` property indicating where in the conditions the error occurred
+   * (relative to the conditions root, e.g., "params.categoryId").
+   *
+   * @param {Object|Array<Object>} conditionSpec - Condition spec(s) to validate.
+   * @throws {BlockError} If validation fails.
+   */
+  validate(conditionSpec) {
+    this.#lazilyInitializeConditionInstances();
+    validateConditions(conditionSpec, this.#conditionInstances);
+  }
+
+  /**
+   * Evaluates condition specs at render time.
+   * Recursively evaluates nested conditions with AND/OR/NOT logic.
+   *
+   * @param {Object|Array<Object>} conditionSpec - Condition spec(s) to evaluate.
+   * @param {Object} [context] - Evaluation context.
+   * @param {boolean} [context.debug] - Enable debug logging for this evaluation.
+   * @param {number} [context._depth] - Internal: nesting depth for logging.
+   * @param {Object} [context.outletArgs] - Outlet arguments passed to conditions.
+   * @returns {boolean} True if conditions pass, false otherwise.
+   */
+  evaluate(conditionSpec, context = {}) {
+    this.#lazilyInitializeConditionInstances();
+    return evaluateConditions(conditionSpec, this.#conditionInstances, context);
+  }
+
+  /**
+   * Checks if a condition type is registered.
+   *
+   * @param {string} type - The condition type name
+   * @returns {boolean}
+   */
+  hasConditionType(type) {
+    this.#lazilyInitializeConditionInstances();
+    return this.#conditionInstances.has(type);
+  }
+
+  /**
+   * Returns all registered condition type names.
+   * Useful for debugging and error messages.
+   *
+   * @returns {string[]}
+   */
+  getRegisteredConditionTypes() {
+    this.#lazilyInitializeConditionInstances();
+    return [...this.#conditionInstances.keys()];
+  }
+
+  /*
+   * Debug Methods
+   */
+
+  /**
+   * Returns whether the debug visual overlay is enabled.
+   *
+   * Container blocks can use this to conditionally render ghost blocks
+   * for children they choose not to display.
+   *
+   * @returns {boolean} True if the visual overlay (ghost blocks) is enabled.
+   *
+   * @example
+   * ```javascript
+   * if (this.blocks.showGhosts) {
+   *   // Render ghost blocks for hidden children
+   * }
+   * ```
+   */
+  get showGhosts() {
+    return debugHooks.isGhostBlocksEnabled;
+  }
+}
diff --git a/frontend/discourse/app/services/discovery.js b/frontend/discourse/app/services/discovery.js
index ef8f2d41abdb2..b60ccdda7ca99 100644
--- a/frontend/discourse/app/services/discovery.js
+++ b/frontend/discourse/app/services/discovery.js
@@ -37,6 +37,12 @@ export default class DiscoveryService extends Service {
     }
   }
 
+  get custom() {
+    if (this.onDiscoveryRoute) {
+      return this.router.currentRouteName === "discovery.custom";
+    }
+  }
+
   get #routeAttrs() {
     return this.router.currentRoute.attributes;
   }
diff --git a/frontend/discourse/app/static/dev-tools/block-debug/block-info.gjs b/frontend/discourse/app/static/dev-tools/block-debug/block-info.gjs
new file mode 100644
index 0000000000000..9a9ca0dfb51d9
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/block-debug/block-info.gjs
@@ -0,0 +1,177 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { array, hash } from "@ember/helper";
+/** @type {import("discourse/float-kit/components/d-tooltip.gjs").default} */
+import DTooltip from "discourse/float-kit/components/d-tooltip";
+import icon from "discourse/helpers/d-icon";
+/** @type {import("../shared/args-table.gjs").default} */
+import ArgsTable from "../shared/args-table";
+/** @type {import("./conditions-tree.gjs").default} */
+import ConditionsTree from "./conditions-tree";
+
+/**
+ * Visual overlay component for rendered blocks.
+ * Wraps a block with debug information including name badge and tooltip.
+ *
+ * @param {string} blockName - The name of the block.
+ * @param {string} [blockId] - The block's unique ID (if set).
+ * @param {string} debugLocation - The hierarchy path where the block is rendered.
+ * @param {Object} [blockArgs] - Arguments passed to the block.
+ * @param {Object} [containerArgs] - Container arguments passed from parent container's childArgs.
+ * @param {Object} [conditions] - Conditions that were evaluated.
+ * @param {Object} [outletArgs] - Outlet arguments available to the block.
+ * @param {Component} WrappedComponent - The actual block component to render.
+ */
+export default class BlockInfo extends Component {
+  /**
+   * Checks whether this block has any conditions configured.
+   * Used to conditionally render the conditions section in the tooltip.
+   *
+   * @returns {boolean} True if the block has conditions defined.
+   */
+  get hasConditions() {
+    return this.args.conditions != null;
+  }
+
+  /**
+   * Checks whether this block has any arguments passed to it.
+   * Used to conditionally render the arguments section in the tooltip.
+   *
+   * @returns {boolean} True if the block has at least one argument.
+   */
+  get hasArgs() {
+    return (
+      this.args.blockArgs != null && Object.keys(this.args.blockArgs).length > 0
+    );
+  }
+
+  /**
+   * Checks whether this block has container args from a parent container.
+   * Used to conditionally render the container args section in the tooltip.
+   *
+   * @returns {boolean} True if the block has container args.
+   */
+  get hasContainerArgs() {
+    return (
+      this.args.containerArgs != null &&
+      Object.keys(this.args.containerArgs).length > 0
+    );
+  }
+
+  /**
+   * Checks whether this block has outlet args available.
+   * Used to conditionally render the outlet args section in the tooltip.
+   *
+   * @returns {boolean} True if outlet args are available.
+   */
+  get hasOutletArgs() {
+    return (
+      this.args.outletArgs != null &&
+      Object.keys(this.args.outletArgs).length > 0
+    );
+  }
+
+  /**
+   * Checks whether the tooltip has no content to display.
+   * Used to show an "empty" message when there are no conditions, args,
+   * container args, or outlet args.
+   *
+   * @returns {boolean} True if there is nothing to display in the tooltip.
+   */
+  get isEmpty() {
+    return (
+      !this.hasConditions &&
+      !this.hasArgs &&
+      !this.hasContainerArgs &&
+      !this.hasOutletArgs
+    );
+  }
+
+  /**
+   * Returns the display name for the block, including ID if set.
+   * Format: "blockName" or "blockName(#id)".
+   *
+   * @returns {string} The display name.
+   */
+  get displayName() {
+    if (this.args.blockId) {
+      return `${this.args.blockName}(#${this.args.blockId})`;
+    }
+    return this.args.blockName;
+  }
+
+  <template>
+    <div class="block-debug-info --rendered" data-block-name={{@blockName}}>
+      <DTooltip
+        @identifier="block-debug-info"
+        @interactive={{true}}
+        @placement="bottom-start"
+        @maxWidth={{500}}
+        @triggers={{hash
+          mobile=(array "click")
+          desktop=(array "hover" "click")
+        }}
+        @untriggers={{hash mobile=(array "click") desktop=(array "mouseleave")}}
+      >
+        <:trigger>
+          <span class="block-debug-badge">
+            {{icon "cube"}}
+            <span class="block-debug-badge__name">{{this.displayName}}</span>
+          </span>
+        </:trigger>
+        <:content>
+          <div class="block-debug-tooltip">
+            <div class="block-debug-tooltip__header">
+              <div class="block-debug-tooltip__row">
+                {{icon "cube"}}
+                <span class="block-debug-tooltip__title">
+                  {{this.displayName}}
+                </span>
+              </div>
+              <div class="block-debug-tooltip__location">
+                in
+                {{@debugLocation}}
+              </div>
+            </div>
+
+            {{#if this.hasConditions}}
+              <div class="block-debug-tooltip__section">
+                <div class="block-debug-tooltip__section-title">Conditions
+                  <span class="--passed">(passed)</span></div>
+                <ConditionsTree @conditions={{@conditions}} @passed={{true}} />
+              </div>
+            {{/if}}
+
+            {{#if this.hasArgs}}
+              <div class="block-debug-tooltip__section">
+                <div class="block-debug-tooltip__section-title">Arguments</div>
+                <ArgsTable @args={{@blockArgs}} />
+              </div>
+            {{/if}}
+
+            {{#if this.hasContainerArgs}}
+              <div class="block-debug-tooltip__section">
+                <div class="block-debug-tooltip__section-title">Container Args</div>
+                <ArgsTable @args={{@containerArgs}} />
+              </div>
+            {{/if}}
+
+            {{#if this.hasOutletArgs}}
+              <div class="block-debug-tooltip__section">
+                <div class="block-debug-tooltip__section-title">Outlet Args</div>
+                <ArgsTable @args={{@outletArgs}} />
+              </div>
+            {{/if}}
+
+            {{#if this.isEmpty}}
+              <div class="block-debug-tooltip__empty">
+                No conditions or arguments
+              </div>
+            {{/if}}
+          </div>
+        </:content>
+      </DTooltip>
+      <@WrappedComponent />
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/app/static/dev-tools/block-debug/button.gjs b/frontend/discourse/app/static/dev-tools/block-debug/button.gjs
new file mode 100644
index 0000000000000..a2ec574280904
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/block-debug/button.gjs
@@ -0,0 +1,140 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+/** @type {import("discourse/float-kit/components/d-menu.gjs").default} */
+import DMenu from "discourse/float-kit/components/d-menu";
+import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
+/** @type {import("discourse/helpers/element.gjs").default} */
+import element from "discourse/helpers/element";
+import { i18n } from "discourse-i18n";
+import devToolsState from "../state";
+
+/**
+ * Block debug button with dropdown menu.
+ * Provides separate toggles for outlet boundaries, visual overlay, ghost blocks,
+ * and condition debugging.
+ */
+export default class BlockDebugButton extends Component {
+  /**
+   * Determines if any block debug feature is currently enabled.
+   * Used to highlight the toolbar button when debugging is active.
+   *
+   * @returns {boolean} True if any block debug mode is enabled.
+   */
+  get isActive() {
+    return (
+      devToolsState.blockDebug ||
+      devToolsState.blockVisualOverlay ||
+      devToolsState.blockGhostBlocks ||
+      devToolsState.blockOutletBoundaries
+    );
+  }
+
+  /**
+   * Toggles outlet boundary indicators around block outlets.
+   * When enabled, shows visual borders around each block outlet area.
+   *
+   * @param {Event} event - The checkbox change event.
+   */
+  @action
+  toggleOutletBoundaries(event) {
+    devToolsState.blockOutletBoundaries = /** @type {HTMLInputElement} */ (
+      event.target
+    ).checked;
+  }
+
+  /**
+   * Toggles visual overlay that displays block information on the page.
+   * When enabled, shows badges and tooltips on rendered blocks.
+   *
+   * @param {Event} event - The checkbox change event.
+   */
+  @action
+  toggleVisualOverlay(event) {
+    devToolsState.blockVisualOverlay = /** @type {HTMLInputElement} */ (
+      event.target
+    ).checked;
+  }
+
+  /**
+   * Toggles ghost blocks that show hidden blocks with dashed outlines.
+   * When enabled, shows placeholder outlines for blocks that weren't rendered
+   * (e.g., failed conditions, optional missing, no visible children).
+   *
+   * @param {Event} event - The checkbox change event.
+   */
+  @action
+  toggleGhostBlocks(event) {
+    devToolsState.blockGhostBlocks = /** @type {HTMLInputElement} */ (
+      event.target
+    ).checked;
+  }
+
+  /**
+   * Toggles condition debugging for block condition evaluation.
+   * When enabled, logs detailed information about each block's condition checks.
+   *
+   * @param {Event} event - The checkbox change event.
+   */
+  @action
+  toggleConditionDebugging(event) {
+    devToolsState.blockDebug = /** @type {HTMLInputElement} */ (
+      event.target
+    ).checked;
+  }
+
+  <template>
+    <DMenu
+      @identifier="block-debug-menu"
+      @triggerClass={{concatClass
+        "toggle-blocks"
+        (if this.isActive "--active")
+      }}
+      @triggerComponent={{element "button"}}
+      @modalForMobile={{false}}
+      @title={{i18n "dev_tools.toggle_block_debug"}}
+    >
+      <:trigger>
+        {{icon "cubes"}}
+      </:trigger>
+      <:content>
+        <div class="block-debug-menu">
+          <label>
+            <input
+              type="checkbox"
+              checked={{devToolsState.blockOutletBoundaries}}
+              {{on "change" this.toggleOutletBoundaries}}
+            />
+            {{i18n "dev_tools.block_debug.outlet_boundaries"}}
+          </label>
+          <label>
+            <input
+              type="checkbox"
+              checked={{devToolsState.blockVisualOverlay}}
+              {{on "change" this.toggleVisualOverlay}}
+            />
+            {{i18n "dev_tools.block_debug.visual_overlay"}}
+          </label>
+          <label>
+            <input
+              type="checkbox"
+              checked={{devToolsState.blockGhostBlocks}}
+              {{on "change" this.toggleGhostBlocks}}
+            />
+            {{i18n "dev_tools.block_debug.ghost_blocks"}}
+          </label>
+          <label>
+            <input
+              type="checkbox"
+              checked={{devToolsState.blockDebug}}
+              {{on "change" this.toggleConditionDebugging}}
+            />
+            {{i18n "dev_tools.block_debug.condition_debugging"}}
+          </label>
+        </div>
+      </:content>
+    </DMenu>
+  </template>
+}
diff --git a/frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjs b/frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjs
new file mode 100644
index 0000000000000..fe975308a9d92
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjs
@@ -0,0 +1,186 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { htmlSafe } from "@ember/template";
+import concatClass from "discourse/helpers/concat-class";
+import { formatValue } from "../lib/value-formatter";
+
+/**
+ * Displays condition hierarchy with pass/fail indicators.
+ *
+ * @param {Object|Array} conditions - The conditions to display
+ * @param {boolean} passed - Whether the conditions passed overall
+ */
+export default class ConditionsTree extends Component {
+  /**
+   * Transforms the raw conditions object/array into a hierarchical array of
+   * formatted nodes for rendering. This is the entry point for the recursive
+   * formatting. Each node may contain a `children` array for nested conditions.
+   *
+   * @returns {Array<Object>} An array of condition nodes ready for rendering.
+   */
+  get formattedConditions() {
+    return this.#formatCondition(this.args.conditions, 0);
+  }
+
+  /**
+   * Recursively transforms a condition structure into a hierarchical array of nodes.
+   * Each combinator node (AND/OR/NOT) contains a `children` array with nested nodes.
+   * Handles four types of input:
+   * - Array: Treated as AND logic, wraps children in an AND combinator node.
+   * - Object with `any`: OR combinator, children are the `any` array items.
+   * - Object with `not`: NOT combinator, child is the negated condition.
+   * - Object with `type`: Leaf condition node with optional arguments.
+   *
+   * @param {Object|Array|null} condition - The condition to format.
+   * @param {number} depth - The nesting depth for indentation calculation.
+   * @returns {Array<Object>} An array of formatted condition nodes.
+   */
+  #formatCondition(condition, depth) {
+    if (!condition) {
+      return [];
+    }
+
+    const items = [];
+
+    // Array of conditions (AND logic) - all conditions must pass
+    if (Array.isArray(condition)) {
+      items.push({
+        type: "AND",
+        depth,
+        children: condition.flatMap((c) => this.#formatCondition(c, depth + 1)),
+      });
+      return items;
+    }
+
+    // OR combinator - at least one condition must pass
+    if (condition.any !== undefined) {
+      items.push({
+        type: "OR",
+        depth,
+        children: condition.any.flatMap((c) =>
+          this.#formatCondition(c, depth + 1)
+        ),
+      });
+      return items;
+    }
+
+    // NOT combinator - inverts the result of the nested condition
+    if (condition.not !== undefined) {
+      items.push({
+        type: "NOT",
+        depth,
+        children: this.#formatCondition(condition.not, depth + 1),
+      });
+      return items;
+    }
+
+    // Single condition with type (leaf node) - extract type and remaining args
+    const { type, ...args } = condition;
+    items.push({
+      type,
+      args: Object.keys(args).length > 0 ? args : null,
+      depth,
+      isLeaf: true,
+    });
+
+    return items;
+  }
+
+  <template>
+    <div
+      class={{concatClass
+        "block-debug-conditions"
+        (if @passed "--passed" "--failed")
+      }}
+    >
+      {{#each this.formattedConditions as |item|}}
+        <ConditionNode @item={{item}} @passed={{@passed}} />
+      {{/each}}
+    </div>
+  </template>
+}
+
+/**
+ * Renders a single condition node in the tree.
+ * Handles both combinator nodes (AND, OR, NOT) and leaf condition nodes.
+ *
+ * @param {Object} item - The condition node data from #formatCondition.
+ * @param {boolean} passed - Whether the overall conditions passed.
+ */
+class ConditionNode extends Component {
+  /**
+   * Formatting options for condition argument values.
+   * Enables expanded arrays, symbols, and RegExp handling for readable output.
+   *
+   * @constant {Object}
+   */
+  static FORMAT_OPTIONS = {
+    expandArrays: true,
+    handleSymbols: true,
+    handleRegExp: true,
+  };
+
+  /**
+   * Calculates the CSS padding for indentation based on the node's depth.
+   * Each level adds 12px of left padding.
+   *
+   * @returns {ReturnType<typeof htmlSafe>} CSS style string for padding, marked as safe for binding.
+   */
+  get indentStyle() {
+    return htmlSafe(`padding-left: ${this.args.item.depth * 12}px`);
+  }
+
+  /**
+   * Checks if this node is a boolean combinator (AND, OR, NOT) rather than
+   * a leaf condition. Combinators are styled differently in the UI.
+   *
+   * @returns {boolean} True if this is a combinator node.
+   */
+  get isCombinator() {
+    return ["AND", "OR", "NOT"].includes(this.args.item.type);
+  }
+
+  /**
+   * Formats the condition's arguments as a comma-separated string for display.
+   * Returns null if there are no arguments to display.
+   *
+   * @returns {string|null} Formatted arguments string, or null if no arguments.
+   */
+  get argsDisplay() {
+    const args = this.args.item.args;
+    if (!args) {
+      return null;
+    }
+    return Object.entries(args)
+      .map(([k, v]) => `${k}: ${formatValue(v, ConditionNode.FORMAT_OPTIONS)}`)
+      .join(", ");
+  }
+
+  <template>
+    <div
+      class={{concatClass
+        "block-debug-condition"
+        (if this.isCombinator "--combinator" "--leaf")
+      }}
+      style={{this.indentStyle}}
+    >
+      {{#if this.isCombinator}}
+        <span class="block-debug-condition__type --combinator">
+          {{@item.type}}
+        </span>
+      {{else}}
+        <span class="block-debug-condition__type">{{@item.type}}</span>
+        {{#if this.argsDisplay}}
+          <span
+            class="block-debug-condition__args"
+          >({{this.argsDisplay}})</span>
+        {{/if}}
+      {{/if}}
+    </div>
+    {{#if @item.children}}
+      {{#each @item.children as |child|}}
+        <ConditionNode @item={{child}} @passed={{@passed}} />
+      {{/each}}
+    {{/if}}
+  </template>
+}
diff --git a/frontend/discourse/app/static/dev-tools/block-debug/debug-logger.js b/frontend/discourse/app/static/dev-tools/block-debug/debug-logger.js
new file mode 100644
index 0000000000000..c02e4d6f59613
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/block-debug/debug-logger.js
@@ -0,0 +1,541 @@
+// @ts-check
+/**
+ * Block debug logger with styled console output.
+ *
+ * Provides grouped, hierarchical logging for condition evaluations.
+ * Logs are grouped by block, showing condition trees with pass/fail status.
+ *
+ * This module lives in the dev-tools bundle and is only loaded when dev tools
+ * are enabled, reducing the main application bundle size.
+ *
+ * @module discourse/static/dev-tools/block-debug/debug-logger
+ */
+
+import { isTypeMismatch } from "discourse/lib/blocks/-internals/matching/value-matcher";
+
+// Console output styles
+const STYLES = {
+  blockName: "font-weight: bold", // bold only, no color
+  passed: "color: #50c050; font-weight: bold", // bright green for RENDERED
+  failed: "color: #e05050; font-weight: bold", // vivid red for SKIPPED
+  combinator: "color: #3070c0; font-weight: bold", // bold blue for operators
+  hint: "color: #d4a000; font-style: italic", // yellow/orange for hints
+};
+
+const ICONS = {
+  passed: "\u2713", // checkmark
+  failed: "\u2717", // X (failed)
+};
+
+/**
+ * Block debug logger class.
+ * Provides grouped console output for block condition evaluations.
+ */
+class BlockDebugLogger {
+  /**
+   * Current evaluation group context.
+   *
+   * @type {{blockName: string, blockId: string|null, hierarchy: string, logs: Array}|null}
+   */
+  #currentGroup = null;
+
+  /**
+   * WeakMap to track pending log entries by condition spec object.
+   * This allows updating log entries by reference rather than by depth/type lookup,
+   * which is more robust for complex nested conditions.
+   *
+   * @type {WeakMap<Object, Object>}
+   */
+  #pendingLogs = new WeakMap();
+
+  /**
+   * Start a new evaluation group for a block render.
+   * All subsequent logCondition calls will be collected in this group
+   * until endGroup is called.
+   *
+   * @param {string} blockName - The block being evaluated.
+   * @param {string|null} blockId - The block's unique ID, or null if not set.
+   * @param {string} hierarchy - The outlet/parent hierarchy path (e.g., "outlet-name/parent-block").
+   */
+  startGroup(blockName, blockId, hierarchy) {
+    this.#currentGroup = { blockName, blockId, hierarchy, logs: [] };
+  }
+
+  /**
+   * Log a condition evaluation within the current group.
+   * If no group is active, logs immediately to console.
+   *
+   * @param {Object} options - Log options
+   * @param {string} options.type - Condition type or combinator (AND/OR/NOT)
+   * @param {Object} [options.args] - Condition arguments
+   * @param {boolean|null} options.result - Whether condition passed, or null for pending combinators
+   * @param {number} [options.depth=0] - Nesting depth for indentation
+   * @param {{ value: *, hasValue: true, formatted?: Object, note?: string }|undefined} [options.resolvedValue] - Resolved value object
+   * @param {Object} [options.conditionSpec] - The condition spec object, used to track
+   *   pending results for combinators/conditions that log before evaluation completes.
+   */
+  logCondition({
+    type,
+    args,
+    result,
+    depth = 0,
+    resolvedValue,
+    conditionSpec,
+  }) {
+    if (!this.#currentGroup) {
+      this.#logStandalone(type, args, result);
+      return;
+    }
+
+    const logEntry = { type, args, result, depth, resolvedValue };
+    this.#currentGroup.logs.push(logEntry);
+
+    // Track pending logs by conditionSpec for later result updates.
+    // This is used for combinators (AND/OR/NOT) and conditions that need to
+    // log nested items before knowing their final result.
+    if (conditionSpec && result === null) {
+      this.#pendingLogs.set(conditionSpec, logEntry);
+    }
+  }
+
+  /**
+   * Log a param group with all matches as a nested expandable group.
+   * Used for params/queryParams matching in route conditions.
+   *
+   * @param {Object} options - Log options.
+   * @param {string} options.label - Group label (e.g., "params", "queryParams", "params[0]").
+   * @param {Array<{key: string, expected: *, actual: *, result: boolean}>} options.matches - Match results.
+   * @param {boolean} options.result - Overall result (all passed).
+   * @param {number} options.depth - Nesting depth for indentation.
+   */
+  logParamGroup({ label, matches, result, depth }) {
+    if (!this.#currentGroup) {
+      return;
+    }
+    this.#currentGroup.logs.push({
+      type: "param-group",
+      label,
+      matches,
+      result,
+      depth,
+    });
+  }
+
+  /**
+   * Log current URL/page state for debugging route conditions.
+   * Shows URL/page matching status. Params and queryParams are logged separately
+   * with proper nesting via logCondition.
+   *
+   * @param {Object} options - Log options.
+   * @param {string} options.currentPath - The current URL path (normalized).
+   * @param {Array} [options.expectedUrls] - URL patterns to match (if using urls).
+   * @param {Array} [options.excludeUrls] - URL patterns to exclude (if using excludeUrls).
+   * @param {Array} [options.pages] - Page types to match (e.g., ["CATEGORY_PAGES"]).
+   * @param {string} [options.actualPageType] - The actual page type (when expected doesn't match).
+   * @param {Object} [options.actualPageContext] - Actual page context (for determining page type match).
+   * @param {number} options.depth - Nesting depth for indentation.
+   * @param {boolean} options.result - Whether the URL/page matched (true) or not (false).
+   */
+  logRouteState({
+    currentPath,
+    expectedUrls,
+    excludeUrls,
+    pages,
+    actualPageType,
+    actualPageContext,
+    depth,
+    result,
+  }) {
+    if (!this.#currentGroup) {
+      return;
+    }
+    this.#currentGroup.logs.push({
+      type: "route-state",
+      currentPath,
+      expectedUrls,
+      excludeUrls,
+      pages,
+      actualPageType,
+      actualPageContext,
+      depth,
+      result,
+    });
+  }
+
+  /**
+   * Update the result of a combinator (AND/OR/NOT) by its condition spec.
+   * Used to set the actual result after children have been evaluated.
+   *
+   * @param {Object} conditionSpec - The condition spec object used when logging.
+   * @param {boolean} result - The actual result.
+   */
+  updateCombinatorResult(conditionSpec, result) {
+    if (!this.#currentGroup || !conditionSpec) {
+      return;
+    }
+
+    const logEntry = this.#pendingLogs.get(conditionSpec);
+    if (logEntry) {
+      logEntry.result = result;
+      this.#pendingLogs.delete(conditionSpec);
+    }
+  }
+
+  /**
+   * Update the result of a condition by its condition spec.
+   * Used when the condition needs to log nested items before knowing its final result.
+   *
+   * @param {Object} conditionSpec - The condition spec object used when logging.
+   * @param {boolean} result - The actual result.
+   */
+  updateConditionResult(conditionSpec, result) {
+    if (!this.#currentGroup || !conditionSpec) {
+      return;
+    }
+
+    const logEntry = this.#pendingLogs.get(conditionSpec);
+    if (logEntry) {
+      logEntry.result = result;
+      this.#pendingLogs.delete(conditionSpec);
+    }
+  }
+
+  /**
+   * End the current group and flush logs to console.
+   * Uses console.groupCollapsed for a clean, expandable view.
+   * Conditions with nested children are rendered as collapsible groups.
+   *
+   * @param {boolean} finalResult - Whether the block will render
+   */
+  endGroup(finalResult) {
+    if (!this.#currentGroup) {
+      return;
+    }
+
+    const { blockName, hierarchy, blockId, logs } = this.#currentGroup;
+
+    if (logs.length === 0) {
+      this.#currentGroup = null;
+      return;
+    }
+
+    const status = finalResult ? "RENDERED" : "SKIPPED";
+    const statusStyle = finalResult ? STYLES.passed : STYLES.failed;
+    const icon = finalResult ? ICONS.passed : ICONS.failed;
+
+    // Format display name with ID if available: "blockName" or "blockName(#id)"
+    const displayName = blockId ? `${blockName}(#${blockId})` : blockName;
+
+    // Format: [Blocks] {icon} {STATUS} {displayName} in {hierarchy}
+    // eslint-disable-next-line no-console
+    console.groupCollapsed(
+      `[Blocks] %c${icon} ${status}%c %c${displayName}%c in ${hierarchy}`,
+      statusStyle, // icon + status - same color
+      "", // reset
+      STYLES.blockName, // block name - bold
+      "font-weight: normal" // "in {hierarchy}" - explicitly reset bold
+    );
+
+    // Track open groups by their depth so we can close them when needed
+    const openGroupDepths = [];
+
+    for (let i = 0; i < logs.length; i++) {
+      const log = logs[i];
+      const nextLog = logs[i + 1];
+
+      // Close any groups at same or deeper depth before rendering this log
+      while (
+        openGroupDepths.length > 0 &&
+        openGroupDepths[openGroupDepths.length - 1] >= log.depth
+      ) {
+        // eslint-disable-next-line no-console
+        console.groupEnd();
+        openGroupDepths.pop();
+      }
+
+      // Check if this log has children (next log is deeper)
+      const hasChildren = nextLog && nextLog.depth > log.depth;
+
+      this.#logTreeNode(log, hasChildren);
+
+      // If we opened a group for this log, track it
+      if (hasChildren && this.#isGroupableLog(log)) {
+        openGroupDepths.push(log.depth);
+      }
+    }
+
+    // Close any remaining open groups
+    while (openGroupDepths.length > 0) {
+      // eslint-disable-next-line no-console
+      console.groupEnd();
+      openGroupDepths.pop();
+    }
+
+    // eslint-disable-next-line no-console
+    console.groupEnd();
+    this.#currentGroup = null;
+  }
+
+  /**
+   * Check if a log entry should be rendered as a collapsible group when it has children.
+   * Param groups and route state handle their own grouping internally.
+   *
+   * @param {Object} log - The log entry
+   * @returns {boolean} True if this log should be a group when it has children
+   */
+  #isGroupableLog(log) {
+    const isSpecialType = ["param-group", "route-state"].includes(log.type);
+    return !isSpecialType;
+  }
+
+  /**
+   * Log a single node in the condition tree.
+   *
+   * @param {Object} log - The log entry.
+   * @param {string} log.type - Condition type.
+   * @param {Object} [log.args] - Condition arguments.
+   * @param {boolean} log.result - Pass/fail.
+   * @param {number} log.depth - Indentation depth.
+   * @param {string} [log.label] - Label for param groups.
+   * @param {Array} [log.matches] - Match results for param groups.
+   * @param {{ value: *, hasValue: true, formatted?: Object, note?: string }|undefined} [log.resolvedValue] - Resolved value object.
+   * @param {string} [log.currentPath] - Current URL path (for route-state type).
+   * @param {Array<string>} [log.expectedUrls] - Expected URL patterns (for route-state type).
+   * @param {Array<string>} [log.excludeUrls] - Excluded URL patterns (for route-state type).
+   * @param {Object} [log.pages] - Page configuration (for route-state type).
+   * @param {string} [log.actualPageType] - Actual page type (for route-state type).
+   * @param {Object} [log.actualPageContext] - Actual page context (for route-state type).
+   * @param {boolean} [hasChildren=false] - Whether this node has nested children.
+   */
+  #logTreeNode(log, hasChildren = false) {
+    const { type, args, result, resolvedValue } = log;
+
+    // Handle route state (shows current URL/page status)
+    // Uses checkmark/X to show whether the route matched
+    if (type === "route-state") {
+      const {
+        currentPath,
+        expectedUrls,
+        excludeUrls: excludedUrls,
+        pages,
+        actualPageType,
+        actualPageContext,
+        result: routeResult,
+      } = log;
+      const routeIcon = routeResult ? ICONS.passed : ICONS.failed;
+      const routeStyle = routeResult ? STYLES.passed : STYLES.failed;
+
+      // When using pages option, show page type and params as siblings
+      if (pages) {
+        // Page type matches if actualPageContext exists (regardless of params)
+        const pageTypeMatched = actualPageContext !== null;
+        const pageIcon = pageTypeMatched ? ICONS.passed : ICONS.failed;
+        const pageStyle = pageTypeMatched ? STYLES.passed : STYLES.failed;
+
+        let pageStatus;
+        if (pageTypeMatched) {
+          pageStatus = `on ${actualPageContext?.pageType || pages[0]}`;
+        } else {
+          // Show what page type they're actually on (if any)
+          const actualInfo = actualPageType
+            ? ` (actual: ${actualPageType})`
+            : "";
+          pageStatus = `not on ${pages.join(", ")}${actualInfo}`;
+        }
+
+        // eslint-disable-next-line no-console
+        console.log(`%c${pageIcon}%c ${pageStatus}`, pageStyle, "");
+
+        // Note: params are logged separately with nesting (like queryParams)
+        return;
+      }
+
+      // For urls option, show URL matching info
+      const expected = excludedUrls
+        ? { excludeUrls: excludedUrls }
+        : { urls: expectedUrls };
+
+      // eslint-disable-next-line no-console
+      console.log(`%c${routeIcon}%c current URL:`, routeStyle, "", {
+        actual: currentPath,
+        expected,
+      });
+      return;
+    }
+
+    const icon = result ? ICONS.passed : ICONS.failed;
+    const iconStyle = result ? STYLES.passed : STYLES.failed;
+
+    // Handle param group (params/queryParams)
+    if (type === "param-group") {
+      const { label, matches } = log;
+
+      // Single key: print directly without group wrapper
+      if (matches.length === 1) {
+        const match = matches[0];
+        this.#logParamMatch(match, `${label}: ${match.key}`, icon, iconStyle);
+        return;
+      }
+
+      // Multiple keys: use collapsible group
+      // eslint-disable-next-line no-console
+      console.groupCollapsed(
+        `%c${icon}%c ${label} (${matches.length} keys)`,
+        iconStyle,
+        ""
+      );
+
+      for (const match of matches) {
+        const matchIcon = match.result ? ICONS.passed : ICONS.failed;
+        const matchStyle = match.result ? STYLES.passed : STYLES.failed;
+        this.#logParamMatch(match, match.key, matchIcon, matchStyle);
+      }
+
+      // eslint-disable-next-line no-console
+      console.groupEnd();
+      return;
+    }
+
+    const isCombinator = ["AND", "OR", "NOT"].includes(type);
+
+    // Use groupCollapsed for conditions with children, log for others
+    // eslint-disable-next-line no-console
+    const logFn = hasChildren ? console.groupCollapsed : console.log;
+
+    if (isCombinator) {
+      logFn.call(
+        console,
+        `%c${icon}%c %c${type}`,
+        iconStyle,
+        "",
+        STYLES.combinator,
+        args ? `(${args})` : ""
+      );
+    } else {
+      // Condition type has no special formatting
+      // Use formatted object if provided, otherwise add actual to args
+      const hasResolved = resolvedValue?.hasValue;
+      let loggedArgs;
+      if (hasResolved && resolvedValue.formatted) {
+        loggedArgs = resolvedValue.formatted;
+      } else if (hasResolved) {
+        loggedArgs =
+          args && Object.keys(args).length > 0
+            ? { ...args, actual: resolvedValue.value }
+            : { actual: resolvedValue.value };
+      } else {
+        loggedArgs = args && Object.keys(args).length > 0 ? args : "";
+      }
+
+      // Display warning note if present (e.g., unknown setting names)
+      if (resolvedValue?.note) {
+        logFn.call(
+          console,
+          `%c${icon}%c ${type} %c⚠ ${resolvedValue.note}`,
+          iconStyle,
+          "",
+          STYLES.hint,
+          loggedArgs
+        );
+      } else {
+        logFn.call(console, `%c${icon}%c ${type}`, iconStyle, "", loggedArgs);
+      }
+    }
+  }
+
+  /**
+   * Log a single param match with optional type mismatch hint.
+   *
+   * @param {Object} match - The match object with configured (expected), actual, result.
+   * @param {string} label - Display label for the param.
+   * @param {string} icon - Pass/fail icon.
+   * @param {string} iconStyle - CSS style for the icon.
+   */
+  #logParamMatch(match, label, icon, iconStyle) {
+    const { expected: configured, actual, result } = match;
+
+    // Check for type mismatch on failed matches
+    if (!result && isTypeMismatch(actual, configured)) {
+      const configuredType = this.#getExpectedValueType(configured);
+      // eslint-disable-next-line no-console
+      console.log(
+        `%c${icon}%c ${label} %c⚠ type mismatch: actual is ${typeof actual}, condition specifies ${configuredType}`,
+        iconStyle,
+        "",
+        STYLES.hint,
+        { actual, configured }
+      );
+      return;
+    }
+
+    // eslint-disable-next-line no-console
+    console.log(`%c${icon}%c ${label}`, iconStyle, "", { actual, configured });
+  }
+
+  /**
+   * Get the type of value configured in the condition, unwrapping `{ any: [...] }` and arrays.
+   * Shows all unique types if mixed (e.g., "number/string").
+   *
+   * @param {*} expected - The configured value spec from the condition.
+   * @returns {string} The type description.
+   */
+  #getExpectedValueType(expected) {
+    // Unwrap { any: [...] } or arrays
+    const values = expected?.any ?? (Array.isArray(expected) ? expected : null);
+
+    if (values && values.length > 0) {
+      const types = [...new Set(values.map((v) => typeof v))];
+      return types.join("/");
+    }
+
+    return typeof expected;
+  }
+
+  /**
+   * Log a standalone condition (when no group is active).
+   *
+   * @param {string} type - Condition type
+   * @param {Object} args - Condition arguments
+   * @param {boolean} result - Pass/fail
+   */
+  #logStandalone(type, args, result) {
+    const icon = result ? ICONS.passed : ICONS.failed;
+    // eslint-disable-next-line no-console
+    console.debug(`[Blocks] ${icon} ${type}:`, args);
+  }
+
+  /**
+   * Log that an optional block was skipped because it's not registered.
+   * Uses standalone log (no group needed since there are no conditions to show).
+   * Format matches endGroup header: `[Blocks] ✗ SKIPPED {displayName} in {hierarchy}`
+   *
+   * @param {string} blockName - The name of the missing optional block.
+   * @param {string|null} blockId - The block's unique ID, or null if not set.
+   * @param {string} hierarchy - The outlet/container hierarchy path.
+   */
+  logOptionalMissing(blockName, blockId, hierarchy) {
+    // Format display name with ID if available
+    const displayName = blockId ? `${blockName}(#${blockId})` : blockName;
+
+    // eslint-disable-next-line no-console
+    console.log(
+      `[Blocks] %c${ICONS.failed} SKIPPED%c %c${displayName}%c in ${hierarchy} %c(optional, not registered)`,
+      STYLES.failed,
+      "",
+      STYLES.blockName,
+      "font-weight: normal",
+      STYLES.hint
+    );
+  }
+
+  /**
+   * Check if a group is currently active.
+   *
+   * @returns {boolean}
+   */
+  hasActiveGroup() {
+    return this.#currentGroup !== null;
+  }
+}
+
+export const blockDebugLogger = new BlockDebugLogger();
diff --git a/frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjs b/frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjs
new file mode 100644
index 0000000000000..b2cc8f4f477cf
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjs
@@ -0,0 +1,225 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { array, hash } from "@ember/helper";
+/** @type {import("discourse/float-kit/components/d-tooltip.gjs").default} */
+import DTooltip from "discourse/float-kit/components/d-tooltip";
+import icon from "discourse/helpers/d-icon";
+import { FAILURE_TYPE } from "discourse/lib/blocks/-internals/patterns";
+import { i18n } from "discourse-i18n";
+/** @type {import("../shared/args-table.gjs").default} */
+import ArgsTable from "../shared/args-table";
+/** @type {import("./conditions-tree.gjs").default} */
+import ConditionsTree from "./conditions-tree";
+
+/**
+ * Component signature for GhostBlock.
+ *
+ * @typedef {Object} GhostBlockSignature
+ * @property {Object} Args
+ * @property {string} Args.blockName - The name of the hidden block.
+ * @property {string} [Args.blockId] - The block's unique ID (if set).
+ * @property {string} Args.debugLocation - The hierarchy path where the block would render.
+ * @property {Object} [Args.blockArgs] - Arguments that would have been passed to the block.
+ * @property {Object} [Args.containerArgs] - Container arguments from parent container's childArgs.
+ * @property {Object} [Args.conditions] - Conditions that failed evaluation.
+ * @property {string} [Args.failureType] - The failure type constant (FAILURE_TYPE value).
+ * @property {string} [Args.failureReason] - Optional custom display message (overrides type-based default).
+ * @property {Array<{Component: import("ember-curry-component").CurriedComponent}>} [Args.children] - Nested ghost children for containers.
+ */
+
+/**
+ * Ghost placeholder for blocks that are hidden.
+ * Shows a dashed outline indicating where the block would render.
+ *
+ * Blocks can be hidden for several reasons:
+ * - **Optional missing**: Block reference uses `?` suffix but isn't registered
+ * - **Conditions failed**: Block is registered but conditions evaluated to false
+ * - **No visible children**: Container block has no children that pass their conditions
+ * - **Custom reason**: Container block chose not to render this child (e.g., head block's "hidden by priority")
+ *
+ * For container blocks hidden due to no visible children, nested ghost children
+ * are rendered inside to show the full block tree structure.
+ *
+ * @extends {Component<GhostBlockSignature>}
+ */
+export default class GhostBlock extends Component {
+  /**
+   * Returns the appropriate hint message based on why the block is hidden.
+   * If a custom `failureReason` is provided, it is displayed directly.
+   * Otherwise, a default message is generated based on the `failureType`.
+   *
+   * @returns {string} The hint message to display.
+   */
+  get hintMessage() {
+    if (this.args.failureReason) {
+      return this.args.failureReason;
+    }
+    if (this.args.failureType === FAILURE_TYPE.OPTIONAL_MISSING) {
+      return i18n("js.blocks.ghost_reasons.optional_missing_hint");
+    }
+    if (this.args.failureType === FAILURE_TYPE.NO_VISIBLE_CHILDREN) {
+      return i18n("js.blocks.ghost_reasons.no_visible_children_hint");
+    }
+    return i18n("js.blocks.ghost_reasons.condition_failed_hint");
+  }
+
+  /**
+   * Returns the section title for the status/conditions section.
+   *
+   * @returns {string} Either "Status" or "Conditions".
+   */
+  get sectionTitle() {
+    if (
+      this.args.failureType === FAILURE_TYPE.OPTIONAL_MISSING ||
+      this.args.failureType === FAILURE_TYPE.NO_VISIBLE_CHILDREN ||
+      this.args.failureReason
+    ) {
+      return i18n("js.blocks.ghost.status");
+    }
+    return i18n("js.blocks.ghost.conditions");
+  }
+
+  /**
+   * Returns the status text shown in parentheses.
+   *
+   * @returns {string} The status text (e.g., "not registered", "failed").
+   */
+  get statusText() {
+    if (this.args.failureType === FAILURE_TYPE.OPTIONAL_MISSING) {
+      return i18n("js.blocks.ghost.not_registered");
+    }
+    if (this.args.failureType === FAILURE_TYPE.NO_VISIBLE_CHILDREN) {
+      return i18n("js.blocks.ghost.no_visible_children");
+    }
+    if (this.args.failureReason) {
+      return i18n("js.blocks.ghost.hidden");
+    }
+    return i18n("js.blocks.ghost.failed");
+  }
+
+  /**
+   * Determines if the conditions tree should be shown.
+   * Only shown when conditions actually failed (not for optional missing,
+   * no visible children, or custom reason).
+   *
+   * @returns {boolean} True if conditions tree should be rendered.
+   */
+  get showConditionsTree() {
+    return (
+      this.args.failureType !== FAILURE_TYPE.OPTIONAL_MISSING &&
+      this.args.failureType !== FAILURE_TYPE.NO_VISIBLE_CHILDREN &&
+      !this.args.failureReason
+    );
+  }
+
+  /**
+   * Checks if an args object has any entries.
+   *
+   * @param {Object} args - The arguments object to check.
+   * @returns {boolean} True if args is non-null and has at least one key.
+   */
+  hasArgs(args) {
+    return args != null && Object.keys(args).length > 0;
+  }
+
+  /**
+   * Returns the display name for the block, including ID if set.
+   * Format: "blockName" or "blockName(#id)".
+   *
+   * @returns {string} The display name.
+   */
+  get displayName() {
+    if (this.args.blockId) {
+      return `${this.args.blockName}(#${this.args.blockId})`;
+    }
+    return this.args.blockName;
+  }
+
+  <template>
+    <div class="block-debug-ghost" data-block-name={{@blockName}}>
+      <DTooltip
+        @identifier="block-debug-ghost"
+        @interactive={{true}}
+        @placement="bottom-start"
+        @maxWidth={{500}}
+        @triggers={{hash
+          mobile=(array "click")
+          desktop=(array "hover" "click")
+        }}
+        @untriggers={{hash mobile=(array "click") desktop=(array "mouseleave")}}
+      >
+        <:trigger>
+          <span class="block-debug-ghost__badge">
+            {{icon "cube"}}
+            <span class="block-debug-ghost__name">
+              {{this.displayName}}
+            </span>
+            <span class="block-debug-ghost__status">
+              ({{i18n "js.blocks.ghost.hidden"}})
+            </span>
+          </span>
+        </:trigger>
+        <:content>
+          <div class="block-debug-tooltip --ghost">
+            <div class="block-debug-tooltip__header --failed">
+              <div class="block-debug-tooltip__row">
+                {{icon "cube"}}
+                <span class="block-debug-tooltip__title">
+                  {{this.displayName}}
+                </span>
+                <span class="block-debug-tooltip__status">
+                  {{i18n "js.blocks.ghost.hidden"}}
+                </span>
+              </div>
+              <div class="block-debug-tooltip__location">
+                {{i18n "js.blocks.ghost.in_location"}}
+                {{@debugLocation}}
+              </div>
+            </div>
+
+            <div class="block-debug-tooltip__section">
+              <div class="block-debug-tooltip__section-title">
+                {{this.sectionTitle}}
+                <span class="--failed">({{this.statusText}})</span>
+              </div>
+              {{#if this.showConditionsTree}}
+                <ConditionsTree @conditions={{@conditions}} @passed={{false}} />
+              {{/if}}
+            </div>
+
+            {{#if (this.hasArgs @blockArgs)}}
+              <div class="block-debug-tooltip__section">
+                <div class="block-debug-tooltip__section-title">
+                  {{i18n "js.blocks.ghost.arguments"}}
+                </div>
+                <ArgsTable @args={{@blockArgs}} />
+              </div>
+            {{/if}}
+
+            {{#if (this.hasArgs @containerArgs)}}
+              <div class="block-debug-tooltip__section">
+                <div class="block-debug-tooltip__section-title">
+                  {{i18n "js.blocks.ghost.container_args"}}
+                </div>
+                <ArgsTable @args={{@containerArgs}} />
+              </div>
+            {{/if}}
+
+            <div class="block-debug-tooltip__hint">
+              {{this.hintMessage}}
+            </div>
+          </div>
+        </:content>
+      </DTooltip>
+
+      {{! Render nested ghost children for container blocks with no visible children }}
+      {{#if @children.length}}
+        <div class="block-debug-ghost__children">
+          {{#each @children as |child|}}
+            <child.Component />
+          {{/each}}
+        </div>
+      {{/if}}
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjs b/frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjs
new file mode 100644
index 0000000000000..d0a8e17620bf5
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjs
@@ -0,0 +1,153 @@
+// @ts-check
+import Component from "@glimmer/component";
+import { array, hash } from "@ember/helper";
+/** @type {import("discourse/float-kit/components/d-tooltip.gjs").default} */
+import DTooltip from "discourse/float-kit/components/d-tooltip";
+import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
+import { DEPRECATED_ARGS_KEY } from "discourse/lib/outlet-args";
+/** @type {import("../shared/args-table.gjs").default} */
+import ArgsTable from "../shared/args-table";
+
+/**
+ * Component signature for OutletInfo.
+ *
+ * @typedef {Object} OutletInfoSignature
+ * @property {Object} Args
+ * @property {string} Args.outletName - The name of the block outlet.
+ * @property {number} Args.blockCount - Number of blocks registered.
+ * @property {Object} [Args.outletArgs] - Arguments passed to the outlet.
+ * @property {Error} [Args.error] - Validation error if config failed.
+ * @property {Object} Blocks
+ * @property {[]} Blocks.default - Default block for rendering children.
+ */
+
+/**
+ * Debug overlay for BlockOutlet components.
+ * Shows outlet name badge with a tooltip containing outlet info and GitHub search link.
+ *
+ * @extends {Component<OutletInfoSignature>}
+ */
+export default class OutletInfo extends Component {
+  /**
+   * Returns a human-readable label for the block count.
+   *
+   * @returns {string} "1 block" for singular, "{n} blocks" for plural.
+   */
+  get blockLabel() {
+    const count = this.args.blockCount;
+    return count === 1 ? "1 block" : `${count} blocks`;
+  }
+
+  /**
+   * Cleans up the error message for display in the popup.
+   * Removes the "[Blocks]" prefix while preserving formatted structure.
+   *
+   * @returns {string} The cleaned error message.
+   */
+  get errorMessage() {
+    let message = this.args.error?.message ?? "Unknown validation error";
+
+    // Remove "[Blocks]" prefix that's added for console logging
+    message = message.replace(/^\[Blocks\]\s*/i, "");
+
+    return message.trim();
+  }
+
+  /**
+   * Checks whether this outlet has any args passed to it.
+   *
+   * @returns {boolean} True if outlet has at least one arg.
+   */
+  get hasOutletArgs() {
+    const outletArgs = this.args.outletArgs;
+    const deprecatedArgs = outletArgs?.[DEPRECATED_ARGS_KEY];
+
+    return (
+      (outletArgs != null && Object.keys(outletArgs).length > 0) ||
+      (deprecatedArgs != null && Object.keys(deprecatedArgs).length > 0)
+    );
+  }
+
+  <template>
+    <div
+      class={{concatClass
+        "block-outlet-debug"
+        (if @error "--validation-failed")
+      }}
+      data-outlet-name={{@outletName}}
+    >
+      <DTooltip
+        @identifier="block-outlet-info"
+        @interactive={{true}}
+        @placement="bottom-start"
+        @maxWidth={{400}}
+        @triggers={{hash
+          mobile=(array "click")
+          desktop=(array "click" "hover")
+        }}
+        @untriggers={{hash mobile=(array "click") desktop=(array "click")}}
+      >
+        <:trigger>
+          <span class="block-outlet-debug__badge {{if @error '--error'}}">
+            {{icon "cubes"}}
+            {{@outletName}}
+          </span>
+        </:trigger>
+        <:content>
+          <div class="outlet-info__wrapper">
+            <div
+              class="outlet-info__heading
+                {{if @error '--error' '--block-outlet'}}"
+            >
+              <span class="title">
+                {{icon "cubes"}}
+                {{@outletName}}
+              </span>
+              {{#if @error}}
+                <span class="outlet-info__status">ERROR</span>
+              {{/if}}
+              <a
+                class="github-link"
+                href="https://github.com/search?q=repo%3Adiscourse%2Fdiscourse%20BlockOutlet%20@name=%22{{@outletName}}%22&type=code"
+                target="_blank"
+                rel="noopener noreferrer"
+                title="Find on GitHub"
+              >{{icon "fab-github"}}</a>
+            </div>
+            <div class="outlet-info__content">
+              {{#if @error}}
+                <div class="outlet-info__error">
+                  <div class="outlet-info__section-title">Validation failed</div>
+                  <pre
+                    class="outlet-info__error-message"
+                  >{{this.errorMessage}}</pre>
+                </div>
+              {{else if @blockCount}}
+                <div class="outlet-info__section">
+                  <div class="outlet-info__section-title">Blocks Registered</div>
+                  <div class="outlet-info__stat">
+                    {{icon "cube"}}
+                    <span>{{this.blockLabel}}</span>
+                  </div>
+                </div>
+              {{else}}
+                <div class="outlet-info__empty">
+                  No blocks registered for this outlet
+                </div>
+              {{/if}}
+
+              {{#if this.hasOutletArgs}}
+                <div class="outlet-info__section">
+                  <div class="outlet-info__section-title">Outlet Args</div>
+                  <ArgsTable @args={{@outletArgs}} @prefix="block outlet" />
+                </div>
+              {{/if}}
+            </div>
+          </div>
+        </:content>
+      </DTooltip>
+      {{yield}}
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/app/static/dev-tools/block-debug/patch.js b/frontend/discourse/app/static/dev-tools/block-debug/patch.js
new file mode 100644
index 0000000000000..87b67df19cb60
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/block-debug/patch.js
@@ -0,0 +1,362 @@
+// @ts-check
+import curryComponent from "ember-curry-component";
+import {
+  DEBUG_CALLBACK,
+  debugHooks,
+} from "discourse/lib/blocks/-internals/debug-hooks";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import {
+  FAILURE_TYPE,
+  MAX_LAYOUT_DEPTH,
+  OPTIONAL_MISSING,
+} from "discourse/lib/blocks/-internals/patterns";
+import { getOwnerWithFallback } from "discourse/lib/get-owner";
+import devToolsState from "../state";
+/** @type {import("./block-info.gjs").default} */
+import BlockInfo from "./block-info";
+import { blockDebugLogger } from "./debug-logger";
+/** @type {import("./ghost-block.gjs").default} */
+import GhostBlock from "./ghost-block";
+/** @type {import("./outlet-info.gjs").default} */
+import OutletInfo from "./outlet-info";
+
+/**
+ * Creates a wrapper callback that only executes when block debug is enabled.
+ *
+ * This factory eliminates the repeated `if (devToolsState.blockDebug)` checks
+ * across all logging callbacks.
+ *
+ * @param {Function} fn - The callback function to wrap.
+ * @returns {Function} A wrapper that calls `fn` only when debug is enabled.
+ */
+function makeDebugCallback(fn) {
+  return (...args) => {
+    if (devToolsState.blockDebug) {
+      fn(...args);
+    }
+  };
+}
+
+/**
+ * Creates ghost components for children of a container ghost block.
+ *
+ * When a container block is rendered as a ghost (due to no visible children),
+ * this function recursively processes its children to create ghost components
+ * so they appear nested inside the container ghost in the debug overlay.
+ *
+ * Includes a depth limit as defense-in-depth against stack overflow. The primary
+ * protection is validation-time depth checking in `validateLayout`, but this
+ * provides additional safety during ghost rendering.
+ *
+ * @param {Array<Object>} childEntries - Child layout entries (already preprocessed with __visible and __failureType)
+ * @param {import("@ember/owner").default} owner - The application owner
+ * @param {string} containerPath - The container's hierarchy path (e.g., "outlet/group[0]")
+ * @param {Object} outletArgs - Outlet arguments for context
+ * @param {boolean} isLoggingEnabled - Whether logging is enabled (unused, kept for API compatibility)
+ * @param {Function} resolveBlockFn - Function to resolve block references to classes
+ * @param {number} [depth=0] - Current nesting depth for recursion limit checking.
+ * @returns {Array<{Component: import("ember-curry-component").CurriedComponent, isGhost?: boolean, asGhost?: Function}>} Array of ghost component data
+ */
+function createGhostChildren(
+  childEntries,
+  owner,
+  containerPath,
+  outletArgs,
+  isLoggingEnabled,
+  resolveBlockFn,
+  depth = 0
+) {
+  // Defense-in-depth: silently stop recursion if depth exceeds limit.
+  // Primary validation happens at layout validation time in validateLayout().
+  if (depth >= MAX_LAYOUT_DEPTH) {
+    return [];
+  }
+
+  const result = [];
+  const containerCounts = new Map();
+
+  for (const childEntry of childEntries) {
+    const resolvedBlock = resolveBlockFn(childEntry.block);
+
+    // Handle optional missing block
+    if (resolvedBlock?.optionalMissing === OPTIONAL_MISSING) {
+      const ghostData = debugHooks.getCallback(DEBUG_CALLBACK.BLOCK_DEBUG)?.(
+        {
+          name: resolvedBlock.name,
+          id: childEntry.id,
+          Component: null,
+          args: childEntry.args,
+          containerArgs: childEntry.containerArgs,
+          conditions: childEntry.conditions,
+          conditionsPassed: false,
+          failureType: FAILURE_TYPE.OPTIONAL_MISSING,
+        },
+        { outletName: containerPath }
+      );
+      if (ghostData?.Component) {
+        result.push(ghostData);
+      }
+      continue;
+    }
+
+    // Skip unresolved blocks
+    if (!resolvedBlock) {
+      continue;
+    }
+
+    const blockMeta = getBlockMetadata(resolvedBlock);
+    const blockName = blockMeta?.blockName || "unknown";
+    const isChildContainer = blockMeta?.isContainer ?? false;
+
+    // Build container path for nested containers.
+    // Use id if available (unique), otherwise fall back to index.
+    let nestedContainerPath;
+    if (isChildContainer) {
+      const count = containerCounts.get(blockName) ?? 0;
+      containerCounts.set(blockName, count + 1);
+      const suffix = childEntry.id ? `(#${childEntry.id})` : `[${count}]`;
+      nestedContainerPath = `${containerPath}/${blockName}${suffix}`;
+    }
+
+    // Recursively create ghost children for nested containers
+    let nestedGhostChildren = null;
+    if (
+      isChildContainer &&
+      childEntry.children?.length &&
+      childEntry.__failureType === FAILURE_TYPE.NO_VISIBLE_CHILDREN
+    ) {
+      nestedGhostChildren = createGhostChildren(
+        childEntry.children,
+        owner,
+        nestedContainerPath,
+        outletArgs,
+        isLoggingEnabled,
+        resolveBlockFn,
+        depth + 1
+      );
+    }
+
+    const ghostData = debugHooks.getCallback(DEBUG_CALLBACK.BLOCK_DEBUG)?.(
+      {
+        name: blockName,
+        id: childEntry.id,
+        Component: null,
+        args: childEntry.args,
+        containerArgs: childEntry.containerArgs,
+        conditions: childEntry.conditions,
+        conditionsPassed: false,
+        failureType: childEntry.__failureType,
+        failureReason: childEntry.__failureReason, // Optional custom message
+        children: nestedGhostChildren,
+      },
+      { outletName: containerPath }
+    );
+    if (ghostData?.Component) {
+      result.push(ghostData);
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Patches the block system to inject debug overlay components.
+ *
+ * When visual overlay is enabled, this callback wraps rendered blocks
+ * with BlockInfo components and adds GhostBlock placeholders for
+ * blocks that fail their conditions.
+ *
+ * Uses devToolsState via closure to check state at invocation time,
+ * following the same pattern as plugin-outlet-debug.
+ */
+export function patchBlockRendering() {
+  // Callback for visual overlay and ghost blocks - wraps blocks with debug info
+  debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, (blockData, context) => {
+    const showVisualOverlay = devToolsState.blockVisualOverlay;
+    const showGhostBlocks = devToolsState.blockGhostBlocks;
+
+    // Check state at invocation time (devToolsState is captured in closure)
+    if (!showVisualOverlay && !showGhostBlocks) {
+      return blockData;
+    }
+
+    const {
+      name,
+      id,
+      Component,
+      args,
+      containerArgs,
+      conditions,
+      conditionsPassed,
+      failureType,
+      failureReason,
+      children,
+    } = blockData;
+    const { outletName } = context;
+    const owner = getOwnerWithFallback();
+
+    // If conditions failed, return a ghost block (if ghost blocks enabled)
+    if (conditionsPassed === false) {
+      if (!showGhostBlocks) {
+        return blockData;
+      }
+
+      const ghostResult = {
+        Component: curryComponent(
+          GhostBlock,
+          {
+            blockName: name,
+            blockId: id,
+            // Use debugLocation to avoid being overwritten by template's @outletName
+            debugLocation: outletName,
+            blockArgs: args,
+            containerArgs,
+            conditions,
+            failureType,
+            failureReason,
+            // Children are ghost components for container blocks with no visible children
+            children,
+          },
+          owner
+        ),
+        isGhost: true,
+        // No-op: calling asGhost on a ghost returns itself
+        asGhost: () => ghostResult,
+      };
+      return ghostResult;
+    }
+
+    // Wrap the rendered block with debug info (if visual overlay enabled)
+    if (!showVisualOverlay) {
+      return blockData;
+    }
+
+    return {
+      Component: curryComponent(
+        BlockInfo,
+        {
+          blockName: name,
+          blockId: id,
+          // Use debugLocation to avoid being overwritten by template's @outletName
+          debugLocation: outletName,
+          blockArgs: args,
+          containerArgs,
+          conditions,
+          outletArgs: context.outletArgs,
+          WrappedComponent: Component,
+        },
+        owner
+      ),
+    };
+  });
+
+  // Callback for console logging
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.BLOCK_LOGGING,
+    () => devToolsState.blockDebug
+  );
+  // Callback for visual overlay
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.VISUAL_OVERLAY,
+    () => devToolsState.blockVisualOverlay
+  );
+  // Callback for ghost blocks
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.GHOST_BLOCKS,
+    () => devToolsState.blockGhostBlocks
+  );
+  // Callback for outlet info component - returns the component when enabled, null otherwise.
+  debugHooks.setCallback(DEBUG_CALLBACK.OUTLET_INFO_COMPONENT, () =>
+    devToolsState.blockOutletBoundaries ? OutletInfo : null
+  );
+
+  // === Logging Callbacks ===
+  // These bridge the main bundle to the debug logger in dev-tools.
+  // All use makeDebugCallback to centralize the devToolsState.blockDebug check.
+
+  // Callback for logging condition evaluations
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.CONDITION_LOG,
+    makeDebugCallback((opts) => {
+      blockDebugLogger.logCondition(opts);
+    })
+  );
+
+  // Callback for updating combinator (AND/OR/NOT) results
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.COMBINATOR_LOG,
+    makeDebugCallback((opts) => {
+      blockDebugLogger.updateCombinatorResult(opts.conditionSpec, opts.result);
+    })
+  );
+
+  // Callback for updating single condition results
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.CONDITION_RESULT,
+    makeDebugCallback((opts) => {
+      blockDebugLogger.updateConditionResult(opts.conditionSpec, opts.result);
+    })
+  );
+
+  // Callback for logging param group matches
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.PARAM_GROUP_LOG,
+    makeDebugCallback((opts) => {
+      blockDebugLogger.logParamGroup(opts);
+    })
+  );
+
+  // Callback for logging route state
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.ROUTE_STATE_LOG,
+    makeDebugCallback((opts) => {
+      blockDebugLogger.logRouteState(opts);
+    })
+  );
+
+  // Callback for logging optional missing blocks
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.OPTIONAL_MISSING_LOG,
+    makeDebugCallback((blockName, blockId, hierarchy) => {
+      blockDebugLogger.logOptionalMissing(blockName, blockId, hierarchy);
+    })
+  );
+
+  // Callback for starting a logging group
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.START_GROUP,
+    makeDebugCallback((blockName, blockId, hierarchy) => {
+      blockDebugLogger.startGroup(blockName, blockId, hierarchy);
+    })
+  );
+
+  // Callback for ending a logging group
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.END_GROUP,
+    makeDebugCallback((finalResult) => {
+      blockDebugLogger.endGroup(finalResult);
+    })
+  );
+
+  // Callback that returns the logger interface for conditions
+  debugHooks.setCallback(DEBUG_CALLBACK.LOGGER_INTERFACE, () => {
+    if (!devToolsState.blockDebug) {
+      return null;
+    }
+    return {
+      logCondition: (opts) => blockDebugLogger.logCondition(opts),
+      updateCombinatorResult: (conditionSpec, result) =>
+        blockDebugLogger.updateCombinatorResult(conditionSpec, result),
+      updateConditionResult: (conditionSpec, result) =>
+        blockDebugLogger.updateConditionResult(conditionSpec, result),
+      logParamGroup: (opts) => blockDebugLogger.logParamGroup(opts),
+      logRouteState: (opts) => blockDebugLogger.logRouteState(opts),
+    };
+  });
+
+  // Register the ghost children creator function
+  debugHooks.setCallback(
+    DEBUG_CALLBACK.GHOST_CHILDREN_CREATOR,
+    createGhostChildren
+  );
+}
diff --git a/frontend/discourse/app/static/dev-tools/entrypoint.js b/frontend/discourse/app/static/dev-tools/entrypoint.js
index 6f9758dd2ee6a..383234219cfcc 100644
--- a/frontend/discourse/app/static/dev-tools/entrypoint.js
+++ b/frontend/discourse/app/static/dev-tools/entrypoint.js
@@ -1,10 +1,12 @@
 import "./styles.css";
 import { withPluginApi } from "discourse/lib/plugin-api";
+import { patchBlockRendering } from "./block-debug/patch";
 import { patchConnectors } from "./plugin-outlet-debug/patch";
 import Toolbar from "./toolbar";
 
 export function init() {
   patchConnectors();
+  patchBlockRendering();
 
   withPluginApi((api) => {
     api.renderInOutlet("above-site-header", Toolbar);
diff --git a/frontend/discourse/app/static/dev-tools/lib/console-logger.js b/frontend/discourse/app/static/dev-tools/lib/console-logger.js
new file mode 100644
index 0000000000000..ebf212da7955f
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/lib/console-logger.js
@@ -0,0 +1,85 @@
+/**
+ * Shared console logging utility for dev tools.
+ *
+ * Provides consistent argument logging to console with a persistent counter
+ * that increments across all dev tools components during the session.
+ *
+ * @module discourse/static/dev-tools/lib/console-logger
+ */
+
+/**
+ * Counter for generating unique global variable names.
+ * Persists across all dev-tools components for the session.
+ *
+ * Note: This counter never automatically resets, so global variables (`arg1`,
+ * `arg2`, etc.) accumulate in `window` during long debugging sessions. This is
+ * intentional - it prevents variable name collisions and allows developers to
+ * reference previously logged values. Use `resetArgCounter()` to manually reset
+ * if namespace pollution becomes a concern.
+ *
+ * @type {number}
+ */
+let globalArgCounter = 1;
+
+/**
+ * Console output styles for dev tools logging.
+ */
+const STYLES = {
+  varName: "color: #ce6edf; font-weight: bold",
+  keyName: "color: #46a7f5",
+  reset: "",
+};
+
+/**
+ * Logs a value to the console and saves it to a global variable.
+ * The variable is named `arg1`, `arg2`, etc., incrementing for each call.
+ *
+ * @param {Object} options - Log options.
+ * @param {string} options.key - The argument key/name being logged.
+ * @param {any} options.value - The value to log and store globally.
+ * @param {string} [options.prefix] - Optional prefix for context (e.g., "plugin outlet").
+ * @returns {string} The variable name assigned (e.g., "arg1").
+ */
+export function logArgToConsole({ key, value, prefix }) {
+  const varName = `arg${globalArgCounter++}`;
+
+  // Warn if overwriting an existing global variable
+  if (varName in window && window[varName] !== undefined) {
+    // eslint-disable-next-line no-console
+    console.warn(`DevTools: Overwriting existing global "${varName}"`);
+  }
+
+  window[varName] = value;
+
+  const prefixStr = prefix ? `[${prefix}] ` : "";
+
+  // eslint-disable-next-line no-console
+  console.log(
+    `${prefixStr}%c${key}%c saved to %c${varName}%c`,
+    STYLES.keyName,
+    STYLES.reset,
+    STYLES.varName,
+    STYLES.reset,
+    value
+  );
+
+  return varName;
+}
+
+/**
+ * Resets the global argument counter.
+ * Primarily for testing purposes.
+ */
+export function resetArgCounter() {
+  globalArgCounter = 1;
+}
+
+/**
+ * Gets the current counter value without incrementing.
+ * Useful for displaying what the next variable name will be.
+ *
+ * @returns {number} The current counter value.
+ */
+export function getNextArgNumber() {
+  return globalArgCounter;
+}
diff --git a/frontend/discourse/app/static/dev-tools/lib/value-formatter.js b/frontend/discourse/app/static/dev-tools/lib/value-formatter.js
new file mode 100644
index 0000000000000..0cfe09cdcfb5b
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/lib/value-formatter.js
@@ -0,0 +1,129 @@
+/**
+ * Shared value formatting utilities for dev tools.
+ *
+ * Provides consistent value display across block-debug and plugin-outlet-debug
+ * components, ensuring uniform representation of different data types.
+ *
+ * @module dev-tools/lib/value-formatter
+ */
+
+/**
+ * Maximum length for string values before truncation.
+ * Strings longer than this will be truncated with "..." appended.
+ *
+ * @constant {number}
+ */
+const MAX_STRING_LENGTH = 50;
+
+/**
+ * Formats a value for display in debug tables. Each type is handled differently
+ * to provide a concise yet informative representation that fits in the UI.
+ *
+ * @param {any} value - The value to format.
+ * @param {Object} [options] - Formatting options.
+ * @param {boolean} [options.expandArrays=false] - If true, shows array contents
+ *   instead of just "Array(n)". Useful for condition trees where values matter.
+ * @param {boolean} [options.handleSymbols=false] - If true, formats Symbols with
+ *   their description. Useful for condition trees where Symbol values may appear.
+ * @param {boolean} [options.handleRegExp=false] - If true, formats RegExp instances
+ *   as their string pattern. Useful for condition trees with regex value matchers.
+ * @returns {string} A human-readable string representation of the value.
+ *
+ * @example
+ * formatValue(null);                    // "null"
+ * formatValue("hello world");           // '"hello world"'
+ * formatValue([1, 2, 3]);               // "Array(3)"
+ * formatValue([1, 2], { expandArrays: true }); // "[1, 2]"
+ * formatValue(Symbol("test"), { handleSymbols: true }); // "Symbol(test)"
+ */
+export function formatValue(value, options = {}) {
+  const {
+    expandArrays = false,
+    handleSymbols = false,
+    handleRegExp = false,
+  } = options;
+
+  // Null and undefined are displayed as literal keywords
+  if (value === null) {
+    return "null";
+  }
+  if (value === undefined) {
+    return "undefined";
+  }
+
+  // Symbols show their description (optional - for condition trees)
+  if (handleSymbols && typeof value === "symbol") {
+    return `Symbol(${value.description || ""})`;
+  }
+
+  // Strings are quoted and truncated to prevent UI overflow
+  if (typeof value === "string") {
+    const truncated =
+      value.length > MAX_STRING_LENGTH
+        ? value.slice(0, MAX_STRING_LENGTH) + "..."
+        : value;
+    return `"${truncated}"`;
+  }
+
+  // Numbers and booleans can be displayed directly as their string representation
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+
+  // Arrays: either show contents or just length depending on context
+  if (Array.isArray(value)) {
+    if (expandArrays) {
+      return `[${value.map((v) => formatValue(v, options)).join(", ")}]`;
+    }
+    return `Array(${value.length})`;
+  }
+
+  // RegExp instances show their pattern (optional - for condition trees)
+  if (handleRegExp && value instanceof RegExp) {
+    return value.toString();
+  }
+
+  // Functions show their name to help identify callbacks
+  if (typeof value === "function") {
+    return `fn ${value.name || "anonymous"}()`;
+  }
+
+  // Objects show their constructor name (e.g., "User {...}") or just "{...}"
+  if (typeof value === "object") {
+    const name = value.constructor?.name;
+    if (name && name !== "Object") {
+      return `${name} {...}`;
+    }
+    return "{...}";
+  }
+
+  // Fallback for any other types (bigints, etc.)
+  return String(value);
+}
+
+/**
+ * Determines the type label to display for a value. This provides a quick
+ * visual indicator of what kind of data is in each argument.
+ *
+ * @param {any} value - The value to get the type info for.
+ * @returns {string} A type label (e.g., "string", "number", "array", "object").
+ *
+ * @example
+ * getTypeInfo(null);        // "null"
+ * getTypeInfo([1, 2, 3]);   // "array"
+ * getTypeInfo({ foo: 1 });  // "object"
+ * getTypeInfo("hello");     // "string"
+ */
+export function getTypeInfo(value) {
+  if (value === null) {
+    return "null";
+  }
+  if (value === undefined) {
+    return "undefined";
+  }
+  // Arrays are identified separately since typeof returns "object" for arrays
+  if (Array.isArray(value)) {
+    return "array";
+  }
+  return typeof value;
+}
diff --git a/frontend/discourse/app/static/dev-tools/mobile-view/button.gjs b/frontend/discourse/app/static/dev-tools/mobile-view/button.gjs
index 057cbdb6d137f..67543656dadcb 100644
--- a/frontend/discourse/app/static/dev-tools/mobile-view/button.gjs
+++ b/frontend/discourse/app/static/dev-tools/mobile-view/button.gjs
@@ -4,6 +4,7 @@ import { action } from "@ember/object";
 import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
 import mobile from "discourse/lib/mobile";
+import { i18n } from "discourse-i18n";
 
 export default class MobileViewButton extends Component {
   get mobileViewActive() {
@@ -17,7 +18,7 @@ export default class MobileViewButton extends Component {
 
   <template>
     <button
-      title="Toggle mobile view"
+      title={{i18n "dev_tools.toggle_mobile_view"}}
       class={{concatClass
         "toggle-mobile-view"
         (if this.mobileViewActive "--active")
diff --git a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs
deleted file mode 100644
index 7db8fa788fca9..0000000000000
--- a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/args-table.gjs
+++ /dev/null
@@ -1,75 +0,0 @@
-import Component from "@glimmer/component";
-import { fn } from "@ember/helper";
-import { on } from "@ember/modifier";
-import icon from "discourse/helpers/d-icon";
-
-let globalI = 1;
-
-function stringifyValue(value) {
-  try {
-    if (value === undefined) {
-      return "undefined";
-    } else if (value === null) {
-      return "null";
-    } else if (["string", "number"].includes(typeof value)) {
-      return JSON.stringify(value);
-    } else if (typeof value === "boolean") {
-      return String(value);
-    } else if (Array.isArray(value)) {
-      return `Array (${value.length} items)`;
-    } else if (String(value).startsWith("class ")) {
-      return `class ${value.name} {}`;
-    } else if (value.constructor?.name === "function") {
-      return `ƒ ${value.name || "function"}(...)`;
-    } else if (value.id) {
-      return `${value.constructor?.name} { id: ${value.id} }`;
-    } else {
-      return `${value.constructor?.name} {}`;
-    }
-  } catch (e) {
-    // eslint-disable-next-line no-console
-    console.error("Unable to stringify value:", value, e);
-    return "(unable to stringify)";
-  }
-}
-
-export default class ArgsTable extends Component {
-  get renderArgs() {
-    return Object.entries(this.args.outletArgs).map(([key, value]) => {
-      return {
-        key,
-        value: stringifyValue(value),
-        originalValue: value,
-      };
-    });
-  }
-
-  writeToConsole(key, value, event) {
-    event.preventDefault();
-    window[`arg${globalI}`] = value;
-    /* eslint-disable no-console */
-    console.log(
-      `[plugin outlet debug] \`@${key}\` saved to global \`arg${globalI}\`, and logged below:`
-    );
-    console.log(value);
-    /* eslint-enable no-console */
-
-    globalI++;
-  }
-
-  <template>
-    {{#each this.renderArgs as |arg|}}
-      <div class="key"><span class="fw">@{{arg.key}}</span>:</div>
-      <div class="value">
-        <span class="fw">{{arg.value}}</span>
-        <a
-          title="Write to console"
-          href=""
-          {{on "click" (fn this.writeToConsole arg.key arg.originalValue)}}
-        >{{icon "code"}}</a>
-      </div>
-    {{else}}
-      <div class="no-arguments">(no arguments)</div>
-    {{/each}}
-  </template>
-}
diff --git a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs
index 0b5bbfb8a94ef..5ffcc9671ff9f 100644
--- a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs
+++ b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs
@@ -3,8 +3,13 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
+import { i18n } from "discourse-i18n";
 import devToolsState from "../state";
 
+/**
+ * Toggle button for the plugin outlet debug mode in the dev-tools toolbar.
+ * Shows plugin outlet boundaries and arg information when active.
+ */
 export default class PluginOutletDebugButton extends Component {
   @action
   togglePluginOutlets() {
@@ -13,7 +18,7 @@ export default class PluginOutletDebugButton extends Component {
 
   <template>
     <button
-      title="Toggle plugin outlet debug"
+      title={{i18n "dev_tools.toggle_plugin_outlet_debug"}}
       class={{concatClass
         "toggle-plugin-outlets"
         (if devToolsState.pluginOutletDebug "--active")
diff --git a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs
index 07a212a4bcc76..9b3a53636b102 100644
--- a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs
+++ b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs
@@ -6,8 +6,9 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import DTooltip from "discourse/float-kit/components/d-tooltip";
 import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
+import { DEPRECATED_ARGS_KEY } from "discourse/lib/outlet-args";
+import ArgsTable from "../shared/args-table";
 import devToolsState from "../state";
-import ArgsTable from "./args-table";
 
 // Outlets matching these patterns will be displayed with an icon only.
 // Feel free to add more if it improves the layout.
@@ -23,6 +24,14 @@ const SMALL_OUTLETS = [
   "after-breadcrumbs",
 ];
 
+/**
+ * Debug overlay for PluginOutlet components.
+ * Shows outlet name badge with a tooltip containing outlet info, args, and GitHub search link.
+ *
+ * @param {string} outletName - The name of the plugin outlet.
+ * @param {Object} [outletArgs] - Arguments passed to the outlet. May contain a non-enumerable
+ *   `__deprecatedArgs__` property with the raw deprecated args for display in the debug tooltip.
+ */
 export default class OutletInfoComponent extends Component {
   static shouldRender() {
     return devToolsState.pluginOutletDebug;
@@ -76,25 +85,50 @@ export default class OutletInfoComponent extends Component {
     );
   }
 
+  /**
+   * Checks whether this outlet has any args passed to it.
+   *
+   * @returns {boolean} True if outlet has at least one arg.
+   */
+  get hasOutletArgs() {
+    const outletArgs = this.args.outletArgs;
+    const deprecatedArgs = outletArgs?.[DEPRECATED_ARGS_KEY];
+
+    return (
+      (outletArgs != null && Object.keys(outletArgs).length > 0) ||
+      (deprecatedArgs != null && Object.keys(deprecatedArgs).length > 0)
+    );
+  }
+
+  /**
+   * Returns the heading modifier class based on outlet type.
+   *
+   * @returns {string} The CSS modifier class for the heading.
+   */
+  get headingModifier() {
+    return this.partOfWrapper ? "--wrapper-outlet" : "--plugin-outlet";
+  }
+
   <template>
     <div
       class={{concatClass
-        "plugin-outlet-info"
+        "plugin-outlet-debug"
         (if this.partOfWrapper "--wrapper")
         (if this.isHidden "hidden")
       }}
       {{didInsert this.checkIsWrapper}}
       data-outlet-name={{@outletName}}
-      title={{@outletName}}
     >
       <DTooltip
+        @identifier="plugin-outlet-info"
+        @interactive={{true}}
+        @placement="bottom-start"
         @maxWidth={{600}}
         @triggers={{hash mobile=(array "click") desktop=(array "hover")}}
         @untriggers={{hash mobile=(array "click") desktop=(array "click")}}
-        @identifier="plugin-outlet-info"
       >
         <:trigger>
-          <span class="name">
+          <span class="plugin-outlet-debug__badge">
             {{#if this.partOfWrapper}}
               &lt;{{if this.isAfter "/"}}{{if
                 this.showName
@@ -107,8 +141,10 @@ export default class OutletInfoComponent extends Component {
           </span>
         </:trigger>
         <:content>
-          <div class="plugin-outlet-info__wrapper">
-            <div class="plugin-outlet-info__heading">
+          <div class="outlet-info__wrapper">
+            <div
+              class={{concatClass "outlet-info__heading" this.headingModifier}}
+            >
               <span class="title">
                 {{icon "plug"}}
                 {{this.displayName}}
@@ -124,8 +160,17 @@ export default class OutletInfoComponent extends Component {
                 title="Find on GitHub"
               >{{icon "fab-github"}}</a>
             </div>
-            <div class="plugin-outlet-info__content">
-              <ArgsTable @outletArgs={{@outletArgs}} />
+            <div class="outlet-info__content">
+              {{#if this.hasOutletArgs}}
+                <div class="outlet-info__section">
+                  <div class="outlet-info__section-title">Outlet Args</div>
+                  <ArgsTable @args={{@outletArgs}} @prefix="plugin outlet" />
+                </div>
+              {{else}}
+                <div class="outlet-info__empty">
+                  No outlet args passed to this outlet
+                </div>
+              {{/if}}
             </div>
           </div>
         </:content>
diff --git a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/patch.js b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/patch.js
index 20921a3f51ec8..fff18c402c237 100644
--- a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/patch.js
+++ b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/patch.js
@@ -1,5 +1,6 @@
 import curryComponent from "ember-curry-component";
 import { getOwnerWithFallback } from "discourse/lib/get-owner";
+import { _setIncludeDeprecatedArgsProperty } from "discourse/lib/outlet-args";
 import { _setOutletDebugCallback } from "discourse/lib/plugin-connectors";
 import devToolsState from "../state";
 import OutletInfoComponent from "./outlet-info";
@@ -9,7 +10,11 @@ const SKIP_EXISTING_FOR_OUTLETS = [
 ];
 
 export function patchConnectors() {
-  _setOutletDebugCallback((outletName, existing) => {
+  // Enable including raw deprecatedArgs in outletArgsWithDeprecations
+  // so ArgsTable can display deprecation info without separate prop passing
+  _setIncludeDeprecatedArgsProperty(true);
+
+  _setOutletDebugCallback((outletName, existing, { outletArgs } = {}) => {
     existing ||= [];
 
     if (!devToolsState.pluginOutletDebug) {
@@ -22,7 +27,7 @@ export function patchConnectors() {
 
     const componentClass = curryComponent(
       OutletInfoComponent,
-      { outletName },
+      { outletName, outletArgs },
       getOwnerWithFallback()
     );
 
diff --git a/frontend/discourse/app/static/dev-tools/safe-mode/button.gjs b/frontend/discourse/app/static/dev-tools/safe-mode/button.gjs
index e8ebfed33cdbe..61a18f1d72f0f 100644
--- a/frontend/discourse/app/static/dev-tools/safe-mode/button.gjs
+++ b/frontend/discourse/app/static/dev-tools/safe-mode/button.gjs
@@ -3,8 +3,9 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
+import { i18n } from "discourse-i18n";
 
-export default class PluginOutletDebugButton extends Component {
+export default class SafeModeButton extends Component {
   get safeModeActive() {
     return new URLSearchParams(window.location.search).has("safe_mode");
   }
@@ -22,7 +23,7 @@ export default class PluginOutletDebugButton extends Component {
 
   <template>
     <button
-      title="Toggle safe mode"
+      title={{i18n "dev_tools.toggle_safe_mode"}}
       class={{concatClass
         "toggle-safe-mode"
         (if this.safeModeActive "--active")
diff --git a/frontend/discourse/app/static/dev-tools/shared/args-table.gjs b/frontend/discourse/app/static/dev-tools/shared/args-table.gjs
new file mode 100644
index 0000000000000..1538320190243
--- /dev/null
+++ b/frontend/discourse/app/static/dev-tools/shared/args-table.gjs
@@ -0,0 +1,179 @@
+import Component from "@glimmer/component";
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import concatClass from "discourse/helpers/concat-class";
+import icon from "discourse/helpers/d-icon";
+import { isDeprecatedOutletArgument } from "discourse/helpers/deprecated-outlet-argument";
+import { DEPRECATED_ARGS_KEY } from "discourse/lib/outlet-args";
+import { logArgToConsole } from "../lib/console-logger";
+import { formatValue, getTypeInfo } from "../lib/value-formatter";
+
+/**
+ * Shared component for displaying outlet arguments in a formatted table.
+ * Used by both PluginOutlet and BlockOutlet debug tooltips.
+ *
+ * Supports deprecated arguments marked with the `deprecatedOutletArgument` helper,
+ * showing a visual indicator and deprecation info. Deprecated args are read from
+ * `args.__deprecatedArgs__` (set by `buildArgsWithDeprecations` when dev-tools outlet
+ * debugging is enabled).
+ *
+ * @param {Object} args - The arguments to display. May contain a non-enumerable
+ *   `__deprecatedArgs__` property with the raw deprecated args.
+ * @param {string} [prefix] - Prefix for console logging context (e.g., "plugin outlet").
+ */
+export default class ArgsTable extends Component {
+  /**
+   * Transforms the raw args object into an array of entry objects for display.
+   * Each entry contains the original key/value plus formatted display representations.
+   *
+   * @returns {Array<{key: string, value: any, displayValue: string, typeInfo: string, isDeprecated: boolean, deprecationInfo: Object|null}>}
+   */
+  get entries() {
+    const entries = [];
+    const args = this.args.args;
+
+    // Read deprecatedArgs from the non-enumerable property on args (set by
+    // buildArgsWithDeprecations when dev-tools outlet debugging is enabled).
+    const deprecatedArgs = args?.[DEPRECATED_ARGS_KEY];
+
+    const deprecatedKeys = new Set(
+      deprecatedArgs && typeof deprecatedArgs === "object"
+        ? Object.keys(deprecatedArgs)
+        : []
+    );
+
+    // Process regular args first, but skip keys that are in deprecatedArgs
+    // (those will be handled in the second loop with proper deprecation info).
+    // Use Object.keys() instead of Object.entries() to avoid triggering the
+    // deprecation warning getters for deprecated args.
+    if (args && typeof args === "object") {
+      for (const key of Object.keys(args)) {
+        // Skip deprecated keys - accessing them would trigger deprecation warnings.
+        // They'll be processed below from the raw deprecatedArgs object.
+        if (deprecatedKeys.has(key)) {
+          continue;
+        }
+
+        const rawValue = args[key];
+
+        // Check if this is a deprecated arg that was merged into args
+        const isDeprecated = isDeprecatedOutletArgument(rawValue);
+        const value = isDeprecated ? rawValue.value : rawValue;
+
+        entries.push({
+          key,
+          value,
+          displayValue: formatValue(value),
+          typeInfo: getTypeInfo(value),
+          isDeprecated,
+          deprecationInfo: isDeprecated
+            ? this.#getDeprecationInfo(rawValue)
+            : null,
+        });
+      }
+    }
+
+    // Process deprecated args (if passed separately)
+    if (deprecatedArgs && typeof deprecatedArgs === "object") {
+      for (const [key, deprecatedArg] of Object.entries(deprecatedArgs)) {
+        if (isDeprecatedOutletArgument(deprecatedArg)) {
+          const value = deprecatedArg.value;
+          entries.push({
+            key,
+            value,
+            displayValue: formatValue(value),
+            typeInfo: getTypeInfo(value),
+            isDeprecated: true,
+            deprecationInfo: this.#getDeprecationInfo(deprecatedArg),
+          });
+        }
+      }
+    }
+
+    return entries;
+  }
+
+  /**
+   * Extracts deprecation info from a deprecated argument for display.
+   *
+   * @param {DeprecatedOutletArgument} deprecatedArg - The deprecated argument.
+   * @returns {{message: string, since: string|undefined, dropFrom: string|undefined}}
+   */
+  #getDeprecationInfo(deprecatedArg) {
+    return {
+      message: deprecatedArg.message,
+      since: deprecatedArg.options?.since,
+      dropFrom: deprecatedArg.options?.dropFrom,
+    };
+  }
+
+  /**
+   * Logs the argument value to the console and stores it in a global variable
+   * for easy inspection. The variable is named `arg1`, `arg2`, etc.
+   *
+   * @param {{key: string, value: any}} entry - The entry to log.
+   */
+  @action
+  logValue(entry) {
+    logArgToConsole({
+      key: entry.key,
+      value: entry.value,
+      prefix: this.args.prefix,
+    });
+  }
+
+  <template>
+    {{#if this.entries.length}}
+      <div class="outlet-args-table">
+        {{#each this.entries as |entry|}}
+          <button
+            type="button"
+            class={{concatClass
+              "outlet-args-table__row"
+              (if entry.isDeprecated "--deprecated")
+            }}
+            title={{if
+              entry.isDeprecated
+              entry.deprecationInfo.message
+              "Save to global variable"
+            }}
+            {{on "click" (fn this.logValue entry)}}
+          >
+            <span class="outlet-args-table__key">
+              @{{entry.key}}
+              {{#if entry.isDeprecated}}
+                <span class="outlet-args-table__deprecated-badge">
+                  {{icon "triangle-exclamation"}}
+                </span>
+              {{/if}}
+            </span>
+            <span class="outlet-args-table__value">
+              <span class="outlet-args-table__type">{{entry.typeInfo}}</span>
+              {{entry.displayValue}}
+            </span>
+          </button>
+          {{#if entry.isDeprecated}}
+            <div class="outlet-args-table__deprecation-info">
+              {{#if entry.deprecationInfo.message}}
+                {{entry.deprecationInfo.message}}
+              {{else}}
+                Deprecated
+              {{/if}}
+              {{#if entry.deprecationInfo.since}}
+                <span class="outlet-args-table__deprecation-version">
+                  (since
+                  {{entry.deprecationInfo.since}}{{#if
+                    entry.deprecationInfo.dropFrom
+                  }}, removal in {{entry.deprecationInfo.dropFrom}}{{/if}})
+                </span>
+              {{/if}}
+            </div>
+          {{/if}}
+        {{/each}}
+      </div>
+    {{else}}
+      <div class="outlet-args-table --empty">No arguments</div>
+    {{/if}}
+  </template>
+}
diff --git a/frontend/discourse/app/static/dev-tools/state.js b/frontend/discourse/app/static/dev-tools/state.js
index 45f354583685e..ff82dfdedc28a 100644
--- a/frontend/discourse/app/static/dev-tools/state.js
+++ b/frontend/discourse/app/static/dev-tools/state.js
@@ -1,7 +1,149 @@
 import { tracked } from "@glimmer/tracking";
 
+/**
+ * Singleton class that manages the state of developer tools.
+ * State is persisted to sessionStorage so it survives page refreshes
+ * but not browser restarts. Each property is tracked for reactivity.
+ *
+ * @class DevToolsState
+ */
 class DevToolsState {
-  @tracked pluginOutletDebug = false;
+  static #SESSION_STORAGE_KEY = "discourse__dev_tools_state";
+
+  // Private backing fields for tracked properties.
+  // These are @tracked so that Glimmer re-renders when values change.
+  @tracked _pluginOutletDebug;
+  @tracked _blockDebug;
+  @tracked _blockVisualOverlay;
+  @tracked _blockGhostBlocks;
+  @tracked _blockOutletBoundaries;
+
+  /**
+   * Initializes the state by loading persisted values from sessionStorage.
+   * Falls back to false for any missing values.
+   */
+  constructor() {
+    const persisted = this.#loadPersistedState();
+    this._pluginOutletDebug = persisted.pluginOutletDebug ?? false;
+    this._blockDebug = persisted.blockDebug ?? false;
+    this._blockVisualOverlay = persisted.blockVisualOverlay ?? false;
+    this._blockGhostBlocks = persisted.blockGhostBlocks ?? false;
+    this._blockOutletBoundaries = persisted.blockOutletBoundaries ?? false;
+  }
+
+  /**
+   * Load persisted state from sessionStorage.
+   *
+   * @returns {Object} Parsed state object or empty object if not found
+   */
+  #loadPersistedState() {
+    try {
+      const stored = window.sessionStorage?.getItem(
+        DevToolsState.#SESSION_STORAGE_KEY
+      );
+      return stored ? JSON.parse(stored) : {};
+    } catch (e) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        "[DevTools] Failed to parse persisted state from sessionStorage. " +
+          "Using defaults.",
+        e
+      );
+      return {};
+    }
+  }
+
+  /**
+   * Save current state to sessionStorage.
+   */
+  #persistState() {
+    try {
+      window.sessionStorage?.setItem(
+        DevToolsState.#SESSION_STORAGE_KEY,
+        JSON.stringify({
+          pluginOutletDebug: this._pluginOutletDebug,
+          blockDebug: this._blockDebug,
+          blockVisualOverlay: this._blockVisualOverlay,
+          blockGhostBlocks: this._blockGhostBlocks,
+          blockOutletBoundaries: this._blockOutletBoundaries,
+        })
+      );
+    } catch {
+      // Ignore storage errors
+    }
+  }
+
+  /**
+   * Enable visual overlay showing plugin outlet debug information.
+   * When enabled, plugin outlets display badges and tooltips with outlet details.
+   *
+   * @type {boolean}
+   */
+  get pluginOutletDebug() {
+    return this._pluginOutletDebug;
+  }
+
+  set pluginOutletDebug(value) {
+    this._pluginOutletDebug = value;
+    this.#persistState();
+  }
+
+  /**
+   * Enable console logging of block condition evaluations.
+   *
+   * @type {boolean}
+   */
+  get blockDebug() {
+    return this._blockDebug;
+  }
+
+  set blockDebug(value) {
+    this._blockDebug = value;
+    this.#persistState();
+  }
+
+  /**
+   * Enable visual overlay showing block boundaries and info.
+   *
+   * @type {boolean}
+   */
+  get blockVisualOverlay() {
+    return this._blockVisualOverlay;
+  }
+
+  set blockVisualOverlay(value) {
+    this._blockVisualOverlay = value;
+    this.#persistState();
+  }
+
+  /**
+   * Enable ghost blocks showing hidden blocks with dashed outlines.
+   *
+   * @type {boolean}
+   */
+  get blockGhostBlocks() {
+    return this._blockGhostBlocks;
+  }
+
+  set blockGhostBlocks(value) {
+    this._blockGhostBlocks = value;
+    this.#persistState();
+  }
+
+  /**
+   * Show block outlet debug boundaries around outlets, even when no blocks
+   * are rendered. This helps visualize outlet locations during development.
+   *
+   * @type {boolean}
+   */
+  get blockOutletBoundaries() {
+    return this._blockOutletBoundaries;
+  }
+
+  set blockOutletBoundaries(value) {
+    this._blockOutletBoundaries = value;
+    this.#persistState();
+  }
 }
 
 const state = new DevToolsState();
diff --git a/frontend/discourse/app/static/dev-tools/styles.css b/frontend/discourse/app/static/dev-tools/styles.css
index dfca77d114ef7..806fb02c32c12 100644
--- a/frontend/discourse/app/static/dev-tools/styles.css
+++ b/frontend/discourse/app/static/dev-tools/styles.css
@@ -1,126 +1,616 @@
-/**
+/*
   This CSS file is loaded dynamically when loadDevTools() is run in the console.
   It is not part of our normal CSS build process, so SCSS variables are not available.
   Native CSS nesting can be used safely, because developers who use this tool are expected to have modern browsers.
 */
-.plugin-outlet-info {
-  --plugin-outlet-info-border-color: #080;
-  --plugin-outlet-info-background-color: #0c0;
 
-  margin: 1px;
-  border: 1px solid var(--plugin-outlet-info-border-color);
-  display: inline-block;
+:root {
+  /* Colors by usage */
+  --dev-tools-plugin-outlet-color: #16a34a;
+  --dev-tools-plugin-outlet-hover-color: #15803d;
+  --dev-tools-wrapper-outlet-color: #2563eb;
+  --dev-tools-wrapper-outlet-hover-color: #1d4ed8;
+  --dev-tools-block-color: #d97706;
+  --dev-tools-block-hover-color: #b45309;
+  --dev-tools-ghost-color: #dc2626;
+  --dev-tools-ghost-hover-color: #b91c1c;
+  --dev-tools-block-outlet-color: #f59e0b;
 
-  background-color: var(--plugin-outlet-info-background-color);
-  color: white;
+  /* Shared values */
+  --dev-tools-badge-font-size: 0.75rem;
+  --dev-tools-badge-padding: 2px 5px;
+  --dev-tools-badge-radius: 0 0 4px 0;
+  --dev-tools-shadow: 1px 1px 2px rgb(0 0 0 / 0.5);
+  --dev-tools-bg-opacity: 0.05;
+  --dev-tools-container-margin: 2px;
+  --dev-tools-mono-font:
+    "Courier New", courier, "Lucida Console", monaco, monospace;
+}
 
-  text-align: center;
-  font-size: 14px !important;
-  font-weight: normal;
-  padding: 1px 5px;
+/* Dev Tools Toolbar */
+.dev-tools-toolbar {
+  position: fixed;
+  z-index: 999999;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--primary-200);
+  border-radius: 0 5px 5px 0;
+  box-shadow: var(--dev-tools-shadow);
+  opacity: 0.8;
+  transition: opacity 0.2s ease-in-out;
+
+  &.--dragging {
+    opacity: 0.5;
+  }
+
+  button {
+    background: none;
+    border: none;
+    padding: 5px;
+    color: var(--primary-700);
+
+    .d-icon {
+      color: inherit !important;
+    }
+
+    &:hover:not(.gripper) {
+      background-color: var(--primary-50);
+    }
+
+    &.gripper {
+      cursor: grab;
+      padding-block: 0;
+      border-bottom: 1px dotted var(--primary-low-mid);
+      color: var(--primary-500);
+    }
+
+    &.--active {
+      background-color: var(--primary-100);
+      color: var(--tertiary);
+
+      .d-icon {
+        font-weight: bold;
+      }
+    }
+  }
+}
+
+/* Shared Base Styles */
+
+/* Base styles for all debug container boundaries */
+.plugin-outlet-debug,
+.block-debug-info,
+.block-debug-ghost,
+.block-outlet-debug {
+  position: relative;
+  margin: var(--dev-tools-container-margin);
+}
+
+/* Base styles for all debug badges */
+.plugin-outlet-debug__badge,
+.block-debug-badge,
+.block-debug-ghost__badge,
+.block-outlet-debug__badge {
+  position: absolute;
+  top: -1px;
+  left: -1px;
+  z-index: 1000;
   display: inline-flex;
   align-items: center;
+  gap: 4px;
+  color: white !important;
+  padding: var(--dev-tools-badge-padding) !important;
+  font-size: var(--dev-tools-badge-font-size) !important;
+  font-weight: bold;
+  border-radius: var(--dev-tools-badge-radius);
+  cursor: pointer;
+  text-shadow: var(--dev-tools-shadow);
 
   .d-icon {
     color: white !important;
-    font-size: 14px !important;
-    width: 14px !important;
+    font-size: var(--dev-tools-badge-font-size) !important;
+    font-weight: bold;
+    width: var(--dev-tools-badge-font-size) !important;
+    filter: drop-shadow(var(--dev-tools-shadow));
   }
+}
 
+/* Plugin Outlet Debug */
+.plugin-outlet-debug {
+  border: 1px dashed var(--dev-tools-plugin-outlet-color);
+  background: rgb(22 163 74 / var(--dev-tools-bg-opacity));
+
+  /* Wrapper outlets are compact inline markers */
   &.--wrapper {
-    --plugin-outlet-info-border-color: #00c;
-    --plugin-outlet-info-background-color: #88f;
+    border: none;
+    background: none;
+
+    .plugin-outlet-debug__badge {
+      position: static;
+      background: var(--dev-tools-wrapper-outlet-color);
+      border-radius: 4px;
+
+      &:hover {
+        background: var(--dev-tools-wrapper-outlet-hover-color);
+      }
+    }
+  }
+}
+
+.plugin-outlet-debug__badge {
+  background: var(--dev-tools-plugin-outlet-color);
+
+  &:hover {
+    background: var(--dev-tools-plugin-outlet-hover-color);
+  }
+}
+
+/* Block Debug Overlay */
+.block-debug-info {
+  border: 1px dotted var(--dev-tools-block-color);
+  background: rgb(217 119 6 / var(--dev-tools-bg-opacity));
+  padding: 2px;
+
+  &.--rendered {
+    border-color: var(--dev-tools-block-color);
+  }
+}
+
+.block-debug-badge {
+  background: var(--dev-tools-block-color);
+
+  &:hover {
+    background: var(--dev-tools-block-hover-color);
+  }
+}
+
+/* Ghost blocks (hidden/failed conditions) */
+.block-debug-ghost {
+  border: 1px dashed var(--dev-tools-ghost-color);
+  background: repeating-linear-gradient(
+    45deg,
+    transparent,
+    transparent 10px,
+    rgb(220 38 38 / var(--dev-tools-bg-opacity)) 10px,
+    rgb(220 38 38 / var(--dev-tools-bg-opacity)) 20px
+  );
+  padding: 2px;
+  min-height: 30px;
+}
+
+.block-debug-ghost__badge {
+  background: var(--dev-tools-ghost-color);
+
+  &:hover {
+    background: var(--dev-tools-ghost-hover-color);
   }
 }
 
-.plugin-outlet-info__wrapper {
+.block-debug-ghost__children {
+  margin-top: 4px;
+}
+
+/* Nested ghost blocks: reduced padding */
+.block-debug-ghost__children .block-debug-ghost {
+  padding: 2px;
+}
+
+/* Odd depth levels: flip stripe direction */
+.block-debug-ghost__children > .block-debug-ghost {
+  background: repeating-linear-gradient(
+    -45deg,
+    transparent,
+    transparent 10px,
+    rgb(220 38 38 / var(--dev-tools-bg-opacity)) 10px,
+    rgb(220 38 38 / var(--dev-tools-bg-opacity)) 20px
+  );
+}
+
+/* Even depth levels: original stripe direction */
+.block-debug-ghost__children
+  > .block-debug-ghost
+  > .block-debug-ghost__children
+  > .block-debug-ghost {
+  background: repeating-linear-gradient(
+    45deg,
+    transparent,
+    transparent 10px,
+    rgb(220 38 38 / var(--dev-tools-bg-opacity)) 10px,
+    rgb(220 38 38 / var(--dev-tools-bg-opacity)) 20px
+  );
+}
+
+/* Block Outlet boundaries */
+.block-outlet-debug {
+  border: 1px dashed var(--dev-tools-block-outlet-color);
+  padding: 2px;
+  min-height: 20px;
+  background: rgb(245 158 11 / var(--dev-tools-bg-opacity));
+
+  &.--validation-failed {
+    border: 1px dashed var(--dev-tools-ghost-color);
+    background: repeating-linear-gradient(
+      45deg,
+      transparent,
+      transparent 10px,
+      rgb(220 38 38 / var(--dev-tools-bg-opacity)) 10px,
+      rgb(220 38 38 / var(--dev-tools-bg-opacity)) 20px
+    );
+  }
+}
+
+.block-outlet-debug__badge {
+  background: var(--dev-tools-block-outlet-color);
+
+  &.--error {
+    background: var(--dev-tools-ghost-color);
+
+    &:hover {
+      background: var(--dev-tools-ghost-hover-color);
+    }
+  }
+}
+
+/* Block Debug Tooltip */
+.block-debug-tooltip {
   display: flex;
   flex-direction: column;
+  gap: 12px;
+  font-size: 13px;
+  min-width: 280px;
+  max-width: 450px;
+
+  &.--ghost {
+    .block-debug-tooltip__header {
+      color: #f44336;
+    }
+  }
 }
 
-.plugin-outlet-info__heading {
+.block-debug-tooltip__header {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  font-weight: bold;
+  color: var(--dev-tools-block-color);
+
+  &.--failed {
+    color: var(--dev-tools-ghost-color);
+  }
+
+  .d-icon {
+    font-size: var(--dev-tools-badge-font-size) !important;
+  }
+}
+
+.block-debug-tooltip__row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.block-debug-tooltip__title {
   font-size: 14px;
+}
+
+.block-debug-tooltip__location {
+  font-weight: normal;
+  font-size: 12px;
+  opacity: 0.7;
+  margin-left: 20px;
+}
+
+.block-debug-tooltip__status {
+  font-size: 10px;
+  padding: 1px 4px;
+  background: var(--dev-tools-ghost-color);
+  color: white;
+  border-radius: 2px;
+  text-transform: uppercase;
+}
+
+.block-debug-tooltip__section {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.block-debug-tooltip__section-title {
+  font-size: 11px;
   font-weight: bold;
-  margin-bottom: 10px;
+  text-transform: uppercase;
+  opacity: 0.6;
+
+  .--passed {
+    color: var(--success);
+  }
+
+  .--failed {
+    color: var(--danger);
+  }
+}
 
+.block-debug-tooltip__empty {
+  font-style: italic;
+  opacity: 0.6;
+}
+
+.block-debug-tooltip__hint {
+  font-size: 11px;
+  font-style: italic;
+  opacity: 0.7;
+  border-top: 1px solid var(--primary-low);
+  padding-top: 8px;
+}
+
+/* Block Debug Conditions Tree */
+.block-debug-conditions {
   display: flex;
-  gap: 5px;
+  flex-direction: column;
+  gap: 2px;
+  font-family: var(--dev-tools-mono-font);
+  font-size: 12px;
 
-  .title {
-    flex-grow: 1;
+  &.--passed {
+    .block-debug-condition__type {
+      color: var(--success);
+    }
   }
 
-  .github-link {
-    color: var(--primary-medium);
+  &.--failed {
+    .block-debug-condition__type {
+      color: var(--danger);
+    }
   }
 }
 
-.plugin-outlet-info__content {
-  display: grid;
-  grid-template-columns: min-content 1fr;
-  font-size: 14px;
-  grid-gap: 10px;
-  min-width: 300px;
-  max-width: 100%;
-  width: 100%;
-  overflow: hidden;
+.block-debug-condition {
+  display: flex;
+  align-items: center;
+  gap: 4px;
 
-  & > div {
-    min-width: 0;
+  &.--combinator {
+    .block-debug-condition__type {
+      font-weight: bold;
+    }
   }
+}
 
-  .fw {
-    font-family:
-      "Courier New", "Courier", "Lucida Console", "Monaco", monospace;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    background: var(--primary-very-low);
+.block-debug-condition__type {
+  &.--combinator {
+    color: #607d8b;
   }
+}
+
+.block-debug-condition__args {
+  opacity: 0.7;
+  font-size: 11px;
+}
+
+.block-debug-menu {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 8px;
+  min-width: 160px;
 
-  .value {
+  label {
     display: flex;
-    gap: 5px;
+    align-items: center;
+    gap: 8px;
+    cursor: pointer;
+    font-size: 13px;
+
+    &:hover {
+      color: var(--primary);
+    }
+
+    input[type="checkbox"] {
+      margin: 0;
+    }
   }
+}
+
+.fk-d-menu[data-identifier="block-debug-menu"] {
+  z-index: 1000001;
+}
+
+/*
+ * Shared Outlet Components
+ * Used by both PluginOutlet and BlockOutlet debug overlays.
+ */
 
-  .no-arguments {
-    grid-column: span 2;
+/* Shared Outlet Info Tooltip Structure */
+.outlet-info__wrapper {
+  display: flex;
+  flex-direction: column;
+  min-width: 250px;
+}
+
+.outlet-info__heading {
+  font-size: 14px;
+  font-weight: bold;
+  display: flex;
+  gap: 5px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid var(--primary-low);
+  margin-bottom: 8px;
+
+  .title {
+    flex-grow: 1;
+    display: flex;
+    align-items: center;
+    gap: 5px;
   }
 
-  a {
+  .github-link {
     color: var(--primary-medium);
   }
+
+  /* Type-specific heading colors */
+  &.--plugin-outlet {
+    color: var(--dev-tools-plugin-outlet-color);
+  }
+
+  &.--wrapper-outlet {
+    color: var(--dev-tools-wrapper-outlet-color);
+  }
+
+  &.--block-outlet {
+    color: var(--dev-tools-block-outlet-color);
+  }
+
+  &.--error {
+    color: var(--dev-tools-ghost-color);
+  }
 }
 
-.dev-tools-toolbar {
-  position: fixed;
-  z-index: 999999;
+.outlet-info__content {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  font-size: 13px;
+  max-width: 100%;
+  overflow: hidden;
+}
 
+.outlet-info__section {
   display: flex;
   flex-direction: column;
+  gap: 6px;
+}
 
-  background-color: var(--primary-low);
-  border-radius: 0px 5px 5px 0px;
+.outlet-info__section-title {
+  font-size: 11px;
+  font-weight: bold;
+  text-transform: uppercase;
+  color: var(--primary-medium);
+  letter-spacing: 0.5px;
+}
 
-  button {
-    background: none;
-    border: none;
-    padding: 5px;
+.outlet-info__stat {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  color: var(--primary-high);
+}
+
+.outlet-info__empty {
+  font-style: italic;
+  color: var(--primary-medium);
+}
+
+.outlet-info__status {
+  font-size: 10px;
+  padding: 2px 6px;
+  background: var(--dev-tools-ghost-color);
+  color: white;
+  border-radius: 2px;
+  text-transform: uppercase;
+  font-weight: bold;
+  margin-left: auto;
+}
+
+.outlet-info__error {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+pre.outlet-info__error-message {
+  margin: 0;
+  padding: 8px;
+  background: none;
+  border: none;
+  font-size: 11px;
+  line-height: 1.4;
+  font-family: var(--dev-tools-mono-font);
+  white-space: pre-wrap;
+  word-break: break-word;
+  max-height: 300px;
+  overflow-y: auto;
+}
+
+/* Shared Outlet Args Table */
+.outlet-args-table {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  &.--empty {
+    font-style: italic;
     color: var(--primary-medium);
+  }
+}
 
-    &:hover:not(.gripper) {
-      background-color: var(--primary-very-low);
-    }
+.outlet-args-table__row {
+  display: flex;
+  gap: 8px;
+  padding: 2px 4px;
+  border-radius: 2px;
+  cursor: pointer;
+  background: none;
+  border: none;
+  width: 100%;
+  text-align: left;
+  font: inherit;
+  color: inherit;
 
-    &.gripper {
-      cursor: grab;
-      padding-bottom: 0;
-      padding-top: 0;
-      color: var(--primary-400);
-    }
+  &:hover {
+    background: var(--primary-very-low);
+  }
 
-    &.--active {
-      color: var(--success);
+  &.--deprecated {
+    .outlet-args-table__key {
+      color: var(--tertiary);
+      text-decoration: line-through;
     }
   }
 }
+
+.outlet-args-table__key {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-weight: bold;
+  color: #2196f3;
+  white-space: nowrap;
+}
+
+.outlet-args-table__deprecated-badge {
+  color: var(--tertiary);
+  font-size: 10px;
+
+  .d-icon {
+    width: 10px !important;
+    height: 10px !important;
+  }
+}
+
+.outlet-args-table__value {
+  font-family: var(--dev-tools-mono-font);
+  font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  flex: 1;
+}
+
+.outlet-args-table__type {
+  font-size: 10px;
+  opacity: 0.5;
+  margin-right: 4px;
+}
+
+.outlet-args-table__deprecation-info {
+  font-size: 11px;
+  font-style: italic;
+  color: var(--tertiary);
+  padding-left: 8px;
+  margin-top: -2px;
+  margin-bottom: 4px;
+}
+
+.outlet-args-table__deprecation-version {
+  opacity: 0.7;
+}
diff --git a/frontend/discourse/app/static/dev-tools/toolbar.gjs b/frontend/discourse/app/static/dev-tools/toolbar.gjs
index 265c279352efb..8fe17db94f694 100644
--- a/frontend/discourse/app/static/dev-tools/toolbar.gjs
+++ b/frontend/discourse/app/static/dev-tools/toolbar.gjs
@@ -4,10 +4,12 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
+import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
 import draggable from "discourse/modifiers/draggable";
 import onResize from "discourse/modifiers/on-resize";
-import I18n from "discourse-i18n";
+import I18n, { i18n } from "discourse-i18n";
+import BlockDebugButton from "./block-debug/button";
 import MobileViewButton from "./mobile-view/button";
 import PluginOutletDebugButton from "./plugin-outlet-debug/button";
 import SafeModeButton from "./safe-mode/button";
@@ -16,10 +18,9 @@ import VerboseLocalizationButton from "./verbose-localization/button";
 export default class Toolbar extends Component {
   @service siteSettings;
 
-  @tracked top = 250;
+  @tracked activeDragOffset;
   @tracked ownSize = 0;
-
-  activeDragOffset;
+  @tracked top = 250;
 
   get style() {
     const clampedTop = Math.max(this.top, 0);
@@ -59,34 +60,40 @@ export default class Toolbar extends Component {
 
   <template>
     <div
-      class="dev-tools-toolbar"
+      class={{concatClass
+        "dev-tools-toolbar"
+        (if this.activeDragOffset "--dragging")
+      }}
       style={{this.style}}
       {{onResize this.onResize}}
     >
+      <button
+        type="button"
+        title={{i18n "dev_tools.drag_to_move"}}
+        class="gripper"
+        {{draggable
+          didStartDrag=this.didStartDrag
+          didEndDrag=this.didEndDrag
+          dragMove=this.dragMove
+        }}
+      >
+        {{icon "grip-lines"}}
+      </button>
       <PluginOutletDebugButton />
+      <BlockDebugButton />
       <SafeModeButton />
       <VerboseLocalizationButton />
       {{#unless this.siteSettings.viewport_based_mobile_mode}}
         <MobileViewButton />
       {{/unless}}
       <button
-        title="Disable dev tools"
+        type="button"
+        title={{i18n "dev_tools.disable_dev_tools"}}
         class="disable-dev-tools"
         {{on "click" this.disableDevTools}}
       >
         {{icon "xmark"}}
       </button>
-      <button
-        class="gripper"
-        title="Drag to move"
-        {{draggable
-          didStartDrag=this.didStartDrag
-          didEndDrag=this.didEndDrag
-          dragMove=this.dragMove
-        }}
-      >
-        {{icon "grip-lines"}}
-      </button>
     </div>
   </template>
 }
diff --git a/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjs b/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjs
index 8f7db20d4897c..74651b7b6f586 100644
--- a/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjs
+++ b/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjs
@@ -3,7 +3,7 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
-import I18n from "discourse-i18n";
+import I18n, { i18n } from "discourse-i18n";
 
 export default class VerboseLocalizationButton extends Component {
   @action
@@ -18,7 +18,7 @@ export default class VerboseLocalizationButton extends Component {
 
   <template>
     <button
-      title="Toggle verbose localization"
+      title={{i18n "dev_tools.toggle_verbose_localization"}}
       class={{concatClass
         "toggle-verbose-localization"
         (if I18n.verbose "--active")
diff --git a/frontend/discourse/app/templates/application.gjs b/frontend/discourse/app/templates/application.gjs
index 60488a680e3ed..bb88cc0034083 100644
--- a/frontend/discourse/app/templates/application.gjs
+++ b/frontend/discourse/app/templates/application.gjs
@@ -1,4 +1,5 @@
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import BlockOutlet from "discourse/blocks/block-outlet";
 import A11yLiveRegions from "discourse/components/a11y/live-regions";
 import A11ySkipLinks from "discourse/components/a11y/skip-links";
 import AdminOnboardingBanner from "discourse/components/admin-onboarding/banner";
@@ -84,6 +85,10 @@ export default <template>
       }}
     />
 
+    {{#unless @controller.isCurrentAdminRoute}}
+      <BlockOutlet @name="hero-blocks" />
+    {{/unless}}
+
     <div id="main-outlet-wrapper" class="wrap" role="main">
       {{#if @controller.sidebarEnabled}}
         <SidebarWrapper
@@ -99,6 +104,9 @@ export default <template>
       <div id="main-outlet">
         {{#unless @controller.shouldHideScrollableContentAbove}}
           <PluginOutlet @name="above-main-container" @connectorTagName="div" />
+          {{#unless @controller.isCurrentAdminRoute}}
+            <BlockOutlet @name="main-outlet-blocks" />
+          {{/unless}}
 
           {{#if @controller.siteSettings.enable_site_owner_onboarding}}
             <AdminOnboardingBanner />
diff --git a/frontend/discourse/app/templates/discovery/custom.gjs b/frontend/discourse/app/templates/discovery/custom.gjs
index 9f25dcb797f0c..d321aa5936dab 100644
--- a/frontend/discourse/app/templates/discovery/custom.gjs
+++ b/frontend/discourse/app/templates/discovery/custom.gjs
@@ -1,12 +1,19 @@
+import BlockOutlet from "discourse/blocks/block-outlet";
 import PluginOutlet from "discourse/components/plugin-outlet";
 import { i18n } from "discourse-i18n";
 
 export default <template>
-  <PluginOutlet @name="custom-homepage">
-    {{#if @controller.currentUser.admin}}
-      <p class="alert alert-info">
-        {{i18n "custom_homepage.admin_message"}}
-      </p>
-    {{/if}}
-  </PluginOutlet>
+  <BlockOutlet @name="homepage-blocks">
+    <:after as |hasBlocks|>
+      <PluginOutlet @name="custom-homepage">
+        {{#if @controller.currentUser.admin}}
+          {{#unless hasBlocks}}
+            <p class="alert alert-info">
+              {{i18n "custom_homepage.admin_message"}}
+            </p>
+          {{/unless}}
+        {{/if}}
+      </PluginOutlet>
+    </:after>
+  </BlockOutlet>
 </template>
diff --git a/frontend/discourse/package.json b/frontend/discourse/package.json
index 6b48e8874c41a..adb3fc7127224 100644
--- a/frontend/discourse/package.json
+++ b/frontend/discourse/package.json
@@ -59,6 +59,7 @@
     "orderedmap": "^2.1.1",
     "photoswipe": "5.4.4",
     "pikaday": "^1.8.2",
+    "picomatch": "^4.0.3",
     "pretty-text": "workspace:1.0.0",
     "prosemirror-codemark": "^0.4.2",
     "prosemirror-commands": "^1.7.1",
diff --git a/frontend/discourse/tests/helpers/block-testing.gjs b/frontend/discourse/tests/helpers/block-testing.gjs
new file mode 100644
index 0000000000000..775bf610dfcc0
--- /dev/null
+++ b/frontend/discourse/tests/helpers/block-testing.gjs
@@ -0,0 +1,379 @@
+// @ts-check
+/**
+ * Testing utilities for the Discourse Block system.
+ *
+ * This module provides helpers for plugin and theme developers to test
+ * their custom blocks and conditions. These utilities temporarily unfreeze
+ * registries to allow registration during tests.
+ *
+ * @module discourse/tests/helpers/block-testing
+ *
+ * @example
+ * import {
+ *   withTestBlockRegistration,
+ *   registerBlock,
+ *   withTestConditionRegistration,
+ *   registerConditionType,
+ *   resetBlockRegistryForTesting,
+ *   hasBlock,
+ *   isValidOutlet,
+ * } from "discourse/tests/helpers/block-testing";
+ *
+ * // Register a block for testing
+ * withTestBlockRegistration(() => registerBlock(MyCustomBlock));
+ *
+ * // Register a condition for testing
+ * withTestConditionRegistration(() => registerConditionType(MyCondition));
+ *
+ * // Assert block was registered
+ * assert.true(hasBlock("my-block"));
+ */
+
+import {
+  DEBUG_CALLBACK,
+  debugHooks,
+} from "discourse/lib/blocks/-internals/debug-hooks";
+import { FAILURE_TYPE } from "discourse/lib/blocks/-internals/patterns";
+import {
+  _freezeBlockRegistry,
+  _registerBlock,
+  _registerBlockFactory,
+  _resetBlockRegistryState,
+  getBlockEntry,
+  hasBlock,
+  isBlockFactory,
+  isBlockRegistryFrozen,
+  isBlockResolved,
+  resolveBlock,
+  tryResolveBlock,
+  withTestBlockRegistration,
+} from "discourse/lib/blocks/-internals/registry/block";
+import {
+  _freezeConditionTypeRegistry,
+  _registerConditionType,
+  _resetConditionRegistryState,
+  hasConditionType,
+  isConditionTypeRegistryFrozen,
+  withTestConditionRegistration,
+} from "discourse/lib/blocks/-internals/registry/condition";
+import {
+  _resetSourceNamespaceState,
+  _setTestSourceIdentifierInternal,
+} from "discourse/lib/blocks/-internals/registry/helpers";
+import {
+  _freezeOutletRegistry,
+  _registerOutlet,
+  _resetOutletRegistryState,
+  getAllOutlets,
+  getCustomOutlet,
+  isOutletRegistryFrozen,
+  isValidOutlet,
+} from "discourse/lib/blocks/-internals/registry/outlet";
+import { validateConditions } from "discourse/lib/blocks/-internals/validation/conditions";
+import { isTesting } from "discourse/lib/environment";
+
+/*
+ * Block Registration
+ **/
+
+/**
+ * Freezes the block registry, preventing further registrations.
+ * Useful for testing frozen state behavior.
+ */
+export { _freezeBlockRegistry as freezeBlockRegistry };
+
+/**
+ * Registers a block class with the block registry.
+ * Use inside withTestBlockRegistration callback.
+ *
+ * @example
+ * withTestBlockRegistration(() => registerBlock(MyBlock));
+ */
+export { _registerBlock as registerBlock };
+
+/**
+ * Registers a factory function for lazy loading a block.
+ * Use inside withTestBlockRegistration callback.
+ *
+ * @example
+ * withTestBlockRegistration(() => {
+ *   registerBlockFactory("lazy-block", async () => LazyBlock);
+ * });
+ */
+export { _registerBlockFactory as registerBlockFactory };
+
+/**
+ * Temporarily unfreezes the block registry to allow registration during tests.
+ * Takes a callback that performs registration, then re-freezes the registry.
+ *
+ * @example
+ * withTestBlockRegistration(() => registerBlock(MyBlock));
+ */
+export { withTestBlockRegistration };
+
+/*
+ * Block Registry Queries
+ **/
+
+/**
+ * Returns the registry entry for a block (class or factory).
+ */
+export { getBlockEntry };
+
+/**
+ * Checks if a block is registered (by name or class reference).
+ *
+ * @example
+ * assert.true(hasBlock("my-block"));
+ */
+export { hasBlock };
+
+/**
+ * Checks if a registry entry is a factory function (not a resolved class).
+ */
+export { isBlockFactory };
+
+/**
+ * Returns whether the block registry is frozen.
+ */
+export { isBlockRegistryFrozen };
+
+/**
+ * Checks if a block is registered and fully resolved (not a pending factory).
+ */
+export { isBlockResolved };
+
+/**
+ * Resolves a block reference (string name or class) to a BlockClass.
+ * Async - use for testing factory resolution.
+ */
+export { resolveBlock };
+
+/**
+ * Attempts to resolve a block reference synchronously.
+ * Returns the BlockClass if found and resolved, null if pending or not found.
+ */
+export { tryResolveBlock };
+
+/*
+ * Outlet Registration
+ **/
+
+/**
+ * Freezes the outlet registry, preventing further registrations.
+ * Useful for testing frozen state behavior.
+ */
+export { _freezeOutletRegistry as freezeOutletRegistry };
+
+/**
+ * Registers a custom outlet for testing.
+ * Use inside withTestBlockRegistration callback.
+ *
+ * @example
+ * withTestBlockRegistration(() => {
+ *   registerOutlet("test-outlet", { description: "For testing" });
+ * });
+ */
+export { _registerOutlet as registerOutlet };
+
+/*
+ * Outlet Registry Queries
+ **/
+
+/**
+ * Returns all registered outlets (core + custom).
+ */
+export { getAllOutlets };
+
+/**
+ * Returns custom outlet data for a registered custom outlet.
+ */
+export { getCustomOutlet };
+
+/**
+ * Returns whether the outlet registry is frozen.
+ */
+export { isOutletRegistryFrozen };
+
+/**
+ * Checks if an outlet name is valid (registered as core or custom outlet).
+ *
+ * @example
+ * assert.true(isValidOutlet("sidebar-blocks"));
+ */
+export { isValidOutlet };
+
+/*
+ * Condition Registration
+ **/
+
+/**
+ * Freezes the condition type registry, preventing further registrations.
+ * Useful for testing frozen state behavior.
+ */
+export { _freezeConditionTypeRegistry as freezeConditionTypeRegistry };
+
+/**
+ * Registers a condition class with the condition registry.
+ * Use inside withTestConditionRegistration callback.
+ *
+ * @example
+ * withTestConditionRegistration(() => registerConditionType(MyCondition));
+ */
+export { _registerConditionType as registerConditionType };
+
+/**
+ * Temporarily unfreezes the condition registry to allow registration during tests.
+ * Takes a callback that performs registration, then re-freezes the registry.
+ *
+ * @example
+ * withTestConditionRegistration(() => registerConditionType(MyCondition));
+ */
+export { withTestConditionRegistration };
+
+/*
+ * Condition Registry Queries
+ **/
+
+/**
+ * Checks if a condition type is registered.
+ *
+ * @example
+ * assert.true(hasConditionType("user"));
+ */
+export { hasConditionType };
+
+/**
+ * Returns whether the condition type registry is frozen.
+ */
+export { isConditionTypeRegistryFrozen };
+
+/**
+ * Validates a condition specification against the registered condition types.
+ * Throws detailed errors if the specification is invalid.
+ */
+export { validateConditions };
+
+/**
+ * Constants for block failure types used in debug mode.
+ * Used to identify why a block didn't render (conditions failed, optional missing, etc.).
+ */
+export { FAILURE_TYPE };
+
+/*
+ * Debug Utilities
+ **/
+
+/**
+ * Debug callback type constants.
+ * Used with debugHooks.setCallback() for testing debug behavior.
+ */
+export { DEBUG_CALLBACK };
+
+/**
+ * Debug hook interface for testing debug mode behavior.
+ * Provides reactive getters and callback management.
+ */
+export { debugHooks };
+
+/**
+ * Sets up debug callbacks to capture ghost blocks and render them with standard markup.
+ * Returns an array that will be populated with ghost data as blocks are processed.
+ *
+ * The rendered ghost blocks have:
+ * - class="ghost-block"
+ * - data-name={blockName}
+ * - data-type={failureType}
+ * - data-reason={failureReason}
+ *
+ * @param {Object} [options] - Configuration options.
+ * @param {boolean} [options.enabled=true] - Whether ghost blocks are enabled.
+ *   Set to false to test that ghosts aren't rendered when debug mode is disabled.
+ * @returns {Array<{name: string, failureType: string, failureReason: string|undefined}>}
+ *
+ * @example
+ * const capturedGhosts = setupGhostCapture();
+ * // ... register blocks and render ...
+ * assert.dom('.ghost-block[data-name="my-block"]').exists();
+ * assert.strictEqual(capturedGhosts[0].name, "my-block");
+ */
+export function setupGhostCapture({ enabled = true } = {}) {
+  const capturedGhosts = [];
+
+  debugHooks.setCallback(DEBUG_CALLBACK.GHOST_BLOCKS, () => enabled);
+  debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, (blockData) => {
+    if (blockData.conditionsPassed === false) {
+      capturedGhosts.push({
+        name: blockData.name,
+        failureType: blockData.failureType,
+        failureReason: blockData.failureReason,
+      });
+      return {
+        Component: <template>
+          <div
+            class="ghost-block"
+            data-name={{blockData.name}}
+            data-type={{blockData.failureType}}
+            data-reason={{blockData.failureReason}}
+          >Ghost: {{blockData.name}}</div>
+        </template>,
+        isGhost: true,
+        asGhost: () => null,
+      };
+    }
+    return { Component: blockData.Component };
+  });
+
+  return capturedGhosts;
+}
+
+/**
+ * Resets all debug callbacks to null.
+ * Use in afterEach hooks to clean up debug state between tests.
+ *
+ * @example
+ * hooks.afterEach(function () {
+ *   resetDebugCallbacks();
+ * });
+ */
+export function resetDebugCallbacks() {
+  for (const key of Object.values(DEBUG_CALLBACK)) {
+    debugHooks.setCallback(key, null);
+  }
+}
+
+/*
+ * Reset Utilities
+ **/
+
+/**
+ * Resets all registries (blocks, outlets, conditions) for testing.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * Clears all registered entities and restores the original frozen state.
+ */
+export function resetBlockRegistryForTesting() {
+  if (!isTesting()) {
+    throw new Error("resetBlockRegistryForTesting can only be used in tests.");
+  }
+
+  _resetBlockRegistryState();
+  _resetOutletRegistryState();
+  _resetConditionRegistryState();
+  _resetSourceNamespaceState();
+}
+
+/**
+ * Sets a test override for the source identifier.
+ *
+ * USE ONLY FOR TESTING PURPOSES.
+ *
+ * @param {string|null} sourceId - Source identifier to use, or null to clear.
+ */
+export function setTestSourceIdentifier(sourceId) {
+  if (!isTesting()) {
+    throw new Error("setTestSourceIdentifier can only be used in tests.");
+  }
+  _setTestSourceIdentifierInternal(sourceId);
+}
diff --git a/frontend/discourse/tests/helpers/qunit-helpers.js b/frontend/discourse/tests/helpers/qunit-helpers.js
index ec0c473406799..9e26244d9594f 100644
--- a/frontend/discourse/tests/helpers/qunit-helpers.js
+++ b/frontend/discourse/tests/helpers/qunit-helpers.js
@@ -14,6 +14,7 @@ import MessageBus from "message-bus-client";
 import { resetCache as resetOneboxCache } from "pretty-text/oneboxer";
 import QUnit, { module, test } from "qunit";
 import sinon from "sinon";
+import { _resetOutletLayoutsForTesting } from "discourse/blocks/block-outlet";
 import { clearAboutPageActivities } from "discourse/components/about-page";
 import { resetCardClickListenerSelector } from "discourse/components/card-contents-base";
 import {
@@ -102,6 +103,10 @@ import {
 } from "discourse/services/keyboard-shortcuts";
 import sessionFixtures from "discourse/tests/fixtures/session-fixtures";
 import siteFixtures from "discourse/tests/fixtures/site-fixtures";
+import {
+  resetBlockRegistryForTesting,
+  resetDebugCallbacks,
+} from "discourse/tests/helpers/block-testing";
 import {
   currentSettings,
   mergeSettings,
@@ -274,6 +279,9 @@ export function testCleanup(container, app) {
   enableClearA11yAnnouncementsInTests();
   resetHtmlDecorators();
   resetCustomUserNavMessagesDropdownRows();
+  _resetOutletLayoutsForTesting();
+  resetBlockRegistryForTesting();
+  resetDebugCallbacks();
 }
 
 function cleanupCssGeneratorTags() {
diff --git a/frontend/discourse/tests/integration/components/block-group-test.gjs b/frontend/discourse/tests/integration/components/block-group-test.gjs
new file mode 100644
index 0000000000000..42575ec355954
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/block-group-test.gjs
@@ -0,0 +1,478 @@
+import Component from "@glimmer/component";
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import BlockOutlet from "discourse/blocks/block-outlet";
+import BlockGroup from "discourse/blocks/builtin/block-group";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import {
+  DEBUG_CALLBACK,
+  debugHooks,
+} from "discourse/tests/helpers/block-testing";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+module("Integration | Blocks | BlockGroup", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("renders with BEM classes", async function (assert) {
+    @block("group-child-1")
+    class GroupChild1 extends Component {
+      <template>
+        <div class="child-1">Child 1</div>
+      </template>
+    }
+
+    @block("group-child-2")
+    class GroupChild2 extends Component {
+      <template>
+        <div class="child-2">Child 2</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockGroup,
+          id: "features",
+          classNames: "custom-group-class",
+          children: [{ block: GroupChild1 }, { block: GroupChild2 }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert
+      .dom(".hero-blocks__block-container--features")
+      .exists("container has BEM modifier class from id");
+    assert.dom(".custom-group-class").exists("custom classNames applied");
+  });
+
+  test("renders all children blocks", async function (assert) {
+    @block("multi-child-a")
+    class MultiChildA extends Component {
+      <template>
+        <div class="multi-a">A</div>
+      </template>
+    }
+
+    @block("multi-child-b")
+    class MultiChildB extends Component {
+      <template>
+        <div class="multi-b">B</div>
+      </template>
+    }
+
+    @block("multi-child-c")
+    class MultiChildC extends Component {
+      <template>
+        <div class="multi-c">C</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockGroup,
+          children: [
+            { block: MultiChildA },
+            { block: MultiChildB },
+            { block: MultiChildC },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert.dom(".multi-a").exists();
+    assert.dom(".multi-b").exists();
+    assert.dom(".multi-c").exists();
+  });
+
+  test("passes args to children blocks", async function (assert) {
+    @block("args-child", { args: { title: { type: "string" } } })
+    class ArgsChild extends Component {
+      <template>
+        <div class="args-child-content">{{@title}}</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: BlockGroup,
+          children: [
+            { block: ArgsChild, args: { title: "First" } },
+            { block: ArgsChild, args: { title: "Second" } },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    const contents = document.querySelectorAll(".args-child-content");
+    assert.strictEqual(contents.length, 2);
+    assert.strictEqual(contents[0].textContent.trim(), "First");
+    assert.strictEqual(contents[1].textContent.trim(), "Second");
+  });
+
+  test("supports nested BlockGroups", async function (assert) {
+    @block("nested-leaf")
+    class NestedLeaf extends Component {
+      <template>
+        <div class="nested-leaf">Leaf</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("main-outlet-blocks", [
+        {
+          block: BlockGroup,
+          id: "outer",
+          children: [
+            {
+              block: BlockGroup,
+              id: "inner",
+              children: [{ block: NestedLeaf }],
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(
+      <template><BlockOutlet @name="main-outlet-blocks" /></template>
+    );
+
+    assert
+      .dom(".main-outlet-blocks__block-container--outer")
+      .exists("outer container has BEM modifier");
+    assert
+      .dom(".main-outlet-blocks__block-container--inner")
+      .exists("inner container has BEM modifier");
+    assert.dom(".nested-leaf").exists();
+  });
+
+  test("children blocks have outlet-prefixed wrapper classes", async function (assert) {
+    @block("wrapper-test-child")
+    class WrapperTestChild extends Component {
+      <template>
+        <span class="child-content">Child</span>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: BlockGroup,
+          id: "wrapper-test",
+          children: [{ block: WrapperTestChild }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    assert
+      .dom(".sidebar-blocks__block-container--wrapper-test")
+      .exists("container has BEM modifier from id");
+
+    // Child block wrapper should have outlet-prefixed class
+    assert
+      .dom(".sidebar-blocks__block")
+      .exists("child has outlet-prefixed __block class");
+    assert
+      .dom('[data-block-name="wrapper-test-child"]')
+      .exists("child has data-block-name attribute");
+  });
+
+  test("deeply nested blocks have correct outlet-prefixed wrapper classes", async function (assert) {
+    @block("deep-leaf")
+    class DeepLeaf extends Component {
+      <template>
+        <span class="deep-leaf-content">Leaf</span>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockGroup,
+          id: "level-1",
+          children: [
+            {
+              block: BlockGroup,
+              id: "level-2",
+              children: [
+                {
+                  block: BlockGroup,
+                  id: "level-3",
+                  children: [{ block: DeepLeaf }],
+                },
+              ],
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    // All nested containers should have BEM modifier classes from id
+    assert
+      .dom(".hero-blocks__block-container--level-1")
+      .exists("level-1 container has BEM modifier");
+    assert
+      .dom(".hero-blocks__block-container--level-2")
+      .exists("level-2 container has BEM modifier");
+    assert
+      .dom(".hero-blocks__block-container--level-3")
+      .exists("level-3 container has BEM modifier");
+
+    // The leaf block should also have the outlet prefix
+    assert
+      .dom(".hero-blocks__block")
+      .exists("deeply nested leaf has outlet-prefixed class");
+    assert
+      .dom('[data-block-name="deep-leaf"]')
+      .exists("deeply nested leaf has data-block-name attribute");
+  });
+
+  test("@outletName is curried and accessible in blocks", async function (assert) {
+    @block("outlet-name-test")
+    class OutletNameTest extends Component {
+      <template>
+        <div class="outlet-name-display" data-outlet={{@outletName}}>
+          {{@outletName}}
+        </div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockGroup,
+          children: [{ block: OutletNameTest }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    const display = document.querySelector(".outlet-name-display");
+    assert.strictEqual(
+      display.getAttribute("data-outlet"),
+      "homepage-blocks",
+      "@outletName is curried into nested blocks"
+    );
+    assert.strictEqual(
+      display.textContent.trim(),
+      "homepage-blocks",
+      "@outletName value is accessible in template"
+    );
+  });
+
+  test("wrapper classes are correct when debug overlay is enabled", async function (assert) {
+    @block("overlay-test-child")
+    class OverlayTestChild extends Component {
+      <template>
+        <span class="overlay-child-content" data-outlet={{@outletName}}>
+          Child
+        </span>
+      </template>
+    }
+
+    // Enable debug overlay - this wraps blocks with BlockInfo component
+    debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, (blockData) => {
+      return { Component: blockData.Component };
+    });
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: BlockGroup,
+          id: "overlay-test",
+          children: [{ block: OverlayTestChild }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    // Verify container has BEM modifier class with overlay enabled
+    assert
+      .dom(".sidebar-blocks__block-container--overlay-test")
+      .exists("container has BEM modifier with overlay enabled");
+
+    // Verify child has correct outlet-prefixed class even with overlay
+    assert
+      .dom(".sidebar-blocks__block")
+      .exists("child has outlet-prefixed class with overlay enabled");
+
+    // Verify @outletName is still accessible to the block component
+    const childContent = document.querySelector(".overlay-child-content");
+    assert.strictEqual(
+      childContent.getAttribute("data-outlet"),
+      "sidebar-blocks",
+      "@outletName is accessible even when overlay wraps the component"
+    );
+  });
+
+  test("deeply nested wrapper classes are correct with debug overlay enabled", async function (assert) {
+    @block("deep-overlay-leaf")
+    class DeepOverlayLeaf extends Component {
+      <template>
+        <span class="deep-overlay-content" data-outlet={{@outletName}}>
+          Leaf
+        </span>
+      </template>
+    }
+
+    // Enable debug overlay
+    debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, (blockData) => {
+      return { Component: blockData.Component };
+    });
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockGroup,
+          id: "level-1",
+          children: [
+            {
+              block: BlockGroup,
+              id: "level-2",
+              children: [{ block: DeepOverlayLeaf }],
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    // All nested containers should have BEM modifier with overlay enabled
+    assert
+      .dom(".hero-blocks__block-container--level-1")
+      .exists("level-1 has BEM modifier with overlay");
+    assert
+      .dom(".hero-blocks__block-container--level-2")
+      .exists("level-2 has BEM modifier with overlay");
+
+    // The deeply nested leaf should have outlet prefix
+    assert
+      .dom(".hero-blocks__block")
+      .exists("deeply nested leaf has outlet-prefixed class with overlay");
+
+    // @outletName should be accessible in deeply nested blocks
+    const leafContent = document.querySelector(".deep-overlay-content");
+    assert.strictEqual(
+      leafContent.getAttribute("data-outlet"),
+      "hero-blocks",
+      "@outletName is accessible in deeply nested blocks with overlay"
+    );
+  });
+
+  test("containerArgs are accessible to parent container", async function (assert) {
+    // A tabs-like container that requires each child to provide a name via containerArgs.
+    // The parent can access containerArgs to render tab headers.
+    @block("tabs-container", {
+      container: true,
+      childArgs: {
+        tabName: { type: "string", required: true, unique: true },
+      },
+      classNames: "tabs-container",
+    })
+    class TabsContainer extends Component {
+      <template>
+        <div class="tabs-header">
+          {{#each @children as |child|}}
+            <button class="tab-button" data-tab={{child.containerArgs.tabName}}>
+              {{child.containerArgs.tabName}}
+            </button>
+          {{/each}}
+        </div>
+        <div class="tabs-content">
+          {{#each @children as |child|}}
+            <child.Component />
+          {{/each}}
+        </div>
+      </template>
+    }
+
+    @block("tab-content")
+    class TabContent extends Component {
+      <template>
+        <div class="tab-panel">Tab Panel Content</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: TabsContainer,
+          children: [
+            { block: TabContent, containerArgs: { tabName: "settings" } },
+            { block: TabContent, containerArgs: { tabName: "profile" } },
+            { block: TabContent, containerArgs: { tabName: "security" } },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    // Verify tab headers are rendered from containerArgs
+    const tabButtons = document.querySelectorAll(".tab-button");
+    assert.strictEqual(tabButtons.length, 3, "three tab buttons rendered");
+    assert.strictEqual(
+      tabButtons[0].getAttribute("data-tab"),
+      "settings",
+      "first tab has correct name from containerArgs"
+    );
+    assert.strictEqual(
+      tabButtons[1].getAttribute("data-tab"),
+      "profile",
+      "second tab has correct name from containerArgs"
+    );
+    assert.strictEqual(
+      tabButtons[2].getAttribute("data-tab"),
+      "security",
+      "third tab has correct name from containerArgs"
+    );
+
+    // Verify tab content panels are rendered
+    const tabPanels = document.querySelectorAll(".tab-panel");
+    assert.strictEqual(tabPanels.length, 3, "three tab panels rendered");
+  });
+
+  test("data-block-id attribute is set when id is provided", async function (assert) {
+    @block("id-test-child")
+    class IdTestChild extends Component {
+      <template>
+        <span class="id-test-content">Child</span>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: BlockGroup,
+          id: "main-group",
+          children: [{ block: IdTestChild, id: "first-child" }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    assert
+      .dom('[data-block-id="main-group"]')
+      .exists("container has data-block-id attribute");
+    assert
+      .dom('[data-block-id="first-child"]')
+      .exists("child has data-block-id attribute");
+  });
+});
diff --git a/frontend/discourse/tests/integration/components/block-head-test.gjs b/frontend/discourse/tests/integration/components/block-head-test.gjs
new file mode 100644
index 0000000000000..46386dca8edc4
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/block-head-test.gjs
@@ -0,0 +1,451 @@
+import Component from "@glimmer/component";
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import BlockOutlet from "discourse/blocks/block-outlet";
+import BlockGroup from "discourse/blocks/builtin/block-group";
+import BlockHead from "discourse/blocks/builtin/block-head";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import {
+  FAILURE_TYPE,
+  setupGhostCapture,
+} from "discourse/tests/helpers/block-testing";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import { i18n } from "discourse-i18n";
+
+module("Integration | Blocks | BlockHead", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("renders only the first child when all children are visible", async function (assert) {
+    @block("head-child-a")
+    class ChildA extends Component {
+      <template>
+        <div class="child-a">A</div>
+      </template>
+    }
+
+    @block("head-child-b")
+    class ChildB extends Component {
+      <template>
+        <div class="child-b">B</div>
+      </template>
+    }
+
+    @block("head-child-c")
+    class ChildC extends Component {
+      <template>
+        <div class="child-c">C</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockHead,
+          children: [{ block: ChildA }, { block: ChildB }, { block: ChildC }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert.dom(".child-a").exists("first child renders");
+    assert.dom(".child-b").doesNotExist("second child does not render");
+    assert.dom(".child-c").doesNotExist("third child does not render");
+  });
+
+  test("renders first child whose conditions pass", async function (assert) {
+    @block("conditional-child-1")
+    class ConditionalChild1 extends Component {
+      <template>
+        <div class="cond-1">First</div>
+      </template>
+    }
+
+    @block("conditional-child-2")
+    class ConditionalChild2 extends Component {
+      <template>
+        <div class="cond-2">Second</div>
+      </template>
+    }
+
+    @block("conditional-child-3")
+    class ConditionalChild3 extends Component {
+      <template>
+        <div class="cond-3">Third</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockHead,
+          children: [
+            // First child fails condition (user is not admin in test)
+            {
+              block: ConditionalChild1,
+              conditions: { type: "user", admin: true },
+            },
+            // Second child passes (no conditions)
+            { block: ConditionalChild2 },
+            // Third child also passes but shouldn't render
+            { block: ConditionalChild3 },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert
+      .dom(".cond-1")
+      .doesNotExist("first child with failing condition does not render");
+    assert.dom(".cond-2").exists("second child (first passing) renders");
+    assert.dom(".cond-3").doesNotExist("third child does not render");
+  });
+
+  test("renders nothing when no children pass conditions", async function (assert) {
+    @block("all-fail-child")
+    class AllFailChild extends Component {
+      <template>
+        <div class="fail-child">Should not render</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockHead,
+          children: [
+            {
+              block: AllFailChild,
+              conditions: { type: "user", admin: true },
+            },
+            {
+              block: AllFailChild,
+              conditions: { type: "user", staff: true },
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert
+      .dom(".fail-child")
+      .doesNotExist("no children render when all conditions fail");
+  });
+
+  test("renders with correct BEM classes", async function (assert) {
+    @block("bem-test-child")
+    class BemTestChild extends Component {
+      <template>
+        <div class="bem-child">Child</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockHead,
+          classNames: "custom-head",
+          children: [{ block: BemTestChild }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert
+      .dom('[data-block-name="head"]')
+      .exists("has data-block-name attribute");
+    assert.dom(".custom-head").exists("has custom class");
+  });
+
+  test("works nested inside a group", async function (assert) {
+    @block("nested-head-a")
+    class NestedHeadA extends Component {
+      <template>
+        <div class="nested-a">A</div>
+      </template>
+    }
+
+    @block("nested-head-b")
+    class NestedHeadB extends Component {
+      <template>
+        <div class="nested-b">B</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockGroup,
+          id: "outer",
+          children: [
+            {
+              block: BlockHead,
+              children: [{ block: NestedHeadA }, { block: NestedHeadB }],
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert
+      .dom(".homepage-blocks__block-container--outer")
+      .exists("group renders with BEM modifier");
+    assert.dom(".nested-a").exists("head renders first child");
+    assert.dom(".nested-b").doesNotExist("head does not render second child");
+  });
+
+  test("passes args to the rendered child", async function (assert) {
+    @block("args-head-child", { args: { message: { type: "string" } } })
+    class ArgsHeadChild extends Component {
+      <template>
+        <div class="args-child">{{@message}}</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockHead,
+          children: [
+            {
+              block: ArgsHeadChild,
+              args: { message: "Hello from head" },
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert.dom(".args-child").hasText("Hello from head");
+  });
+
+  test("@outletName is accessible in the rendered child", async function (assert) {
+    @block("outlet-name-head-child")
+    class OutletNameHeadChild extends Component {
+      <template>
+        <div
+          class="outlet-display"
+          data-outlet={{@outletName}}
+        >{{@outletName}}</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: BlockHead,
+          children: [{ block: OutletNameHeadChild }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    const display = document.querySelector(".outlet-display");
+    assert.strictEqual(display.getAttribute("data-outlet"), "sidebar-blocks");
+    assert.strictEqual(display.textContent.trim(), "sidebar-blocks");
+  });
+
+  test("shows ghosts for children that failed conditions in debug mode", async function (assert) {
+    const capturedGhosts = setupGhostCapture();
+
+    @block("ghost-fail-child")
+    class GhostFailChild extends Component {
+      <template>
+        <div class="fail-child">Should be ghost</div>
+      </template>
+    }
+
+    @block("ghost-pass-child")
+    class GhostPassChild extends Component {
+      <template>
+        <div class="pass-child">Rendered</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockHead,
+          children: [
+            {
+              block: GhostFailChild,
+              conditions: { type: "user", admin: true },
+            },
+            { block: GhostPassChild },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert.dom(".pass-child").exists("passing child renders");
+    assert
+      .dom('.ghost-block[data-name="ghost-fail-child"]')
+      .exists("failed child shows as ghost");
+    assert
+      .dom(`[data-type="${FAILURE_TYPE.CONDITION_FAILED}"]`)
+      .exists("ghost has correct failure type");
+
+    const failedGhost = capturedGhosts.find(
+      (g) => g.name === "ghost-fail-child"
+    );
+    assert.strictEqual(
+      failedGhost?.failureType,
+      FAILURE_TYPE.CONDITION_FAILED,
+      "captured ghost has CONDITION_FAILED type"
+    );
+
+    // Verify order: ghost should appear before the rendered child
+    const headContainer = document.querySelector('[data-block-name="head"]');
+    const children = [...headContainer.children];
+    const ghostIndex = children.findIndex((el) =>
+      el.matches('.ghost-block[data-name="ghost-fail-child"]')
+    );
+    const passIndex = children.findIndex((el) =>
+      el.querySelector(".pass-child")
+    );
+    assert.true(
+      ghostIndex < passIndex,
+      "ghost appears before rendered child in DOM order"
+    );
+  });
+
+  test("shows ghosts for children hidden by priority in debug mode", async function (assert) {
+    const capturedGhosts = setupGhostCapture();
+
+    @block("priority-first")
+    class PriorityFirst extends Component {
+      <template>
+        <div class="priority-first">First</div>
+      </template>
+    }
+
+    @block("priority-second")
+    class PrioritySecond extends Component {
+      <template>
+        <div class="priority-second">Second</div>
+      </template>
+    }
+
+    @block("priority-third")
+    class PriorityThird extends Component {
+      <template>
+        <div class="priority-third">Third</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockHead,
+          children: [
+            { block: PriorityFirst },
+            { block: PrioritySecond },
+            { block: PriorityThird },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert.dom(".priority-first").exists("first child renders");
+    assert.dom(".priority-second").doesNotExist("second child does not render");
+    assert.dom(".priority-third").doesNotExist("third child does not render");
+
+    assert
+      .dom('.ghost-block[data-name="priority-second"]')
+      .exists("second child shows as ghost");
+    assert
+      .dom('.ghost-block[data-name="priority-third"]')
+      .exists("third child shows as ghost");
+
+    const hiddenGhosts = capturedGhosts.filter(
+      (g) => g.name === "priority-second" || g.name === "priority-third"
+    );
+    assert.strictEqual(
+      hiddenGhosts.length,
+      2,
+      "two children hidden by priority"
+    );
+    assert.true(
+      hiddenGhosts.every(
+        (g) =>
+          g.failureReason ===
+          i18n("js.blocks.ghost_reasons.head_hidden_tail_hint")
+      ),
+      "ghosts have hidden-by-priority reason"
+    );
+
+    // Verify order: first < second ghost < third ghost
+    const headContainer = document.querySelector('[data-block-name="head"]');
+    const children = [...headContainer.children];
+    const firstIndex = children.findIndex((el) =>
+      el.querySelector(".priority-first")
+    );
+    const secondGhostIndex = children.findIndex((el) =>
+      el.matches('.ghost-block[data-name="priority-second"]')
+    );
+    const thirdGhostIndex = children.findIndex((el) =>
+      el.matches('.ghost-block[data-name="priority-third"]')
+    );
+    assert.true(
+      firstIndex < secondGhostIndex,
+      "rendered child appears before second ghost"
+    );
+    assert.true(
+      secondGhostIndex < thirdGhostIndex,
+      "second ghost appears before third ghost"
+    );
+  });
+
+  test("no ghosts rendered when debug mode is disabled", async function (assert) {
+    // When visual overlay is disabled, ghosts should not be rendered even if
+    // BLOCK_DEBUG callback is set. The blocks service's showGhosts getter
+    // controls whether head block renders ghosts for hidden children.
+    setupGhostCapture({ enabled: false });
+
+    @block("no-ghost-first")
+    class NoGhostFirst extends Component {
+      <template>
+        <div class="no-ghost-first">First</div>
+      </template>
+    }
+
+    @block("no-ghost-second")
+    class NoGhostSecond extends Component {
+      <template>
+        <div class="no-ghost-second">Second</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: BlockHead,
+          children: [{ block: NoGhostFirst }, { block: NoGhostSecond }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    assert.dom(".no-ghost-first").exists("first child renders");
+    assert.dom(".no-ghost-second").doesNotExist("second child does not render");
+    assert
+      .dom(".ghost-block")
+      .doesNotExist("no ghost blocks rendered when overlay disabled");
+  });
+});
diff --git a/frontend/discourse/tests/integration/components/block-layout-wrapper-test.gjs b/frontend/discourse/tests/integration/components/block-layout-wrapper-test.gjs
new file mode 100644
index 0000000000000..2c7f8cced9458
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/block-layout-wrapper-test.gjs
@@ -0,0 +1,386 @@
+import Component from "@glimmer/component";
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import BlockOutlet from "discourse/blocks/block-outlet";
+import BlockGroup from "discourse/blocks/builtin/block-group";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+module("Integration | Blocks | BlockLayoutWrapper", function (hooks) {
+  setupRenderingTest(hooks);
+
+  module("data attributes", function () {
+    test("non-container block has correct data-block-name", async function (assert) {
+      @block("data-attr-test-block")
+      class DataAttrTestBlock extends Component {
+        <template>
+          <div class="test-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [{ block: DataAttrTestBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert
+        .dom('[data-block-name="data-attr-test-block"]')
+        .exists("data-block-name attribute is set");
+      assert
+        .dom(".hero-blocks__block")
+        .hasAttribute(
+          "data-block-name",
+          "data-attr-test-block",
+          "data-block-name has correct value"
+        );
+    });
+
+    test("namespaced block has correct data-block-namespace", async function (assert) {
+      @block("test-plugin:namespaced-block")
+      class NamespacedBlock extends Component {
+        <template>
+          <div class="namespaced-content">Namespaced</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: NamespacedBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert
+        .dom('[data-block-namespace="test-plugin"]')
+        .exists("data-block-namespace attribute is set for namespaced block");
+      assert
+        .dom(".sidebar-blocks__block")
+        .hasAttribute(
+          "data-block-namespace",
+          "test-plugin",
+          "data-block-namespace has correct value"
+        );
+    });
+
+    test("core block has no data-block-namespace", async function (assert) {
+      @block("core-style-block")
+      class CoreStyleBlock extends Component {
+        <template>
+          <div class="core-content">Core</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [{ block: CoreStyleBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      const wrapper = document.querySelector(".hero-blocks__block");
+      assert.strictEqual(
+        wrapper.getAttribute("data-block-namespace"),
+        null,
+        "core blocks have no namespace attribute"
+      );
+    });
+
+    test("data-block-id is set when id is provided", async function (assert) {
+      @block("id-attr-test-block")
+      class IdAttrTestBlock extends Component {
+        <template>
+          <div class="id-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          { block: IdAttrTestBlock, id: "my-block-id" },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert
+        .dom('[data-block-id="my-block-id"]')
+        .exists("data-block-id attribute is set");
+    });
+
+    test("data-block-id is not set when id is not provided", async function (assert) {
+      @block("no-id-attr-block")
+      class NoIdAttrBlock extends Component {
+        <template>
+          <div class="no-id-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [{ block: NoIdAttrBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      const wrapper = document.querySelector(".hero-blocks__block");
+      assert.strictEqual(
+        wrapper.getAttribute("data-block-id"),
+        null,
+        "data-block-id is not set when id is not provided"
+      );
+    });
+
+    test("all data attributes are present on container block", async function (assert) {
+      @block("full-attr-child")
+      class FullAttrChild extends Component {
+        <template>
+          <div class="full-child">Child</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: BlockGroup,
+            id: "full-test",
+            children: [{ block: FullAttrChild }],
+          },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      const containerWrapper = document.querySelector(
+        '[data-block-name="group"]'
+      );
+      assert.strictEqual(
+        containerWrapper.getAttribute("data-block-name"),
+        "group",
+        "container has correct data-block-name"
+      );
+      assert.strictEqual(
+        containerWrapper.getAttribute("data-block-namespace"),
+        null,
+        "built-in container has no namespace"
+      );
+      assert.strictEqual(
+        containerWrapper.getAttribute("data-block-id"),
+        "full-test",
+        "container has correct data-block-id"
+      );
+    });
+
+    test("nested blocks have correct data attributes", async function (assert) {
+      @block("nested-attr-leaf")
+      class NestedAttrLeaf extends Component {
+        <template>
+          <div class="nested-leaf">Leaf</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: BlockGroup,
+            id: "outer",
+            children: [
+              {
+                block: BlockGroup,
+                id: "inner",
+                children: [{ block: NestedAttrLeaf }],
+              },
+            ],
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert
+        .dom('[data-block-id="outer"]')
+        .exists("outer container has data-block-id");
+      assert
+        .dom('[data-block-id="inner"]')
+        .exists("inner container has data-block-id");
+
+      const leaf = document.querySelector(
+        '[data-block-name="nested-attr-leaf"]'
+      );
+      assert.strictEqual(
+        leaf.getAttribute("data-block-id"),
+        null,
+        "nested leaf without id does not have data-block-id"
+      );
+    });
+  });
+
+  module("CSS classes", function () {
+    test("leaf blocks have {outlet}__block class", async function (assert) {
+      @block("css-class-block")
+      class CssClassBlock extends Component {
+        <template>
+          <div class="css-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: CssClassBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert
+        .dom(".sidebar-blocks__block")
+        .exists("leaf block has outlet__block class");
+    });
+
+    test("container blocks have {outlet}__block-container class", async function (assert) {
+      @block("container-css-child")
+      class ContainerCssChild extends Component {
+        <template>
+          <div class="container-css-content">Child</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: BlockGroup,
+            children: [{ block: ContainerCssChild }],
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      const containerWrapper = document.querySelector(
+        '[data-block-name="group"]'
+      );
+      assert.true(
+        containerWrapper.classList.contains("hero-blocks__block-container"),
+        "container has outlet__block-container class"
+      );
+    });
+
+    test("id generates BEM modifier class on leaf blocks", async function (assert) {
+      @block("bem-modifier-block")
+      class BemModifierBlock extends Component {
+        <template>
+          <div class="bem-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          { block: BemModifierBlock, id: "featured" },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert
+        .dom(".sidebar-blocks__block--featured")
+        .exists("leaf block has BEM modifier class from id");
+    });
+
+    test("id generates BEM modifier class on container blocks", async function (assert) {
+      @block("bem-container-child")
+      class BemContainerChild extends Component {
+        <template>
+          <div class="bem-child">Child</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: BlockGroup,
+            id: "main-group",
+            children: [{ block: BemContainerChild }],
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert
+        .dom(".hero-blocks__block-container--main-group")
+        .exists("container has BEM modifier class from id");
+    });
+
+    test("decorator classNames are applied", async function (assert) {
+      @block("decorator-class-block", {
+        classNames: "custom-decorator-class",
+      })
+      class DecoratorClassBlock extends Component {
+        <template>
+          <div class="decorator-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [{ block: DecoratorClassBlock }])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert
+        .dom(".custom-decorator-class")
+        .exists("decorator classNames are applied to wrapper");
+    });
+
+    test("layout entry classNames are applied", async function (assert) {
+      @block("entry-class-block")
+      class EntryClassBlock extends Component {
+        <template>
+          <div class="entry-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          { block: EntryClassBlock, classNames: "custom-entry-class" },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert
+        .dom(".custom-entry-class")
+        .exists("layout entry classNames are applied to wrapper");
+    });
+
+    test("both decorator and entry classNames are applied", async function (assert) {
+      @block("both-classes-block", {
+        classNames: "from-decorator",
+      })
+      class BothClassesBlock extends Component {
+        <template>
+          <div class="both-content">Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          { block: BothClassesBlock, classNames: "from-entry" },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      const wrapper = document.querySelector(".main-outlet-blocks__block");
+      assert.true(
+        wrapper.classList.contains("from-decorator"),
+        "decorator class is applied"
+      );
+      assert.true(
+        wrapper.classList.contains("from-entry"),
+        "entry class is applied"
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/integration/components/block-outlet-conditions-test.gjs b/frontend/discourse/tests/integration/components/block-outlet-conditions-test.gjs
new file mode 100644
index 0000000000000..4fc1e7f4fa082
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/block-outlet-conditions-test.gjs
@@ -0,0 +1,623 @@
+import Component from "@glimmer/component";
+import { render } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import BlockOutlet from "discourse/blocks/block-outlet";
+import BlockGroup from "discourse/blocks/builtin/block-group";
+import { BlockCondition, blockCondition } from "discourse/blocks/conditions";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import {
+  registerConditionType,
+  withTestConditionRegistration,
+} from "discourse/tests/helpers/block-testing";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+/* Test condition classes - defined at module scope to use with decorator */
+
+@blockCondition({ type: "always-true", args: {} })
+class BlockAlwaysTrueCondition extends BlockCondition {
+  evaluate() {
+    return true;
+  }
+}
+
+@blockCondition({ type: "always-false", args: {} })
+class BlockAlwaysFalseCondition extends BlockCondition {
+  evaluate() {
+    return false;
+  }
+}
+
+module("Integration | Blocks | BlockOutlet | Conditions", function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.beforeEach(function () {
+    // Register test conditions for each test (registries are reset between tests)
+    withTestConditionRegistration(() => {
+      registerConditionType(BlockAlwaysTrueCondition);
+      registerConditionType(BlockAlwaysFalseCondition);
+    });
+  });
+
+  test("renders block when no conditions specified", async function (assert) {
+    @block("no-condition-block")
+    class NoConditionBlock extends Component {
+      <template>
+        <div class="no-condition">No Condition</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [{ block: NoConditionBlock }])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert.dom(".no-condition").exists();
+  });
+
+  test("renders block when condition passes", async function (assert) {
+    @block("passing-condition-block")
+    class PassingConditionBlock extends Component {
+      <template>
+        <div class="passing-condition">Passes</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: PassingConditionBlock,
+          conditions: { type: "always-true" },
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert.dom(".passing-condition").exists();
+  });
+
+  test("hides block when condition fails", async function (assert) {
+    @block("failing-condition-block")
+    class FailingConditionBlock extends Component {
+      <template>
+        <div class="failing-condition">Fails</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: FailingConditionBlock,
+          conditions: { type: "always-false" },
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    assert.dom(".failing-condition").doesNotExist();
+  });
+
+  test("AND logic: hides if any condition fails", async function (assert) {
+    @block("and-logic-block")
+    class AndLogicBlock extends Component {
+      <template>
+        <div class="and-logic">AND Logic</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("main-outlet-blocks", [
+        {
+          block: AndLogicBlock,
+          conditions: [{ type: "always-true" }, { type: "always-false" }],
+        },
+      ])
+    );
+
+    await render(
+      <template><BlockOutlet @name="main-outlet-blocks" /></template>
+    );
+
+    assert.dom(".and-logic").doesNotExist();
+  });
+
+  test("AND logic: renders when all conditions pass", async function (assert) {
+    @block("all-pass-block")
+    class AllPassBlock extends Component {
+      <template>
+        <div class="all-pass">All Pass</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: AllPassBlock,
+          conditions: [{ type: "always-true" }, { type: "always-true" }],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert.dom(".all-pass").exists();
+  });
+
+  test("OR logic: renders when any condition passes", async function (assert) {
+    @block("or-logic-pass-block")
+    class OrLogicPassBlock extends Component {
+      <template>
+        <div class="or-logic-pass">OR Logic Pass</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: OrLogicPassBlock,
+          conditions: {
+            any: [{ type: "always-false" }, { type: "always-true" }],
+          },
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert.dom(".or-logic-pass").exists();
+  });
+
+  test("OR logic: hides when all conditions fail", async function (assert) {
+    @block("or-logic-fail-block")
+    class OrLogicFailBlock extends Component {
+      <template>
+        <div class="or-logic-fail">OR Logic Fail</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: OrLogicFailBlock,
+          conditions: {
+            any: [{ type: "always-false" }, { type: "always-false" }],
+          },
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert.dom(".or-logic-fail").doesNotExist();
+  });
+
+  test("NOT logic: inverts true to false", async function (assert) {
+    @block("not-true-block")
+    class NotTrueBlock extends Component {
+      <template>
+        <div class="not-true">NOT True</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: NotTrueBlock,
+          conditions: { not: { type: "always-true" } },
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    assert.dom(".not-true").doesNotExist();
+  });
+
+  test("NOT logic: inverts false to true", async function (assert) {
+    @block("not-false-block")
+    class NotFalseBlock extends Component {
+      <template>
+        <div class="not-false">NOT False</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("main-outlet-blocks", [
+        {
+          block: NotFalseBlock,
+          conditions: { not: { type: "always-false" } },
+        },
+      ])
+    );
+
+    await render(
+      <template><BlockOutlet @name="main-outlet-blocks" /></template>
+    );
+
+    assert.dom(".not-false").exists();
+  });
+
+  test("filters nested children based on conditions", async function (assert) {
+    @block("nested-visible")
+    class NestedVisibleBlock extends Component {
+      <template>
+        <div class="nested-visible">Visible</div>
+      </template>
+    }
+
+    @block("nested-hidden")
+    class NestedHiddenBlock extends Component {
+      <template>
+        <div class="nested-hidden">Hidden</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockGroup,
+
+          children: [
+            {
+              block: NestedVisibleBlock,
+              conditions: { type: "always-true" },
+            },
+            {
+              block: NestedHiddenBlock,
+              conditions: { type: "always-false" },
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert.dom(".nested-visible").exists();
+    assert.dom(".nested-hidden").doesNotExist();
+  });
+
+  test("multiple blocks with mixed conditions", async function (assert) {
+    @block("mixed-visible-1")
+    class MixedVisible1 extends Component {
+      <template>
+        <div class="mixed-visible-1">Visible 1</div>
+      </template>
+    }
+
+    @block("mixed-visible-2")
+    class MixedVisible2 extends Component {
+      <template>
+        <div class="mixed-visible-2">Visible 2</div>
+      </template>
+    }
+
+    @block("mixed-hidden")
+    class MixedHidden extends Component {
+      <template>
+        <div class="mixed-hidden">Hidden</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        { block: MixedVisible1, conditions: { type: "always-true" } },
+        { block: MixedHidden, conditions: { type: "always-false" } },
+        { block: MixedVisible2 },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert.dom(".mixed-visible-1").exists();
+    assert.dom(".mixed-visible-2").exists();
+    assert.dom(".mixed-hidden").doesNotExist();
+  });
+
+  test("complex nested conditions: NOT within OR renders when inner condition is false", async function (assert) {
+    @block("not-within-or-block")
+    class NotWithinOrBlock extends Component {
+      <template>
+        <div class="not-within-or">NOT within OR</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: NotWithinOrBlock,
+          conditions: {
+            any: [{ type: "always-false" }, { not: { type: "always-false" } }],
+          },
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    assert.dom(".not-within-or").exists();
+  });
+
+  test("complex nested conditions: OR within AND hides when AND fails", async function (assert) {
+    @block("or-within-and-block")
+    class OrWithinAndBlock extends Component {
+      <template>
+        <div class="or-within-and">OR within AND</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("main-outlet-blocks", [
+        {
+          block: OrWithinAndBlock,
+          conditions: [
+            { any: [{ type: "always-true" }, { type: "always-false" }] },
+            { type: "always-false" },
+          ],
+        },
+      ])
+    );
+
+    await render(
+      <template><BlockOutlet @name="main-outlet-blocks" /></template>
+    );
+
+    assert.dom(".or-within-and").doesNotExist();
+  });
+
+  test("complex nested conditions: OR within AND renders when all pass", async function (assert) {
+    @block("or-within-and-pass-block")
+    class OrWithinAndPassBlock extends Component {
+      <template>
+        <div class="or-within-and-pass">OR within AND Pass</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: OrWithinAndPassBlock,
+          conditions: [
+            { any: [{ type: "always-false" }, { type: "always-true" }] },
+            { type: "always-true" },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    assert.dom(".or-within-and-pass").exists();
+  });
+
+  test("complex nested conditions: deeply nested NOT within OR within AND", async function (assert) {
+    @block("deep-nested-block")
+    class DeepNestedBlock extends Component {
+      <template>
+        <div class="deep-nested">Deep Nested</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: DeepNestedBlock,
+          conditions: [
+            {
+              any: [
+                { not: { type: "always-true" } },
+                { not: { type: "always-false" } },
+              ],
+            },
+            { type: "always-true" },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    assert.dom(".deep-nested").exists();
+  });
+
+  test("container with all children failing conditions does not render", async function (assert) {
+    @block("child-hidden-1")
+    class ChildHidden1 extends Component {
+      <template>
+        <div class="child-hidden-1">Hidden 1</div>
+      </template>
+    }
+
+    @block("child-hidden-2")
+    class ChildHidden2 extends Component {
+      <template>
+        <div class="child-hidden-2">Hidden 2</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockGroup,
+
+          classNames: "admin-only-group",
+          children: [
+            {
+              block: ChildHidden1,
+              conditions: { type: "always-false" },
+            },
+            {
+              block: ChildHidden2,
+              conditions: { type: "always-false" },
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    // Container should not render because no children are visible
+    assert.dom(".admin-only-group").doesNotExist();
+    assert.dom(".child-hidden-1").doesNotExist();
+    assert.dom(".child-hidden-2").doesNotExist();
+  });
+
+  test("container with at least one visible child renders", async function (assert) {
+    @block("child-visible-container")
+    class ChildVisibleContainer extends Component {
+      <template>
+        <div class="child-visible-container">Visible</div>
+      </template>
+    }
+
+    @block("child-hidden-container")
+    class ChildHiddenContainer extends Component {
+      <template>
+        <div class="child-hidden-container">Hidden</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("sidebar-blocks", [
+        {
+          block: BlockGroup,
+
+          classNames: "mixed-group",
+          children: [
+            {
+              block: ChildVisibleContainer,
+              conditions: { type: "always-true" },
+            },
+            {
+              block: ChildHiddenContainer,
+              conditions: { type: "always-false" },
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+    // Container should render because at least one child is visible
+    assert.dom(".mixed-group").exists();
+    assert.dom(".child-visible-container").exists();
+    assert.dom(".child-hidden-container").doesNotExist();
+  });
+
+  test("nested containers: inner container without visible children hides outer container", async function (assert) {
+    @block("deeply-hidden-child")
+    class DeeplyHiddenChild extends Component {
+      <template>
+        <div class="deeply-hidden-child">Hidden</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("main-outlet-blocks", [
+        {
+          block: BlockGroup,
+
+          classNames: "outer-group",
+          children: [
+            {
+              block: BlockGroup,
+
+              classNames: "inner-group",
+              children: [
+                {
+                  block: DeeplyHiddenChild,
+                  conditions: { type: "always-false" },
+                },
+              ],
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(
+      <template><BlockOutlet @name="main-outlet-blocks" /></template>
+    );
+
+    // Both containers should not render because the deepest child fails
+    assert.dom(".outer-group").doesNotExist();
+    assert.dom(".inner-group").doesNotExist();
+    assert.dom(".deeply-hidden-child").doesNotExist();
+  });
+
+  test("nested containers: outer renders when inner has visible children", async function (assert) {
+    @block("deeply-visible-child")
+    class DeeplyVisibleChild extends Component {
+      <template>
+        <div class="deeply-visible-child">Visible</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("hero-blocks", [
+        {
+          block: BlockGroup,
+
+          classNames: "outer-visible-group",
+          children: [
+            {
+              block: BlockGroup,
+
+              classNames: "inner-visible-group",
+              children: [
+                {
+                  block: DeeplyVisibleChild,
+                  conditions: { type: "always-true" },
+                },
+              ],
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+    // Both containers should render because the deepest child is visible
+    assert.dom(".outer-visible-group").exists();
+    assert.dom(".inner-visible-group").exists();
+    assert.dom(".deeply-visible-child").exists();
+  });
+
+  test("container with own failing condition does not render even with visible children", async function (assert) {
+    @block("child-would-be-visible")
+    class ChildWouldBeVisible extends Component {
+      <template>
+        <div class="child-would-be-visible">Would be visible</div>
+      </template>
+    }
+
+    withPluginApi((api) =>
+      api.renderBlocks("homepage-blocks", [
+        {
+          block: BlockGroup,
+
+          classNames: "failing-container",
+          conditions: { type: "always-false" },
+          children: [
+            {
+              block: ChildWouldBeVisible,
+              conditions: { type: "always-true" },
+            },
+          ],
+        },
+      ])
+    );
+
+    await render(<template><BlockOutlet @name="homepage-blocks" /></template>);
+
+    // Container should not render because its own condition fails
+    assert.dom(".failing-container").doesNotExist();
+    assert.dom(".child-would-be-visible").doesNotExist();
+  });
+});
diff --git a/frontend/discourse/tests/integration/components/block-outlet-test.gjs b/frontend/discourse/tests/integration/components/block-outlet-test.gjs
new file mode 100644
index 0000000000000..858ee3dda4811
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/block-outlet-test.gjs
@@ -0,0 +1,1759 @@
+import Component from "@glimmer/component";
+import { getOwner } from "@ember/owner";
+import { render, setupOnerror } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import sinon from "sinon";
+import { block } from "discourse/blocks";
+import BlockOutlet, { _getOutletLayouts } from "discourse/blocks/block-outlet";
+import BlockGroup from "discourse/blocks/builtin/block-group";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import {
+  DEBUG_CALLBACK,
+  debugHooks,
+  FAILURE_TYPE,
+  registerBlock,
+  registerBlockFactory,
+  withTestBlockRegistration,
+} from "discourse/tests/helpers/block-testing";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+module("Integration | Blocks | BlockOutlet", function (hooks) {
+  setupRenderingTest(hooks);
+
+  hooks.afterEach(function () {
+    setupOnerror();
+  });
+
+  module("basic rendering", function () {
+    test("renders nothing when no blocks registered for outlet", async function (assert) {
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".hero-blocks").doesNotExist();
+    });
+
+    test("renders blocks when registered for outlet", async function (assert) {
+      @block("render-test-block")
+      class RenderTestBlock extends Component {
+        <template>
+          <div class="render-test-content">Test Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [{ block: RenderTestBlock }])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.dom(".homepage-blocks").exists();
+      assert.dom(".render-test-content").hasText("Test Content");
+    });
+
+    test("renders correct BEM class structure", async function (assert) {
+      @block("bem-test-block")
+      class BemTestBlock extends Component {
+        <template>
+          <span>BEM Test</span>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: BemTestBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert.dom(".sidebar-blocks").exists();
+      assert.dom(".sidebar-blocks__container").exists();
+      assert.dom(".sidebar-blocks__layout").exists();
+    });
+
+    test("wraps non-container blocks with block classes", async function (assert) {
+      @block("wrapped-block")
+      class WrappedBlock extends Component {
+        <template>
+          <span>Wrapped</span>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          { block: WrappedBlock, classNames: "custom-class" },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      assert.dom(".main-outlet-blocks__block").exists();
+      assert.dom('[data-block-name="wrapped-block"]').exists();
+      assert.dom(".custom-class").exists();
+    });
+
+    test("passes args to block components", async function (assert) {
+      @block("args-test-block", {
+        args: { title: { type: "string" }, count: { type: "number" } },
+      })
+      class ArgsTestBlock extends Component {
+        <template>
+          <div class="args-test">
+            <span class="title">{{@title}}</span>
+            <span class="count">{{@count}}</span>
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          { block: ArgsTestBlock, args: { title: "Hello", count: 42 } },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".args-test .title").hasText("Hello");
+      assert.dom(".args-test .count").hasText("42");
+    });
+
+    test("applies default values from metadata when args not provided", async function (assert) {
+      @block("defaults-test-block", {
+        args: {
+          title: { type: "string", default: "Default Title" },
+          count: { type: "number", default: 10 },
+          enabled: { type: "boolean", default: true },
+        },
+      })
+      class DefaultsTestBlock extends Component {
+        <template>
+          <div class="defaults-test">
+            <span class="title">{{@title}}</span>
+            <span class="count">{{@count}}</span>
+            <span class="enabled">{{if @enabled "yes" "no"}}</span>
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [{ block: DefaultsTestBlock }])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      assert.dom(".defaults-test .title").hasText("Default Title");
+      assert.dom(".defaults-test .count").hasText("10");
+      assert.dom(".defaults-test .enabled").hasText("yes");
+    });
+
+    test("provided args override default values", async function (assert) {
+      @block("override-defaults-block", {
+        args: {
+          title: { type: "string", default: "Default Title" },
+          count: { type: "number", default: 10 },
+        },
+      })
+      class OverrideDefaultsBlock extends Component {
+        <template>
+          <div class="override-test">
+            <span class="title">{{@title}}</span>
+            <span class="count">{{@count}}</span>
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: OverrideDefaultsBlock,
+            args: { title: "Custom Title", count: 99 },
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".override-test .title").hasText("Custom Title");
+      assert.dom(".override-test .count").hasText("99");
+    });
+
+    test("partial args use defaults for missing values", async function (assert) {
+      @block("partial-defaults-block", {
+        args: {
+          title: { type: "string", default: "Default Title" },
+          subtitle: { type: "string", default: "Default Subtitle" },
+        },
+      })
+      class PartialDefaultsBlock extends Component {
+        <template>
+          <div class="partial-test">
+            <span class="title">{{@title}}</span>
+            <span class="subtitle">{{@subtitle}}</span>
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          {
+            block: PartialDefaultsBlock,
+            args: { title: "Custom Title" },
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert.dom(".partial-test .title").hasText("Custom Title");
+      assert.dom(".partial-test .subtitle").hasText("Default Subtitle");
+    });
+  });
+
+  module("named blocks", function () {
+    test(":before block yields hasBlocks boolean (false when no blocks)", async function (assert) {
+      await render(
+        <template>
+          <BlockOutlet @name="hero-blocks">
+            <:before as |hasBlocks|>
+              <div class="before-block">
+                {{#if hasBlocks}}
+                  <span class="has-blocks">Has Blocks</span>
+                {{else}}
+                  <span class="no-blocks">No Blocks</span>
+                {{/if}}
+              </div>
+            </:before>
+          </BlockOutlet>
+        </template>
+      );
+
+      assert.dom(".before-block").exists();
+      assert.dom(".no-blocks").exists();
+      assert.dom(".has-blocks").doesNotExist();
+    });
+
+    test(":after block yields hasBlocks boolean", async function (assert) {
+      await render(
+        <template>
+          <BlockOutlet @name="hero-blocks">
+            <:after as |hasBlocks|>
+              <div class="after-block">
+                {{#if hasBlocks}}
+                  <span class="has-blocks">Has Blocks</span>
+                {{else}}
+                  <span class="no-blocks">No Blocks</span>
+                {{/if}}
+              </div>
+            </:after>
+          </BlockOutlet>
+        </template>
+      );
+
+      assert.dom(".after-block").exists();
+      assert.dom(".no-blocks").exists();
+      assert.dom(".has-blocks").doesNotExist();
+    });
+  });
+
+  module("authorization and security", function () {
+    test("throws when @block component used directly in template", async function (assert) {
+      @block("direct-usage-block")
+      class DirectUsageBlock extends Component {
+        <template>
+          <span>Should not render</span>
+        </template>
+      }
+
+      let errorThrown = null;
+      setupOnerror((error) => {
+        errorThrown = error;
+      });
+
+      await render(<template><DirectUsageBlock /></template>);
+
+      assert.true(
+        errorThrown?.message?.includes("cannot be used directly in templates"),
+        "throws authorization error"
+      );
+    });
+  });
+
+  module("debug callbacks", function () {
+    test("debugHooks.setCallback(BLOCK_DEBUG) wraps rendered blocks", async function (assert) {
+      @block("debug-wrap-block")
+      class DebugWrapBlock extends Component {
+        <template>
+          <div class="debug-wrap-content">Content</div>
+        </template>
+      }
+
+      let callbackCalled = false;
+      let receivedBlockData = null;
+
+      debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, (blockData) => {
+        callbackCalled = true;
+        receivedBlockData = blockData;
+        return { Component: blockData.Component };
+      });
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [{ block: DebugWrapBlock }])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.true(callbackCalled, "callback was called");
+      assert.strictEqual(
+        receivedBlockData.name,
+        "debug-wrap-block",
+        "received correct block name"
+      );
+      assert.true(
+        receivedBlockData.conditionsPassed,
+        "conditions passed is true"
+      );
+      assert.dom(".debug-wrap-content").exists();
+    });
+
+    test("debugHooks.setCallback(BLOCK_DEBUG) shows ghost blocks when conditions fail", async function (assert) {
+      @block("ghost-test-block")
+      class GhostTestBlock extends Component {
+        <template>
+          <div class="ghost-content">Should not render</div>
+        </template>
+      }
+
+      let ghostBlockReceived = false;
+
+      debugHooks.setCallback(DEBUG_CALLBACK.GHOST_BLOCKS, () => true);
+      debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, (blockData) => {
+        if (!blockData.conditionsPassed) {
+          ghostBlockReceived = true;
+          return {
+            Component: <template>
+              <div class="ghost-indicator">Ghost: {{blockData.name}}</div>
+            </template>,
+          };
+        }
+        return { Component: blockData.Component };
+      });
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          {
+            block: GhostTestBlock,
+            // loggedIn: false means "only for anonymous users" - fails when logged in
+            conditions: { type: "user", loggedIn: false },
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert.true(ghostBlockReceived, "ghost block callback received");
+      assert
+        .dom(".ghost-content")
+        .doesNotExist("original content not rendered");
+      assert.dom(".ghost-indicator").exists("ghost indicator rendered");
+    });
+
+    test("debugHooks.setCallback(BLOCK_DEBUG) can be cleared by setting to null", async function (assert) {
+      @block("clear-callback-block")
+      class ClearCallbackBlock extends Component {
+        <template>
+          <div class="clear-content">Content</div>
+        </template>
+      }
+
+      let callCount = 0;
+      debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, () => {
+        callCount++;
+        return null;
+      });
+
+      debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_DEBUG, null);
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [{ block: ClearCallbackBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.strictEqual(callCount, 0, "callback not called after clearing");
+      assert.dom(".clear-content").exists("block still renders");
+    });
+
+    test("debugHooks.setCallback(BLOCK_DEBUG) receives correct hierarchy for direct children", async function (assert) {
+      @block("direct-child-block")
+      class DirectChildBlock extends Component {
+        <template>
+          <div class="direct-child">Direct Child</div>
+        </template>
+      }
+
+      const receivedContexts = [];
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.BLOCK_DEBUG,
+        (blockData, context) => {
+          receivedContexts.push({
+            name: blockData.name,
+            outletName: context.outletName,
+          });
+          return { Component: blockData.Component };
+        }
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [{ block: DirectChildBlock }])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.strictEqual(receivedContexts.length, 1, "callback called once");
+      assert.strictEqual(
+        receivedContexts[0].name,
+        "direct-child-block",
+        "received correct block name"
+      );
+      assert.strictEqual(
+        receivedContexts[0].outletName,
+        "homepage-blocks",
+        "direct child receives outlet name as hierarchy"
+      );
+    });
+
+    test("debugHooks.setCallback(BLOCK_DEBUG) receives correct hierarchy for children of container blocks", async function (assert) {
+      @block("nested-child-block")
+      class NestedChildBlock extends Component {
+        <template>
+          <div class="nested-child">Nested Child</div>
+        </template>
+      }
+
+      const receivedContexts = [];
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.BLOCK_DEBUG,
+        (blockData, context) => {
+          receivedContexts.push({
+            name: blockData.name,
+            outletName: context?.outletName,
+          });
+          return { Component: blockData.Component };
+        }
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          {
+            block: BlockGroup,
+
+            children: [{ block: NestedChildBlock }],
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      // BlockGroup is decorated with @block("group", { container: true })
+      const groupContext = receivedContexts.find((c) => c.name === "group");
+      const childContext = receivedContexts.find(
+        (c) => c.name === "nested-child-block"
+      );
+
+      assert.strictEqual(
+        groupContext.outletName,
+        "sidebar-blocks",
+        "container block receives outlet name as hierarchy"
+      );
+      assert.strictEqual(
+        childContext.outletName,
+        "sidebar-blocks/group[0]",
+        "nested child receives parent container path with index"
+      );
+    });
+
+    test("debugHooks.setCallback(BLOCK_DEBUG) receives correct hierarchy for deeply nested children", async function (assert) {
+      @block("deep-nested-block")
+      class DeepNestedBlock extends Component {
+        <template>
+          <div class="deep-nested">Deep Nested</div>
+        </template>
+      }
+
+      const receivedContexts = [];
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.BLOCK_DEBUG,
+        (blockData, context) => {
+          receivedContexts.push({
+            name: blockData.name,
+            outletName: context?.outletName,
+          });
+          return { Component: blockData.Component };
+        }
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: BlockGroup,
+
+            children: [
+              {
+                block: BlockGroup,
+
+                children: [{ block: DeepNestedBlock }],
+              },
+            ],
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      // BlockGroup is decorated with @block("group", { container: true })
+      const outerContext = receivedContexts.find(
+        (c) => c.name === "group" && c.outletName === "hero-blocks"
+      );
+      const innerContext = receivedContexts.find(
+        (c) => c.name === "group" && c.outletName === "hero-blocks/group[0]"
+      );
+      const deepContext = receivedContexts.find(
+        (c) => c.name === "deep-nested-block"
+      );
+
+      assert.strictEqual(
+        outerContext.outletName,
+        "hero-blocks",
+        "outer container receives outlet name"
+      );
+      assert.strictEqual(
+        innerContext.outletName,
+        "hero-blocks/group[0]",
+        "inner container receives parent path with index"
+      );
+      assert.strictEqual(
+        deepContext.outletName,
+        "hero-blocks/group[0]/group[0]",
+        "deeply nested child receives full hierarchy path"
+      );
+    });
+
+    test("debugHooks.setCallback(BLOCK_DEBUG) includes index for multiple containers at same level", async function (assert) {
+      @block("multi-container-child")
+      class MultiContainerChild extends Component {
+        <template>
+          <div class="multi-child">Multi Child</div>
+        </template>
+      }
+
+      const receivedContexts = [];
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.BLOCK_DEBUG,
+        (blockData, context) => {
+          receivedContexts.push({
+            name: blockData.name,
+            outletName: context?.outletName,
+          });
+          return { Component: blockData.Component };
+        }
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: BlockGroup,
+
+            children: [{ block: MultiContainerChild }],
+          },
+          {
+            block: BlockGroup,
+
+            children: [{ block: MultiContainerChild }],
+          },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      // BlockGroup is decorated with @block("group", { container: true })
+      const childContexts = receivedContexts.filter(
+        (c) => c.name === "multi-container-child"
+      );
+
+      assert.strictEqual(childContexts.length, 2, "two children rendered");
+      assert.strictEqual(
+        childContexts[0].outletName,
+        "main-outlet-blocks/group[0]",
+        "first container child has index 0"
+      );
+      assert.strictEqual(
+        childContexts[1].outletName,
+        "main-outlet-blocks/group[1]",
+        "second container child has index 1"
+      );
+    });
+
+    test("debug overlay displays correct hierarchy for nested children (not overwritten by template)", async function (assert) {
+      // This test ensures the debugLocation prop is not overwritten by the
+      // template's @outletName when rendering children. The debug wrapper
+      // must use a separate prop (debugLocation) to avoid this collision.
+      @block("hierarchy-display-block")
+      class HierarchyDisplayBlock extends Component {
+        <template>
+          <div class="hierarchy-display">Content</div>
+        </template>
+      }
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.BLOCK_DEBUG,
+        (blockData, context) => {
+          // Wrap with a component that displays the hierarchy, simulating BlockInfo
+          const debugLocation = context?.outletName;
+          return {
+            Component: <template>
+              <div
+                class="debug-wrapper"
+                data-block-name={{blockData.name}}
+                data-debug-location={{debugLocation}}
+              >
+                <blockData.Component />
+              </div>
+            </template>,
+          };
+        }
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: BlockGroup,
+
+            children: [{ block: HierarchyDisplayBlock }],
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      // The nested child should have the full hierarchy path, NOT just "hero-blocks"
+      const nestedChildWrapper = document.querySelector(
+        '.debug-wrapper[data-block-name="hierarchy-display-block"]'
+      );
+
+      assert.strictEqual(
+        nestedChildWrapper.dataset.debugLocation,
+        "hero-blocks/group[0]",
+        "nested child displays full hierarchy path (not overwritten by template's @outletName)"
+      );
+
+      // The container itself should show the outlet name
+      const containerWrapper = document.querySelector(
+        '.debug-wrapper[data-block-name="group"]'
+      );
+
+      assert.strictEqual(
+        containerWrapper.dataset.debugLocation,
+        "hero-blocks",
+        "container displays outlet name as its location"
+      );
+    });
+  });
+
+  module("logging callbacks", function () {
+    test("debugHooks.setCallback(BLOCK_LOGGING) enables console logging when returns true", async function (assert) {
+      @block("logging-test-block")
+      class LoggingTestBlock extends Component {
+        <template>
+          <div class="logging-content">Content</div>
+        </template>
+      }
+
+      let consoleCalled = false;
+      debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_LOGGING, () => true);
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.START_GROUP,
+        () => (consoleCalled = true)
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: LoggingTestBlock,
+            conditions: { type: "user", loggedIn: false },
+          },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      assert.true(consoleCalled, "console logging was enabled");
+    });
+
+    test("debugHooks.setCallback(BLOCK_LOGGING) disables logging when returns false", async function (assert) {
+      @block("no-logging-block")
+      class NoLoggingBlock extends Component {
+        <template>
+          <div class="no-logging-content">Content</div>
+        </template>
+      }
+
+      const consoleStub = sinon.stub(console, "groupCollapsed");
+
+      debugHooks.setCallback(DEBUG_CALLBACK.BLOCK_LOGGING, () => false);
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: NoLoggingBlock,
+            conditions: { type: "user", loggedIn: false },
+          },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.false(consoleStub.called, "console logging was not enabled");
+      consoleStub.restore();
+    });
+  });
+
+  module("outlet boundary callbacks", function () {
+    // Mock outlet info component for testing debug boundaries.
+    // Must wrap content in .block-outlet-debug and yield children like the real OutletInfo.
+    const MockOutletInfo = <template>
+      <div class="block-outlet-debug">
+        <span class="mock-outlet-info">{{@outletName}}</span>
+        {{yield}}
+      </div>
+    </template>;
+
+    test("debugHooks.setCallback(OUTLET_INFO_COMPONENT) shows boundary when returns component", async function (assert) {
+      @block("boundary-test-block")
+      class BoundaryTestBlock extends Component {
+        <template>
+          <div class="boundary-content">Content</div>
+        </template>
+      }
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.OUTLET_INFO_COMPONENT,
+        () => MockOutletInfo
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [{ block: BoundaryTestBlock }])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.dom(".block-outlet-debug").exists("debug boundary shown");
+      assert.dom(".mock-outlet-info").exists("outlet info component rendered");
+      assert.dom(".boundary-content").exists("content still renders");
+    });
+
+    test("debugHooks.setCallback(OUTLET_INFO_COMPONENT) hides boundary when returns null", async function (assert) {
+      @block("no-boundary-block")
+      class NoBoundaryBlock extends Component {
+        <template>
+          <div class="no-boundary-content">Content</div>
+        </template>
+      }
+
+      debugHooks.setCallback(DEBUG_CALLBACK.OUTLET_INFO_COMPONENT, () => null);
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: NoBoundaryBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert
+        .dom(".block-outlet-debug")
+        .doesNotExist("debug boundary not shown");
+      assert.dom(".no-boundary-content").exists("content renders normally");
+    });
+
+    test("debugHooks.setCallback(OUTLET_INFO_COMPONENT) can be cleared by setting to null", async function (assert) {
+      @block("boundary-clear-block")
+      class BoundaryClearBlock extends Component {
+        <template>
+          <div class="boundary-clear-content">Content</div>
+        </template>
+      }
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.OUTLET_INFO_COMPONENT,
+        () => MockOutletInfo
+      );
+      debugHooks.setCallback(DEBUG_CALLBACK.OUTLET_INFO_COMPONENT, null);
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [{ block: BoundaryClearBlock }])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert
+        .dom(".block-outlet-debug")
+        .doesNotExist("debug boundary not shown after clearing");
+    });
+  });
+
+  module("deeply nested containers", function () {
+    test("renders 5+ levels of nested container blocks", async function (assert) {
+      @block("leaf-block", { args: { depth: { type: "string" } } })
+      class LeafBlock extends Component {
+        <template>
+          <div class="leaf-block" data-depth={{@depth}}>
+            Leaf at depth
+            {{@depth}}
+          </div>
+        </template>
+      }
+
+      // Counter to generate unique IDs for each group at each depth
+      let idCounter = 0;
+
+      const buildNestedConfig = (depth, maxDepth) => {
+        if (depth >= maxDepth) {
+          return [
+            { block: LeafBlock, args: { depth: depth.toString() } },
+            { block: LeafBlock, args: { depth: depth.toString() } },
+          ];
+        }
+
+        return [
+          {
+            block: BlockGroup,
+            id: `level-${depth}-${idCounter++}`,
+            children: buildNestedConfig(depth + 1, maxDepth),
+          },
+          {
+            block: BlockGroup,
+            id: `level-${depth}-${idCounter++}`,
+            children: buildNestedConfig(depth + 1, maxDepth),
+          },
+        ];
+      };
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", buildNestedConfig(0, 5))
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.dom(".homepage-blocks").exists("outlet renders");
+
+      assert.dom('[data-block-id^="level-0"]').exists("level 0 groups exist");
+      assert.dom('[data-block-id^="level-1"]').exists("level 1 groups exist");
+      assert.dom('[data-block-id^="level-2"]').exists("level 2 groups exist");
+      assert.dom('[data-block-id^="level-3"]').exists("level 3 groups exist");
+      assert.dom('[data-block-id^="level-4"]').exists("level 4 groups exist");
+
+      const leafBlocks = document.querySelectorAll(".leaf-block");
+      assert.strictEqual(
+        leafBlocks.length,
+        64,
+        "all 64 leaf blocks render (2^6 from binary tree)"
+      );
+
+      const depth5Leaves = document.querySelectorAll(
+        '.leaf-block[data-depth="5"]'
+      );
+      assert.strictEqual(
+        depth5Leaves.length,
+        64,
+        "all leaf blocks are at depth 5"
+      );
+    });
+
+    test("deeply nested blocks do not cause stack overflow", async function (assert) {
+      @block("deep-leaf-block")
+      class DeepLeafBlock extends Component {
+        <template>
+          <div class="deep-leaf">Deep Leaf</div>
+        </template>
+      }
+
+      const buildDeeplyNestedConfig = (depth) => {
+        if (depth <= 0) {
+          return [{ block: DeepLeafBlock }];
+        }
+
+        return [
+          {
+            block: BlockGroup,
+            id: `deep-${depth}`,
+            children: buildDeeplyNestedConfig(depth - 1),
+          },
+        ];
+      };
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", buildDeeplyNestedConfig(10))
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert.dom(".sidebar-blocks").exists("outlet renders");
+
+      assert
+        .dom(".sidebar-blocks__block-container--deep-10")
+        .exists("deepest group exists");
+      assert
+        .dom(".sidebar-blocks__block-container--deep-1")
+        .exists("shallowest group exists");
+      assert.dom(".deep-leaf").exists("leaf block renders at bottom");
+    });
+
+    test("nested containers with conditions at multiple levels", async function (assert) {
+      @block("conditional-leaf", { args: { level: { type: "string" } } })
+      class ConditionalLeaf extends Component {
+        <template>
+          <div class="conditional-leaf" data-level={{@level}}>
+            Level
+            {{@level}}
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: BlockGroup,
+            id: "outer",
+            children: [
+              {
+                block: BlockGroup,
+                id: "middle-1",
+                children: [
+                  {
+                    block: ConditionalLeaf,
+                    args: { level: "3a" },
+                    conditions: { type: "user", loggedIn: false },
+                  },
+                  {
+                    block: ConditionalLeaf,
+                    args: { level: "3b" },
+                  },
+                ],
+              },
+              {
+                block: BlockGroup,
+                id: "middle-2",
+                conditions: { type: "user", loggedIn: false },
+                children: [{ block: ConditionalLeaf, args: { level: "3c" } }],
+              },
+            ],
+          },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      assert
+        .dom(".main-outlet-blocks__block-container--outer")
+        .exists("outer group renders");
+      assert
+        .dom(".main-outlet-blocks__block-container--middle-1")
+        .exists("middle-1 group renders");
+      assert
+        .dom('.conditional-leaf[data-level="3a"]')
+        .doesNotExist("conditional leaf 3a hidden (logged out required)");
+      assert
+        .dom('.conditional-leaf[data-level="3b"]')
+        .exists("unconditional leaf 3b renders");
+      assert
+        .dom(".main-outlet-blocks__block-container--middle-2")
+        .doesNotExist("middle-2 group hidden (logged out required)");
+      assert
+        .dom('.conditional-leaf[data-level="3c"]')
+        .doesNotExist("leaf 3c hidden (parent hidden)");
+    });
+  });
+
+  module("string block references", function () {
+    test("renders block using string name reference", async function (assert) {
+      @block("string-ref-block")
+      class StringRefBlock extends Component {
+        <template>
+          <div class="string-ref-content">String Referenced Block</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() => registerBlock(StringRefBlock));
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [{ block: "string-ref-block" }])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.dom(".homepage-blocks").exists("outlet renders");
+      assert
+        .dom(".string-ref-content")
+        .hasText("String Referenced Block", "string-referenced block renders");
+    });
+
+    test("passes args to string-referenced block", async function (assert) {
+      @block("string-args-block", {
+        args: {
+          title: { type: "string" },
+          count: { type: "number" },
+        },
+      })
+      class StringArgsBlock extends Component {
+        <template>
+          <div class="string-args-content">
+            <span class="title">{{@title}}</span>
+            <span class="count">{{@count}}</span>
+          </div>
+        </template>
+      }
+
+      withTestBlockRegistration(() => registerBlock(StringArgsBlock));
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          { block: "string-args-block", args: { title: "Hello", count: 42 } },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".string-args-content .title").hasText("Hello");
+      assert.dom(".string-args-content .count").hasText("42");
+    });
+
+    test("mixed class and string references work together", async function (assert) {
+      @block("class-ref-block")
+      class ClassRefBlock extends Component {
+        <template>
+          <div class="class-ref-content">Class Reference</div>
+        </template>
+      }
+
+      @block("string-mixed-block")
+      class StringMixedBlock extends Component {
+        <template>
+          <div class="string-mixed-content">String Reference</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() => {
+        registerBlock(ClassRefBlock);
+        registerBlock(StringMixedBlock);
+      });
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          { block: ClassRefBlock },
+          { block: "string-mixed-block" },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".hero-blocks").exists("outlet renders");
+      assert
+        .dom(".class-ref-content")
+        .hasText("Class Reference", "class-referenced block renders");
+      assert
+        .dom(".string-mixed-content")
+        .hasText("String Reference", "string-referenced block renders");
+    });
+
+    test("string reference in nested container children", async function (assert) {
+      @block("nested-string-block")
+      class NestedStringBlock extends Component {
+        <template>
+          <div class="nested-string-content">Nested String Block</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() => registerBlock(NestedStringBlock));
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: BlockGroup,
+            id: "container",
+            children: [{ block: "nested-string-block" }],
+          },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      assert
+        .dom(".main-outlet-blocks__block-container--container")
+        .exists("container renders");
+      assert
+        .dom(".nested-string-content")
+        .hasText(
+          "Nested String Block",
+          "nested string-referenced block renders"
+        );
+    });
+
+    test("renders block from factory function", async function (assert) {
+      @block("factory-render-block")
+      class FactoryRenderBlock extends Component {
+        <template>
+          <div class="factory-render-content">Factory Loaded Block</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() =>
+        registerBlockFactory(
+          "factory-render-block",
+          async () => FactoryRenderBlock
+        )
+      );
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: "factory-render-block" }])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert.dom(".sidebar-blocks").exists("outlet renders");
+      assert
+        .dom(".factory-render-content")
+        .hasText("Factory Loaded Block", "factory-registered block renders");
+    });
+
+    test("handles factory returning module with default export", async function (assert) {
+      @block("default-export-block")
+      class DefaultExportBlock extends Component {
+        <template>
+          <div class="default-export-content">Default Export Block</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() =>
+        registerBlockFactory("default-export-block", async () => ({
+          default: DefaultExportBlock,
+        }))
+      );
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [{ block: "default-export-block" }])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".hero-blocks").exists("outlet renders");
+      assert
+        .dom(".default-export-content")
+        .hasText("Default Export Block", "block from default export renders");
+    });
+  });
+
+  module("optional blocks", function () {
+    test("missing optional block is silently skipped (no error)", async function (assert) {
+      @block("required-block")
+      class RequiredBlock extends Component {
+        <template>
+          <div class="required-content">Required Block</div>
+        </template>
+      }
+
+      // Configure with one required block and one optional missing block
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          { block: RequiredBlock },
+          { block: "non-existent-block?" }, // Optional - should silently skip
+        ])
+      );
+
+      // Should not throw error
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".hero-blocks").exists("outlet renders");
+      assert.dom(".required-content").hasText("Required Block");
+    });
+
+    test("present optional block renders normally", async function (assert) {
+      @block("present-optional-block")
+      class PresentOptionalBlock extends Component {
+        <template>
+          <div class="present-optional-content">Present Optional</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() => registerBlock(PresentOptionalBlock));
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          { block: "present-optional-block?" }, // Optional but present
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert.dom(".sidebar-blocks").exists("outlet renders");
+      assert
+        .dom(".present-optional-content")
+        .hasText("Present Optional", "optional block renders when present");
+    });
+
+    test("mix of required and optional blocks renders correctly", async function (assert) {
+      @block("mix-required-block")
+      class MixRequiredBlock extends Component {
+        <template>
+          <div class="mix-required">Required</div>
+        </template>
+      }
+
+      @block("mix-optional-present")
+      class MixOptionalPresent extends Component {
+        <template>
+          <div class="mix-optional-present">Optional Present</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() => registerBlock(MixOptionalPresent));
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          { block: MixRequiredBlock },
+          { block: "missing-optional-block?" }, // Optional missing - skipped
+          { block: "mix-optional-present?" }, // Optional present - rendered
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="main-outlet-blocks" /></template>
+      );
+
+      assert.dom(".main-outlet-blocks").exists("outlet renders");
+      assert.dom(".mix-required").exists("required block renders");
+      assert
+        .dom(".mix-optional-present")
+        .exists("optional present block renders");
+    });
+
+    test("multiple missing optional blocks all skipped", async function (assert) {
+      @block("single-required")
+      class SingleRequired extends Component {
+        <template>
+          <div class="single-required-content">Only Required</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [
+          { block: "missing-1?" },
+          { block: "missing-2?" },
+          { block: SingleRequired },
+          { block: "missing-3?" },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.dom(".homepage-blocks").exists("outlet renders");
+      assert
+        .dom(".single-required-content")
+        .hasText(
+          "Only Required",
+          "required block renders among multiple optional missing"
+        );
+    });
+
+    test("optional namespaced blocks work correctly", async function (assert) {
+      @block("chat:optional-widget")
+      class OptionalWidget extends Component {
+        <template>
+          <div class="optional-widget-content">Namespaced Optional</div>
+        </template>
+      }
+
+      withTestBlockRegistration(() => registerBlock(OptionalWidget));
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          { block: "chat:optional-widget?" }, // Present namespaced optional
+          { block: "chat:missing-widget?" }, // Missing namespaced optional
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert.dom(".hero-blocks").exists("outlet renders");
+      assert
+        .dom(".optional-widget-content")
+        .hasText("Namespaced Optional", "present namespaced optional renders");
+    });
+
+    test("optional missing block shows ghost when debug callback enabled", async function (assert) {
+      @block("ghost-test-block")
+      class GhostTestBlock extends Component {
+        <template>
+          <div class="ghost-test-content">Ghost Test</div>
+        </template>
+      }
+
+      let ghostBlockData = null;
+
+      debugHooks.setCallback(DEBUG_CALLBACK.GHOST_BLOCKS, () => true);
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.BLOCK_DEBUG,
+        (blockData, context) => {
+          if (blockData.failureType === FAILURE_TYPE.OPTIONAL_MISSING) {
+            ghostBlockData = { ...blockData, context };
+            return {
+              Component: <template>
+                <div
+                  class="ghost-block"
+                  data-name={{blockData.name}}
+                >Ghost</div>
+              </template>,
+            };
+          }
+          return { Component: blockData.Component };
+        }
+      );
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          { block: GhostTestBlock },
+          { block: "missing-optional-block?", args: { foo: "bar" } },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert.dom(".sidebar-blocks").exists("outlet renders");
+      assert.dom(".ghost-test-content").exists("required block renders");
+      assert
+        .dom('.ghost-block[data-name="missing-optional-block"]')
+        .exists("ghost block shown for optional missing");
+
+      assert.strictEqual(
+        ghostBlockData.name,
+        "missing-optional-block",
+        "ghost receives correct block name"
+      );
+      assert.strictEqual(
+        ghostBlockData.failureType,
+        FAILURE_TYPE.OPTIONAL_MISSING,
+        "ghost receives failureType OPTIONAL_MISSING"
+      );
+      assert.deepEqual(
+        ghostBlockData.args,
+        { foo: "bar" },
+        "ghost receives original args"
+      );
+    });
+  });
+
+  module("outlet args", function () {
+    test("blocks receive @outletArgs separately from config args", async function (assert) {
+      let receivedArgs = null;
+      let receivedOutletArgs = null;
+
+      @block("outlet-args-test-block", {
+        args: { title: { type: "string" }, count: { type: "number" } },
+      })
+      class OutletArgsTestBlock extends Component {
+        constructor() {
+          super(...arguments);
+          receivedArgs = { title: this.args.title, count: this.args.count };
+          receivedOutletArgs = this.args.outletArgs;
+        }
+
+        <template>
+          <div class="outlet-args-test">
+            <span class="title">{{@title}}</span>
+            <span class="topic">{{@outletArgs.topic.title}}</span>
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [
+          { block: OutletArgsTestBlock, args: { title: "Hello", count: 42 } },
+        ])
+      );
+
+      const outletArgs = {
+        topic: { title: "Test Topic" },
+        category: { id: 5 },
+      };
+
+      await render(
+        <template>
+          <BlockOutlet @name="homepage-blocks" @outletArgs={{outletArgs}} />
+        </template>
+      );
+
+      assert.strictEqual(receivedArgs.title, "Hello", "config arg received");
+      assert.strictEqual(receivedArgs.count, 42, "config arg received");
+      assert.strictEqual(
+        receivedOutletArgs.topic.title,
+        "Test Topic",
+        "outlet arg accessible"
+      );
+      assert.strictEqual(
+        receivedOutletArgs.category.id,
+        5,
+        "outlet arg accessible"
+      );
+      assert.dom(".outlet-args-test .title").hasText("Hello");
+      assert.dom(".outlet-args-test .topic").hasText("Test Topic");
+    });
+
+    test("BlockGroup forwards @outletArgs to children", async function (assert) {
+      let receivedOutletArgs = null;
+
+      @block("group-child-block")
+      class GroupChildBlock extends Component {
+        constructor() {
+          super(...arguments);
+          receivedOutletArgs = this.args.outletArgs;
+        }
+
+        <template>
+          <div class="group-child-content">
+            {{@outletArgs.topic.title}}
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          {
+            block: BlockGroup,
+
+            children: [{ block: GroupChildBlock }],
+          },
+        ])
+      );
+
+      const outletArgs = { topic: { title: "Forwarded Topic" } };
+
+      await render(
+        <template>
+          <BlockOutlet @name="sidebar-blocks" @outletArgs={{outletArgs}} />
+        </template>
+      );
+
+      assert.strictEqual(
+        receivedOutletArgs.topic.title,
+        "Forwarded Topic",
+        "outlet args forwarded through BlockGroup"
+      );
+      assert.dom(".group-child-content").hasText("Forwarded Topic");
+    });
+
+    test("nested containers forward @outletArgs through hierarchy", async function (assert) {
+      let receivedOutletArgs = null;
+
+      @block("deep-nested-outlet-args-block")
+      class DeepNestedBlock extends Component {
+        constructor() {
+          super(...arguments);
+          receivedOutletArgs = this.args.outletArgs;
+        }
+
+        <template>
+          <div class="deep-nested-content">
+            {{@outletArgs.user.name}}
+          </div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: BlockGroup,
+
+            children: [
+              {
+                block: BlockGroup,
+
+                children: [{ block: DeepNestedBlock }],
+              },
+            ],
+          },
+        ])
+      );
+
+      const outletArgs = { user: { name: "Deep User" } };
+
+      await render(
+        <template>
+          <BlockOutlet @name="hero-blocks" @outletArgs={{outletArgs}} />
+        </template>
+      );
+
+      assert.strictEqual(
+        receivedOutletArgs.user.name,
+        "Deep User",
+        "outlet args passed through nested containers"
+      );
+      assert.dom(".deep-nested-content").hasText("Deep User");
+    });
+
+    test("outlet args are available for condition evaluation", async function (assert) {
+      @block("conditional-outlet-args-block")
+      class ConditionalBlock extends Component {
+        <template>
+          <div class="conditional-content">Conditional</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: ConditionalBlock,
+            conditions: {
+              type: "outlet-arg",
+              path: "topic.closed",
+              value: true,
+            },
+          },
+        ])
+      );
+
+      // Condition should pass - topic is closed
+      const closedTopicArgs = { topic: { closed: true } };
+      await render(
+        <template>
+          <BlockOutlet
+            @name="main-outlet-blocks"
+            @outletArgs={{closedTopicArgs}}
+          />
+        </template>
+      );
+
+      assert
+        .dom(".conditional-content")
+        .exists("block renders when outlet-arg condition passes");
+    });
+
+    test("outlet args condition can fail", async function (assert) {
+      @block("failing-condition-block")
+      class FailingConditionBlock extends Component {
+        <template>
+          <div class="failing-condition-content">Should not render</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: FailingConditionBlock,
+            conditions: {
+              type: "outlet-arg",
+              path: "topic.closed",
+              value: true,
+            },
+          },
+        ])
+      );
+
+      // Condition should fail - topic is not closed
+      const openTopicArgs = { topic: { closed: false } };
+      await render(
+        <template>
+          <BlockOutlet @name="hero-blocks" @outletArgs={{openTopicArgs}} />
+        </template>
+      );
+
+      assert
+        .dom(".failing-condition-content")
+        .doesNotExist("block does not render when outlet-arg condition fails");
+    });
+
+    test("debug callback receives outletArgs in context", async function (assert) {
+      let receivedContext = null;
+
+      debugHooks.setCallback(
+        DEBUG_CALLBACK.BLOCK_DEBUG,
+        (blockData, context) => {
+          receivedContext = context;
+          return { Component: blockData.Component };
+        }
+      );
+
+      @block("debug-outlet-args-block")
+      class DebugOutletArgsBlock extends Component {
+        <template>
+          <div class="debug-outlet-args-content">Debug</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: DebugOutletArgsBlock }])
+      );
+
+      const outletArgs = { topic: { id: 123 }, user: { name: "Test" } };
+
+      await render(
+        <template>
+          <BlockOutlet @name="sidebar-blocks" @outletArgs={{outletArgs}} />
+        </template>
+      );
+
+      assert.deepEqual(
+        receivedContext.outletArgs,
+        outletArgs,
+        "debug callback receives outletArgs in context"
+      );
+    });
+  });
+
+  module("error handling", function () {
+    test("outlet continues rendering other blocks when one block throws", async function (assert) {
+      let errorCaught = null;
+      setupOnerror((error) => {
+        errorCaught = error;
+      });
+
+      @block("throwing-block")
+      class ThrowingBlock extends Component {
+        constructor() {
+          super(...arguments);
+          throw new Error("Block render error");
+        }
+
+        <template>
+          <div class="throwing-content">Should not render</div>
+        </template>
+      }
+
+      @block("safe-block")
+      class SafeBlock extends Component {
+        <template>
+          <div class="safe-content">Safe Content</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("homepage-blocks", [
+          { block: SafeBlock },
+          { block: ThrowingBlock },
+        ])
+      );
+
+      await render(
+        <template><BlockOutlet @name="homepage-blocks" /></template>
+      );
+
+      assert.notStrictEqual(errorCaught, null, "error was caught");
+      assert.true(
+        errorCaught?.message?.includes("Block render error"),
+        "error message is correct"
+      );
+    });
+
+    test("block with invalid condition type shows warning in dev mode", async function (assert) {
+      const blocks = getOwner(this).lookup("service:blocks");
+
+      // Using an unknown condition type should return false (fail silently)
+      const result = blocks.evaluate({ type: "unknown-condition-type" });
+      assert.false(
+        result,
+        "unknown condition type evaluates to false (fails closed)"
+      );
+    });
+
+    test("block with null conditions renders normally", async function (assert) {
+      @block("null-conditions-block")
+      class NullConditionsBlock extends Component {
+        <template>
+          <div class="null-conditions-content">Renders</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          { block: NullConditionsBlock, conditions: null },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="sidebar-blocks" /></template>);
+
+      assert
+        .dom(".null-conditions-content")
+        .exists("block renders with null conditions");
+    });
+
+    test("block with undefined conditions renders normally", async function (assert) {
+      @block("undefined-conditions-block")
+      class UndefinedConditionsBlock extends Component {
+        <template>
+          <div class="undefined-conditions-content">Renders</div>
+        </template>
+      }
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          { block: UndefinedConditionsBlock, conditions: undefined },
+        ])
+      );
+
+      await render(<template><BlockOutlet @name="hero-blocks" /></template>);
+
+      assert
+        .dom(".undefined-conditions-content")
+        .exists("block renders with undefined conditions");
+    });
+
+    test("validation errors cause test failures", async function (assert) {
+      @block("validation-error-block")
+      class ValidationErrorBlock extends Component {
+        <template>
+          <div class="validation-error-content">Content</div>
+        </template>
+      }
+
+      // The validation promise rejects when conditions are invalid.
+      // In tests, unhandled promise rejections cause test failures.
+      // We can access the validation promise via the internal outletLayouts.
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: ValidationErrorBlock,
+            conditions: { type: "outlet-arg" }, // missing required "path"
+          },
+        ])
+      );
+
+      // Access the validation promise to catch the expected error
+      const layoutData = _getOutletLayouts().get("main-outlet-blocks");
+
+      await assert.rejects(
+        layoutData.validatedLayout,
+        /missing required arg "path"/,
+        "validation error thrown for missing required path argument"
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/arg-validation-test.js b/frontend/discourse/tests/unit/blocks/arg-validation-test.js
new file mode 100644
index 0000000000000..6c28efee203ea
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/arg-validation-test.js
@@ -0,0 +1,203 @@
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import {
+  VALID_CHILD_ARG_SCHEMA_PROPERTIES,
+  validateChildArgsSchema,
+} from "discourse/lib/blocks/-internals/validation/block-args";
+
+module("Unit | Blocks | arg-validation", function (hooks) {
+  setupTest(hooks);
+
+  module("validateChildArgsSchema", function () {
+    test("accepts valid childArgs schema with basic types", function (assert) {
+      const schema = {
+        name: { type: "string", required: true },
+        count: { type: "number" },
+        active: { type: "boolean" },
+      };
+
+      // Should not throw
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "valid schema accepted");
+    });
+
+    test("accepts childArgs schema with unique property", function (assert) {
+      const schema = {
+        name: { type: "string", required: true, unique: true },
+        itemId: { type: "number", unique: true },
+      };
+
+      // Should not throw
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "schema with unique property accepted");
+    });
+
+    test("throws for invalid unique value type", function (assert) {
+      const schema = {
+        name: { type: "string", unique: "yes" },
+      };
+
+      assert.throws(
+        () => validateChildArgsSchema(schema, "test-container"),
+        /invalid "unique" value\. Must be a boolean/,
+        "rejects non-boolean unique value"
+      );
+    });
+
+    test("throws for unique: true with array type", function (assert) {
+      const schema = {
+        items: { type: "array", unique: true },
+      };
+
+      assert.throws(
+        () => validateChildArgsSchema(schema, "test-container"),
+        /has "unique: true" but type is "array"/,
+        "rejects unique on array type"
+      );
+    });
+
+    test("allows unique: true with string type", function (assert) {
+      const schema = {
+        name: { type: "string", unique: true },
+      };
+
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "unique with string type accepted");
+    });
+
+    test("allows unique: true with number type", function (assert) {
+      const schema = {
+        itemId: { type: "number", unique: true },
+      };
+
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "unique with number type accepted");
+    });
+
+    test("allows unique: true with boolean type", function (assert) {
+      const schema = {
+        flag: { type: "boolean", unique: true },
+      };
+
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "unique with boolean type accepted");
+    });
+
+    test("throws for missing type property", function (assert) {
+      const schema = {
+        name: { required: true },
+      };
+
+      assert.throws(
+        () => validateChildArgsSchema(schema, "test-container"),
+        /missing required "type" property/,
+        "rejects schema without type"
+      );
+    });
+
+    test("throws for invalid type value", function (assert) {
+      const schema = {
+        name: { type: "invalid" },
+      };
+
+      assert.throws(
+        () => validateChildArgsSchema(schema, "test-container"),
+        /has invalid type/,
+        "rejects invalid type"
+      );
+    });
+
+    test("throws for invalid arg name format", function (assert) {
+      const schema = {
+        "123invalid": { type: "string" },
+      };
+
+      assert.throws(
+        () => validateChildArgsSchema(schema, "test-container"),
+        /arg name "123invalid" is invalid/,
+        "rejects invalid arg name"
+      );
+    });
+
+    test("throws for unknown properties", function (assert) {
+      const schema = {
+        name: { type: "string", unknownProp: true },
+      };
+
+      assert.throws(
+        () => validateChildArgsSchema(schema, "test-container"),
+        /has unknown properties/,
+        "rejects unknown properties"
+      );
+    });
+
+    test("throws for required + default combination", function (assert) {
+      const schema = {
+        name: { type: "string", required: true, default: "test" },
+      };
+
+      assert.throws(
+        () => validateChildArgsSchema(schema, "test-container"),
+        /has both "required: true" and "default"/,
+        "rejects required + default"
+      );
+    });
+
+    test("accepts schema with default value", function (assert) {
+      const schema = {
+        name: { type: "string", default: "default-name" },
+      };
+
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "schema with default accepted");
+    });
+
+    test("accepts schema with pattern constraint", function (assert) {
+      const schema = {
+        name: { type: "string", pattern: /^[a-z]+$/ },
+      };
+
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "schema with pattern accepted");
+    });
+
+    test("accepts schema with min/max constraints", function (assert) {
+      const schema = {
+        count: { type: "number", min: 0, max: 100 },
+      };
+
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "schema with min/max accepted");
+    });
+
+    test("accepts schema with enum constraint", function (assert) {
+      const schema = {
+        color: { type: "string", enum: ["red", "green", "blue"] },
+      };
+
+      validateChildArgsSchema(schema, "test-container");
+      assert.true(true, "schema with enum accepted");
+    });
+
+    test("accepts null or undefined schema", function (assert) {
+      validateChildArgsSchema(null, "test-container");
+      validateChildArgsSchema(undefined, "test-container");
+      assert.true(true, "null/undefined schema accepted");
+    });
+
+    test("VALID_CHILD_ARG_SCHEMA_PROPERTIES includes unique", function (assert) {
+      assert.true(
+        VALID_CHILD_ARG_SCHEMA_PROPERTIES.includes("unique"),
+        "unique is a valid child arg property"
+      );
+      assert.true(
+        VALID_CHILD_ARG_SCHEMA_PROPERTIES.includes("type"),
+        "type is a valid child arg property"
+      );
+      assert.true(
+        VALID_CHILD_ARG_SCHEMA_PROPERTIES.includes("required"),
+        "required is a valid child arg property"
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/conditions/condition-test.js b/frontend/discourse/tests/unit/blocks/conditions/condition-test.js
new file mode 100644
index 0000000000000..9413dba5f8f22
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/conditions/condition-test.js
@@ -0,0 +1,293 @@
+import { getOwner } from "@ember/owner";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import { BlockCondition } from "discourse/blocks/conditions";
+import { validateConditionSource } from "discourse/lib/blocks/-internals/validation/conditions";
+
+module("Unit | Blocks | Conditions | condition", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.blocks = getOwner(this).lookup("service:blocks");
+  });
+
+  module("validateConditionSource", function () {
+    test("allows source to be undefined for all sourceTypes", function (assert) {
+      assert.strictEqual(validateConditionSource("none", {}), null);
+      assert.strictEqual(validateConditionSource("outletArgs", {}), null);
+      assert.strictEqual(validateConditionSource("object", {}), null);
+    });
+
+    test("returns error when source is provided for sourceType 'none'", function (assert) {
+      const error = validateConditionSource("none", {
+        source: "@outletArgs.foo",
+      });
+
+      assert.true(error?.message.includes("source"));
+      assert.true(error?.message.includes("not supported"));
+      assert.strictEqual(error.path, "source");
+    });
+
+    test("validates source format for sourceType 'outletArgs'", function (assert) {
+      // Valid formats should return null
+      assert.strictEqual(
+        validateConditionSource("outletArgs", { source: "@outletArgs.foo" }),
+        null
+      );
+      assert.strictEqual(
+        validateConditionSource("outletArgs", {
+          source: "@outletArgs.nested.path",
+        }),
+        null
+      );
+      assert.strictEqual(
+        validateConditionSource("outletArgs", {
+          source: "@outletArgs.deep.nested.value",
+        }),
+        null
+      );
+
+      // Invalid formats should return errors with path
+      let error = validateConditionSource("outletArgs", { source: "foo" });
+      assert.true(
+        error?.message.includes('must be in format "@outletArgs.propertyName"')
+      );
+      assert.strictEqual(error.path, "source");
+
+      error = validateConditionSource("outletArgs", {
+        source: "outletArgs.foo",
+      });
+      assert.true(
+        error?.message.includes('must be in format "@outletArgs.propertyName"')
+      );
+
+      error = validateConditionSource("outletArgs", { source: "@outletArgs" });
+      assert.true(
+        error?.message.includes('must be in format "@outletArgs.propertyName"')
+      );
+
+      error = validateConditionSource("outletArgs", { source: 123 });
+      assert.true(error?.message.includes("must be a string"));
+    });
+
+    test("validates source is object for sourceType 'object'", function (assert) {
+      // Valid objects should return null
+      assert.strictEqual(
+        validateConditionSource("object", { source: { key: "value" } }),
+        null
+      );
+      assert.strictEqual(
+        validateConditionSource("object", { source: {} }),
+        null
+      );
+      assert.strictEqual(
+        validateConditionSource("object", { source: null }),
+        null
+      );
+
+      // Invalid types should return errors
+      let error = validateConditionSource("object", { source: "string" });
+      assert.true(error?.message.includes("must be an object"));
+      assert.strictEqual(error.path, "source");
+
+      error = validateConditionSource("object", { source: 123 });
+      assert.true(error?.message.includes("must be an object"));
+
+      error = validateConditionSource("object", { source: true });
+      assert.true(error?.message.includes("must be an object"));
+    });
+  });
+
+  module("resolveSource", function () {
+    test("returns undefined when source is not provided", function (assert) {
+      class TestCondition extends BlockCondition {
+        static type = "resolve-no-source-test";
+        static sourceType = "outletArgs";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      const condition = new TestCondition();
+      assert.strictEqual(condition.resolveSource({}, {}), undefined);
+    });
+
+    test("returns source directly for sourceType 'object'", function (assert) {
+      class ObjectCondition extends BlockCondition {
+        static type = "resolve-object-test";
+        static sourceType = "object";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      const condition = new ObjectCondition();
+      const sourceObj = { key: "value", nested: { deep: true } };
+
+      assert.strictEqual(
+        condition.resolveSource({ source: sourceObj }, {}),
+        sourceObj
+      );
+    });
+
+    test("resolves value from outlet args for sourceType 'outletArgs'", function (assert) {
+      class OutletArgsCondition extends BlockCondition {
+        static type = "resolve-outlet-args-test";
+        static sourceType = "outletArgs";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      const condition = new OutletArgsCondition();
+      const context = {
+        outletArgs: {
+          topic: {
+            id: 123,
+            title: "Test Topic",
+          },
+          user: {
+            admin: true,
+          },
+        },
+      };
+
+      // Simple path
+      assert.deepEqual(
+        condition.resolveSource({ source: "@outletArgs.topic" }, context),
+        { id: 123, title: "Test Topic" }
+      );
+
+      // Nested path
+      assert.strictEqual(
+        condition.resolveSource({ source: "@outletArgs.topic.id" }, context),
+        123
+      );
+
+      assert.true(
+        condition.resolveSource({ source: "@outletArgs.user.admin" }, context)
+      );
+    });
+
+    test("returns undefined for missing paths in outlet args", function (assert) {
+      class OutletArgsCondition extends BlockCondition {
+        static type = "resolve-missing-path-test";
+        static sourceType = "outletArgs";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      const condition = new OutletArgsCondition();
+      const context = {
+        outletArgs: {
+          topic: { id: 123 },
+        },
+      };
+
+      // Non-existent property
+      assert.strictEqual(
+        condition.resolveSource({ source: "@outletArgs.nonexistent" }, context),
+        undefined
+      );
+
+      // Non-existent nested path
+      assert.strictEqual(
+        condition.resolveSource(
+          { source: "@outletArgs.topic.missing.deep" },
+          context
+        ),
+        undefined
+      );
+
+      // Missing outlet args entirely
+      assert.strictEqual(
+        condition.resolveSource({ source: "@outletArgs.topic" }, {}),
+        undefined
+      );
+    });
+
+    test("returns undefined for sourceType 'none'", function (assert) {
+      class NoSourceCondition extends BlockCondition {
+        static type = "resolve-none-test";
+        static sourceType = "none";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      const condition = new NoSourceCondition();
+
+      assert.strictEqual(
+        condition.resolveSource(
+          { source: "@outletArgs.foo" },
+          { outletArgs: { foo: "bar" } }
+        ),
+        undefined
+      );
+    });
+  });
+
+  module("evaluate", function () {
+    test("throws when not implemented in subclass", function (assert) {
+      class UnimplementedCondition extends BlockCondition {
+        static type = "unimplemented-test";
+      }
+
+      const condition = new UnimplementedCondition();
+
+      assert.throws(
+        () => condition.evaluate({}, {}),
+        /must implement evaluate/
+      );
+    });
+  });
+
+  module("getResolvedValueForLogging", function () {
+    test("returns resolved source value when source is provided", function (assert) {
+      class SourceCondition extends BlockCondition {
+        static type = "logging-source-test";
+        static sourceType = "outletArgs";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      const condition = new SourceCondition();
+      const context = {
+        outletArgs: {
+          topic: { id: 123 },
+        },
+      };
+
+      const result = condition.getResolvedValueForLogging(
+        { source: "@outletArgs.topic.id" },
+        context
+      );
+
+      assert.deepEqual(result, { value: 123, hasValue: true });
+    });
+
+    test("returns undefined when source is not provided", function (assert) {
+      class NoSourceLoggingCondition extends BlockCondition {
+        static type = "logging-no-source-test";
+        static sourceType = "outletArgs";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      const condition = new NoSourceLoggingCondition();
+      const result = condition.getResolvedValueForLogging({}, {});
+
+      assert.strictEqual(result, undefined);
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/conditions/decorator-test.js b/frontend/discourse/tests/unit/blocks/conditions/decorator-test.js
new file mode 100644
index 0000000000000..6150de7704a97
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/conditions/decorator-test.js
@@ -0,0 +1,627 @@
+import { module, test } from "qunit";
+import { BlockCondition, blockCondition } from "discourse/blocks/conditions";
+
+module("Unit | Blocks | Conditions | decorator", function () {
+  module("config validation", function () {
+    test("throws for missing type", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            args: {},
+          }),
+        /`type` is required and must be a string/
+      );
+    });
+
+    test("throws for non-string type", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: 123,
+            args: {},
+          }),
+        /`type` is required and must be a string/
+      );
+    });
+
+    test("defaults to empty args object when not provided", function (assert) {
+      @blockCondition({
+        type: "test-no-args",
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.deepEqual(TestCondition.argsSchema, {});
+      assert.deepEqual(TestCondition.validArgKeys, []);
+    });
+  });
+
+  module("sourceType validation", function () {
+    test("accepts valid sourceType values", function (assert) {
+      const validSourceTypes = ["none", "outletArgs", "object"];
+
+      validSourceTypes.forEach((sourceType, index) => {
+        const decorator = blockCondition({
+          type: `test-source-type-${index}`,
+          sourceType,
+          args: {},
+        });
+
+        @decorator
+        class TestCondition extends BlockCondition {
+          evaluate() {
+            return true;
+          }
+        }
+
+        assert.strictEqual(
+          TestCondition.sourceType,
+          sourceType,
+          `sourceType "${sourceType}" should be accepted`
+        );
+      });
+    });
+
+    test("throws for invalid sourceType with suggestion", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            sourceType: "outletarg",
+            args: {},
+          }),
+        /Invalid `sourceType`.*"outletarg".*did you mean.*"outletArgs"/
+      );
+    });
+
+    test("throws for completely invalid sourceType", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            sourceType: "invalid",
+            args: {},
+          }),
+        /Invalid `sourceType`.*Valid values are: none, outletArgs, object/
+      );
+    });
+
+    test("defaults to 'none' when sourceType is not provided", function (assert) {
+      @blockCondition({
+        type: "test-default-source",
+        args: {},
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.sourceType, "none");
+    });
+  });
+
+  module("unknown config keys validation", function () {
+    test("throws for unknown config key with suggestion", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {},
+            sourceType: "none",
+            arg: {},
+          }),
+        /unknown config key.*"arg".*did you mean.*"args"/
+      );
+    });
+
+    test("throws for multiple unknown config keys", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {},
+            sourceTyp: "none",
+            typo: true,
+          }),
+        /unknown config key.*"sourceTyp".*"typo"/
+      );
+    });
+
+    test("throws for typo in sourceType key", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {},
+            sourcetype: "outletArgs",
+          }),
+        /unknown config key.*"sourcetype".*did you mean.*"sourceType"/
+      );
+    });
+
+    test("accepts only valid config keys", function (assert) {
+      @blockCondition({
+        type: "test-valid-keys",
+        sourceType: "outletArgs",
+        args: {
+          foo: { type: "string" },
+          bar: { type: "number" },
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.type, "test-valid-keys");
+      assert.strictEqual(TestCondition.sourceType, "outletArgs");
+      assert.deepEqual(TestCondition.validArgKeys, ["foo", "bar", "source"]);
+    });
+  });
+
+  module("args schema validation", function () {
+    test("validates arg type is valid", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              myArg: { type: "invalid" },
+            },
+          }),
+        /arg "myArg" has invalid type/
+      );
+    });
+
+    test("validates arg name format", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              "invalid-name": { type: "string" },
+            },
+          }),
+        /arg name "invalid-name" is invalid/
+      );
+    });
+
+    test("rejects default property for conditions", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              myArg: { type: "string", default: "value" },
+            },
+          }),
+        /disallowed property "default"/
+      );
+    });
+
+    test("allows type: 'any' for accepting any value type", function (assert) {
+      @blockCondition({
+        type: "test-any-type",
+        args: {
+          anyValue: { type: "any" },
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.deepEqual(TestCondition.argsSchema, { anyValue: { type: "any" } });
+    });
+
+    test("validates enum values match declared type", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              myArg: { type: "string", enum: [1, 2, 3] },
+            },
+          }),
+        /enum contains invalid value/
+      );
+    });
+
+    test("validates min/max/integer only for number type", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              myArg: { type: "string", min: 0 },
+            },
+          }),
+        /"min" is only valid for number type/
+      );
+    });
+
+    test("validates minLength/maxLength for string and array types", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              myArg: { type: "number", minLength: 0 },
+            },
+          }),
+        /"minLength" is only valid for string or array/
+      );
+    });
+  });
+
+  module("constraints validation", function () {
+    test("validates constraint types are known", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              a: { type: "string" },
+              b: { type: "string" },
+            },
+            constraints: {
+              unknownConstraint: ["a", "b"],
+            },
+          }),
+        /unknown constraint type.*"unknownConstraint"/i
+      );
+    });
+
+    test("validates constraint args exist in schema", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {
+              a: { type: "string" },
+            },
+            constraints: {
+              atLeastOne: ["a", "nonexistent"],
+            },
+          }),
+        /references unknown arg.*"nonexistent"/
+      );
+    });
+
+    test("accepts valid constraints", function (assert) {
+      @blockCondition({
+        type: "test-constraints",
+        args: {
+          a: { type: "string" },
+          b: { type: "string" },
+        },
+        constraints: {
+          atLeastOne: ["a", "b"],
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.deepEqual(TestCondition.constraints, { atLeastOne: ["a", "b"] });
+    });
+
+    test("accepts atMostOne constraint", function (assert) {
+      @blockCondition({
+        type: "test-at-most-one",
+        args: {
+          optionA: { type: "string" },
+          optionB: { type: "string" },
+          optionC: { type: "string" },
+        },
+        constraints: {
+          atMostOne: ["optionA", "optionB", "optionC"],
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.deepEqual(TestCondition.constraints, {
+        atMostOne: ["optionA", "optionB", "optionC"],
+      });
+    });
+  });
+
+  module("validate function", function () {
+    test("throws when validate is not a function", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "test",
+            args: {},
+            validate: "not a function",
+          }),
+        /"validate" must be a function/
+      );
+    });
+
+    test("accepts validate function", function (assert) {
+      const validateFn = () => null;
+
+      @blockCondition({
+        type: "test-validate-fn",
+        args: {
+          foo: { type: "string" },
+        },
+        validate: validateFn,
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.validateFn, validateFn);
+    });
+  });
+
+  module("class validation", function () {
+    test("throws when class does not extend BlockCondition", function (assert) {
+      class NotACondition {}
+
+      assert.throws(() => {
+        blockCondition({
+          type: "invalid-class",
+          args: {},
+        })(NotACondition);
+      }, /NotACondition must extend BlockCondition/);
+    });
+
+    test("accepts class that extends BlockCondition", function (assert) {
+      @blockCondition({
+        type: "valid-class",
+        args: {},
+      })
+      class ValidCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(ValidCondition.type, "valid-class");
+    });
+  });
+
+  module("static property assignment", function () {
+    test("assigns type as static getter", function (assert) {
+      @blockCondition({
+        type: "static-type-test",
+        args: {},
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.type, "static-type-test");
+    });
+
+    test("assigns sourceType as static getter", function (assert) {
+      @blockCondition({
+        type: "static-source-test",
+        sourceType: "object",
+        args: {},
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.sourceType, "object");
+    });
+
+    test("assigns argsSchema as static getter", function (assert) {
+      const schema = {
+        foo: { type: "string", required: true },
+        bar: { type: "number", min: 0 },
+      };
+
+      @blockCondition({
+        type: "static-schema-test",
+        args: schema,
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.deepEqual(TestCondition.argsSchema, schema);
+    });
+
+    test("derives validArgKeys from args schema", function (assert) {
+      @blockCondition({
+        type: "derived-keys-test",
+        sourceType: "outletArgs",
+        args: {
+          foo: { type: "string" },
+          bar: { type: "number" },
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.deepEqual(TestCondition.validArgKeys, ["foo", "bar", "source"]);
+    });
+
+    test("does not add source to validArgKeys when sourceType is none", function (assert) {
+      @blockCondition({
+        type: "no-source-key-test",
+        sourceType: "none",
+        args: {
+          foo: { type: "string" },
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.deepEqual(TestCondition.validArgKeys, ["foo"]);
+    });
+
+    test("freezes validArgKeys array", function (assert) {
+      @blockCondition({
+        type: "frozen-keys-test",
+        args: {
+          foo: { type: "string" },
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.true(Object.isFrozen(TestCondition.validArgKeys));
+    });
+
+    test("freezes argsSchema object", function (assert) {
+      @blockCondition({
+        type: "frozen-schema-test",
+        args: {
+          foo: { type: "string" },
+        },
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.true(Object.isFrozen(TestCondition.argsSchema));
+    });
+  });
+
+  module("type namespace validation", function () {
+    test("accepts valid core type (simple name)", function (assert) {
+      @blockCondition({
+        type: "simple-type",
+        args: {},
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.type, "simple-type");
+      assert.strictEqual(TestCondition.namespace, null);
+      assert.strictEqual(TestCondition.namespaceType, "core");
+    });
+
+    test("accepts valid plugin type (namespace:name)", function (assert) {
+      @blockCondition({
+        type: "chat:unread-messages",
+        args: {},
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.type, "chat:unread-messages");
+      assert.strictEqual(TestCondition.namespace, "chat");
+      assert.strictEqual(TestCondition.namespaceType, "plugin");
+    });
+
+    test("accepts valid theme type (theme:namespace:name)", function (assert) {
+      @blockCondition({
+        type: "theme:tactile:dark-mode",
+        args: {},
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.type, "theme:tactile:dark-mode");
+      assert.strictEqual(TestCondition.namespace, "theme:tactile");
+      assert.strictEqual(TestCondition.namespaceType, "theme");
+    });
+
+    test("throws for uppercase in type", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "InvalidType",
+            args: {},
+          }),
+        /type "InvalidType" is invalid/
+      );
+    });
+
+    test("throws for underscores in type", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "invalid_type",
+            args: {},
+          }),
+        /type "invalid_type" is invalid/
+      );
+    });
+
+    test("throws for type exceeding max length", function (assert) {
+      const longType = "a".repeat(101);
+
+      assert.throws(
+        () =>
+          blockCondition({
+            type: longType,
+            args: {},
+          }),
+        /exceeds maximum length/
+      );
+    });
+
+    test("throws for invalid theme format (theme:name without namespace)", function (assert) {
+      assert.throws(
+        () =>
+          blockCondition({
+            type: "theme:my-type",
+            args: {},
+          }),
+        /type "theme:my-type" is invalid/
+      );
+    });
+
+    test("allows type with numbers", function (assert) {
+      @blockCondition({
+        type: "type-123",
+        args: {},
+      })
+      class TestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.strictEqual(TestCondition.type, "type-123");
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/conditions/outlet-arg-test.js b/frontend/discourse/tests/unit/blocks/conditions/outlet-arg-test.js
new file mode 100644
index 0000000000000..b5222cbc4937d
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/conditions/outlet-arg-test.js
@@ -0,0 +1,301 @@
+import { getOwner, setOwner } from "@ember/owner";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import BlockOutletArgCondition from "discourse/blocks/conditions/outlet-arg";
+import { validateConditions } from "discourse/tests/helpers/block-testing";
+
+module("Unit | Blocks | Condition | outlet-arg", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.condition = new BlockOutletArgCondition();
+    setOwner(this.condition, getOwner(this));
+
+    // Helper to validate via infrastructure
+    this.validateCondition = (args) => {
+      const conditionTypes = new Map([["outlet-arg", this.condition]]);
+
+      try {
+        validateConditions({ type: "outlet-arg", ...args }, conditionTypes);
+        return null;
+      } catch (error) {
+        return error;
+      }
+    };
+  });
+
+  module("validate (through infrastructure)", function () {
+    test("returns error when path is missing", function (assert) {
+      const error = this.validateCondition({});
+      assert.true(error?.message.includes("missing required arg"));
+    });
+
+    test("returns error when path is not a string (schema type validation)", function (assert) {
+      const error = this.validateCondition({ path: 123 });
+      assert.true(error?.message.includes("must be a string"));
+    });
+
+    test("returns error when path contains invalid characters (custom validation)", function (assert) {
+      const error = this.validateCondition({ path: "user-name", value: true });
+      assert.true(error?.message.includes("is invalid"));
+    });
+
+    test("returns error when both value and exists are specified (exactlyOne constraint)", function (assert) {
+      const error = this.validateCondition({
+        path: "user",
+        value: true,
+        exists: true,
+      });
+      assert.true(error?.message.includes("exactly one of"));
+    });
+
+    test("returns error when neither value nor exists is specified (exactlyOne constraint)", function (assert) {
+      const error = this.validateCondition({
+        path: "user",
+      });
+      assert.true(error?.message.includes("exactly one of"));
+    });
+
+    test("accepts valid path with value", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({ path: "user.admin", value: true }),
+        null
+      );
+    });
+
+    test("accepts valid path with exists", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({ path: "topic", exists: true }),
+        null
+      );
+    });
+
+    test("accepts dot-notation paths", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({ path: "user.trust_level", value: 2 }),
+        null
+      );
+    });
+
+    test("returns error when exists is not a boolean (schema type validation)", function (assert) {
+      const error = this.validateCondition({ path: "user", exists: "true" });
+      assert.true(error?.message.includes("must be a boolean"));
+    });
+  });
+
+  module("evaluate", function () {
+    test("returns true when property matches value", function (assert) {
+      const context = { outletArgs: { user: { admin: true } } };
+      const result = this.condition.evaluate(
+        { path: "user.admin", value: true },
+        context
+      );
+      assert.true(result);
+    });
+
+    test("returns false when property does not match value", function (assert) {
+      const context = { outletArgs: { user: { admin: false } } };
+      const result = this.condition.evaluate(
+        { path: "user.admin", value: true },
+        context
+      );
+      assert.false(result);
+    });
+
+    test("returns true when value matches exactly", function (assert) {
+      const context = { outletArgs: { topic: { closed: true } } };
+      const result = this.condition.evaluate(
+        { path: "topic.closed", value: true },
+        context
+      );
+      assert.true(result);
+    });
+
+    test("returns false when value does not match exactly", function (assert) {
+      const context = { outletArgs: { topic: { closed: false } } };
+      const result = this.condition.evaluate(
+        { path: "topic.closed", value: true },
+        context
+      );
+      assert.false(result);
+    });
+
+    test("supports array value matching (OR logic)", function (assert) {
+      const context = { outletArgs: { user: { trust_level: 2 } } };
+      const result = this.condition.evaluate(
+        { path: "user.trust_level", value: [2, 3, 4] },
+        context
+      );
+      assert.true(result);
+    });
+
+    test("returns false when value not in array", function (assert) {
+      const context = { outletArgs: { user: { trust_level: 1 } } };
+      const result = this.condition.evaluate(
+        { path: "user.trust_level", value: [2, 3, 4] },
+        context
+      );
+      assert.false(result);
+    });
+
+    test("supports negation with { not: value }", function (assert) {
+      const context = { outletArgs: { topic: { closed: false } } };
+      const result = this.condition.evaluate(
+        { path: "topic.closed", value: { not: true } },
+        context
+      );
+      assert.true(result);
+    });
+
+    test("exists: true passes when property exists", function (assert) {
+      const context = { outletArgs: { topic: { title: "Hello" } } };
+      const result = this.condition.evaluate(
+        { path: "topic.title", exists: true },
+        context
+      );
+      assert.true(result);
+    });
+
+    test("exists: true fails when property is undefined", function (assert) {
+      const context = { outletArgs: { topic: {} } };
+      const result = this.condition.evaluate(
+        { path: "topic.title", exists: true },
+        context
+      );
+      assert.false(result);
+    });
+
+    test("exists: false passes when property is undefined", function (assert) {
+      const context = { outletArgs: { topic: {} } };
+      const result = this.condition.evaluate(
+        { path: "topic.title", exists: false },
+        context
+      );
+      assert.true(result);
+    });
+
+    test("exists: false fails when property exists", function (assert) {
+      const context = { outletArgs: { topic: { title: "Hello" } } };
+      const result = this.condition.evaluate(
+        { path: "topic.title", exists: false },
+        context
+      );
+      assert.false(result);
+    });
+
+    test("handles missing outletArgs gracefully", function (assert) {
+      const result = this.condition.evaluate(
+        { path: "user.admin", value: true },
+        {}
+      );
+      assert.false(result);
+    });
+
+    test("handles null outletArgs gracefully", function (assert) {
+      const result = this.condition.evaluate(
+        { path: "user.admin", value: true },
+        { outletArgs: null }
+      );
+      assert.false(result);
+    });
+
+    test("handles deeply nested paths", function (assert) {
+      const context = {
+        outletArgs: { topic: { category: { parent: { id: 5 } } } },
+      };
+      const result = this.condition.evaluate(
+        { path: "topic.category.parent.id", value: 5 },
+        context
+      );
+      assert.true(result);
+    });
+
+    test("returns false for non-existent path", function (assert) {
+      const context = { outletArgs: { topic: {} } };
+      const result = this.condition.evaluate(
+        { path: "topic.category.id", value: 5 },
+        context
+      );
+      assert.false(result);
+    });
+
+    module("nested path error handling", function () {
+      test("handles null intermediate value in nested path", function (assert) {
+        const context = { outletArgs: { topic: { category: null } } };
+        const result = this.condition.evaluate(
+          { path: "topic.category.id", value: 5 },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles undefined intermediate value in nested path", function (assert) {
+        const context = { outletArgs: { topic: { category: undefined } } };
+        const result = this.condition.evaluate(
+          { path: "topic.category.parent.id", value: 5 },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles missing root property in nested path", function (assert) {
+        const context = { outletArgs: {} };
+        const result = this.condition.evaluate(
+          { path: "topic.category.parent.id", value: 5 },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles deeply nested path with null at various levels", function (assert) {
+        // null at first level
+        let context = { outletArgs: { a: null } };
+        assert.false(
+          this.condition.evaluate({ path: "a.b.c.d", value: 1 }, context),
+          "null at first level"
+        );
+
+        // null at second level
+        context = { outletArgs: { a: { b: null } } };
+        assert.false(
+          this.condition.evaluate({ path: "a.b.c.d", value: 1 }, context),
+          "null at second level"
+        );
+
+        // null at third level
+        context = { outletArgs: { a: { b: { c: null } } } };
+        assert.false(
+          this.condition.evaluate({ path: "a.b.c.d", value: 1 }, context),
+          "null at third level"
+        );
+      });
+
+      test("handles exists: true with null intermediate value", function (assert) {
+        const context = { outletArgs: { topic: { category: null } } };
+        const result = this.condition.evaluate(
+          { path: "topic.category.id", exists: true },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles exists: false with null intermediate value", function (assert) {
+        const context = { outletArgs: { topic: { category: null } } };
+        const result = this.condition.evaluate(
+          { path: "topic.category.id", exists: false },
+          context
+        );
+        assert.true(result);
+      });
+
+      test("handles value check with missing nested path", function (assert) {
+        const context = { outletArgs: { topic: null } };
+        const result = this.condition.evaluate(
+          { path: "topic.closed", value: true },
+          context
+        );
+        assert.false(result);
+      });
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/conditions/route-test.js b/frontend/discourse/tests/unit/blocks/conditions/route-test.js
new file mode 100644
index 0000000000000..7c0f76213b379
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/conditions/route-test.js
@@ -0,0 +1,1312 @@
+import { getOwner, setOwner } from "@ember/owner";
+import Service from "@ember/service";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import BlockRouteCondition from "discourse/blocks/conditions/route";
+import { setPrefix } from "discourse/lib/get-url";
+import { validateConditions } from "discourse/tests/helpers/block-testing";
+
+module("Unit | Blocks | Conditions | route", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    const testOwner = getOwner(this);
+
+    // Reset URL prefix for clean tests
+    setPrefix("");
+
+    // Default mock router state
+    this.mockRouterState = {
+      currentURL: "/latest",
+      currentRouteName: "discovery.latest",
+      currentRoute: {
+        params: {},
+        queryParams: {},
+      },
+    };
+
+    // Mock discovery state
+    this.mockDiscoveryState = {
+      category: null,
+      tag: null,
+      custom: false,
+      onDiscoveryRoute: true,
+    };
+
+    // Create mock router service
+    const mockRouterState = this.mockRouterState;
+    class MockRouter extends Service {
+      get currentURL() {
+        return mockRouterState.currentURL;
+      }
+
+      get currentRouteName() {
+        return mockRouterState.currentRouteName;
+      }
+
+      get currentRoute() {
+        return mockRouterState.currentRoute;
+      }
+    }
+    testOwner.unregister("service:router");
+    testOwner.register("service:router", MockRouter);
+
+    // Create mock discovery service
+    const mockDiscoveryState = this.mockDiscoveryState;
+    class MockDiscovery extends Service {
+      get category() {
+        return mockDiscoveryState.category;
+      }
+
+      get tag() {
+        return mockDiscoveryState.tag;
+      }
+
+      get custom() {
+        return mockDiscoveryState.custom;
+      }
+
+      get onDiscoveryRoute() {
+        return mockDiscoveryState.onDiscoveryRoute;
+      }
+    }
+    testOwner.unregister("service:discovery");
+    testOwner.register("service:discovery", MockDiscovery);
+
+    // Helper to evaluate route condition directly
+    this.evaluateCondition = (args) => {
+      const condition = new BlockRouteCondition();
+      setOwner(condition, testOwner);
+      return condition.evaluate(args);
+    };
+
+    // Create condition instance for validation
+    this.condition = new BlockRouteCondition();
+    setOwner(this.condition, testOwner);
+
+    // Helper to validate route condition (returns error or null) via infrastructure
+    this.validateCondition = (args) => {
+      const conditionTypes = new Map([["route", this.condition]]);
+
+      try {
+        validateConditions({ type: "route", ...args }, conditionTypes);
+        return null;
+      } catch (error) {
+        return error;
+      }
+    };
+  });
+
+  module("URL pattern matching", function () {
+    test("matches exact URL path", function (assert) {
+      this.mockRouterState.currentURL = "/latest";
+
+      assert.true(this.evaluateCondition({ urls: ["/latest"] }));
+      assert.false(this.evaluateCondition({ urls: ["/top"] }));
+    });
+
+    test("matches single wildcard (*)", function (assert) {
+      this.mockRouterState.currentURL = "/c/general";
+
+      assert.true(this.evaluateCondition({ urls: ["/c/*"] }));
+    });
+
+    test("single wildcard does not match multiple segments", function (assert) {
+      this.mockRouterState.currentURL = "/c/general/subcategory";
+
+      assert.false(this.evaluateCondition({ urls: ["/c/*"] }));
+    });
+
+    test("matches double wildcard (**)", function (assert) {
+      this.mockRouterState.currentURL = "/c/general/subcategory";
+
+      assert.true(this.evaluateCondition({ urls: ["/c/**"] }));
+    });
+
+    test("double wildcard matches zero segments", function (assert) {
+      this.mockRouterState.currentURL = "/c";
+
+      assert.true(this.evaluateCondition({ urls: ["/c/**"] }));
+    });
+
+    test("matches multiple patterns (OR logic)", function (assert) {
+      this.mockRouterState.currentURL = "/c/general";
+
+      assert.true(this.evaluateCondition({ urls: ["/c/**", "/tag/*"] }));
+    });
+
+    test("does not match when no patterns match", function (assert) {
+      this.mockRouterState.currentURL = "/latest";
+
+      assert.false(this.evaluateCondition({ urls: ["/c/**", "/tag/*"] }));
+    });
+
+    test("matches wildcard in middle of pattern", function (assert) {
+      this.mockRouterState.currentURL = "/t/my-topic/123";
+
+      assert.true(this.evaluateCondition({ urls: ["/t/*/123"] }));
+      assert.false(this.evaluateCondition({ urls: ["/t/*/456"] }));
+    });
+
+    test("matches brace expansion", function (assert) {
+      this.mockRouterState.currentURL = "/latest";
+
+      assert.true(this.evaluateCondition({ urls: ["/{latest,top,new}"] }));
+
+      this.mockRouterState.currentURL = "/top";
+      assert.true(this.evaluateCondition({ urls: ["/{latest,top,new}"] }));
+
+      this.mockRouterState.currentURL = "/unread";
+      assert.false(this.evaluateCondition({ urls: ["/{latest,top,new}"] }));
+    });
+
+    test("matches character class", function (assert) {
+      this.mockRouterState.currentURL = "/api/v1";
+
+      assert.true(this.evaluateCondition({ urls: ["/api/v[123]"] }));
+
+      this.mockRouterState.currentURL = "/api/v4";
+      assert.false(this.evaluateCondition({ urls: ["/api/v[123]"] }));
+    });
+  });
+
+  module("subfolder support", function () {
+    test("strips subfolder prefix before matching", function (assert) {
+      setPrefix("/forum");
+      this.mockRouterState.currentURL = "/forum/c/general";
+
+      assert.true(this.evaluateCondition({ urls: ["/c/**"] }));
+    });
+
+    test("matches root path with subfolder", function (assert) {
+      setPrefix("/discourse");
+      this.mockRouterState.currentURL = "/discourse/";
+
+      assert.true(this.evaluateCondition({ urls: ["/"] }));
+    });
+
+    test("handles complex subfolder with query params", function (assert) {
+      setPrefix("/forum");
+      this.mockRouterState.currentURL = "/forum/c/general?filter=latest";
+
+      assert.true(this.evaluateCondition({ urls: ["/c/**"] }));
+    });
+  });
+
+  module("pages: CATEGORY_PAGES", function () {
+    test("matches when discovery.category is set", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 1,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general";
+
+      assert.true(this.evaluateCondition({ pages: ["CATEGORY_PAGES"] }));
+    });
+
+    test("does not match when category is null", function (assert) {
+      this.mockDiscoveryState.category = null;
+      this.mockRouterState.currentURL = "/latest";
+
+      assert.false(this.evaluateCondition({ pages: ["CATEGORY_PAGES"] }));
+    });
+
+    test("matches specific category by ID", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categoryId: 5 },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categoryId: 10 },
+        })
+      );
+    });
+
+    test("matches category by slug", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 1,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categorySlug: "general" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categorySlug: "support" },
+        })
+      );
+    });
+
+    test("matches subcategory by parentCategoryId", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 10,
+        slug: "javascript",
+        parent_category_id: 5,
+      };
+      this.mockRouterState.currentURL = "/c/programming/javascript";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { parentCategoryId: 5 },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { parentCategoryId: 99 },
+        })
+      );
+    });
+
+    test("matches multiple params (AND logic)", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categoryId: 5, categorySlug: "general" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categoryId: 5, categorySlug: "other" },
+        })
+      );
+    });
+  });
+
+  module("pages: TAG_PAGES", function () {
+    test("matches when discovery.tag is set", function (assert) {
+      this.mockDiscoveryState.tag = { name: "javascript" };
+      this.mockRouterState.currentURL = "/tag/javascript";
+
+      assert.true(this.evaluateCondition({ pages: ["TAG_PAGES"] }));
+    });
+
+    test("does not match when tag is null", function (assert) {
+      this.mockDiscoveryState.tag = null;
+      this.mockRouterState.currentURL = "/latest";
+
+      assert.false(this.evaluateCondition({ pages: ["TAG_PAGES"] }));
+    });
+
+    test("matches specific tag by tagId", function (assert) {
+      this.mockDiscoveryState.tag = { name: "javascript" };
+      this.mockRouterState.currentURL = "/tag/javascript";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["TAG_PAGES"],
+          params: { tagId: "javascript" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["TAG_PAGES"],
+          params: { tagId: "python" },
+        })
+      );
+    });
+
+    test("matches tag filtered by category", function (assert) {
+      this.mockDiscoveryState.tag = { name: "javascript" };
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "programming",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/tags/c/programming/javascript";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["TAG_PAGES"],
+          params: { tagId: "javascript", categoryId: 5 },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["TAG_PAGES"],
+          params: { tagId: "javascript", categoryId: 10 },
+        })
+      );
+    });
+  });
+
+  module("pages: DISCOVERY_PAGES", function () {
+    test("matches on discovery routes excluding custom", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.custom = false;
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.true(this.evaluateCondition({ pages: ["DISCOVERY_PAGES"] }));
+    });
+
+    test("does not match on custom homepage", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.custom = true;
+      this.mockRouterState.currentURL = "/";
+
+      assert.false(this.evaluateCondition({ pages: ["DISCOVERY_PAGES"] }));
+    });
+
+    test("does not match when not on discovery route", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = false;
+      this.mockRouterState.currentURL = "/t/my-topic/123";
+      this.mockRouterState.currentRouteName = "topic.show";
+
+      assert.false(this.evaluateCondition({ pages: ["DISCOVERY_PAGES"] }));
+    });
+
+    test("matches specific filter", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.custom = false;
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["DISCOVERY_PAGES"],
+          params: { filter: "latest" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["DISCOVERY_PAGES"],
+          params: { filter: "top" },
+        })
+      );
+    });
+  });
+
+  module("pages: HOMEPAGE", function () {
+    test("matches only on custom homepage", function (assert) {
+      this.mockDiscoveryState.custom = true;
+      this.mockRouterState.currentURL = "/";
+
+      assert.true(this.evaluateCondition({ pages: ["HOMEPAGE"] }));
+    });
+
+    test("does not match on regular discovery routes", function (assert) {
+      this.mockDiscoveryState.custom = false;
+      this.mockRouterState.currentURL = "/latest";
+
+      assert.false(this.evaluateCondition({ pages: ["HOMEPAGE"] }));
+    });
+  });
+
+  module("pages: TOP_MENU", function () {
+    test("matches on main navigation discovery routes", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.category = null;
+      this.mockDiscoveryState.tag = null;
+      this.mockDiscoveryState.custom = false;
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.true(this.evaluateCondition({ pages: ["TOP_MENU"] }));
+    });
+
+    test("does not match on category pages", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.category = { id: 1, slug: "test" };
+      this.mockDiscoveryState.tag = null;
+      this.mockDiscoveryState.custom = false;
+      this.mockRouterState.currentURL = "/c/test";
+
+      assert.false(this.evaluateCondition({ pages: ["TOP_MENU"] }));
+    });
+
+    test("does not match on tag pages", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.category = null;
+      this.mockDiscoveryState.tag = { name: "javascript" };
+      this.mockDiscoveryState.custom = false;
+      this.mockRouterState.currentURL = "/tag/javascript";
+
+      assert.false(this.evaluateCondition({ pages: ["TOP_MENU"] }));
+    });
+
+    test("does not match on custom homepage", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.category = null;
+      this.mockDiscoveryState.tag = null;
+      this.mockDiscoveryState.custom = true;
+      this.mockRouterState.currentURL = "/";
+
+      assert.false(this.evaluateCondition({ pages: ["TOP_MENU"] }));
+    });
+
+    test("matches specific filter", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = true;
+      this.mockDiscoveryState.category = null;
+      this.mockDiscoveryState.tag = null;
+      this.mockDiscoveryState.custom = false;
+      this.mockRouterState.currentURL = "/top";
+      this.mockRouterState.currentRouteName = "discovery.top";
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["TOP_MENU"],
+          params: { filter: "top" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["TOP_MENU"],
+          params: { filter: "latest" },
+        })
+      );
+    });
+  });
+
+  module("pages: TOPIC_PAGES", function () {
+    test("matches on topic routes", function (assert) {
+      this.mockDiscoveryState.onDiscoveryRoute = false;
+      this.mockRouterState.currentURL = "/t/my-topic/123";
+      this.mockRouterState.currentRouteName = "topic.show";
+      this.mockRouterState.currentRoute.params = {
+        id: "123",
+        slug: "my-topic",
+      };
+
+      assert.true(this.evaluateCondition({ pages: ["TOPIC_PAGES"] }));
+    });
+
+    test("does not match on non-topic routes", function (assert) {
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.false(this.evaluateCondition({ pages: ["TOPIC_PAGES"] }));
+    });
+
+    test("matches specific topic by ID", function (assert) {
+      this.mockRouterState.currentURL = "/t/my-topic/123";
+      this.mockRouterState.currentRouteName = "topic.show";
+      this.mockRouterState.currentRoute.params = {
+        id: "123",
+        slug: "my-topic",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["TOPIC_PAGES"],
+          params: { id: 123 },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["TOPIC_PAGES"],
+          params: { id: 456 },
+        })
+      );
+    });
+
+    test("matches topic by slug", function (assert) {
+      this.mockRouterState.currentURL = "/t/my-topic/123";
+      this.mockRouterState.currentRouteName = "topic.show";
+      this.mockRouterState.currentRoute.params = {
+        id: "123",
+        slug: "my-topic",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["TOPIC_PAGES"],
+          params: { slug: "my-topic" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["TOPIC_PAGES"],
+          params: { slug: "other-topic" },
+        })
+      );
+    });
+  });
+
+  module("pages: USER_PAGES", function () {
+    test("matches on user profile routes", function (assert) {
+      this.mockRouterState.currentURL = "/u/admin";
+      this.mockRouterState.currentRouteName = "user.summary";
+      this.mockRouterState.currentRoute.params = { username: "admin" };
+
+      assert.true(this.evaluateCondition({ pages: ["USER_PAGES"] }));
+    });
+
+    test("does not match on non-user routes", function (assert) {
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.false(this.evaluateCondition({ pages: ["USER_PAGES"] }));
+    });
+
+    test("matches specific user by username", function (assert) {
+      this.mockRouterState.currentURL = "/u/admin";
+      this.mockRouterState.currentRouteName = "user.summary";
+      this.mockRouterState.currentRoute.params = { username: "admin" };
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["USER_PAGES"],
+          params: { username: "admin" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["USER_PAGES"],
+          params: { username: "other-user" },
+        })
+      );
+    });
+  });
+
+  module("pages: ADMIN_PAGES", function () {
+    test("matches on admin routes", function (assert) {
+      this.mockRouterState.currentURL = "/admin/dashboard";
+      this.mockRouterState.currentRouteName = "admin.dashboard";
+
+      assert.true(this.evaluateCondition({ pages: ["ADMIN_PAGES"] }));
+    });
+
+    test("matches on nested admin routes", function (assert) {
+      this.mockRouterState.currentURL = "/admin/plugins/discourse-ai";
+      this.mockRouterState.currentRouteName = "admin.plugins.show";
+
+      assert.true(this.evaluateCondition({ pages: ["ADMIN_PAGES"] }));
+    });
+
+    test("does not match on non-admin routes", function (assert) {
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.false(this.evaluateCondition({ pages: ["ADMIN_PAGES"] }));
+    });
+  });
+
+  module("pages: GROUP_PAGES", function () {
+    test("matches on group routes", function (assert) {
+      this.mockRouterState.currentURL = "/g/staff";
+      this.mockRouterState.currentRouteName = "group.index";
+      this.mockRouterState.currentRoute.params = { name: "staff" };
+
+      assert.true(this.evaluateCondition({ pages: ["GROUP_PAGES"] }));
+    });
+
+    test("does not match on non-group routes", function (assert) {
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.false(this.evaluateCondition({ pages: ["GROUP_PAGES"] }));
+    });
+
+    test("matches specific group by name", function (assert) {
+      this.mockRouterState.currentURL = "/g/staff";
+      this.mockRouterState.currentRouteName = "group.index";
+      this.mockRouterState.currentRoute.params = { name: "staff" };
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["GROUP_PAGES"],
+          params: { name: "staff" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["GROUP_PAGES"],
+          params: { name: "moderators" },
+        })
+      );
+    });
+  });
+
+  module("multiple page types (OR logic)", function () {
+    test("matches when any page type matches", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 1,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general";
+
+      assert.true(
+        this.evaluateCondition({ pages: ["CATEGORY_PAGES", "TAG_PAGES"] })
+      );
+    });
+
+    test("matches when second page type matches", function (assert) {
+      this.mockDiscoveryState.category = null;
+      this.mockDiscoveryState.tag = { name: "javascript" };
+      this.mockRouterState.currentURL = "/tag/javascript";
+
+      assert.true(
+        this.evaluateCondition({ pages: ["CATEGORY_PAGES", "TAG_PAGES"] })
+      );
+    });
+
+    test("does not match when no page type matches", function (assert) {
+      this.mockDiscoveryState.category = null;
+      this.mockDiscoveryState.tag = null;
+      this.mockRouterState.currentURL = "/latest";
+      this.mockRouterState.currentRouteName = "discovery.latest";
+
+      assert.false(
+        this.evaluateCondition({ pages: ["CATEGORY_PAGES", "TAG_PAGES"] })
+      );
+    });
+  });
+
+  module("queryParams matching", function () {
+    test("matches queryParam with urls", function (assert) {
+      this.mockRouterState.currentURL = "/latest?filter=solved";
+      this.mockRouterState.currentRoute.queryParams = { filter: "solved" };
+
+      assert.true(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { filter: "solved" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { filter: "unsolved" },
+        })
+      );
+    });
+
+    test("matches queryParam with pages", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 1,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general?filter=latest";
+      this.mockRouterState.currentRoute.queryParams = { filter: "latest" };
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          queryParams: { filter: "latest" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          queryParams: { filter: "top" },
+        })
+      );
+    });
+
+    test("matches queryParam with array of values (OR)", function (assert) {
+      this.mockRouterState.currentURL = "/latest?filter=solved";
+      this.mockRouterState.currentRoute.queryParams = { filter: "solved" };
+
+      assert.true(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { filter: ["solved", "closed"] },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { filter: ["open", "closed"] },
+        })
+      );
+    });
+
+    test("matches queryParam with regex", function (assert) {
+      this.mockRouterState.currentURL = "/latest?q=javascript%20help";
+      this.mockRouterState.currentRoute.queryParams = { q: "javascript help" };
+
+      assert.true(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { q: /javascript/ },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { q: /python/ },
+        })
+      );
+    });
+
+    test("matches queryParams with { any: [...] } OR logic", function (assert) {
+      this.mockRouterState.currentURL = "/latest?filter=solved&page=2";
+      this.mockRouterState.currentRoute.queryParams = {
+        filter: "solved",
+        page: "2",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { any: [{ filter: "closed" }, { page: "2" }] },
+        })
+      );
+    });
+  });
+
+  module("combined pages, params, and queryParams", function () {
+    test("matches when pages, params, and queryParams all match", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general?solved=true";
+      this.mockRouterState.currentRoute.queryParams = { solved: "true" };
+
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categoryId: 5 },
+          queryParams: { solved: "true" },
+        })
+      );
+    });
+
+    test("fails when params match but queryParams do not", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general?solved=false";
+      this.mockRouterState.currentRoute.queryParams = { solved: "false" };
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categoryId: 5 },
+          queryParams: { solved: "true" },
+        })
+      );
+    });
+
+    test("fails when page matches but params do not", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 10,
+        slug: "other",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/other";
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { categoryId: 5 },
+        })
+      );
+    });
+  });
+
+  module("params with any/not operators", function () {
+    test("matches params with { any: [...] } OR logic", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 2,
+        slug: "announcements",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/announcements/2";
+
+      // Should match because categoryId is 2 (one of the allowed values)
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            any: [{ categoryId: 1 }, { categoryId: 2 }, { categoryId: 3 }],
+          },
+        })
+      );
+
+      // Should not match because categoryId is 2, not 10 or 20
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            any: [{ categoryId: 10 }, { categoryId: 20 }],
+          },
+        })
+      );
+    });
+
+    test("matches params with { not: {...} } negation", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general/5";
+
+      // Should match because categoryId is NOT 10
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { not: { categoryId: 10 } },
+        })
+      );
+
+      // Should not match because categoryId IS 5
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: { not: { categoryId: 5 } },
+        })
+      );
+    });
+
+    test("matches nested { any: [{ not: {...} }] } combination", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "general",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/general/5";
+
+      // Match if categoryId is NOT 10 OR NOT 20 (always true since can't be both)
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            any: [{ not: { categoryId: 10 } }, { not: { categoryId: 20 } }],
+          },
+        })
+      );
+
+      // Match if categoryId is NOT 5 OR categoryId is 5 (always true)
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            any: [{ not: { categoryId: 5 } }, { categoryId: 5 }],
+          },
+        })
+      );
+    });
+
+    test("matches { not: { any: [...] } } - none of the values", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 99,
+        slug: "other",
+        parent_category_id: null,
+      };
+      this.mockRouterState.currentURL = "/c/other/99";
+
+      // Match if categoryId is NOT (1 OR 2 OR 3) - i.e., not any of them
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            not: {
+              any: [{ categoryId: 1 }, { categoryId: 2 }, { categoryId: 3 }],
+            },
+          },
+        })
+      );
+
+      // Change to category 2 - should NOT match
+      this.mockDiscoveryState.category = {
+        id: 2,
+        slug: "announcements",
+        parent_category_id: null,
+      };
+
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            not: {
+              any: [{ categoryId: 1 }, { categoryId: 2 }, { categoryId: 3 }],
+            },
+          },
+        })
+      );
+    });
+
+    test("matches any with multiple params per spec (AND within each)", function (assert) {
+      this.mockDiscoveryState.category = {
+        id: 5,
+        slug: "general",
+        parent_category_id: 1,
+      };
+      this.mockRouterState.currentURL = "/c/parent/general/5";
+
+      // Match if (categoryId=5 AND parentCategoryId=1) OR (categoryId=10)
+      assert.true(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            any: [{ categoryId: 5, parentCategoryId: 1 }, { categoryId: 10 }],
+          },
+        })
+      );
+
+      // Should NOT match - first spec has wrong parent, second has wrong id
+      assert.false(
+        this.evaluateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            any: [{ categoryId: 5, parentCategoryId: 99 }, { categoryId: 10 }],
+          },
+        })
+      );
+    });
+
+    test("validates params with any operator", function (assert) {
+      // Valid any usage
+      const noError = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: {
+          any: [{ categoryId: 1 }, { categoryId: 2 }],
+        },
+      });
+      assert.strictEqual(noError, null, "valid any params should not error");
+
+      // Invalid param name inside any
+      const invalidParam = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: {
+          any: [{ invalidParam: 1 }],
+        },
+      });
+      assert.true(
+        invalidParam?.message.includes("not valid"),
+        "invalid param inside any should error"
+      );
+    });
+
+    test("validates params with not operator", function (assert) {
+      // Valid not usage
+      const noError = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: { not: { categoryId: 5 } },
+      });
+      assert.strictEqual(noError, null, "valid not params should not error");
+
+      // Invalid param name inside not
+      const invalidParam = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: { not: { invalidParam: 1 } },
+      });
+      assert.true(
+        invalidParam?.message.includes("not valid"),
+        "invalid param inside not should error"
+      );
+    });
+
+    test("validates nested any/not operators", function (assert) {
+      // Valid nested any containing not
+      assert.strictEqual(
+        this.validateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            any: [{ not: { categoryId: 1 } }, { categoryId: 2 }],
+          },
+        }),
+        null,
+        "nested not inside any should be valid"
+      );
+
+      // Valid not containing any
+      assert.strictEqual(
+        this.validateCondition({
+          pages: ["CATEGORY_PAGES"],
+          params: {
+            not: {
+              any: [{ categoryId: 1 }, { categoryId: 2 }],
+            },
+          },
+        }),
+        null,
+        "any inside not should be valid"
+      );
+
+      // Invalid param deeply nested
+      const deepError = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: {
+          any: [{ not: { invalidParam: 1 } }],
+        },
+      });
+      assert.true(
+        deepError?.message.includes("not valid"),
+        "invalid param in deeply nested structure should error"
+      );
+    });
+
+    test("validates any must be an array", function (assert) {
+      const error = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: { any: { categoryId: 1 } },
+      });
+      assert.true(
+        error?.message.includes("must be an array"),
+        "any must be an array"
+      );
+    });
+  });
+
+  module("validate (through infrastructure)", function () {
+    test("returns error when neither urls nor pages provided", function (assert) {
+      const error = this.validateCondition({});
+      assert.true(error?.message.includes("at least one of"));
+    });
+
+    test("returns error when urls contains non-string values", function (assert) {
+      const error = this.validateCondition({ urls: ["/path", 123, "/other"] });
+      assert.true(error?.message.includes("must be a string"));
+    });
+
+    test("returns error for unknown page type", function (assert) {
+      const error = this.validateCondition({ pages: ["INVALID_PAGE"] });
+      assert.true(
+        error?.message.includes("must be one of"),
+        "error message lists valid page types"
+      );
+      assert.true(
+        error?.message.includes("INVALID_PAGE"),
+        "error message includes the invalid page type"
+      );
+    });
+
+    test("suggests correction for typo in page type", function (assert) {
+      const error = this.validateCondition({ pages: ["CATEGORY_PAGE"] });
+      assert.true(
+        error?.message.includes('did you mean "CATEGORY_PAGES"'),
+        "error message suggests the correct page type"
+      );
+    });
+
+    test("returns error when params used without pages", function (assert) {
+      const error = this.validateCondition({
+        urls: ["/c/**"],
+        params: { id: 5 },
+      });
+      assert.true(
+        error?.message.includes('"params" requires "pages" to be specified')
+      );
+    });
+
+    test("returns error when params used with urls", function (assert) {
+      const error = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        urls: ["/c/**"],
+        params: { id: 5 },
+      });
+      assert.true(
+        error?.message.includes(
+          'at most one of "params", "urls" may be provided'
+        )
+      );
+    });
+
+    test("returns error for invalid param for page type", function (assert) {
+      const error = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: { filter: "latest" },
+      });
+      assert.true(
+        error?.message.includes(
+          "Parameter 'filter' is not valid for any of the listed page types"
+        )
+      );
+    });
+
+    test("returns error for param type mismatch (number expected, string given)", function (assert) {
+      const error = this.validateCondition({
+        pages: ["CATEGORY_PAGES"],
+        params: { categoryId: "5" },
+      });
+      assert.true(
+        error?.message.includes(
+          "Parameter 'categoryId' must be a number, got string '5'"
+        )
+      );
+    });
+
+    test("returns error for param type mismatch (string expected, number given)", function (assert) {
+      const error = this.validateCondition({
+        pages: ["TAG_PAGES"],
+        params: { tagId: 123 },
+      });
+      assert.true(
+        error?.message.includes(
+          "Parameter 'tagId' must be a string, got number '123'"
+        )
+      );
+    });
+
+    test("returns error when param not valid for all listed page types", function (assert) {
+      const error = this.validateCondition({
+        pages: ["TAG_PAGES", "DISCOVERY_PAGES"],
+        params: { tagId: "javascript" },
+      });
+      assert.true(
+        error?.message.includes(
+          "Parameter 'tagId' is not valid for all listed page types"
+        )
+      );
+    });
+
+    test("accepts params valid for all listed page types", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({
+          pages: ["DISCOVERY_PAGES", "TOP_MENU"],
+          params: { filter: "latest" },
+        }),
+        null
+      );
+    });
+
+    test("accepts categoryId param valid for both CATEGORY_PAGES and TAG_PAGES", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({
+          pages: ["CATEGORY_PAGES", "TAG_PAGES"],
+          params: { categoryId: 5 },
+        }),
+        null
+      );
+    });
+
+    test("returns error for page type names in urls", function (assert) {
+      const error = this.validateCondition({ urls: ["CATEGORY_PAGES"] });
+      assert.true(
+        error?.message.includes(
+          "Page shortcuts like 'CATEGORY_PAGES' are not supported in `urls`"
+        )
+      );
+    });
+
+    test("accepts valid page types", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({ pages: ["CATEGORY_PAGES"] }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ pages: ["TAG_PAGES"] }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ pages: ["DISCOVERY_PAGES"] }),
+        null
+      );
+      assert.strictEqual(this.validateCondition({ pages: ["HOMEPAGE"] }), null);
+      assert.strictEqual(this.validateCondition({ pages: ["TOP_MENU"] }), null);
+      assert.strictEqual(
+        this.validateCondition({ pages: ["TOPIC_PAGES"] }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ pages: ["USER_PAGES"] }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ pages: ["ADMIN_PAGES"] }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ pages: ["GROUP_PAGES"] }),
+        null
+      );
+    });
+
+    test("accepts valid URL patterns", function (assert) {
+      assert.strictEqual(this.validateCondition({ urls: ["/c/**"] }), null);
+      assert.strictEqual(this.validateCondition({ urls: ["/t/*"] }), null);
+    });
+
+    test("returns error for invalid glob pattern in urls", function (assert) {
+      const error = this.validateCondition({ urls: ["[unclosed"] });
+      assert.true(error?.message.includes('Invalid glob pattern "[unclosed"'));
+    });
+
+    test("pages must be an array", function (assert) {
+      const error = this.validateCondition({ pages: "CATEGORY_PAGES" });
+      assert.true(error?.message.includes("must be an array"));
+    });
+
+    test("each page type must be a string", function (assert) {
+      const error = this.validateCondition({ pages: [123] });
+      assert.true(error?.message.includes("must be a string"));
+    });
+  });
+
+  module("backslash escape for reserved keys", function () {
+    test("\\\\any matches literal queryParam named 'any'", function (assert) {
+      this.mockRouterState.currentURL = "/latest?any=some-value";
+      this.mockRouterState.currentRoute.queryParams = { any: "some-value" };
+
+      assert.true(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { "\\any": "some-value" },
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { "\\any": "other-value" },
+        })
+      );
+    });
+
+    test("\\\\not matches literal queryParam named 'not'", function (assert) {
+      this.mockRouterState.currentURL = "/latest?not=some-value";
+      this.mockRouterState.currentRoute.queryParams = { not: "some-value" };
+
+      assert.true(
+        this.evaluateCondition({
+          urls: ["/latest"],
+          queryParams: { "\\not": "some-value" },
+        })
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/conditions/setting-test.js b/frontend/discourse/tests/unit/blocks/conditions/setting-test.js
new file mode 100644
index 0000000000000..43f685783b51e
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/conditions/setting-test.js
@@ -0,0 +1,660 @@
+import { getOwner, setOwner } from "@ember/owner";
+import Service from "@ember/service";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import BlockSettingCondition from "discourse/blocks/conditions/setting";
+import { validateConditions } from "discourse/tests/helpers/block-testing";
+
+module("Unit | Blocks | Conditions | setting", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    const testOwner = getOwner(this);
+
+    // Mock site settings
+    this.mockSiteSettings = {
+      enable_badges: true,
+      enable_whispers: false,
+      desktop_category_page_style: "categories_and_latest_topics",
+      top_menu: "latest|new|unread|categories",
+      share_links: "twitter|facebook|email",
+    };
+
+    // Create mock site settings service
+    const mockSiteSettings = this.mockSiteSettings;
+    class MockSiteSettings extends Service {
+      get enable_badges() {
+        return mockSiteSettings.enable_badges;
+      }
+
+      get enable_whispers() {
+        return mockSiteSettings.enable_whispers;
+      }
+
+      get desktop_category_page_style() {
+        return mockSiteSettings.desktop_category_page_style;
+      }
+
+      get top_menu() {
+        return mockSiteSettings.top_menu;
+      }
+
+      get share_links() {
+        return mockSiteSettings.share_links;
+      }
+    }
+    testOwner.unregister("service:site-settings");
+    testOwner.register("service:site-settings", MockSiteSettings);
+
+    // Store owner for creating condition instances
+    this.testOwner = testOwner;
+
+    // Helper to evaluate setting condition directly
+    this.evaluateCondition = (args) => {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, testOwner);
+      return condition.evaluate(args);
+    };
+
+    // Helper to validate via infrastructure
+    this.validateCondition = (args) => {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, testOwner);
+
+      // Create a map with the condition instance
+      const conditionTypes = new Map([["setting", condition]]);
+
+      try {
+        validateConditions({ type: "setting", ...args }, conditionTypes);
+        return null;
+      } catch (error) {
+        return error;
+      }
+    };
+  });
+
+  module("with site settings (existing behavior)", function () {
+    test("enabled: true passes when setting is truthy", function (assert) {
+      assert.true(
+        this.evaluateCondition({
+          name: "enable_badges",
+          enabled: true,
+        })
+      );
+    });
+
+    test("enabled: true fails when setting is falsy", function (assert) {
+      assert.false(
+        this.evaluateCondition({
+          name: "enable_whispers",
+          enabled: true,
+        })
+      );
+    });
+
+    test("enabled: false passes when setting is falsy", function (assert) {
+      assert.true(
+        this.evaluateCondition({
+          name: "enable_whispers",
+          enabled: false,
+        })
+      );
+    });
+
+    test("equals matches exact value", function (assert) {
+      assert.true(
+        this.evaluateCondition({
+          name: "desktop_category_page_style",
+          equals: "categories_and_latest_topics",
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          name: "desktop_category_page_style",
+          equals: "categories_only",
+        })
+      );
+    });
+
+    test("includes matches if setting is in array", function (assert) {
+      assert.true(
+        this.evaluateCondition({
+          name: "desktop_category_page_style",
+          includes: [
+            "categories_and_latest_topics",
+            "categories_and_top_topics",
+          ],
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          name: "desktop_category_page_style",
+          includes: ["categories_only", "categories_boxes"],
+        })
+      );
+    });
+
+    test("contains matches if list setting contains value", function (assert) {
+      assert.true(
+        this.evaluateCondition({
+          name: "top_menu",
+          contains: "latest",
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          name: "top_menu",
+          contains: "hot",
+        })
+      );
+    });
+
+    test("containsAny matches if list setting contains any value", function (assert) {
+      assert.true(
+        this.evaluateCondition({
+          name: "share_links",
+          containsAny: ["twitter", "linkedin"],
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          name: "share_links",
+          containsAny: ["linkedin", "reddit"],
+        })
+      );
+    });
+  });
+
+  module("with explicit source object (theme settings)", function () {
+    test("enabled: true passes when custom setting is truthy", function (assert) {
+      const themeSettings = {
+        show_sidebar: true,
+        enable_animations: false,
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "show_sidebar",
+          enabled: true,
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "enable_animations",
+          enabled: true,
+        })
+      );
+    });
+
+    test("enabled: false passes when custom setting is falsy", function (assert) {
+      const themeSettings = {
+        show_sidebar: true,
+        enable_animations: false,
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "enable_animations",
+          enabled: false,
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "show_sidebar",
+          enabled: false,
+        })
+      );
+    });
+
+    test("equals matches exact value in custom settings", function (assert) {
+      const themeSettings = {
+        theme_color: "dark",
+        layout_style: "compact",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "theme_color",
+          equals: "dark",
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "theme_color",
+          equals: "light",
+        })
+      );
+    });
+
+    test("includes matches if custom setting is in array", function (assert) {
+      const themeSettings = {
+        icon_style: "outline",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "icon_style",
+          includes: ["outline", "filled"],
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "icon_style",
+          includes: ["filled", "duotone"],
+        })
+      );
+    });
+
+    test("contains matches if custom list setting contains value", function (assert) {
+      const themeSettings = {
+        enabled_features: "sidebar|dark-mode|animations",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "enabled_features",
+          contains: "dark-mode",
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "enabled_features",
+          contains: "tooltips",
+        })
+      );
+    });
+
+    test("containsAny matches if custom list setting contains any value", function (assert) {
+      const themeSettings = {
+        enabled_modules: "header|footer|sidebar",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "enabled_modules",
+          containsAny: ["header", "navigation"],
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "enabled_modules",
+          containsAny: ["navigation", "search"],
+        })
+      );
+    });
+
+    test("handles missing setting key in custom settings", function (assert) {
+      const themeSettings = {
+        existing_key: true,
+      };
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "missing_key",
+          enabled: true,
+        })
+      );
+    });
+
+    test("handles null source object gracefully", function (assert) {
+      assert.false(
+        this.evaluateCondition({
+          source: null,
+          name: "any_setting",
+          enabled: true,
+        }),
+        "enabled: true returns false with null source"
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: null,
+          name: "any_setting",
+          enabled: false,
+        }),
+        "enabled: false returns false with null source (source is invalid)"
+      );
+    });
+
+    test("handles undefined source value gracefully", function (assert) {
+      const themeSettings = {};
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "undefined_setting",
+          enabled: true,
+        }),
+        "undefined setting returns false (setting doesn't exist)"
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "undefined_setting",
+          enabled: false,
+        }),
+        "enabled: false returns false for non-existent setting"
+      );
+    });
+
+    test("evaluates truthy using enabled: true", function (assert) {
+      const themeSettings = {
+        some_setting: "has-value",
+        empty_setting: "",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "some_setting",
+          enabled: true,
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "empty_setting",
+          enabled: true,
+        })
+      );
+    });
+  });
+
+  module("validate (through infrastructure)", function () {
+    test("returns error when name argument is missing", function (assert) {
+      const error = this.validateCondition({});
+      assert.true(error?.message.includes("missing required arg"));
+    });
+
+    test("typo in required arg produces unknown arg error with suggestion, not missing required error", function (assert) {
+      // Typo: "nam" instead of "name"
+      const error = this.validateCondition({ nam: "enable_badges" });
+
+      // Should say "unknown" not "missing required"
+      assert.true(
+        error?.message.includes("unknown arg"),
+        "error should mention unknown arg"
+      );
+      assert.false(
+        error?.message.includes("missing required"),
+        "error should NOT mention missing required"
+      );
+      assert.true(
+        error?.message.includes('did you mean "name"'),
+        "error should suggest the correct arg name"
+      );
+    });
+
+    test("returns error when multiple condition types are provided (exactlyOne constraint)", function (assert) {
+      const error = this.validateCondition({
+        name: "enable_badges",
+        enabled: true,
+        equals: "some-value",
+      });
+      assert.true(error?.message.includes("exactly one of"));
+    });
+
+    test("returns error when enabled and includes are both provided", function (assert) {
+      const error = this.validateCondition({
+        name: "enable_badges",
+        enabled: true,
+        includes: ["value1", "value2"],
+      });
+      assert.true(error?.message.includes("exactly one of"));
+    });
+
+    test("returns error when no condition type is provided (exactlyOne constraint)", function (assert) {
+      const error = this.validateCondition({
+        name: "enable_badges",
+      });
+      assert.true(error?.message.includes("exactly one of"));
+    });
+
+    test("constraint error path points to condition type for better error location", function (assert) {
+      const error = this.validateCondition({
+        name: "enable_badges",
+        // Missing required arg: enabled, equals, includes, contains, or containsAny
+      });
+
+      // The error path should include "type" so the error location indicator
+      // points to the condition (identified by its type) rather than the block
+      assert.strictEqual(
+        error?.path,
+        "type",
+        "constraint error path should point to the condition's type property"
+      );
+    });
+
+    test("constraint error path includes array index when condition is in an array", function (assert) {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, this.testOwner);
+      const conditionTypes = new Map([["setting", condition]]);
+
+      let error;
+      try {
+        // Array of conditions - the second one has a constraint error
+        validateConditions(
+          [
+            { type: "setting", name: "enable_badges", enabled: true },
+            { type: "setting", name: "enable_whispers" }, // Missing condition type arg
+          ],
+          conditionTypes
+        );
+      } catch (e) {
+        error = e;
+      }
+
+      // Path should include the array index and point to the type
+      assert.strictEqual(
+        error?.path,
+        "[1].type",
+        "constraint error path should include array index and type"
+      );
+    });
+
+    test("accepts valid site setting", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({ name: "enable_badges", enabled: true }),
+        null
+      );
+    });
+
+    test("returns error when enabled is not a boolean", function (assert) {
+      const error = this.validateCondition({
+        name: "enable_badges",
+        enabled: "true",
+      });
+      assert.true(error?.message.includes("must be a boolean"));
+    });
+
+    test("returns error when includes is not an array", function (assert) {
+      const error = this.validateCondition({
+        name: "desktop_category_page_style",
+        includes: "categories_only",
+      });
+      assert.true(error?.message.includes("must be an array"));
+    });
+
+    test("returns error when containsAny is not an array", function (assert) {
+      const error = this.validateCondition({
+        name: "top_menu",
+        containsAny: "latest",
+      });
+      assert.true(error?.message.includes("must be an array"));
+    });
+  });
+
+  module("getResolvedValueForLogging", function () {
+    test("returns setting value when setting exists", function (assert) {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, this.testOwner);
+
+      const result = condition.getResolvedValueForLogging({
+        name: "enable_badges",
+      });
+
+      assert.deepEqual(result, { value: true, hasValue: true });
+    });
+
+    test("returns note when setting does not exist", function (assert) {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, this.testOwner);
+
+      // Use a custom source with enumerable properties
+      const settings = { existing_setting: true };
+      const result = condition.getResolvedValueForLogging({
+        source: settings,
+        name: "nonexistent_setting",
+      });
+
+      assert.strictEqual(result.value, undefined);
+      assert.true(result.hasValue);
+      assert.true(result.note.includes('"nonexistent_setting" does not exist'));
+    });
+
+    test("suggests similar setting name in note", function (assert) {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, this.testOwner);
+
+      // Use a custom source with enumerable properties
+      const settings = { enable_badges: true, enable_whispers: false };
+      const result = condition.getResolvedValueForLogging({
+        source: settings,
+        name: "enable_badgez", // typo - similar to "enable_badges"
+      });
+
+      assert.strictEqual(result.value, undefined);
+      assert.true(result.hasValue);
+      assert.true(result.note.includes('did you mean "enable_badges"'));
+    });
+
+    test("returns note when settings source is null", function (assert) {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, this.testOwner);
+
+      const result = condition.getResolvedValueForLogging({
+        source: null,
+        name: "any_setting",
+      });
+
+      assert.deepEqual(result, {
+        value: undefined,
+        hasValue: true,
+        note: "settings source is null/undefined",
+      });
+    });
+
+    test("returns value from custom source when setting exists", function (assert) {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, this.testOwner);
+
+      const themeSettings = { my_setting: "custom_value" };
+      const result = condition.getResolvedValueForLogging({
+        source: themeSettings,
+        name: "my_setting",
+      });
+
+      assert.deepEqual(result, { value: "custom_value", hasValue: true });
+    });
+
+    test("returns note with suggestion from custom source", function (assert) {
+      const condition = new BlockSettingCondition();
+      setOwner(condition, this.testOwner);
+
+      const themeSettings = { my_setting: "value" };
+      const result = condition.getResolvedValueForLogging({
+        source: themeSettings,
+        name: "my_settin", // typo
+      });
+
+      assert.strictEqual(result.value, undefined);
+      assert.true(result.hasValue);
+      assert.true(result.note.includes('did you mean "my_setting"'));
+    });
+  });
+
+  module("type coercion", function () {
+    test("contains matches number searchValue against string list", function (assert) {
+      const themeSettings = {
+        allowed_ids: "123|456|789",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "allowed_ids",
+          contains: 123,
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "allowed_ids",
+          contains: 999,
+        })
+      );
+    });
+
+    test("containsAny matches number searchValues against string list", function (assert) {
+      const themeSettings = {
+        allowed_ids: "123|456|789",
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "allowed_ids",
+          containsAny: [123, 999],
+        })
+      );
+
+      assert.false(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "allowed_ids",
+          containsAny: [111, 222],
+        })
+      );
+    });
+
+    test("contains matches number searchValue against array setting", function (assert) {
+      const themeSettings = {
+        allowed_ids: [123, 456, 789],
+      };
+
+      assert.true(
+        this.evaluateCondition({
+          source: themeSettings,
+          name: "allowed_ids",
+          contains: "123",
+        })
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/conditions/user-test.js b/frontend/discourse/tests/unit/blocks/conditions/user-test.js
new file mode 100644
index 0000000000000..24538c2c42b07
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/conditions/user-test.js
@@ -0,0 +1,725 @@
+import { getOwner, setOwner } from "@ember/owner";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import BlockUserCondition from "discourse/blocks/conditions/user";
+import { validateConditions } from "discourse/tests/helpers/block-testing";
+
+module("Unit | Blocks | Condition | user", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.condition = new BlockUserCondition();
+    setOwner(this.condition, getOwner(this));
+
+    // Helper to validate via infrastructure
+    this.validateCondition = (args) => {
+      const conditionTypes = new Map([["user", this.condition]]);
+
+      try {
+        validateConditions({ type: "user", ...args }, conditionTypes);
+        return null;
+      } catch (error) {
+        return error;
+      }
+    };
+  });
+
+  module("validate (through infrastructure)", function () {
+    test("returns error when loggedIn: false combined with admin", function (assert) {
+      const error = this.validateCondition({ loggedIn: false, admin: true });
+      assert.true(error?.message.includes("loggedIn: false"));
+    });
+
+    test("returns error when loggedIn: false combined with moderator", function (assert) {
+      const error = this.validateCondition({
+        loggedIn: false,
+        moderator: true,
+      });
+      assert.true(error?.message.includes("loggedIn: false"));
+    });
+
+    test("returns error when loggedIn: false combined with staff", function (assert) {
+      const error = this.validateCondition({ loggedIn: false, staff: true });
+      assert.true(error?.message.includes("loggedIn: false"));
+    });
+
+    test("returns error when loggedIn: false combined with minTrustLevel", function (assert) {
+      const error = this.validateCondition({
+        loggedIn: false,
+        minTrustLevel: 2,
+      });
+      assert.true(error?.message.includes("loggedIn: false"));
+    });
+
+    test("returns error when loggedIn: false combined with maxTrustLevel", function (assert) {
+      const error = this.validateCondition({
+        loggedIn: false,
+        maxTrustLevel: 2,
+      });
+      assert.true(error?.message.includes("loggedIn: false"));
+    });
+
+    test("returns error when loggedIn: false combined with groups", function (assert) {
+      const error = this.validateCondition({
+        loggedIn: false,
+        groups: ["some-group"],
+      });
+      assert.true(error?.message.includes("loggedIn: false"));
+    });
+
+    test("returns error when minTrustLevel > maxTrustLevel", function (assert) {
+      const error = this.validateCondition({
+        minTrustLevel: 3,
+        maxTrustLevel: 1,
+      });
+      assert.true(error?.message.includes("cannot be greater than"));
+    });
+
+    test("returns error when minTrustLevel is negative", function (assert) {
+      const error = this.validateCondition({ minTrustLevel: -1 });
+      assert.true(error?.message.includes("must be at least 0"));
+    });
+
+    test("returns error when maxTrustLevel is negative", function (assert) {
+      const error = this.validateCondition({ maxTrustLevel: -1 });
+      assert.true(error?.message.includes("must be at least 0"));
+    });
+
+    test("returns error when minTrustLevel exceeds 4", function (assert) {
+      const error = this.validateCondition({ minTrustLevel: 5 });
+      assert.true(error?.message.includes("must be at most 4"));
+    });
+
+    test("returns error when maxTrustLevel exceeds 4", function (assert) {
+      const error = this.validateCondition({ maxTrustLevel: 5 });
+      assert.true(error?.message.includes("must be at most 4"));
+    });
+
+    test("returns error when minTrustLevel is not a number", function (assert) {
+      const error = this.validateCondition({ minTrustLevel: "2" });
+      assert.true(error?.message.includes("must be a number"));
+    });
+
+    test("returns error when maxTrustLevel is not a number", function (assert) {
+      const error = this.validateCondition({ maxTrustLevel: "3" });
+      assert.true(error?.message.includes("must be a number"));
+    });
+
+    test("accepts boundary trust levels 0 and 4", function (assert) {
+      assert.strictEqual(this.validateCondition({ minTrustLevel: 0 }), null);
+      assert.strictEqual(this.validateCondition({ maxTrustLevel: 4 }), null);
+      assert.strictEqual(
+        this.validateCondition({ minTrustLevel: 0, maxTrustLevel: 4 }),
+        null
+      );
+    });
+
+    test("returns error when loggedIn is not a boolean", function (assert) {
+      const error = this.validateCondition({ loggedIn: "true" });
+      assert.true(error?.message.includes("must be a boolean"));
+    });
+
+    test("returns error when admin is not a boolean", function (assert) {
+      const error = this.validateCondition({ admin: 1 });
+      assert.true(error?.message.includes("must be a boolean"));
+    });
+
+    test("returns error when moderator is not a boolean", function (assert) {
+      const error = this.validateCondition({ moderator: "yes" });
+      assert.true(error?.message.includes("must be a boolean"));
+    });
+
+    test("returns error when staff is not a boolean", function (assert) {
+      const error = this.validateCondition({ staff: 0 });
+      assert.true(error?.message.includes("must be a boolean"));
+    });
+
+    test("returns error when groups is not an array", function (assert) {
+      const error = this.validateCondition({ groups: "beta-testers" });
+      assert.true(error?.message.includes("must be an array"));
+    });
+
+    test("returns error when groups contains non-string values", function (assert) {
+      const error = this.validateCondition({ groups: ["valid", 123] });
+      assert.true(error?.message.includes("must be a string"));
+    });
+
+    test("passes valid configurations", function (assert) {
+      assert.strictEqual(this.validateCondition({ loggedIn: true }), null);
+      assert.strictEqual(this.validateCondition({ loggedIn: false }), null);
+      assert.strictEqual(this.validateCondition({ admin: true }), null);
+      assert.strictEqual(this.validateCondition({ moderator: true }), null);
+      assert.strictEqual(this.validateCondition({ staff: true }), null);
+      assert.strictEqual(this.validateCondition({ minTrustLevel: 2 }), null);
+      assert.strictEqual(this.validateCondition({ maxTrustLevel: 3 }), null);
+      assert.strictEqual(
+        this.validateCondition({ minTrustLevel: 1, maxTrustLevel: 3 }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ minTrustLevel: 2, maxTrustLevel: 2 }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ groups: ["test-group"] }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({ loggedIn: true, admin: true }),
+        null
+      );
+      assert.strictEqual(
+        this.validateCondition({
+          minTrustLevel: 2,
+          groups: ["beta"],
+          staff: true,
+        }),
+        null
+      );
+    });
+  });
+
+  module("evaluate", function () {
+    module("anonymous users", function () {
+      test("fails with loggedIn: true", function (assert) {
+        assert.false(this.condition.evaluate({ loggedIn: true }));
+      });
+
+      test("passes with loggedIn: false", function (assert) {
+        assert.true(this.condition.evaluate({ loggedIn: false }));
+      });
+
+      test("fails with admin: true", function (assert) {
+        assert.false(this.condition.evaluate({ admin: true }));
+      });
+
+      test("fails with moderator: true", function (assert) {
+        assert.false(this.condition.evaluate({ moderator: true }));
+      });
+
+      test("fails with staff: true", function (assert) {
+        assert.false(this.condition.evaluate({ staff: true }));
+      });
+
+      test("fails with minTrustLevel", function (assert) {
+        assert.false(this.condition.evaluate({ minTrustLevel: 1 }));
+      });
+
+      test("fails with maxTrustLevel", function (assert) {
+        assert.false(this.condition.evaluate({ maxTrustLevel: 4 }));
+      });
+
+      test("fails with groups", function (assert) {
+        assert.false(this.condition.evaluate({ groups: ["some-group"] }));
+      });
+    });
+
+    module("logged-in users", function (nestedHooks) {
+      nestedHooks.beforeEach(function () {
+        this.condition.currentUser = {
+          admin: false,
+          moderator: false,
+          staff: false,
+          trust_level: 2,
+          groups: [{ name: "trust_level_2" }, { name: "beta-testers" }],
+        };
+      });
+
+      test("passes with loggedIn: true", function (assert) {
+        assert.true(this.condition.evaluate({ loggedIn: true }));
+      });
+
+      test("fails with loggedIn: false", function (assert) {
+        assert.false(this.condition.evaluate({ loggedIn: false }));
+      });
+
+      module("admin condition", function () {
+        test("fails when user is not admin", function (assert) {
+          assert.false(this.condition.evaluate({ admin: true }));
+        });
+
+        test("passes when user is admin", function (assert) {
+          this.condition.currentUser.admin = true;
+          assert.true(this.condition.evaluate({ admin: true }));
+        });
+
+        test("admin: false is a no-op (passes for any user)", function (assert) {
+          assert.true(
+            this.condition.evaluate({ admin: false }),
+            "non-admin user passes"
+          );
+
+          this.condition.currentUser.admin = true;
+          assert.true(
+            this.condition.evaluate({ admin: false }),
+            "admin user also passes"
+          );
+        });
+      });
+
+      module("moderator condition", function () {
+        test("fails when user is not moderator", function (assert) {
+          assert.false(this.condition.evaluate({ moderator: true }));
+        });
+
+        test("passes when user is moderator", function (assert) {
+          this.condition.currentUser.moderator = true;
+          assert.true(this.condition.evaluate({ moderator: true }));
+        });
+
+        test("passes when user is admin (admins are moderators)", function (assert) {
+          this.condition.currentUser.admin = true;
+          assert.true(this.condition.evaluate({ moderator: true }));
+        });
+
+        test("moderator: false is a no-op (passes for any user)", function (assert) {
+          assert.true(
+            this.condition.evaluate({ moderator: false }),
+            "non-moderator user passes"
+          );
+
+          this.condition.currentUser.moderator = true;
+          assert.true(
+            this.condition.evaluate({ moderator: false }),
+            "moderator user also passes"
+          );
+        });
+      });
+
+      module("staff condition", function () {
+        test("fails when user is not staff", function (assert) {
+          assert.false(this.condition.evaluate({ staff: true }));
+        });
+
+        test("passes when user is staff", function (assert) {
+          this.condition.currentUser.staff = true;
+          assert.true(this.condition.evaluate({ staff: true }));
+        });
+
+        test("staff: false is a no-op (passes for any user)", function (assert) {
+          assert.true(
+            this.condition.evaluate({ staff: false }),
+            "non-staff user passes"
+          );
+
+          this.condition.currentUser.staff = true;
+          assert.true(
+            this.condition.evaluate({ staff: false }),
+            "staff user also passes"
+          );
+        });
+      });
+
+      module("trust level conditions", function () {
+        test("passes when trust level meets minimum", function (assert) {
+          assert.true(this.condition.evaluate({ minTrustLevel: 2 }));
+        });
+
+        test("passes when trust level exceeds minimum", function (assert) {
+          assert.true(this.condition.evaluate({ minTrustLevel: 1 }));
+        });
+
+        test("fails when trust level is below minimum", function (assert) {
+          assert.false(this.condition.evaluate({ minTrustLevel: 3 }));
+        });
+
+        test("passes when trust level meets maximum", function (assert) {
+          assert.true(this.condition.evaluate({ maxTrustLevel: 2 }));
+        });
+
+        test("passes when trust level is below maximum", function (assert) {
+          assert.true(this.condition.evaluate({ maxTrustLevel: 4 }));
+        });
+
+        test("fails when trust level exceeds maximum", function (assert) {
+          assert.false(this.condition.evaluate({ maxTrustLevel: 1 }));
+        });
+
+        test("passes when trust level is within range", function (assert) {
+          assert.true(
+            this.condition.evaluate({ minTrustLevel: 1, maxTrustLevel: 3 })
+          );
+        });
+
+        test("passes when trust level equals both min and max", function (assert) {
+          assert.true(
+            this.condition.evaluate({ minTrustLevel: 2, maxTrustLevel: 2 })
+          );
+        });
+
+        test("fails when trust level is outside range", function (assert) {
+          assert.false(
+            this.condition.evaluate({ minTrustLevel: 3, maxTrustLevel: 4 })
+          );
+        });
+      });
+
+      module("group conditions", function () {
+        test("passes when user is in specified group", function (assert) {
+          assert.true(this.condition.evaluate({ groups: ["beta-testers"] }));
+        });
+
+        test("passes when user is in one of multiple groups (OR logic)", function (assert) {
+          assert.true(
+            this.condition.evaluate({
+              groups: ["alpha-testers", "beta-testers"],
+            })
+          );
+        });
+
+        test("fails when user is not in any specified group", function (assert) {
+          assert.false(
+            this.condition.evaluate({ groups: ["alpha-testers", "vip"] })
+          );
+        });
+
+        test("handles empty groups array", function (assert) {
+          this.condition.currentUser.groups = [];
+          assert.false(this.condition.evaluate({ groups: ["any-group"] }));
+        });
+
+        test("handles undefined groups", function (assert) {
+          this.condition.currentUser.groups = undefined;
+          assert.false(this.condition.evaluate({ groups: ["any-group"] }));
+        });
+      });
+
+      module("combined conditions", function () {
+        test("passes when all conditions are met", function (assert) {
+          this.condition.currentUser.staff = true;
+          assert.true(
+            this.condition.evaluate({
+              loggedIn: true,
+              staff: true,
+              minTrustLevel: 2,
+              groups: ["beta-testers"],
+            })
+          );
+        });
+
+        test("fails when one condition is not met", function (assert) {
+          assert.false(
+            this.condition.evaluate({
+              loggedIn: true,
+              admin: true,
+              minTrustLevel: 2,
+            })
+          );
+        });
+      });
+    });
+  });
+
+  module("source parameter", function () {
+    test("has sourceType of outletArgs", function (assert) {
+      assert.strictEqual(BlockUserCondition.sourceType, "outletArgs");
+    });
+
+    test("validate passes with valid source format", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({ source: "@outletArgs.user", admin: true }),
+        null
+      );
+    });
+
+    test("validate returns error with invalid source format", function (assert) {
+      const error = this.validateCondition({ source: "user", admin: true });
+      assert.notStrictEqual(error, null, "returns an error");
+      assert.true(
+        error.message.includes("must be in format"),
+        "error message mentions format"
+      );
+    });
+
+    test("validate returns error when no args specified (atLeastOne constraint)", function (assert) {
+      const error = this.validateCondition({});
+      assert.notStrictEqual(error, null, "returns an error");
+      assert.true(
+        error.message.includes("at least one of"),
+        "error message mentions atLeastOne"
+      );
+    });
+
+    test("uses user from source when provided", function (assert) {
+      const outletUser = {
+        admin: true,
+        moderator: true,
+        staff: true,
+        trust_level: 4,
+      };
+
+      const context = { outletArgs: { customUser: outletUser } };
+      const result = this.condition.evaluate(
+        { source: "@outletArgs.customUser", admin: true },
+        context
+      );
+
+      assert.true(result);
+    });
+
+    test("does NOT fall back to currentUser when source resolves to undefined", function (assert) {
+      this.condition.currentUser = {
+        admin: true,
+        trust_level: 2,
+      };
+
+      const context = { outletArgs: {} };
+      // Source is provided but resolves to undefined - should use undefined, not currentUser
+      const result = this.condition.evaluate(
+        { source: "@outletArgs.user", admin: true },
+        context
+      );
+
+      // No user found at source path, so admin check fails
+      assert.false(result);
+    });
+
+    test("checks source user properties correctly", function (assert) {
+      const outletUser = {
+        admin: false,
+        moderator: true,
+        staff: true,
+        trust_level: 3,
+      };
+
+      const context = { outletArgs: { topicAuthor: outletUser } };
+
+      // Should fail admin check on source user
+      assert.false(
+        this.condition.evaluate(
+          { source: "@outletArgs.topicAuthor", admin: true },
+          context
+        )
+      );
+
+      // Should pass moderator check on source user
+      assert.true(
+        this.condition.evaluate(
+          { source: "@outletArgs.topicAuthor", moderator: true },
+          context
+        )
+      );
+
+      // Should pass trust level check on source user
+      assert.true(
+        this.condition.evaluate(
+          { source: "@outletArgs.topicAuthor", minTrustLevel: 2 },
+          context
+        )
+      );
+    });
+
+    test("handles nested source paths", function (assert) {
+      const topicCreator = {
+        admin: true,
+        trust_level: 4,
+      };
+
+      const context = { outletArgs: { topic: { creator: topicCreator } } };
+      const result = this.condition.evaluate(
+        { source: "@outletArgs.topic.creator", admin: true },
+        context
+      );
+
+      assert.true(result);
+    });
+
+    module("nested source path error handling", function () {
+      test("handles null intermediate value in source path", function (assert) {
+        const context = { outletArgs: { topic: null } };
+        const result = this.condition.evaluate(
+          { source: "@outletArgs.topic.creator", admin: true },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles undefined intermediate value in source path", function (assert) {
+        const context = { outletArgs: { topic: { creator: undefined } } };
+        const result = this.condition.evaluate(
+          { source: "@outletArgs.topic.creator", admin: true },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles missing root property in source path", function (assert) {
+        const context = { outletArgs: {} };
+        const result = this.condition.evaluate(
+          { source: "@outletArgs.topic.creator", admin: true },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles deeply nested source path with null at various levels", function (assert) {
+        // null at first level
+        let context = { outletArgs: { a: null } };
+        assert.false(
+          this.condition.evaluate(
+            { source: "@outletArgs.a.b.c", admin: true },
+            context
+          ),
+          "null at first level"
+        );
+
+        // null at second level
+        context = { outletArgs: { a: { b: null } } };
+        assert.false(
+          this.condition.evaluate(
+            { source: "@outletArgs.a.b.c", admin: true },
+            context
+          ),
+          "null at second level"
+        );
+      });
+
+      test("handles source resolving to non-user object gracefully", function (assert) {
+        const context = { outletArgs: { topic: { creator: "not-a-user" } } };
+        const result = this.condition.evaluate(
+          { source: "@outletArgs.topic.creator", admin: true },
+          context
+        );
+        assert.false(result);
+      });
+
+      test("handles missing outletArgs in context", function (assert) {
+        const result = this.condition.evaluate(
+          { source: "@outletArgs.user", admin: true },
+          {}
+        );
+        assert.false(result);
+      });
+
+      test("handles null outletArgs in context", function (assert) {
+        const result = this.condition.evaluate(
+          { source: "@outletArgs.user", admin: true },
+          { outletArgs: null }
+        );
+        assert.false(result);
+      });
+    });
+
+    module("loggedIn comparison with currentUser", function (nestedHooks) {
+      nestedHooks.beforeEach(function () {
+        this.condition.currentUser = {
+          id: 42,
+          admin: false,
+          trust_level: 2,
+        };
+      });
+
+      test("loggedIn: true passes when source user IS currentUser", function (assert) {
+        const context = { outletArgs: { postUser: { id: 42 } } };
+        assert.true(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: true },
+            context
+          )
+        );
+      });
+
+      test("loggedIn: true fails when source user is NOT currentUser", function (assert) {
+        const context = { outletArgs: { postUser: { id: 99 } } };
+        assert.false(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: true },
+            context
+          )
+        );
+      });
+
+      test("loggedIn: true fails when source user is undefined", function (assert) {
+        const context = { outletArgs: {} };
+        assert.false(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: true },
+            context
+          )
+        );
+      });
+
+      test("loggedIn: false fails when source user IS currentUser", function (assert) {
+        const context = { outletArgs: { postUser: { id: 42 } } };
+        assert.false(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: false },
+            context
+          )
+        );
+      });
+
+      test("loggedIn: false passes when source user is NOT currentUser", function (assert) {
+        const context = { outletArgs: { postUser: { id: 99 } } };
+        assert.true(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: false },
+            context
+          )
+        );
+      });
+
+      test("loggedIn: false passes when source user is undefined", function (assert) {
+        const context = { outletArgs: {} };
+        assert.true(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: false },
+            context
+          )
+        );
+      });
+
+      test("loggedIn: true fails when currentUser is null (anon)", function (assert) {
+        this.condition.currentUser = null;
+        const context = { outletArgs: { postUser: { id: 99 } } };
+        assert.false(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: true },
+            context
+          )
+        );
+      });
+
+      test("loggedIn: false passes when currentUser is null (anon)", function (assert) {
+        this.condition.currentUser = null;
+        const context = { outletArgs: { postUser: { id: 99 } } };
+        assert.true(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: false },
+            context
+          )
+        );
+      });
+
+      test("compares by reference when users have no id", function (assert) {
+        const sharedUser = { username: "test" };
+        this.condition.currentUser = sharedUser;
+        const context = { outletArgs: { postUser: sharedUser } };
+
+        assert.true(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: true },
+            context
+          ),
+          "same reference passes"
+        );
+
+        const differentUser = { username: "test" };
+        const context2 = { outletArgs: { postUser: differentUser } };
+        assert.false(
+          this.condition.evaluate(
+            { source: "@outletArgs.postUser", loggedIn: true },
+            context2
+          ),
+          "different reference fails even with same properties"
+        );
+      });
+    });
+  });
+
+  module("static type", function () {
+    test("has correct type", function (assert) {
+      assert.strictEqual(BlockUserCondition.type, "user");
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/conditions/viewport-test.js b/frontend/discourse/tests/unit/blocks/conditions/viewport-test.js
new file mode 100644
index 0000000000000..4ca305bc1b269
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/conditions/viewport-test.js
@@ -0,0 +1,207 @@
+import { getOwner, setOwner } from "@ember/owner";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import BlockViewportCondition from "discourse/blocks/conditions/viewport";
+import { validateConditions } from "discourse/tests/helpers/block-testing";
+
+module("Unit | Blocks | Condition | viewport", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.condition = new BlockViewportCondition();
+    setOwner(this.condition, getOwner(this));
+
+    // Helper to validate via infrastructure
+    this.validateCondition = (args) => {
+      const conditionTypes = new Map([["viewport", this.condition]]);
+
+      try {
+        validateConditions({ type: "viewport", ...args }, conditionTypes);
+        return null;
+      } catch (error) {
+        return error;
+      }
+    };
+  });
+
+  module("validate (through infrastructure)", function () {
+    test("returns error for invalid min breakpoint (enum validation)", function (assert) {
+      const error = this.validateCondition({ min: "xxl" });
+      assert.true(
+        error?.message.includes("must be one of"),
+        "returns error for invalid enum"
+      );
+    });
+
+    test("returns error for invalid max breakpoint (enum validation)", function (assert) {
+      const error = this.validateCondition({ max: "invalid" });
+      assert.true(error?.message.includes("must be one of"), "returns error");
+    });
+
+    test("returns error when min > max (custom validation)", function (assert) {
+      const error = this.validateCondition({ min: "xl", max: "sm" });
+      assert.true(error?.message.includes("larger than"), "returns error");
+    });
+
+    test("passes valid breakpoint configurations", function (assert) {
+      assert.strictEqual(this.validateCondition({ min: "sm" }), null);
+      assert.strictEqual(this.validateCondition({ max: "lg" }), null);
+      assert.strictEqual(
+        this.validateCondition({ min: "md", max: "xl" }),
+        null
+      );
+      assert.strictEqual(this.validateCondition({ min: "2xl" }), null);
+      assert.strictEqual(this.validateCondition({ touch: true }), null);
+      assert.strictEqual(this.validateCondition({ touch: false }), null);
+    });
+
+    test("passes when min equals max", function (assert) {
+      assert.strictEqual(
+        this.validateCondition({ min: "md", max: "md" }),
+        null
+      );
+    });
+
+    test("returns error when min is not a string (schema type validation)", function (assert) {
+      const error = this.validateCondition({ min: 123 });
+      assert.true(error?.message.includes("must be a string"));
+    });
+
+    test("returns error when max is not a string (schema type validation)", function (assert) {
+      const error = this.validateCondition({ max: true });
+      assert.true(error?.message.includes("must be a string"));
+    });
+
+    test("returns error when touch is not a boolean (schema type validation)", function (assert) {
+      const error = this.validateCondition({ touch: 1 });
+      assert.true(error?.message.includes("must be a boolean"));
+    });
+  });
+
+  module("evaluate", function (nestedHooks) {
+    nestedHooks.beforeEach(function () {
+      this.condition.capabilities = {
+        touch: false,
+        viewport: {
+          sm: true,
+          md: true,
+          lg: false,
+          xl: false,
+          "2xl": false,
+        },
+      };
+    });
+
+    module("breakpoint conditions", function () {
+      test("passes when viewport meets minimum breakpoint", function (assert) {
+        assert.true(this.condition.evaluate({ min: "md" }));
+      });
+
+      test("passes when viewport exceeds minimum breakpoint", function (assert) {
+        assert.true(this.condition.evaluate({ min: "sm" }));
+      });
+
+      test("fails when viewport is below minimum breakpoint", function (assert) {
+        assert.false(this.condition.evaluate({ min: "lg" }));
+      });
+
+      test("passes when viewport meets maximum breakpoint", function (assert) {
+        assert.true(this.condition.evaluate({ max: "md" }));
+      });
+
+      test("passes when viewport is below maximum breakpoint", function (assert) {
+        assert.true(this.condition.evaluate({ max: "lg" }));
+      });
+
+      test("fails when viewport exceeds maximum breakpoint", function (assert) {
+        this.condition.capabilities.viewport.lg = true;
+        assert.false(this.condition.evaluate({ max: "md" }));
+      });
+
+      test("passes when viewport is within range", function (assert) {
+        assert.true(this.condition.evaluate({ min: "sm", max: "lg" }));
+      });
+
+      test("fails when viewport is below range", function (assert) {
+        this.condition.capabilities.viewport.sm = false;
+        this.condition.capabilities.viewport.md = false;
+        assert.false(this.condition.evaluate({ min: "md", max: "xl" }));
+      });
+
+      test("fails when viewport is above range", function (assert) {
+        this.condition.capabilities.viewport.lg = true;
+        this.condition.capabilities.viewport.xl = true;
+        assert.false(this.condition.evaluate({ min: "sm", max: "md" }));
+      });
+    });
+
+    module("touch device condition", function () {
+      test("passes when touch: true and device has touch", function (assert) {
+        this.condition.capabilities.touch = true;
+        assert.true(this.condition.evaluate({ touch: true }));
+      });
+
+      test("fails when touch: true and device has no touch", function (assert) {
+        assert.false(this.condition.evaluate({ touch: true }));
+      });
+
+      test("passes when touch: false and device has no touch", function (assert) {
+        assert.true(this.condition.evaluate({ touch: false }));
+      });
+
+      test("fails when touch: false and device has touch", function (assert) {
+        this.condition.capabilities.touch = true;
+        assert.false(this.condition.evaluate({ touch: false }));
+      });
+    });
+
+    module("combined conditions", function () {
+      test("passes when all conditions are met", function (assert) {
+        this.condition.capabilities.touch = true;
+        assert.true(
+          this.condition.evaluate({
+            min: "sm",
+            max: "lg",
+            touch: true,
+          })
+        );
+      });
+
+      test("fails when breakpoint condition is not met", function (assert) {
+        this.condition.capabilities.touch = true;
+        assert.false(
+          this.condition.evaluate({
+            min: "lg",
+            touch: true,
+          })
+        );
+      });
+
+      test("fails when touch condition is not met", function (assert) {
+        assert.false(
+          this.condition.evaluate({
+            min: "sm",
+            touch: true,
+          })
+        );
+      });
+    });
+  });
+
+  module("validate (constraints)", function () {
+    test("returns error when no args specified (atLeastOne constraint)", function (assert) {
+      const error = this.validateCondition({});
+      assert.notStrictEqual(error, null, "returns an error");
+      assert.true(
+        error.message.includes("at least one of"),
+        "error message mentions atLeastOne"
+      );
+    });
+  });
+
+  module("static type", function () {
+    test("has correct type", function (assert) {
+      assert.strictEqual(BlockViewportCondition.type, "viewport");
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/entry-formatter-test.js b/frontend/discourse/tests/unit/blocks/entry-formatter-test.js
new file mode 100644
index 0000000000000..8515c62361087
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/entry-formatter-test.js
@@ -0,0 +1,249 @@
+import { module, test } from "qunit";
+import {
+  formatEntryWithErrorPath,
+  parseConditionPath,
+} from "discourse/lib/blocks/-internals/error";
+
+module("Unit | Blocks | entry-formatter", function () {
+  module("parseConditionPath", function () {
+    test("parses simple dot notation", function (assert) {
+      assert.deepEqual(parseConditionPath("args.name"), ["args", "name"]);
+    });
+
+    test("parses bracket notation", function (assert) {
+      assert.deepEqual(parseConditionPath("blocks[0]"), ["blocks", 0]);
+    });
+
+    test("parses mixed dot and bracket notation", function (assert) {
+      assert.deepEqual(parseConditionPath("blocks[4].children[2].args.nme"), [
+        "blocks",
+        4,
+        "children",
+        2,
+        "args",
+        "nme",
+      ]);
+    });
+
+    test("handles consecutive brackets", function (assert) {
+      assert.deepEqual(parseConditionPath("conditions.any[0][1]"), [
+        "conditions",
+        "any",
+        0,
+        1,
+      ]);
+    });
+  });
+
+  module("formatEntryWithErrorPath", function () {
+    test("marks existing key with error comment", function (assert) {
+      const config = {
+        block: "test",
+        args: {
+          name: "value",
+        },
+      };
+
+      const result = formatEntryWithErrorPath(config, "args.name");
+
+      assert.true(
+        result.includes('name: "value", // <-- error here'),
+        "error marker should appear on existing key"
+      );
+    });
+
+    test("renders synthetic entry for non-existent key", function (assert) {
+      const config = {
+        block: "test",
+        args: {
+          name: "value",
+        },
+      };
+
+      const result = formatEntryWithErrorPath(config, "args.nme");
+
+      assert.true(
+        result.includes("nme: <missing>, // <-- error here"),
+        "should render synthetic entry for missing key 'nme'"
+      );
+      // Sibling keys are shown with their values (hybrid approach)
+      assert.true(
+        result.includes('name: "value"'),
+        "should show sibling keys with their values"
+      );
+    });
+
+    test("shows all keys with truncated values for non-path keys", function (assert) {
+      const config = {
+        block: "test",
+        args: {
+          errorKey: "bad",
+        },
+        conditions: { type: "route", name: "home" },
+        children: [{ block: "child1" }, { block: "child2" }],
+      };
+
+      const result = formatEntryWithErrorPath(config, "args.errorKey");
+
+      // Error key should have marker
+      assert.true(
+        result.includes('errorKey: "bad", // <-- error here'),
+        "error key should have marker"
+      );
+      // Non-path keys should show truncated values
+      assert.true(
+        result.includes("conditions: { ... }"),
+        "object keys not on path should show truncated"
+      );
+      assert.true(
+        result.includes("children: [ 2 items ]"),
+        "array keys not on path should show item count"
+      );
+      assert.true(
+        result.includes('block: "test"'),
+        "primitive keys not on path should show value"
+      );
+    });
+
+    test("handles nested path with non-existent final segment", function (assert) {
+      const config = {
+        blocks: [
+          {
+            block: "group",
+            args: {
+              name: "test-group",
+            },
+          },
+        ],
+      };
+
+      const result = formatEntryWithErrorPath(config, "blocks[0].args.nme");
+
+      assert.true(
+        result.includes("nme: <missing>, // <-- error here"),
+        "should render synthetic entry at nested path"
+      );
+    });
+
+    test("handles empty object parent for non-existent key", function (assert) {
+      const config = {
+        block: "test",
+        args: {},
+      };
+
+      const result = formatEntryWithErrorPath(config, "args.missingKey");
+
+      assert.true(
+        result.includes("missingKey: <missing>, // <-- error here"),
+        "should render synthetic entry in empty object"
+      );
+    });
+
+    test("shows missing intermediate key when entire parent is absent", function (assert) {
+      // When "args" is completely missing and error is "args.name"
+      const config = {
+        block: "group",
+        children: [{ block: "child1" }, { block: "child2" }],
+      };
+
+      const result = formatEntryWithErrorPath(config, "args.name");
+
+      // Should show args as missing with nested path to the error
+      assert.true(result.includes("args:"), "should show missing 'args' key");
+      assert.true(
+        result.includes("// <-- missing"),
+        "should indicate 'args' is missing"
+      );
+      assert.true(
+        result.includes("name: <missing>"),
+        "should show nested missing 'name' key"
+      );
+      assert.true(
+        result.includes("// <-- error here"),
+        "should show error marker on final key"
+      );
+    });
+
+    test("does not add synthetic entry when key exists", function (assert) {
+      const config = {
+        args: {
+          name: "value",
+        },
+      };
+
+      const result = formatEntryWithErrorPath(config, "args.name");
+      const invalidCount = (result.match(/<missing>/g) || []).length;
+
+      assert.strictEqual(
+        invalidCount,
+        0,
+        "should not add <missing> when key exists"
+      );
+    });
+
+    test("marks array item with error comment when item itself is the error", function (assert) {
+      const config = {
+        type: "route",
+        urls: ["TAG_PAGES", "/other/**"],
+      };
+
+      const result = formatEntryWithErrorPath(config, "urls[0]");
+
+      assert.true(
+        result.includes('"TAG_PAGES", // <-- error here'),
+        "error marker should appear on array item when item itself is the error location"
+      );
+    });
+
+    test("shows full nested path from root array to error", function (assert) {
+      const config = [
+        { block: "Block1", args: { name: "first" } },
+        { block: "Block2", args: { name: "second" } },
+        {
+          block: "Block3",
+          args: { name: "third" },
+          children: [
+            { block: "Child1", args: { title: "child1" } },
+            { block: "Child2", args: { nme: "typo" } },
+          ],
+        },
+        { block: "Block4", args: { name: "fourth" } },
+      ];
+
+      // Path starts with array index (no "blocks" prefix)
+      const result = formatEntryWithErrorPath(
+        config,
+        "[2].children[1].args.nme"
+      );
+
+      // Should show ... for items before [2]
+      assert.true(
+        result.includes("..."),
+        "should show ellipsis for skipped siblings"
+      );
+
+      // Should NOT show all items as { ... }
+      const truncatedCount = (result.match(/\{ \.\.\. \}/g) || []).length;
+      assert.true(
+        truncatedCount < 4,
+        `should not show all items as { ... }, got ${truncatedCount}`
+      );
+
+      // Should show the nested path to the error
+      const showsBlock = result.includes("Block3") || result.includes("block:");
+      assert.true(showsBlock, "should show the block on the error path");
+
+      // Should show children array with nested structure
+      assert.true(
+        result.includes("children:"),
+        "should show children key on path"
+      );
+
+      // Should show the error marker
+      assert.true(
+        result.includes("// <-- error here"),
+        "should show error marker"
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/blocks/error-test.js b/frontend/discourse/tests/unit/blocks/error-test.js
new file mode 100644
index 0000000000000..b3acfed81ba1e
--- /dev/null
+++ b/frontend/discourse/tests/unit/blocks/error-test.js
@@ -0,0 +1,270 @@
+import Component from "@glimmer/component";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import { raiseBlockError } from "discourse/lib/blocks/-internals/error";
+
+module("Unit | Blocks | error", function () {
+  module("raiseBlockError", function () {
+    test("includes tree-style breadcrumb when rootLayout is provided", function (assert) {
+      @block("error-test-block1")
+      class Block1 extends Component {}
+
+      @block("error-test-block2")
+      class Block2 extends Component {}
+
+      @block("error-test-block-group")
+      class BlockGroup extends Component {}
+
+      @block("error-test-child1")
+      class Child1 extends Component {}
+
+      @block("error-test-child2")
+      class Child2 extends Component {}
+
+      const rootLayout = [
+        { block: Block1, args: { name: "first" } },
+        { block: Block2, args: { name: "second" } },
+        {
+          block: BlockGroup,
+          args: { name: "callouts" },
+          children: [
+            { block: Child1, args: { title: "child1" } },
+            { block: Child2, args: { nme: "typo" } },
+          ],
+        },
+      ];
+
+      try {
+        raiseBlockError("Invalid arg name", {
+          path: "[2].children[1].args.nme",
+          rootLayout,
+        });
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(
+          error.message.includes("Location:"),
+          "should include Location header"
+        );
+        assert.true(
+          error.message.includes("└─"),
+          "should include tree-style breadcrumb"
+        );
+        assert.true(
+          error.message.includes("[2]"),
+          "should show array index in breadcrumb"
+        );
+        assert.true(
+          error.message.includes("error-test-block-group"),
+          "should show block name in breadcrumb"
+        );
+      }
+    });
+
+    test("shows nested config context from root to error", function (assert) {
+      @block("nested-context-block1")
+      class Block1 extends Component {}
+
+      @block("nested-context-block-group")
+      class BlockGroup extends Component {}
+
+      @block("nested-context-child")
+      class Child extends Component {}
+
+      const rootLayout = [
+        { block: Block1, args: { name: "first" } },
+        {
+          block: BlockGroup,
+          args: { name: "nested" },
+          children: [{ block: Child, args: { bad: "value" } }],
+        },
+      ];
+
+      try {
+        raiseBlockError("Validation error", {
+          path: "[1].children[0].args.bad",
+          rootLayout,
+        });
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(
+          error.message.includes("Context:"),
+          "should include Context section"
+        );
+        // Should show the path to error in context (either ... for skipped items or the block name)
+        const showsPath =
+          error.message.includes("...") ||
+          error.message.includes("nested-context-block-group");
+        assert.true(showsPath, "should show path to error in context");
+      }
+    });
+
+    test("uses path when errorPath is not provided", function (assert) {
+      @block("path-test-block")
+      class TestBlock extends Component {}
+
+      const rootLayout = [{ block: TestBlock, args: { name: "test" } }];
+
+      try {
+        raiseBlockError("Block error", {
+          path: "[0]",
+          rootLayout,
+        });
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(
+          error.message.includes("Location:"),
+          "should include Location even with just path"
+        );
+        assert.true(
+          error.message.includes("[0]"),
+          "should show the path location"
+        );
+      }
+    });
+
+    test("falls back to plain path when rootLayout is not provided", function (assert) {
+      try {
+        raiseBlockError("Simple error", {
+          path: "[0].args.name",
+        });
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(
+          error.message.includes("Location: [0].args.name"),
+          "should show plain path without tree-style formatting"
+        );
+      }
+    });
+
+    test("paths without prefix correctly expand nested config", function (assert) {
+      @block("prefix-test-block1")
+      class Block1 extends Component {}
+
+      @block("prefix-test-block2")
+      class Block2 extends Component {}
+
+      @block("prefix-test-block-group")
+      class BlockGroup extends Component {}
+
+      @block("prefix-test-child")
+      class Child extends Component {}
+
+      // Paths must start with array index (e.g., "[2]") not a string prefix
+      // (e.g., "blocks[2]") for the formatter to match them to the config array
+      const rootLayout = [
+        { block: Block1, args: { name: "first" } },
+        { block: Block2, args: { name: "second" } },
+        {
+          block: BlockGroup,
+          args: { name: "nested" },
+          children: [{ block: Child, args: { bad: "value" } }],
+        },
+      ];
+
+      try {
+        raiseBlockError("Validation error", {
+          // Path starts with array index, no "blocks" prefix
+          path: "[2].children[0].args.bad",
+          rootLayout,
+        });
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        const contextSection = error.message.split("Context:")[1] || "";
+
+        // Should expand the path to the error, not show all as { ... }
+        const truncatedCount = (contextSection.match(/\{ \.\.\. \}/g) || [])
+          .length;
+
+        assert.true(
+          truncatedCount < 3,
+          `Context should expand nested path. Got ${truncatedCount} truncated objects.`
+        );
+
+        // Should show the block on the error path (check for block name or the <block> format)
+        const showsBlockInfo =
+          contextSection.includes("prefix-test-block-group") ||
+          contextSection.includes("<prefix-test");
+        assert.true(showsBlockInfo, "should show block info on the error path");
+      }
+    });
+
+    test("expands nested config even with deeply nested error path", function (assert) {
+      @block("deep-test-block1")
+      class Block1 extends Component {}
+
+      @block("deep-test-block2")
+      class Block2 extends Component {}
+
+      @block("deep-test-block3")
+      class Block3 extends Component {}
+
+      @block("deep-test-block4")
+      class Block4 extends Component {}
+
+      @block("deep-test-block-group")
+      class BlockGroup extends Component {}
+
+      @block("deep-test-child1")
+      class Child1 extends Component {}
+
+      @block("deep-test-child2")
+      class Child2 extends Component {}
+
+      @block("deep-test-child3")
+      class Child3 extends Component {}
+
+      // This test mimics the CORRECT validation scenario where the path
+      // starts with array index (no "blocks" prefix)
+      const rootLayout = [
+        { block: Block1, args: { name: "first" } },
+        { block: Block2, args: { name: "second" } },
+        { block: Block3, args: { name: "third" } },
+        { block: Block4, args: { name: "fourth" } },
+        {
+          block: BlockGroup,
+          args: { name: "callouts" },
+          children: [
+            { block: Child1, args: { name: "child1" } },
+            { block: Child2, args: { name: "child2" } },
+            { block: Child3, args: { nme: "typo" } },
+          ],
+        },
+      ];
+
+      try {
+        raiseBlockError("Invalid arg", {
+          path: "[4].children[2].args.nme",
+          rootLayout,
+        });
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        // The context should NOT show all items as { ... }
+        // It should expand the path to the error
+        const contextSection = error.message.split("Context:")[1];
+
+        // Count how many { ... } truncated objects are shown
+        const truncatedCount = (contextSection.match(/\{ \.\.\. \}/g) || [])
+          .length;
+
+        // Should have at most 1-2 truncated objects (for args not on path),
+        // NOT 5 (one for each root block)
+        assert.true(
+          truncatedCount < 5,
+          `Context should expand nested path, not show all as { ... }. Got ${truncatedCount} truncated objects. Context:\n${contextSection}`
+        );
+
+        // Should show the block name on the error path (check for block name or the <block> format)
+        const showsBlockInfo =
+          contextSection.includes("deep-test-block-group") ||
+          contextSection.includes("<deep-test");
+        assert.true(showsBlockInfo, "should show block info on the error path");
+
+        // Should show children key
+        assert.true(
+          contextSection.includes("children:"),
+          "should show children array on error path"
+        );
+      }
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/block-outlet-test.js b/frontend/discourse/tests/unit/lib/block-outlet-test.js
new file mode 100644
index 0000000000000..e70c9e3e0706f
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/block-outlet-test.js
@@ -0,0 +1,898 @@
+import Component from "@glimmer/component";
+import { getOwner } from "@ember/owner";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import { _renderBlocks } from "discourse/blocks/block-outlet";
+import BlockGroup from "discourse/blocks/builtin/block-group";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import {
+  hasBlock,
+  registerBlock,
+  withTestBlockRegistration,
+} from "discourse/tests/helpers/block-testing";
+
+module("Unit | Lib | block-outlet", function (hooks) {
+  setupTest(hooks);
+
+  module("isBlock (via getBlockMetadata)", function () {
+    test("returns metadata for @block decorated components", function (assert) {
+      @block("test-decorated")
+      class DecoratedBlock extends Component {}
+
+      assert.notStrictEqual(getBlockMetadata(DecoratedBlock), null);
+    });
+
+    test("returns null for plain Glimmer components", function (assert) {
+      // eslint-disable-next-line ember/no-empty-glimmer-component-classes
+      class PlainComponent extends Component {}
+
+      assert.strictEqual(getBlockMetadata(PlainComponent), null);
+    });
+
+    test("returns null for non-component classes", function (assert) {
+      class NotAComponent {}
+
+      assert.strictEqual(getBlockMetadata(NotAComponent), null);
+    });
+
+    test("returns null/undefined for null/undefined", function (assert) {
+      assert.strictEqual(getBlockMetadata(null), null);
+      assert.strictEqual(getBlockMetadata(undefined), null);
+    });
+  });
+
+  module("@block decorator", function () {
+    test("sets blockName via getBlockMetadata", function (assert) {
+      @block("my-block-name")
+      class NamedBlock extends Component {}
+
+      assert.strictEqual(
+        getBlockMetadata(NamedBlock)?.blockName,
+        "my-block-name"
+      );
+    });
+
+    test("throws for non-Glimmer component targets", function (assert) {
+      assert.throws(() => {
+        @block("invalid-target")
+        class NotAComponent {}
+
+        return NotAComponent;
+      }, /@block target must be a Glimmer component/);
+    });
+
+    test("marks component as block via getBlockMetadata check", function (assert) {
+      @block("check-block")
+      class CheckBlock extends Component {}
+
+      assert.notStrictEqual(getBlockMetadata(CheckBlock), null);
+    });
+
+    test("sets blockMetadata with default values", function (assert) {
+      @block("metadata-default")
+      class MetadataDefaultBlock extends Component {}
+
+      const meta = getBlockMetadata(MetadataDefaultBlock);
+      assert.strictEqual(meta.blockName, "metadata-default");
+      assert.strictEqual(meta.shortName, "metadata-default");
+      assert.strictEqual(meta.namespace, null);
+      assert.strictEqual(meta.namespaceType, "core");
+      assert.false(meta.isContainer);
+      assert.strictEqual(meta.description, "");
+      assert.strictEqual(meta.decoratorClassNames, null);
+      assert.strictEqual(meta.args, null);
+      assert.strictEqual(meta.childArgs, null);
+      assert.strictEqual(meta.constraints, null);
+      assert.strictEqual(meta.validate, null);
+      assert.strictEqual(meta.allowedOutlets, null);
+      assert.strictEqual(meta.deniedOutlets, null);
+    });
+
+    test("sets blockMetadata with description", function (assert) {
+      @block("metadata-description", {
+        description: "A test block for metadata",
+      })
+      class MetadataDescriptionBlock extends Component {}
+
+      assert.strictEqual(
+        getBlockMetadata(MetadataDescriptionBlock).description,
+        "A test block for metadata"
+      );
+    });
+
+    test("sets blockMetadata with container flag", function (assert) {
+      @block("metadata-container", { container: true })
+      class MetadataContainerBlock extends Component {}
+
+      assert.true(getBlockMetadata(MetadataContainerBlock).isContainer);
+    });
+
+    test("sets blockMetadata with args schema", function (assert) {
+      @block("metadata-args", {
+        args: {
+          title: { type: "string", required: true },
+          count: { type: "number", default: 5 },
+        },
+      })
+      class MetadataArgsBlock extends Component {}
+
+      assert.deepEqual(getBlockMetadata(MetadataArgsBlock).args, {
+        title: { type: "string", required: true },
+        count: { type: "number", default: 5 },
+      });
+    });
+
+    test("freezes blockMetadata object", function (assert) {
+      @block("metadata-frozen", {
+        description: "Frozen block",
+        args: { title: { type: "string" } },
+      })
+      class MetadataFrozenBlock extends Component {}
+
+      assert.true(Object.isFrozen(getBlockMetadata(MetadataFrozenBlock)));
+      assert.true(Object.isFrozen(getBlockMetadata(MetadataFrozenBlock).args));
+    });
+
+    test("sets blockMetadata with allowedOutlets", function (assert) {
+      @block("metadata-allowed-outlets", {
+        allowedOutlets: ["sidebar-*", "homepage-blocks"],
+      })
+      class AllowedOutletsBlock extends Component {}
+
+      assert.deepEqual(getBlockMetadata(AllowedOutletsBlock).allowedOutlets, [
+        "sidebar-*",
+        "homepage-blocks",
+      ]);
+    });
+
+    test("sets blockMetadata with deniedOutlets", function (assert) {
+      @block("metadata-denied-outlets", {
+        deniedOutlets: ["modal-*", "tooltip-*"],
+      })
+      class DeniedOutletsBlock extends Component {}
+
+      assert.deepEqual(getBlockMetadata(DeniedOutletsBlock).deniedOutlets, [
+        "modal-*",
+        "tooltip-*",
+      ]);
+    });
+
+    test("freezes allowedOutlets and deniedOutlets arrays", function (assert) {
+      @block("metadata-frozen-outlets", {
+        allowedOutlets: ["sidebar-*"],
+        deniedOutlets: ["modal-*"],
+      })
+      class FrozenOutletsBlock extends Component {}
+
+      assert.true(
+        Object.isFrozen(getBlockMetadata(FrozenOutletsBlock).allowedOutlets)
+      );
+      assert.true(
+        Object.isFrozen(getBlockMetadata(FrozenOutletsBlock).deniedOutlets)
+      );
+    });
+
+    test("throws for conflicting outlet patterns", function (assert) {
+      assert.throws(() => {
+        @block("conflicting-outlets-block", {
+          allowedOutlets: ["sidebar-*"],
+          deniedOutlets: ["sidebar-blocks"],
+        })
+        class ConflictingOutletsBlock extends Component {}
+
+        return ConflictingOutletsBlock;
+      }, /matches both.*allowedOutlets.*deniedOutlets/);
+    });
+
+    test("throws for invalid allowedOutlets type", function (assert) {
+      assert.throws(() => {
+        @block("invalid-allowed-type-block", {
+          allowedOutlets: "sidebar-*",
+        })
+        class InvalidAllowedTypeBlock extends Component {}
+
+        return InvalidAllowedTypeBlock;
+      }, /must be an array of strings/);
+    });
+
+    test("throws for invalid deniedOutlets type", function (assert) {
+      assert.throws(() => {
+        @block("invalid-denied-type-block", {
+          deniedOutlets: { pattern: "sidebar-*" },
+        })
+        class InvalidDeniedTypeBlock extends Component {}
+
+        return InvalidDeniedTypeBlock;
+      }, /must be an array of strings/);
+    });
+
+    test("throws for invalid glob pattern syntax", function (assert) {
+      assert.throws(() => {
+        @block("invalid-glob-block", {
+          allowedOutlets: ["[unclosed"],
+        })
+        class InvalidGlobBlock extends Component {}
+
+        return InvalidGlobBlock;
+      }, /not valid glob syntax/);
+    });
+
+    test("throws for unknown option key with suggestion", function (assert) {
+      assert.throws(() => {
+        @block("unknown-option-block", {
+          containers: true,
+        })
+        class UnknownOptionBlock extends Component {}
+
+        return UnknownOptionBlock;
+      }, /unknown option.*"containers".*did you mean.*"container"/);
+    });
+
+    test("throws for multiple unknown option keys", function (assert) {
+      assert.throws(() => {
+        @block("multiple-unknown-block", {
+          desc: "Test",
+          containers: true,
+        })
+        class MultipleUnknownBlock extends Component {}
+
+        return MultipleUnknownBlock;
+      }, /unknown option.*"desc".*"containers".*Valid options are/);
+    });
+
+    test("throws for typo in deniedOutlets", function (assert) {
+      assert.throws(() => {
+        @block("typo-denied-block", {
+          deniedOutlet: ["sidebar-*"],
+        })
+        class TypoDeniedBlock extends Component {}
+
+        return TypoDeniedBlock;
+      }, /unknown option.*"deniedOutlet".*did you mean.*"deniedOutlets"/);
+    });
+
+    test("accepts only valid option keys", function (assert) {
+      @block("valid-options-block", {
+        container: true,
+        description: "Test block",
+        args: { title: { type: "string" } },
+        allowedOutlets: ["sidebar-*"],
+        deniedOutlets: ["modal-*"],
+      })
+      class ValidOptionsBlock extends Component {}
+
+      assert.true(getBlockMetadata(ValidOptionsBlock).isContainer);
+      assert.strictEqual(
+        getBlockMetadata(ValidOptionsBlock).description,
+        "Test block"
+      );
+    });
+
+    test("throws for invalid arg schema - missing type", function (assert) {
+      assert.throws(() => {
+        @block("invalid-schema-no-type", {
+          args: { title: { required: true } },
+        })
+        class InvalidSchemaBlock extends Component {}
+
+        return InvalidSchemaBlock;
+      }, /missing required "type" property/);
+    });
+
+    test("throws for invalid arg schema - invalid type", function (assert) {
+      assert.throws(() => {
+        @block("invalid-schema-bad-type", {
+          args: { title: { type: "invalid" } },
+        })
+        class InvalidTypeBlock extends Component {}
+
+        return InvalidTypeBlock;
+      }, /invalid type "invalid"/);
+    });
+
+    test("throws for invalid arg schema - unknown properties", function (assert) {
+      assert.throws(() => {
+        @block("invalid-schema-unknown-prop", {
+          args: { title: { type: "string", unknownProp: true } },
+        })
+        class UnknownPropBlock extends Component {}
+
+        return UnknownPropBlock;
+      }, /unknown properties/);
+    });
+
+    test("throws for classNames with invalid type", function (assert) {
+      assert.throws(() => {
+        @block("block-invalid-classnames", {
+          classNames: { foo: "bar" },
+        })
+        class BlockInvalidClassNames extends Component {}
+
+        return BlockInvalidClassNames;
+      }, /classNames.*must be a string, array, or function/);
+    });
+
+    test("accepts classNames as string", function (assert) {
+      @block("block-string-classes", {
+        classNames: "extra-class",
+      })
+      class BlockStringClasses extends Component {}
+
+      assert.strictEqual(
+        getBlockMetadata(BlockStringClasses).decoratorClassNames,
+        "extra-class"
+      );
+    });
+
+    test("accepts classNames as array", function (assert) {
+      @block("block-array-classes", {
+        classNames: ["class-a", "class-b"],
+      })
+      class BlockArrayClasses extends Component {}
+
+      assert.deepEqual(
+        getBlockMetadata(BlockArrayClasses).decoratorClassNames,
+        ["class-a", "class-b"]
+      );
+    });
+
+    test("accepts classNames as function", function (assert) {
+      const classNamesFn = (args) => `dynamic-${args.name}`;
+
+      @block("block-fn-classes", {
+        classNames: classNamesFn,
+      })
+      class BlockFnClasses extends Component {}
+
+      assert.strictEqual(
+        getBlockMetadata(BlockFnClasses).decoratorClassNames,
+        classNamesFn
+      );
+    });
+
+    test("accepts classNames on non-container blocks", function (assert) {
+      @block("non-container-with-classes", {
+        classNames: "extra-class",
+      })
+      class NonContainerWithClasses extends Component {}
+
+      assert.strictEqual(
+        getBlockMetadata(NonContainerWithClasses).decoratorClassNames,
+        "extra-class"
+      );
+      assert.false(getBlockMetadata(NonContainerWithClasses).isContainer);
+    });
+  });
+
+  module("renderBlocks validation", function () {
+    test("throws for unknown outlet names", function (assert) {
+      @block("valid-block")
+      class ValidBlock extends Component {}
+
+      assert.throws(
+        () =>
+          withPluginApi((api) =>
+            api.renderBlocks("unknown-outlet", [{ block: ValidBlock }])
+          ),
+        /Unknown block outlet/
+      );
+    });
+
+    test("throws for missing block component", async function (assert) {
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [{ args: { title: "test" } }]),
+        /missing required "block" property/
+      );
+    });
+
+    test("throws for non-@block decorated components", async function (assert) {
+      // eslint-disable-next-line ember/no-empty-glimmer-component-classes
+      class PlainComponent extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [{ block: PlainComponent }]),
+        /not a valid @block-decorated component/
+      );
+    });
+
+    test("throws for non-container block with children", async function (assert) {
+      @block("leaf-block")
+      class LeafBlock extends Component {}
+
+      @block("child-block")
+      class ChildBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: LeafBlock,
+            children: [{ block: ChildBlock }],
+          },
+        ]),
+        /cannot have children/
+      );
+    });
+
+    test("throws for container block without children", async function (assert) {
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [{ block: BlockGroup }]),
+        /must have children/
+      );
+    });
+
+    test("throws for undeclared arg: classNames", async function (assert) {
+      @block("reserved-test")
+      class ReservedTestBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: ReservedTestBlock,
+            args: { classNames: "custom" },
+          },
+        ]),
+        /does not declare an args schema/i
+      );
+    });
+
+    test("throws for undeclared arg: outletName", async function (assert) {
+      @block("reserved-outlet")
+      class ReservedOutletBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: ReservedOutletBlock,
+            args: { outletName: "test" },
+          },
+        ]),
+        /does not declare an args schema/i
+      );
+    });
+
+    test("throws for undeclared arg: children", async function (assert) {
+      @block("reserved-children")
+      class ReservedChildrenBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: ReservedChildrenBlock,
+            args: { children: [] },
+          },
+        ]),
+        /does not declare an args schema/i
+      );
+    });
+
+    test("throws for undeclared arg: conditions", async function (assert) {
+      @block("reserved-conditions")
+      class ReservedConditionsBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: ReservedConditionsBlock,
+            args: { conditions: {} },
+          },
+        ]),
+        /does not declare an args schema/i
+      );
+    });
+
+    test("throws for undeclared underscore-prefixed arg", async function (assert) {
+      @block("underscore-arg-reserved")
+      class UnderscoreArgReservedBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: UnderscoreArgReservedBlock,
+            args: { _privateArg: "value" },
+          },
+        ]),
+        /does not declare an args schema/i
+      );
+    });
+
+    test("validates nested children recursively", async function (assert) {
+      @block("nested-child")
+      class NestedChildBlock extends Component {}
+
+      // eslint-disable-next-line ember/no-empty-glimmer-component-classes
+      class NotABlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: BlockGroup,
+            id: "test",
+            children: [{ block: NestedChildBlock }, { block: NotABlock }],
+          },
+        ]),
+        /not a valid @block-decorated component/
+      );
+    });
+
+    test("validates conditions via evaluator service", async function (assert) {
+      @block("condition-validation")
+      class ConditionValidationBlock extends Component {}
+
+      const owner = getOwner(this);
+
+      await assert.rejects(
+        _renderBlocks(
+          "hero-blocks",
+          [
+            {
+              block: ConditionValidationBlock,
+              conditions: { type: "unknown-condition-type" },
+            },
+          ],
+          owner
+        ),
+        /Unknown block condition type|Invalid conditions/
+      );
+    });
+
+    test("accepts valid layout entry", function (assert) {
+      @block("valid-config", { args: { title: { type: "string" } } })
+      class ValidConfigBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [
+          { block: ValidConfigBlock, args: { title: "Test" } },
+        ])
+      );
+
+      assert.true(true, "no error thrown for valid configuration");
+    });
+
+    test("accepts container block with children", function (assert) {
+      @block("container-child")
+      class ContainerChildBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("main-outlet-blocks", [
+          {
+            block: BlockGroup,
+            id: "test",
+            children: [{ block: ContainerChildBlock }],
+          },
+        ])
+      );
+
+      assert.true(true, "no error thrown for container with children");
+    });
+
+    test("accepts block with valid conditions", function (assert) {
+      @block("valid-conditions")
+      class ValidConditionsBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: ValidConditionsBlock,
+            conditions: { type: "user", loggedIn: true },
+          },
+        ])
+      );
+
+      assert.true(true, "no error thrown for valid conditions");
+    });
+
+    test("throws for missing required arg", async function (assert) {
+      @block("required-arg-block", {
+        args: {
+          title: { type: "string", required: true },
+        },
+      })
+      class RequiredArgBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [{ block: RequiredArgBlock, args: {} }]),
+        /missing required args\.title/
+      );
+    });
+
+    test("throws for invalid arg type - string expected", async function (assert) {
+      @block("string-arg-block", {
+        args: {
+          title: { type: "string" },
+        },
+      })
+      class StringArgBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          { block: StringArgBlock, args: { title: 123 } },
+        ]),
+        /must be a string/
+      );
+    });
+
+    test("throws for invalid arg type - number expected", async function (assert) {
+      @block("number-arg-block", {
+        args: {
+          count: { type: "number" },
+        },
+      })
+      class NumberArgBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          { block: NumberArgBlock, args: { count: "five" } },
+        ]),
+        /must be a number/
+      );
+    });
+
+    test("throws for invalid arg type - boolean expected", async function (assert) {
+      @block("boolean-arg-block", {
+        args: {
+          enabled: { type: "boolean" },
+        },
+      })
+      class BooleanArgBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          { block: BooleanArgBlock, args: { enabled: "yes" } },
+        ]),
+        /must be a boolean/
+      );
+    });
+
+    test("throws for invalid arg type - array expected", async function (assert) {
+      @block("array-arg-block", {
+        args: {
+          tags: { type: "array" },
+        },
+      })
+      class ArrayArgBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          { block: ArrayArgBlock, args: { tags: "tag1,tag2" } },
+        ]),
+        /must be an array/
+      );
+    });
+
+    test("throws for invalid array item type", async function (assert) {
+      @block("array-item-type-block", {
+        args: {
+          tags: { type: "array", itemType: "string" },
+        },
+      })
+      class ArrayItemTypeBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [
+          {
+            block: ArrayItemTypeBlock,
+            args: { tags: ["valid", 123, "also-valid"] },
+          },
+        ]),
+        /must be a string/
+      );
+    });
+
+    test("accepts valid args matching schema", function (assert) {
+      @block("valid-schema-args", {
+        args: {
+          title: { type: "string", required: true },
+          count: { type: "number" },
+          enabled: { type: "boolean" },
+          tags: { type: "array", itemType: "string" },
+        },
+      })
+      class ValidSchemaArgsBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: ValidSchemaArgsBlock,
+            args: {
+              title: "Hello",
+              count: 5,
+              enabled: true,
+              tags: ["a", "b", "c"],
+            },
+          },
+        ])
+      );
+
+      assert.true(true, "no error thrown for valid args");
+    });
+
+    test("accepts optional args as undefined", function (assert) {
+      @block("optional-args-block", {
+        args: {
+          title: { type: "string", required: true },
+          subtitle: { type: "string" },
+        },
+      })
+      class OptionalArgsBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: OptionalArgsBlock,
+            args: { title: "Required Only" },
+          },
+        ])
+      );
+
+      assert.true(true, "no error thrown when optional args missing");
+    });
+
+    test("throws when block is in denied outlet", async function (assert) {
+      @block("denied-outlet-block", {
+        deniedOutlets: ["hero-*"],
+      })
+      class DeniedOutletBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [{ block: DeniedOutletBlock }]),
+        /cannot be rendered in outlet.*matches deniedOutlets pattern/
+      );
+    });
+
+    test("throws when block is not in allowed outlet", async function (assert) {
+      @block("not-allowed-outlet-block", {
+        allowedOutlets: ["sidebar-*"],
+      })
+      class NotAllowedOutletBlock extends Component {}
+
+      await assert.rejects(
+        _renderBlocks("hero-blocks", [{ block: NotAllowedOutletBlock }]),
+        /cannot be rendered in outlet.*does not match any allowedOutlets/
+      );
+    });
+
+    test("permits block in allowed outlet", function (assert) {
+      @block("allowed-outlet-block", {
+        allowedOutlets: ["sidebar-*"],
+      })
+      class AllowedOutletBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: AllowedOutletBlock }])
+      );
+
+      assert.true(true, "no error thrown for block in allowed outlet");
+    });
+
+    test("permits unrestricted block in any outlet", function (assert) {
+      @block("unrestricted-outlet-block")
+      class UnrestrictedOutletBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [{ block: UnrestrictedOutletBlock }])
+      );
+      withPluginApi((api) =>
+        api.renderBlocks("sidebar-blocks", [{ block: UnrestrictedOutletBlock }])
+      );
+
+      assert.true(true, "unrestricted block renders in any outlet");
+    });
+  });
+
+  module("edge cases", function () {
+    test("block names with invalid characters throw error", function (assert) {
+      assert.throws(() => {
+        @block("Invalid_Name")
+        class InvalidNameBlock extends Component {}
+
+        withTestBlockRegistration(() => registerBlock(InvalidNameBlock));
+      }, /Block name .* is invalid/);
+    });
+
+    test("block names starting with number throw error", function (assert) {
+      assert.throws(() => {
+        @block("123-block")
+        class NumericStartBlock extends Component {}
+
+        withTestBlockRegistration(() => registerBlock(NumericStartBlock));
+      }, /Block name .* is invalid/);
+    });
+
+    test("block names with uppercase throw error", function (assert) {
+      assert.throws(() => {
+        @block("MyBlock")
+        class UppercaseBlock extends Component {}
+
+        withTestBlockRegistration(() => registerBlock(UppercaseBlock));
+      }, /Block name .* is invalid/);
+    });
+
+    test("valid block names with hyphens and numbers work", function (assert) {
+      @block("my-block-1")
+      class ValidBlock extends Component {}
+
+      withTestBlockRegistration(() => registerBlock(ValidBlock));
+
+      assert.true(hasBlock("my-block-1"));
+    });
+
+    test("unicode in block args works correctly", function (assert) {
+      @block("unicode-args-block", {
+        args: {
+          title: { type: "string" },
+        },
+      })
+      class UnicodeArgsBlock extends Component {}
+
+      withPluginApi((api) =>
+        api.renderBlocks("hero-blocks", [
+          {
+            block: UnicodeArgsBlock,
+            args: { title: "日本語テスト 🎉 émoji" },
+          },
+        ])
+      );
+
+      assert.true(true, "unicode args accepted without error");
+    });
+
+    test("arg names with special characters in schema throw error", function (assert) {
+      assert.throws(() => {
+        @block("special-arg-names-block", {
+          args: {
+            "my@arg": { type: "string" },
+          },
+        })
+        class SpecialArgNamesBlock extends Component {}
+
+        return SpecialArgNamesBlock;
+      }, /arg name .* is invalid/);
+    });
+
+    test("arg names starting with number in schema throw error", function (assert) {
+      assert.throws(() => {
+        @block("numeric-arg-names-block", {
+          args: {
+            "123title": { type: "string" },
+          },
+        })
+        class NumericArgNamesBlock extends Component {}
+
+        return NumericArgNamesBlock;
+      }, /arg name .* is invalid/);
+    });
+
+    test("valid arg names with underscores work", function (assert) {
+      @block("underscore-arg-block", {
+        args: {
+          my_arg_name: { type: "string" },
+        },
+      })
+      class UnderscoreArgBlock extends Component {}
+
+      assert.deepEqual(getBlockMetadata(UnderscoreArgBlock).args, {
+        my_arg_name: { type: "string" },
+      });
+    });
+  });
+
+  module("condition edge cases", function () {
+    test("empty conditions array renders block (vacuous truth)", function (assert) {
+      const blocksService = this.owner.lookup("service:blocks");
+
+      const result = blocksService.evaluate([]);
+
+      assert.true(result, "empty AND array returns true");
+    });
+
+    test("empty any array does not render block", function (assert) {
+      const blocksService = this.owner.lookup("service:blocks");
+
+      const result = blocksService.evaluate({ any: [] });
+
+      assert.false(result, "empty OR array returns false");
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/core/error-test.js b/frontend/discourse/tests/unit/lib/blocks/core/error-test.js
new file mode 100644
index 0000000000000..43f9dda4f8660
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/core/error-test.js
@@ -0,0 +1,154 @@
+import Component from "@glimmer/component";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import {
+  raiseBlockError,
+  truncateForDisplay,
+} from "discourse/lib/blocks/-internals/error";
+
+module("Unit | Lib | blocks/core/error", function (hooks) {
+  setupTest(hooks);
+
+  module("raiseBlockError", function () {
+    test("throws error with Blocks prefix", function (assert) {
+      assert.throws(
+        () => raiseBlockError("Test error message"),
+        /\[Blocks\] Test error message/
+      );
+    });
+
+    test("error message includes [Blocks] prefix", function (assert) {
+      try {
+        raiseBlockError("Custom error");
+        assert.false(true, "Should have thrown");
+      } catch (error) {
+        assert.true(error.message.startsWith("[Blocks]"));
+        assert.true(error.message.includes("Custom error"));
+      }
+    });
+
+    test("preserves original message in error", function (assert) {
+      const originalMessage = "Something went wrong with block registration";
+
+      try {
+        raiseBlockError(originalMessage);
+        assert.false(true, "Should have thrown");
+      } catch (error) {
+        assert.true(error.message.includes(originalMessage));
+      }
+    });
+  });
+});
+
+module("Unit | Lib | blocks/core/error > entry-formatter", function () {
+  module("truncateForDisplay", function () {
+    test("returns primitives unchanged", function (assert) {
+      assert.strictEqual(truncateForDisplay(null), null);
+      assert.strictEqual(truncateForDisplay(undefined), undefined);
+      assert.strictEqual(truncateForDisplay(123), 123);
+      assert.strictEqual(truncateForDisplay("hello"), "hello");
+      assert.true(truncateForDisplay(true));
+    });
+
+    test("truncates deep objects at maxDepth", function (assert) {
+      const deep = { a: { b: { c: { d: "deep" } } } };
+      const result = truncateForDisplay(deep, 2);
+
+      assert.deepEqual(result, { a: { b: "{...}" } });
+    });
+
+    test("truncates arrays at maxDepth", function (assert) {
+      const deep = [[["nested"]]];
+      const result = truncateForDisplay(deep, 2);
+
+      assert.deepEqual(result, [["[...]"]]);
+    });
+
+    test("limits object keys to maxKeys", function (assert) {
+      const obj = { a: 1, b: 2, c: 3, d: 4, e: 5, f: 6 };
+      const result = truncateForDisplay(obj, 2, 3);
+
+      assert.deepEqual(result, { a: 1, b: 2, c: 3, "...": "(3 more)" });
+    });
+
+    test("limits array items to maxKeys", function (assert) {
+      const arr = [1, 2, 3, 4, 5, 6];
+      const result = truncateForDisplay(arr, 2, 3);
+
+      assert.deepEqual(result, [1, 2, 3, "..."]);
+    });
+
+    test("handles block key specially", function (assert) {
+      @block("my-block")
+      class MyBlock extends Component {}
+
+      const entry = { block: MyBlock, args: {} };
+      const result = truncateForDisplay(entry);
+
+      assert.strictEqual(result.block, "<my-block>");
+    });
+
+    test("handles children key specially", function (assert) {
+      @block("parent-block")
+      class ParentBlock extends Component {}
+
+      const entry = { block: ParentBlock, children: [{}, {}, {}] };
+      const result = truncateForDisplay(entry);
+
+      assert.strictEqual(result.children, "[3 children]");
+    });
+
+    test("handles circular references", function (assert) {
+      const circular = { name: "root" };
+      circular.self = circular;
+
+      const result = truncateForDisplay(circular);
+
+      assert.strictEqual(result.name, "root");
+      assert.strictEqual(result.self, "[Circular]");
+    });
+
+    test("handles deeply nested circular references", function (assert) {
+      const obj = { a: { b: {} } };
+      obj.a.b.circular = obj;
+
+      const result = truncateForDisplay(obj, 5);
+
+      assert.strictEqual(result.a.b.circular, "[Circular]");
+    });
+
+    test("handles circular references in arrays", function (assert) {
+      const arr = [1, 2];
+      arr.push(arr);
+
+      const result = truncateForDisplay(arr, 5);
+
+      assert.strictEqual(result[0], 1);
+      assert.strictEqual(result[1], 2);
+      assert.strictEqual(result[2], "[Circular]");
+    });
+
+    test("handles empty objects and arrays", function (assert) {
+      assert.deepEqual(truncateForDisplay({}), {});
+      assert.deepEqual(truncateForDisplay([]), []);
+    });
+
+    test("handles mixed nested structures", function (assert) {
+      @block("test-block")
+      class TestBlock extends Component {}
+
+      const config = {
+        block: TestBlock,
+        args: { title: "Hello" },
+        children: [{ block: TestBlock }],
+      };
+
+      const result = truncateForDisplay(config);
+
+      assert.strictEqual(result.block, "<test-block>");
+      assert.deepEqual(result.args, { title: "Hello" });
+      assert.strictEqual(result.children, "[1 children]");
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/core/patterns-test.js b/frontend/discourse/tests/unit/lib/blocks/core/patterns-test.js
new file mode 100644
index 0000000000000..8227837c5a875
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/core/patterns-test.js
@@ -0,0 +1,210 @@
+import { module, test } from "qunit";
+import {
+  parseBlockName,
+  parseBlockReference,
+  VALID_BLOCK_NAME_PATTERN,
+  VALID_NAMESPACED_BLOCK_PATTERN,
+} from "discourse/lib/blocks/-internals/patterns";
+
+module("Unit | Lib | blocks/core/patterns", function () {
+  module("VALID_BLOCK_NAME_PATTERN", function () {
+    test("matches valid simple block names", function (assert) {
+      assert.true(VALID_BLOCK_NAME_PATTERN.test("group"));
+      assert.true(VALID_BLOCK_NAME_PATTERN.test("hero-banner"));
+      assert.true(VALID_BLOCK_NAME_PATTERN.test("my-block-123"));
+      assert.true(VALID_BLOCK_NAME_PATTERN.test("a"));
+    });
+
+    test("rejects invalid block names", function (assert) {
+      assert.false(VALID_BLOCK_NAME_PATTERN.test(""));
+      assert.false(VALID_BLOCK_NAME_PATTERN.test("123-block"));
+      assert.false(VALID_BLOCK_NAME_PATTERN.test("-block"));
+      assert.false(VALID_BLOCK_NAME_PATTERN.test("Block"));
+      assert.false(VALID_BLOCK_NAME_PATTERN.test("my_block"));
+      assert.false(VALID_BLOCK_NAME_PATTERN.test("my block"));
+    });
+  });
+
+  module("VALID_NAMESPACED_BLOCK_PATTERN", function () {
+    test("matches core block names (no namespace)", function (assert) {
+      assert.true(VALID_NAMESPACED_BLOCK_PATTERN.test("group"));
+      assert.true(VALID_NAMESPACED_BLOCK_PATTERN.test("hero-banner"));
+      assert.true(VALID_NAMESPACED_BLOCK_PATTERN.test("my-block-123"));
+    });
+
+    test("matches plugin block names (namespace:name)", function (assert) {
+      assert.true(VALID_NAMESPACED_BLOCK_PATTERN.test("chat:message-widget"));
+      assert.true(VALID_NAMESPACED_BLOCK_PATTERN.test("my-plugin:my-block"));
+      assert.true(VALID_NAMESPACED_BLOCK_PATTERN.test("a:b"));
+    });
+
+    test("matches theme block names (theme:namespace:name)", function (assert) {
+      assert.true(
+        VALID_NAMESPACED_BLOCK_PATTERN.test("theme:tactile:hero-banner")
+      );
+      assert.true(
+        VALID_NAMESPACED_BLOCK_PATTERN.test("theme:my-theme:my-block")
+      );
+      assert.true(VALID_NAMESPACED_BLOCK_PATTERN.test("theme:a:b"));
+    });
+
+    test("rejects invalid namespaced names", function (assert) {
+      // Uppercase not allowed
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("Theme:tactile:banner"));
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("theme:Tactile:banner"));
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("Chat:widget"));
+
+      // theme: requires both namespace and name
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("theme:banner"));
+
+      // Underscores not allowed
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("my_plugin:block"));
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("plugin:my_block"));
+
+      // Empty segments not allowed
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test(":block"));
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("plugin:"));
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("theme::block"));
+
+      // Numbers can't start segments
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("123:block"));
+      assert.false(VALID_NAMESPACED_BLOCK_PATTERN.test("plugin:123block"));
+    });
+  });
+
+  module("parseBlockName", function () {
+    test("parses core block names", function (assert) {
+      const result = parseBlockName("group");
+
+      assert.deepEqual(result, {
+        type: "core",
+        namespace: null,
+        name: "group",
+      });
+    });
+
+    test("parses core block names with hyphens and numbers", function (assert) {
+      const result = parseBlockName("hero-banner-123");
+
+      assert.deepEqual(result, {
+        type: "core",
+        namespace: null,
+        name: "hero-banner-123",
+      });
+    });
+
+    test("parses plugin block names", function (assert) {
+      const result = parseBlockName("chat:message-widget");
+
+      assert.deepEqual(result, {
+        type: "plugin",
+        namespace: "chat",
+        name: "message-widget",
+      });
+    });
+
+    test("parses plugin block names with complex namespace", function (assert) {
+      const result = parseBlockName("my-plugin-name:my-block");
+
+      assert.deepEqual(result, {
+        type: "plugin",
+        namespace: "my-plugin-name",
+        name: "my-block",
+      });
+    });
+
+    test("parses theme block names", function (assert) {
+      const result = parseBlockName("theme:tactile:hero-banner");
+
+      assert.deepEqual(result, {
+        type: "theme",
+        namespace: "theme:tactile",
+        name: "hero-banner",
+      });
+    });
+
+    test("parses theme block names with complex namespace", function (assert) {
+      const result = parseBlockName("theme:my-cool-theme:sidebar-widget");
+
+      assert.deepEqual(result, {
+        type: "theme",
+        namespace: "theme:my-cool-theme",
+        name: "sidebar-widget",
+      });
+    });
+
+    test("returns null for invalid names", function (assert) {
+      assert.strictEqual(parseBlockName(""), null);
+      assert.strictEqual(parseBlockName("Invalid_Name"), null);
+      assert.strictEqual(parseBlockName("Theme:name:block"), null);
+      assert.strictEqual(parseBlockName("123:block"), null);
+      assert.strictEqual(parseBlockName("theme:block"), null);
+    });
+  });
+
+  module("parseBlockReference", function () {
+    test("parses required block reference (no ? suffix)", function (assert) {
+      const result = parseBlockReference("hero-banner");
+
+      assert.deepEqual(result, {
+        name: "hero-banner",
+        optional: false,
+      });
+    });
+
+    test("parses optional block reference (with ? suffix)", function (assert) {
+      const result = parseBlockReference("hero-banner?");
+
+      assert.deepEqual(result, {
+        name: "hero-banner",
+        optional: true,
+      });
+    });
+
+    test("parses optional namespaced plugin block", function (assert) {
+      const result = parseBlockReference("chat:widget?");
+
+      assert.deepEqual(result, {
+        name: "chat:widget",
+        optional: true,
+      });
+    });
+
+    test("parses optional namespaced theme block", function (assert) {
+      const result = parseBlockReference("theme:tactile:banner?");
+
+      assert.deepEqual(result, {
+        name: "theme:tactile:banner",
+        optional: true,
+      });
+    });
+
+    test("parses required namespaced plugin block", function (assert) {
+      const result = parseBlockReference("chat:widget");
+
+      assert.deepEqual(result, {
+        name: "chat:widget",
+        optional: false,
+      });
+    });
+
+    test("parses required namespaced theme block", function (assert) {
+      const result = parseBlockReference("theme:tactile:banner");
+
+      assert.deepEqual(result, {
+        name: "theme:tactile:banner",
+        optional: false,
+      });
+    });
+
+    test("handles non-string input", function (assert) {
+      const classRef = { blockName: "test" };
+      const result = parseBlockReference(classRef);
+
+      assert.deepEqual(result, {
+        name: classRef,
+        optional: false,
+      });
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/core/registration-test.js b/frontend/discourse/tests/unit/lib/blocks/core/registration-test.js
new file mode 100644
index 0000000000000..88043e856851b
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/core/registration-test.js
@@ -0,0 +1,1135 @@
+import Component from "@glimmer/component";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import { BlockCondition, blockCondition } from "discourse/blocks/conditions";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { OPTIONAL_MISSING } from "discourse/lib/blocks/-internals/patterns";
+import {
+  _freezeBlockRegistry,
+  _registerBlock,
+  _registerBlockFactory,
+  getBlockEntry,
+  hasBlock,
+  isBlockFactory,
+  isBlockRegistryFrozen,
+  isBlockResolved,
+  resolveBlock,
+  tryResolveBlock,
+} from "discourse/lib/blocks/-internals/registry/block";
+import {
+  _registerConditionType,
+  hasConditionType,
+} from "discourse/lib/blocks/-internals/registry/condition";
+import {
+  _freezeOutletRegistry,
+  _registerOutlet,
+  getAllOutlets,
+  getCustomOutlet,
+  isOutletRegistryFrozen,
+  isValidOutlet,
+} from "discourse/lib/blocks/-internals/registry/outlet";
+import { BLOCK_OUTLETS } from "discourse/lib/registry/block-outlets";
+import {
+  resetBlockRegistryForTesting,
+  setTestSourceIdentifier,
+} from "discourse/tests/helpers/block-testing";
+
+module("Unit | Lib | blocks/core/registration", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    resetBlockRegistryForTesting();
+  });
+
+  hooks.afterEach(function () {
+    resetBlockRegistryForTesting();
+  });
+
+  module("_registerBlock", function () {
+    test("registers a valid block", function (assert) {
+      @block("test-block")
+      class TestBlock extends Component {}
+
+      _registerBlock(TestBlock);
+
+      assert.true(hasBlock("test-block"));
+      assert.strictEqual(getBlockEntry("test-block"), TestBlock);
+    });
+
+    test("throws for class without @block decorator", function (assert) {
+      // eslint-disable-next-line ember/no-empty-glimmer-component-classes
+      class PlainComponent extends Component {}
+
+      assert.throws(
+        () => _registerBlock(PlainComponent),
+        /must be decorated with @block/
+      );
+    });
+
+    test("throws for duplicate block name", function (assert) {
+      @block("duplicate-block")
+      class FirstBlock extends Component {}
+
+      @block("duplicate-block")
+      class SecondBlock extends Component {}
+
+      _registerBlock(FirstBlock);
+
+      assert.throws(() => _registerBlock(SecondBlock), /already registered/);
+    });
+
+    test("throws after registry is frozen", function (assert) {
+      @block("frozen-test-block")
+      class FrozenTestBlock extends Component {}
+
+      _freezeBlockRegistry();
+
+      assert.throws(
+        () => _registerBlock(FrozenTestBlock),
+        /registry was frozen/
+      );
+    });
+  });
+
+  module("_freezeBlockRegistry", function () {
+    test("freezes the registry", function (assert) {
+      assert.false(isBlockRegistryFrozen());
+
+      _freezeBlockRegistry();
+
+      assert.true(isBlockRegistryFrozen());
+    });
+  });
+
+  module("resetBlockRegistryForTesting", function () {
+    test("clears the registry and unfreezes it", function (assert) {
+      @block("reset-test-block")
+      class ResetTestBlock extends Component {}
+
+      _registerBlock(ResetTestBlock);
+      _freezeBlockRegistry();
+
+      assert.true(hasBlock("reset-test-block"));
+      assert.true(isBlockRegistryFrozen());
+
+      resetBlockRegistryForTesting();
+
+      assert.false(hasBlock("reset-test-block"));
+      assert.false(isBlockRegistryFrozen());
+    });
+  });
+
+  module("_registerBlockFactory", function () {
+    test("registers a factory function", function (assert) {
+      const factory = async () => {
+        @block("lazy-block")
+        class LazyBlock extends Component {}
+        return LazyBlock;
+      };
+
+      _registerBlockFactory("lazy-block", factory);
+
+      assert.true(hasBlock("lazy-block"));
+      assert.true(isBlockFactory(getBlockEntry("lazy-block")));
+    });
+
+    test("throws for invalid name format", function (assert) {
+      assert.throws(
+        () => _registerBlockFactory("Invalid_Name", async () => ({})),
+        /is invalid.*Valid formats/
+      );
+    });
+
+    test("throws for non-function factory", function (assert) {
+      assert.throws(
+        () => _registerBlockFactory("not-function", "not a function"),
+        /must be a function/
+      );
+    });
+
+    test("throws for duplicate name", function (assert) {
+      _registerBlockFactory("dup-factory", async () => ({}));
+
+      assert.throws(
+        () => _registerBlockFactory("dup-factory", async () => ({})),
+        /already registered/
+      );
+    });
+
+    test("throws after registry is frozen", function (assert) {
+      _freezeBlockRegistry();
+
+      assert.throws(
+        () => _registerBlockFactory("frozen-factory", async () => ({})),
+        /registry was frozen/
+      );
+    });
+  });
+
+  module("isBlockFactory", function () {
+    test("returns true for factory function", function (assert) {
+      const factory = async () => ({});
+      assert.true(isBlockFactory(factory));
+    });
+
+    test("returns false for @block decorated class", function (assert) {
+      @block("decorated-class")
+      class DecoratedClass extends Component {}
+
+      assert.false(isBlockFactory(DecoratedClass));
+    });
+
+    test("returns false for non-function", function (assert) {
+      assert.false(isBlockFactory("string"));
+      assert.false(isBlockFactory(123));
+      assert.false(isBlockFactory(null));
+    });
+  });
+
+  module("hasBlock", function () {
+    test("returns true for registered class by name", function (assert) {
+      @block("has-block-test")
+      class HasBlockTest extends Component {}
+
+      _registerBlock(HasBlockTest);
+
+      assert.true(hasBlock("has-block-test"));
+    });
+
+    test("returns true for registered class by reference", function (assert) {
+      @block("has-block-ref")
+      class HasBlockRef extends Component {}
+
+      _registerBlock(HasBlockRef);
+
+      assert.true(hasBlock(HasBlockRef));
+    });
+
+    test("returns true for registered factory", function (assert) {
+      _registerBlockFactory("has-factory", async () => ({}));
+
+      assert.true(hasBlock("has-factory"));
+    });
+
+    test("returns false for unregistered name", function (assert) {
+      assert.false(hasBlock("unregistered-block"));
+    });
+  });
+
+  module("isBlockResolved", function () {
+    test("returns true for direct class registration", function (assert) {
+      @block("resolved-direct")
+      class ResolvedDirect extends Component {}
+
+      _registerBlock(ResolvedDirect);
+
+      assert.true(isBlockResolved("resolved-direct"));
+    });
+
+    test("returns true after factory resolution", async function (assert) {
+      @block("factory-resolved")
+      class FactoryResolved extends Component {}
+
+      _registerBlockFactory("factory-resolved", async () => FactoryResolved);
+
+      assert.false(isBlockResolved("factory-resolved"), "Before resolution");
+      await resolveBlock("factory-resolved");
+      assert.true(isBlockResolved("factory-resolved"), "After resolution");
+    });
+
+    test("returns false for unresolved factory", function (assert) {
+      _registerBlockFactory("unresolved-factory", async () => ({}));
+
+      assert.false(isBlockResolved("unresolved-factory"));
+    });
+
+    test("returns false for unregistered name", function (assert) {
+      assert.false(isBlockResolved("nonexistent"));
+    });
+  });
+
+  module("resolveBlock", function () {
+    test("resolves class reference directly", async function (assert) {
+      @block("direct-class")
+      class DirectClass extends Component {}
+
+      _registerBlock(DirectClass);
+
+      const resolved = await resolveBlock(DirectClass);
+      assert.strictEqual(resolved, DirectClass);
+    });
+
+    test("resolves string name to registered class", async function (assert) {
+      @block("string-lookup")
+      class StringLookup extends Component {}
+
+      _registerBlock(StringLookup);
+
+      const resolved = await resolveBlock("string-lookup");
+      assert.strictEqual(resolved, StringLookup);
+    });
+
+    test("resolves factory and caches result", async function (assert) {
+      @block("factory-resolve")
+      class FactoryResolve extends Component {}
+
+      let callCount = 0;
+      _registerBlockFactory("factory-resolve", async () => {
+        callCount++;
+        return FactoryResolve;
+      });
+
+      const first = await resolveBlock("factory-resolve");
+      const second = await resolveBlock("factory-resolve");
+
+      assert.strictEqual(first, FactoryResolve);
+      assert.strictEqual(second, FactoryResolve);
+      assert.strictEqual(callCount, 1, "Factory called only once");
+    });
+
+    test("handles default export from factory", async function (assert) {
+      @block("default-export")
+      class DefaultExport extends Component {}
+
+      _registerBlockFactory("default-export", async () => ({
+        default: DefaultExport,
+      }));
+
+      const resolved = await resolveBlock("default-export");
+      assert.strictEqual(resolved, DefaultExport);
+    });
+
+    test("updates isBlockResolved after factory resolution", async function (assert) {
+      @block("resolve-updates")
+      class ResolveUpdates extends Component {}
+
+      _registerBlockFactory("resolve-updates", async () => ResolveUpdates);
+
+      assert.false(isBlockResolved("resolve-updates"), "Before resolution");
+
+      await resolveBlock("resolve-updates");
+
+      assert.true(isBlockResolved("resolve-updates"), "After resolution");
+    });
+
+    test("throws for unregistered block name", async function (assert) {
+      await assert.rejects(resolveBlock("nonexistent"), /not registered/);
+    });
+
+    test("throws if factory returns non-block class", async function (assert) {
+      // eslint-disable-next-line ember/no-empty-glimmer-component-classes
+      class NotABlock extends Component {}
+
+      _registerBlockFactory("not-a-block", async () => NotABlock);
+
+      await assert.rejects(
+        resolveBlock("not-a-block"),
+        /did not return a valid @block-decorated class/
+      );
+    });
+
+    test("throws if factory returns block with mismatched name", async function (assert) {
+      @block("actual-name")
+      class MismatchedBlock extends Component {}
+
+      _registerBlockFactory("registered-name", async () => MismatchedBlock);
+
+      await assert.rejects(
+        resolveBlock("registered-name"),
+        /registered as "registered-name" resolved to a block with blockName "actual-name"/
+      );
+    });
+
+    test("throws for invalid block reference type", async function (assert) {
+      await assert.rejects(
+        resolveBlock(null),
+        /Invalid block reference.*expected string name or @block-decorated class/
+      );
+    });
+  });
+
+  module("namespaced blocks", function () {
+    test("registers core block (no namespace)", function (assert) {
+      @block("core-block")
+      class CoreBlock extends Component {}
+
+      _registerBlock(CoreBlock);
+
+      assert.true(hasBlock("core-block"));
+      const meta = getBlockMetadata(CoreBlock);
+      assert.strictEqual(meta.blockName, "core-block");
+      assert.strictEqual(meta.namespace, null);
+      assert.strictEqual(meta.namespaceType, "core");
+    });
+
+    test("registers plugin block (namespace:name)", function (assert) {
+      @block("chat:message-widget")
+      class MessageWidget extends Component {}
+
+      _registerBlock(MessageWidget);
+
+      assert.true(hasBlock("chat:message-widget"));
+      const meta = getBlockMetadata(MessageWidget);
+      assert.strictEqual(meta.blockName, "chat:message-widget");
+      assert.strictEqual(meta.namespace, "chat");
+      assert.strictEqual(meta.namespaceType, "plugin");
+    });
+
+    test("registers theme block (theme:namespace:name)", function (assert) {
+      @block("theme:tactile:hero-banner")
+      class HeroBanner extends Component {}
+
+      _registerBlock(HeroBanner);
+
+      assert.true(hasBlock("theme:tactile:hero-banner"));
+      const meta = getBlockMetadata(HeroBanner);
+      assert.strictEqual(meta.blockName, "theme:tactile:hero-banner");
+      assert.strictEqual(meta.namespace, "theme:tactile");
+      assert.strictEqual(meta.namespaceType, "theme");
+    });
+
+    test("registers factory with namespaced name", function (assert) {
+      _registerBlockFactory("chat:lazy-widget", async () => {
+        @block("chat:lazy-widget")
+        class LazyWidget extends Component {}
+        return LazyWidget;
+      });
+
+      assert.true(hasBlock("chat:lazy-widget"));
+    });
+
+    test("resolves factory with namespaced name", async function (assert) {
+      @block("theme:test:lazy-block")
+      class LazyBlock extends Component {}
+
+      _registerBlockFactory("theme:test:lazy-block", async () => LazyBlock);
+
+      const resolved = await resolveBlock("theme:test:lazy-block");
+      assert.strictEqual(resolved, LazyBlock);
+      assert.strictEqual(getBlockMetadata(resolved).namespaceType, "theme");
+    });
+
+    test("throws for invalid namespaced format", function (assert) {
+      // theme: requires namespace segment
+      assert.throws(() => {
+        @block("theme:invalid")
+        class InvalidTheme extends Component {}
+        _registerBlock(InvalidTheme);
+      }, /is invalid.*Valid formats/);
+    });
+  });
+
+  module("namespace enforcement", function (nestedHooks) {
+    nestedHooks.afterEach(function () {
+      setTestSourceIdentifier(undefined);
+    });
+
+    test("theme source must use theme:namespace:name format", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      @block("unnamespaced-block")
+      class UnamespacedBlock extends Component {}
+
+      assert.throws(
+        () => _registerBlock(UnamespacedBlock),
+        /Theme blocks must use the "theme:namespace:block-name" format/
+      );
+    });
+
+    test("theme source allows properly namespaced blocks", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      @block("theme:mytheme:my-block")
+      class NamespacedBlock extends Component {}
+
+      _registerBlock(NamespacedBlock);
+
+      assert.true(hasBlock("theme:mytheme:my-block"));
+    });
+
+    test("plugin source must use namespace:name format", function (assert) {
+      setTestSourceIdentifier("plugin:my-plugin");
+
+      @block("unnamespaced-plugin-block")
+      class UnamespacedPluginBlock extends Component {}
+
+      assert.throws(
+        () => _registerBlock(UnamespacedPluginBlock),
+        /Plugin blocks must use the "namespace:block-name" format/
+      );
+    });
+
+    test("plugin source allows properly namespaced blocks", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      @block("chat:message-widget")
+      class ChatWidget extends Component {}
+
+      _registerBlock(ChatWidget);
+
+      assert.true(hasBlock("chat:message-widget"));
+    });
+
+    test("factory registration enforces theme namespace", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      assert.throws(
+        () => _registerBlockFactory("my-factory-block", async () => ({})),
+        /Theme blocks must use the "theme:namespace:block-name" format/
+      );
+    });
+
+    test("factory registration enforces plugin namespace", function (assert) {
+      setTestSourceIdentifier("plugin:my-plugin");
+
+      assert.throws(
+        () => _registerBlockFactory("my-factory-block", async () => ({})),
+        /Plugin blocks must use the "namespace:block-name" format/
+      );
+    });
+
+    test("core source (null) allows unnamespaced blocks", function (assert) {
+      setTestSourceIdentifier(null);
+
+      @block("core-block")
+      class CoreBlock extends Component {}
+
+      _registerBlock(CoreBlock);
+
+      assert.true(hasBlock("core-block"));
+    });
+  });
+
+  module("resolution tracking", function () {
+    test("concurrent resolveBlock calls only invoke factory once", async function (assert) {
+      @block("concurrent-block")
+      class ConcurrentBlock extends Component {}
+
+      let callCount = 0;
+      _registerBlockFactory("concurrent-block", async () => {
+        callCount++;
+        // Add a small delay to simulate async work
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        return ConcurrentBlock;
+      });
+
+      // Start multiple resolutions concurrently (don't await yet)
+      const promise1 = resolveBlock("concurrent-block");
+      const promise2 = resolveBlock("concurrent-block");
+      const promise3 = resolveBlock("concurrent-block");
+
+      // Wait for all resolutions
+      const [result1, result2, result3] = await Promise.all([
+        promise1,
+        promise2,
+        promise3,
+      ]);
+
+      // All should resolve to the same class
+      assert.strictEqual(result1, ConcurrentBlock);
+      assert.strictEqual(result2, ConcurrentBlock);
+      assert.strictEqual(result3, ConcurrentBlock);
+
+      // The factory should only be called once despite 3 concurrent calls
+      assert.strictEqual(callCount, 1, "Factory should be called only once");
+    });
+
+    test("failed resolution is cached and not retried", async function (assert) {
+      let callCount = 0;
+      _registerBlockFactory("failing-block", async () => {
+        callCount++;
+        throw new Error("Factory failed!");
+      });
+
+      // Helper to safely resolve (catches the thrown BlockError in DEBUG mode)
+      const safeResolve = async (name) => {
+        try {
+          return await resolveBlock(name);
+        } catch {
+          return undefined;
+        }
+      };
+
+      // First resolution attempt should fail
+      const result1 = await safeResolve("failing-block");
+      assert.strictEqual(result1, undefined, "First call returns undefined");
+      assert.strictEqual(callCount, 1, "Factory called once");
+
+      // Second resolution attempt should not call factory again
+      const result2 = await safeResolve("failing-block");
+      assert.strictEqual(result2, undefined, "Second call returns undefined");
+      assert.strictEqual(callCount, 1, "Factory still only called once");
+
+      // Third attempt should also be cached
+      const result3 = await safeResolve("failing-block");
+      assert.strictEqual(result3, undefined, "Third call returns undefined");
+      assert.strictEqual(callCount, 1, "Factory still only called once");
+    });
+
+    test("resetBlockRegistryForTesting clears failed resolution cache", async function (assert) {
+      let callCount = 0;
+      const registerFailingFactory = () => {
+        _registerBlockFactory("reset-failing", async () => {
+          callCount++;
+          throw new Error("Factory failed!");
+        });
+      };
+
+      // Helper to safely resolve (catches the thrown BlockError in DEBUG mode)
+      const safeResolve = async (name) => {
+        try {
+          return await resolveBlock(name);
+        } catch {
+          return undefined;
+        }
+      };
+
+      registerFailingFactory();
+
+      // First attempt fails
+      await safeResolve("reset-failing");
+      assert.strictEqual(callCount, 1, "Factory called once");
+
+      // Second attempt is cached
+      await safeResolve("reset-failing");
+      assert.strictEqual(callCount, 1, "Factory still called once (cached)");
+
+      // Reset the registry
+      resetBlockRegistryForTesting();
+
+      // Re-register the factory
+      registerFailingFactory();
+
+      // Now factory should be called again
+      await safeResolve("reset-failing");
+      assert.strictEqual(callCount, 2, "Factory called again after reset");
+    });
+
+    test("pending resolutions are cleaned up after completion", async function (assert) {
+      @block("pending-cleanup")
+      class PendingCleanup extends Component {}
+
+      _registerBlockFactory("pending-cleanup", async () => {
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        return PendingCleanup;
+      });
+
+      // Start resolution
+      const promise = resolveBlock("pending-cleanup");
+
+      // Wait for it to complete
+      await promise;
+
+      // Start a new resolution - should create a new promise (not reuse old)
+      // This verifies pending tracking was cleaned up
+      const promise2 = resolveBlock("pending-cleanup");
+
+      // But since it's now cached in resolvedFactoryCache, should resolve immediately
+      const result = await promise2;
+      assert.strictEqual(result, PendingCleanup);
+    });
+  });
+
+  module("tryResolveBlock", function () {
+    test("returns class directly for class references", function (assert) {
+      @block("sync-class-ref")
+      class SyncClassRef extends Component {}
+
+      _registerBlock(SyncClassRef);
+
+      const result = tryResolveBlock(SyncClassRef);
+      assert.strictEqual(result, SyncClassRef);
+    });
+
+    test("returns class for registered block by string name", function (assert) {
+      @block("sync-string-lookup")
+      class SyncStringLookup extends Component {}
+
+      _registerBlock(SyncStringLookup);
+
+      const result = tryResolveBlock("sync-string-lookup");
+      assert.strictEqual(result, SyncStringLookup);
+    });
+
+    test("returns optional missing marker for optional block not registered", function (assert) {
+      const result = tryResolveBlock("nonexistent-block?");
+
+      assert.strictEqual(result.optionalMissing, OPTIONAL_MISSING);
+      assert.strictEqual(result.name, "nonexistent-block");
+    });
+
+    test("logs error and returns null for non-optional block not registered", function (assert) {
+      // eslint-disable-next-line no-console
+      const originalError = console.error;
+      let errorLogged = false;
+      // eslint-disable-next-line no-console
+      console.error = () => (errorLogged = true);
+
+      try {
+        const result = tryResolveBlock("nonexistent-required");
+
+        assert.strictEqual(result, null);
+        assert.true(errorLogged, "Should log an error");
+      } finally {
+        // eslint-disable-next-line no-console
+        console.error = originalError;
+      }
+    });
+
+    test("returns null for unresolved factory", function (assert) {
+      _registerBlockFactory("sync-unresolved-factory", async () => {
+        @block("sync-unresolved-factory")
+        class UnresolvedFactory extends Component {}
+        return UnresolvedFactory;
+      });
+
+      const result = tryResolveBlock("sync-unresolved-factory");
+
+      assert.strictEqual(
+        result,
+        null,
+        "Should return null for pending factory"
+      );
+      assert.true(
+        hasBlock("sync-unresolved-factory"),
+        "Factory should still be registered"
+      );
+    });
+
+    test("returns class for already-resolved factory", async function (assert) {
+      @block("sync-resolved-factory")
+      class ResolvedFactory extends Component {}
+
+      _registerBlockFactory(
+        "sync-resolved-factory",
+        async () => ResolvedFactory
+      );
+
+      await resolveBlock("sync-resolved-factory");
+
+      const result = tryResolveBlock("sync-resolved-factory");
+      assert.strictEqual(result, ResolvedFactory);
+    });
+  });
+
+  /* Outlet Registration */
+
+  module("_registerOutlet", function () {
+    test("registers a valid core outlet", function (assert) {
+      _registerOutlet("custom-outlet");
+
+      assert.true(isValidOutlet("custom-outlet"));
+      assert.deepEqual(getCustomOutlet("custom-outlet"), {
+        name: "custom-outlet",
+        description: undefined,
+      });
+    });
+
+    test("registers outlet with description", function (assert) {
+      _registerOutlet("described-outlet", {
+        description: "A test outlet for descriptions",
+      });
+
+      const outlet = getCustomOutlet("described-outlet");
+      assert.strictEqual(outlet.description, "A test outlet for descriptions");
+    });
+
+    test("registers plugin outlet (namespace:name)", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      _registerOutlet("chat:message-actions");
+
+      assert.true(isValidOutlet("chat:message-actions"));
+      const outlet = getCustomOutlet("chat:message-actions");
+      assert.strictEqual(outlet.name, "chat:message-actions");
+    });
+
+    test("registers theme outlet (theme:namespace:name)", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      _registerOutlet("theme:mytheme:hero-section");
+
+      assert.true(isValidOutlet("theme:mytheme:hero-section"));
+      const outlet = getCustomOutlet("theme:mytheme:hero-section");
+      assert.strictEqual(outlet.name, "theme:mytheme:hero-section");
+    });
+
+    test("throws for invalid name format", function (assert) {
+      assert.throws(
+        () => _registerOutlet("Invalid_Name"),
+        /is invalid.*Valid formats/
+      );
+    });
+
+    test("throws for duplicate outlet name", function (assert) {
+      _registerOutlet("dup-outlet");
+
+      assert.throws(() => _registerOutlet("dup-outlet"), /already registered/);
+    });
+
+    test("throws for outlet name matching core outlet", function (assert) {
+      const coreOutlet = BLOCK_OUTLETS[0];
+
+      assert.throws(
+        () => _registerOutlet(coreOutlet),
+        /already registered as a core outlet/
+      );
+    });
+
+    test("throws after registry is frozen", function (assert) {
+      _freezeOutletRegistry();
+
+      assert.throws(
+        () => _registerOutlet("frozen-outlet"),
+        /registry was frozen/
+      );
+    });
+  });
+
+  module("outlet namespace enforcement", function (nestedHooks) {
+    nestedHooks.afterEach(function () {
+      setTestSourceIdentifier(undefined);
+    });
+
+    test("theme source must use theme:namespace:name format", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      assert.throws(
+        () => _registerOutlet("unnamespaced-outlet"),
+        /Theme outlets must use the "theme:namespace:outlet-name" format/
+      );
+    });
+
+    test("theme source allows properly namespaced outlets", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      _registerOutlet("theme:mytheme:custom-outlet");
+
+      assert.true(isValidOutlet("theme:mytheme:custom-outlet"));
+    });
+
+    test("plugin source must use namespace:name format", function (assert) {
+      setTestSourceIdentifier("plugin:my-plugin");
+
+      assert.throws(
+        () => _registerOutlet("unnamespaced-plugin-outlet"),
+        /Plugin outlets must use the "namespace:outlet-name" format/
+      );
+    });
+
+    test("plugin source allows properly namespaced outlets", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      _registerOutlet("chat:sidebar-outlet");
+
+      assert.true(isValidOutlet("chat:sidebar-outlet"));
+    });
+
+    test("core source (null) allows unnamespaced outlets", function (assert) {
+      setTestSourceIdentifier(null);
+
+      _registerOutlet("core-outlet");
+
+      assert.true(isValidOutlet("core-outlet"));
+    });
+  });
+
+  module("_freezeOutletRegistry", function () {
+    test("freezes the outlet registry", function (assert) {
+      assert.false(isOutletRegistryFrozen());
+
+      _freezeOutletRegistry();
+
+      assert.true(isOutletRegistryFrozen());
+    });
+  });
+
+  module("getAllOutlets", function () {
+    test("includes core outlets", function (assert) {
+      const allOutlets = getAllOutlets();
+
+      BLOCK_OUTLETS.forEach((coreOutlet) => {
+        assert.true(
+          allOutlets.includes(coreOutlet),
+          `should include core outlet: ${coreOutlet}`
+        );
+      });
+    });
+
+    test("includes custom registered outlets", function (assert) {
+      _registerOutlet("custom-test-outlet");
+
+      const allOutlets = getAllOutlets();
+
+      assert.true(allOutlets.includes("custom-test-outlet"));
+    });
+
+    test("returns combined list of core and custom outlets", function (assert) {
+      _registerOutlet("first-custom");
+      _registerOutlet("second-custom");
+
+      const allOutlets = getAllOutlets();
+
+      assert.strictEqual(
+        allOutlets.length,
+        BLOCK_OUTLETS.length + 2,
+        "should have core outlets plus 2 custom"
+      );
+      assert.true(allOutlets.includes("first-custom"));
+      assert.true(allOutlets.includes("second-custom"));
+    });
+  });
+
+  module("isValidOutlet", function () {
+    test("returns true for core outlets", function (assert) {
+      BLOCK_OUTLETS.forEach((coreOutlet) => {
+        assert.true(
+          isValidOutlet(coreOutlet),
+          `should validate core outlet: ${coreOutlet}`
+        );
+      });
+    });
+
+    test("returns true for custom registered outlets", function (assert) {
+      _registerOutlet("valid-custom-outlet");
+
+      assert.true(isValidOutlet("valid-custom-outlet"));
+    });
+
+    test("returns false for unregistered outlets", function (assert) {
+      assert.false(isValidOutlet("nonexistent-outlet"));
+      assert.false(isValidOutlet("random:namespaced-outlet"));
+    });
+  });
+
+  module("getCustomOutlet", function () {
+    test("returns outlet data for registered custom outlet", function (assert) {
+      _registerOutlet("data-outlet", { description: "Test description" });
+
+      const outlet = getCustomOutlet("data-outlet");
+
+      assert.strictEqual(outlet.name, "data-outlet");
+      assert.strictEqual(outlet.description, "Test description");
+    });
+
+    test("returns undefined for core outlets", function (assert) {
+      const coreOutlet = BLOCK_OUTLETS[0];
+
+      assert.strictEqual(getCustomOutlet(coreOutlet), undefined);
+    });
+
+    test("returns undefined for unregistered outlets", function (assert) {
+      assert.strictEqual(getCustomOutlet("not-registered"), undefined);
+    });
+  });
+
+  module("resetBlockRegistryForTesting clears outlets", function () {
+    test("clears custom outlets and unfreezes outlet registry", function (assert) {
+      _registerOutlet("reset-test-outlet");
+      _freezeOutletRegistry();
+
+      assert.true(isValidOutlet("reset-test-outlet"));
+      assert.true(isOutletRegistryFrozen());
+
+      resetBlockRegistryForTesting();
+
+      assert.false(
+        isValidOutlet("reset-test-outlet"),
+        "custom outlet should be cleared"
+      );
+      assert.false(
+        isOutletRegistryFrozen(),
+        "outlet registry should be unfrozen"
+      );
+      assert.true(
+        isValidOutlet(BLOCK_OUTLETS[0]),
+        "core outlets should still be valid"
+      );
+    });
+  });
+
+  module("condition namespace enforcement", function (nestedHooks) {
+    nestedHooks.afterEach(function () {
+      setTestSourceIdentifier(undefined);
+    });
+
+    test("theme source must use theme:namespace:name format", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      @blockCondition({ type: "unnamespaced-condition", args: {} })
+      class UnamespacedCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.throws(
+        () => _registerConditionType(UnamespacedCondition),
+        /Theme conditions must use the "theme:namespace:condition-name" format/
+      );
+    });
+
+    test("theme source allows properly namespaced conditions", function (assert) {
+      setTestSourceIdentifier("theme:My Theme");
+
+      @blockCondition({ type: "theme:mytheme:custom-condition", args: {} })
+      class ThemeCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      _registerConditionType(ThemeCondition);
+
+      assert.true(hasConditionType("theme:mytheme:custom-condition"));
+    });
+
+    test("plugin source must use namespace:name format", function (assert) {
+      setTestSourceIdentifier("plugin:my-plugin");
+
+      @blockCondition({ type: "unnamespaced-plugin-condition", args: {} })
+      class UnamespacedCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.throws(
+        () => _registerConditionType(UnamespacedCondition),
+        /Plugin conditions must use the "namespace:condition-name" format/
+      );
+    });
+
+    test("plugin source allows properly namespaced conditions", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      @blockCondition({ type: "chat:unread-count", args: {} })
+      class ChatCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      _registerConditionType(ChatCondition);
+
+      assert.true(hasConditionType("chat:unread-count"));
+    });
+
+    test("core source (null) allows unnamespaced conditions", function (assert) {
+      setTestSourceIdentifier(null);
+
+      @blockCondition({ type: "core-condition", args: {} })
+      class CoreCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      _registerConditionType(CoreCondition);
+
+      assert.true(hasConditionType("core-condition"));
+    });
+  });
+
+  module("unified namespace consistency", function (nestedHooks) {
+    nestedHooks.afterEach(function () {
+      setTestSourceIdentifier(undefined);
+    });
+
+    test("plugin must use same namespace for blocks and conditions", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      @block("chat:message-block")
+      class ChatBlock extends Component {}
+      _registerBlock(ChatBlock);
+
+      @blockCondition({ type: "different:my-condition", args: {} })
+      class DifferentCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.throws(
+        () => _registerConditionType(DifferentCondition),
+        /already used namespace.*chat.*must use a single consistent namespace/
+      );
+    });
+
+    test("plugin must use same namespace for blocks and outlets", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      @block("chat:message-block")
+      class ChatBlock extends Component {}
+      _registerBlock(ChatBlock);
+
+      assert.throws(
+        () => _registerOutlet("different:my-outlet"),
+        /already used namespace.*chat.*must use a single consistent namespace/
+      );
+    });
+
+    test("plugin must use same namespace for outlets and conditions", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      _registerOutlet("chat:sidebar-outlet");
+
+      @blockCondition({ type: "different:my-condition", args: {} })
+      class DifferentCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.throws(
+        () => _registerConditionType(DifferentCondition),
+        /already used namespace.*chat.*must use a single consistent namespace/
+      );
+    });
+
+    test("plugin can register blocks, outlets, and conditions with same namespace", function (assert) {
+      setTestSourceIdentifier("plugin:chat");
+
+      @block("chat:message-block")
+      class ChatBlock extends Component {}
+      _registerBlock(ChatBlock);
+
+      _registerOutlet("chat:sidebar-outlet");
+
+      @blockCondition({ type: "chat:unread-count", args: {} })
+      class ChatCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+      _registerConditionType(ChatCondition);
+
+      assert.true(hasBlock("chat:message-block"));
+      assert.true(isValidOutlet("chat:sidebar-outlet"));
+      assert.true(hasConditionType("chat:unread-count"));
+    });
+
+    test("theme must use same namespace for blocks, outlets, and conditions", function (assert) {
+      setTestSourceIdentifier("theme:Tactile Theme");
+
+      @block("theme:tactile:hero-block")
+      class ThemeBlock extends Component {}
+      _registerBlock(ThemeBlock);
+
+      _registerOutlet("theme:tactile:custom-outlet");
+
+      @blockCondition({ type: "theme:tactile:dark-mode", args: {} })
+      class ThemeCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+      _registerConditionType(ThemeCondition);
+
+      assert.true(hasBlock("theme:tactile:hero-block"));
+      assert.true(isValidOutlet("theme:tactile:custom-outlet"));
+      assert.true(hasConditionType("theme:tactile:dark-mode"));
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/core/utils-test.js b/frontend/discourse/tests/unit/lib/blocks/core/utils-test.js
new file mode 100644
index 0000000000000..32596492141f4
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/core/utils-test.js
@@ -0,0 +1,134 @@
+import Component from "@glimmer/component";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import { applyArgDefaults } from "discourse/lib/blocks/-internals/utils";
+
+module("Unit | Lib | blocks/core/utils", function () {
+  module("applyArgDefaults", function () {
+    test("returns original args when no schema", function (assert) {
+      @block("no-schema-block")
+      class NoSchemaBlock extends Component {}
+
+      const providedArgs = { title: "Hello", count: 5 };
+      const result = applyArgDefaults(NoSchemaBlock, providedArgs);
+
+      assert.deepEqual(result, providedArgs);
+    });
+
+    test("returns original args when component is not a block", function (assert) {
+      // eslint-disable-next-line ember/no-empty-glimmer-component-classes
+      class PlainComponent extends Component {}
+      const providedArgs = { title: "Hello" };
+
+      const result = applyArgDefaults(PlainComponent, providedArgs);
+
+      assert.deepEqual(result, providedArgs);
+    });
+
+    test("applies defaults for undefined args", function (assert) {
+      @block("defaults-block", {
+        args: {
+          title: { type: "string", default: "Default Title" },
+          count: { type: "number", default: 0 },
+          enabled: { type: "boolean", default: true },
+        },
+      })
+      class DefaultsBlock extends Component {}
+
+      const providedArgs = {};
+      const result = applyArgDefaults(DefaultsBlock, providedArgs);
+
+      assert.deepEqual(result, {
+        title: "Default Title",
+        count: 0,
+        enabled: true,
+      });
+    });
+
+    test("does not override provided args", function (assert) {
+      @block("override-block", {
+        args: {
+          title: { type: "string", default: "Default Title" },
+          count: { type: "number", default: 0 },
+        },
+      })
+      class OverrideBlock extends Component {}
+
+      const providedArgs = { title: "Custom Title", count: 42 };
+      const result = applyArgDefaults(OverrideBlock, providedArgs);
+
+      assert.deepEqual(result, { title: "Custom Title", count: 42 });
+    });
+
+    test("applies defaults only for missing args (partial args)", function (assert) {
+      @block("partial-args-block", {
+        args: {
+          title: { type: "string", default: "Default Title" },
+          subtitle: { type: "string", default: "Default Subtitle" },
+          count: { type: "number", default: 0 },
+        },
+      })
+      class PartialArgsBlock extends Component {}
+
+      const providedArgs = { title: "Custom Title" };
+      const result = applyArgDefaults(PartialArgsBlock, providedArgs);
+
+      assert.deepEqual(result, {
+        title: "Custom Title",
+        subtitle: "Default Subtitle",
+        count: 0,
+      });
+    });
+
+    test("does not apply defaults for args with no default value", function (assert) {
+      @block("no-default-block", {
+        args: {
+          title: { type: "string", required: true },
+          count: { type: "number", default: 5 },
+        },
+      })
+      class NoDefaultBlock extends Component {}
+
+      const providedArgs = {};
+      const result = applyArgDefaults(NoDefaultBlock, providedArgs);
+
+      assert.deepEqual(result, { count: 5 });
+      assert.false("title" in result, "Title should not be added");
+    });
+
+    test("preserves null and false values in provided args", function (assert) {
+      @block("preserve-values-block", {
+        args: {
+          value: { type: "string", default: "default" },
+          enabled: { type: "boolean", default: true },
+        },
+      })
+      class PreserveValuesBlock extends Component {}
+
+      const providedArgs = { value: null, enabled: false };
+      const result = applyArgDefaults(PreserveValuesBlock, providedArgs);
+
+      assert.strictEqual(result.value, null, "Null should be preserved");
+      assert.false(result.enabled, "False should be preserved");
+    });
+
+    test("returns a new object (does not mutate input)", function (assert) {
+      @block("immutable-block", {
+        args: {
+          count: { type: "number", default: 0 },
+        },
+      })
+      class ImmutableBlock extends Component {}
+
+      const providedArgs = { title: "Hello" };
+      const result = applyArgDefaults(ImmutableBlock, providedArgs);
+
+      assert.notStrictEqual(result, providedArgs, "Should return new object");
+      assert.deepEqual(
+        providedArgs,
+        { title: "Hello" },
+        "Original should not be mutated"
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/debug/debug-logger-test.js b/frontend/discourse/tests/unit/lib/blocks/debug/debug-logger-test.js
new file mode 100644
index 0000000000000..250b9ada6dece
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/debug/debug-logger-test.js
@@ -0,0 +1,888 @@
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import sinon from "sinon";
+import { blockDebugLogger } from "discourse/static/dev-tools/block-debug/debug-logger";
+
+module("Unit | Lib | blocks/debug-logger", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.consoleStub = {
+      log: sinon.stub(console, "log"),
+      debug: sinon.stub(console, "debug"),
+      groupCollapsed: sinon.stub(console, "groupCollapsed"),
+      groupEnd: sinon.stub(console, "groupEnd"),
+    };
+  });
+
+  hooks.afterEach(function () {
+    this.consoleStub.log.restore();
+    this.consoleStub.debug.restore();
+    this.consoleStub.groupCollapsed.restore();
+    this.consoleStub.groupEnd.restore();
+  });
+
+  module("startGroup", function () {
+    test("creates new group entry", function (assert) {
+      assert.false(blockDebugLogger.hasActiveGroup());
+
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+
+      assert.true(blockDebugLogger.hasActiveGroup());
+
+      blockDebugLogger.endGroup(true);
+    });
+  });
+
+  module("logCondition", function () {
+    test("adds condition to current group", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: { loggedIn: true },
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.endGroup(true);
+
+      assert.true(
+        this.consoleStub.log.calledOnce,
+        "console.log called for condition"
+      );
+    });
+
+    test("logs standalone when no group active", function (assert) {
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: { loggedIn: true },
+        result: true,
+        depth: 0,
+      });
+
+      assert.true(
+        this.consoleStub.debug.calledOnce,
+        "console.debug called for standalone condition"
+      );
+      const [message] = this.consoleStub.debug.firstCall.args;
+      assert.true(message.includes("[Blocks]"));
+      assert.true(message.includes("user"));
+    });
+  });
+
+  module("updateCombinatorResult", function () {
+    test("updates pending combinator result", function (assert) {
+      // Simulates a simple condition tree:
+      // AND (depth 0)
+      //   user (depth 1)
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "AND",
+        args: "2 conditions",
+        result: null,
+        depth: 0,
+      });
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: { loggedIn: true },
+        result: true,
+        depth: 1,
+      });
+      blockDebugLogger.updateCombinatorResult(true, 0);
+      blockDebugLogger.endGroup(true);
+
+      // groupCollapsed called twice: once for main block, once for AND (has children)
+      assert.strictEqual(
+        this.consoleStub.groupCollapsed.callCount,
+        2,
+        "console.groupCollapsed called for main block and AND combinator"
+      );
+      // log called once for user condition (no children)
+      assert.strictEqual(
+        this.consoleStub.log.callCount,
+        1,
+        "one condition logged with console.log"
+      );
+    });
+
+    test("does nothing when no group active", function (assert) {
+      blockDebugLogger.updateCombinatorResult(true, 0);
+      assert.true(
+        this.consoleStub.log.notCalled,
+        "no console output without group"
+      );
+    });
+  });
+
+  module("endGroup", function () {
+    test("flushes logs to console", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: { loggedIn: true },
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.endGroup(true);
+
+      assert.true(
+        this.consoleStub.groupCollapsed.calledOnce,
+        "console.groupCollapsed called"
+      );
+      assert.true(
+        this.consoleStub.groupEnd.calledOnce,
+        "console.groupEnd called"
+      );
+    });
+
+    test("clears group after flush", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: {},
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.endGroup(true);
+
+      assert.false(blockDebugLogger.hasActiveGroup());
+    });
+
+    test("does nothing with empty logs", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.endGroup(true);
+
+      assert.true(
+        this.consoleStub.groupCollapsed.notCalled,
+        "no console group for empty logs"
+      );
+    });
+
+    test("shows RENDERED status for passing blocks", function (assert) {
+      blockDebugLogger.startGroup("my-block", null, "homepage-blocks");
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: {},
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.endGroup(true);
+
+      const [message] = this.consoleStub.groupCollapsed.firstCall.args;
+      assert.true(message.includes("RENDERED"));
+      assert.true(message.includes("my-block"));
+      assert.true(message.includes("homepage-blocks"));
+    });
+
+    test("shows SKIPPED status for failing blocks", function (assert) {
+      blockDebugLogger.startGroup("my-block", null, "homepage-blocks");
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: {},
+        result: false,
+        depth: 0,
+      });
+      blockDebugLogger.endGroup(false);
+
+      const [message] = this.consoleStub.groupCollapsed.firstCall.args;
+      assert.true(message.includes("SKIPPED"));
+    });
+
+    test("includes block id in display name and shows hierarchy with parent id", function (assert) {
+      // Simulates a block with id "upcoming-events" inside a container with id "callouts"
+      blockDebugLogger.startGroup(
+        "theme:tactile:upcoming-events",
+        "upcoming-events",
+        "homepage-blocks/head(#callouts)"
+      );
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: {},
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.endGroup(true);
+
+      const [message] = this.consoleStub.groupCollapsed.firstCall.args;
+      assert.true(
+        message.includes("theme:tactile:upcoming-events(#upcoming-events)"),
+        "block name includes its own id"
+      );
+      assert.true(
+        message.includes("in homepage-blocks/head(#callouts)"),
+        "hierarchy includes parent container id"
+      );
+    });
+
+    test("does nothing when no group active", function (assert) {
+      blockDebugLogger.endGroup(true);
+
+      assert.true(
+        this.consoleStub.groupCollapsed.notCalled,
+        "no console output without group"
+      );
+    });
+  });
+
+  module("nested groups", function () {
+    test("maintains correct hierarchy with nested conditions", function (assert) {
+      // Simulates a condition tree with sibling combinators:
+      // AND (depth 0)
+      //   user (depth 1)
+      //   OR (depth 1)
+      //     route (depth 2)
+      blockDebugLogger.startGroup("outer-block", null, "outlet-name");
+
+      blockDebugLogger.logCondition({
+        type: "AND",
+        args: "2 conditions",
+        result: null,
+        depth: 0,
+      });
+      blockDebugLogger.logCondition({
+        type: "user",
+        args: { loggedIn: true },
+        result: true,
+        depth: 1,
+      });
+      blockDebugLogger.logCondition({
+        type: "OR",
+        args: "2 conditions",
+        result: null,
+        depth: 1,
+      });
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { urls: ["/"] },
+        result: true,
+        depth: 2,
+      });
+      blockDebugLogger.updateCombinatorResult(true, 1);
+      blockDebugLogger.updateCombinatorResult(true, 0);
+
+      blockDebugLogger.endGroup(true);
+
+      // AND (depth 0) has children (user at depth 1) → groupCollapsed
+      // user (depth 1) has no children (OR is at same depth) → log
+      // OR (depth 1) has children (route at depth 2) → groupCollapsed
+      // route (depth 2) has no children → log
+      // Plus the main block group → total groupCollapsed = 3
+      assert.strictEqual(
+        this.consoleStub.groupCollapsed.callCount,
+        3,
+        "three groups collapsed (main + AND + OR)"
+      );
+      assert.strictEqual(
+        this.consoleStub.log.callCount,
+        2,
+        "two conditions logged with console.log (user + route)"
+      );
+    });
+
+    test("deeply nested conditions maintain proper group hierarchy", function (assert) {
+      // Simulates a complex condition tree like:
+      // AND (depth 0)
+      //   route (depth 1)
+      //     route-state (depth 2)
+      //     OR (depth 2) - queryParams with { any: [...] }
+      //       param-group (depth 3)
+      //       param-group (depth 3)
+      //   setting (depth 1)
+      blockDebugLogger.startGroup("complex-block", null, "main-outlet");
+
+      // Top-level AND combinator
+      blockDebugLogger.logCondition({
+        type: "AND",
+        args: "2 conditions",
+        result: null,
+        depth: 0,
+      });
+
+      // First child: route condition with nested children
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { urls: ["/c/**"], queryParams: { any: [] } },
+        result: null,
+        depth: 1,
+      });
+
+      // route-state logged by route condition
+      blockDebugLogger.logRouteState({
+        currentPath: "/c/general",
+        expectedUrls: ["/c/**"],
+        excludeUrls: undefined,
+        actualParams: { slug: "general" },
+        depth: 2,
+        result: true,
+      });
+
+      // OR combinator for queryParams { any: [...] }
+      blockDebugLogger.logCondition({
+        type: "OR",
+        args: "2 queryParams specs",
+        result: null,
+        depth: 2,
+      });
+
+      // First queryParams spec
+      blockDebugLogger.logParamGroup({
+        label: "queryParams[0]",
+        matches: [
+          {
+            key: "preview_theme_id",
+            expected: { any: ["3", "4"] },
+            actual: "3",
+            result: true,
+          },
+        ],
+        result: true,
+        depth: 3,
+      });
+
+      // Second queryParams spec
+      blockDebugLogger.logParamGroup({
+        label: "queryParams[1]",
+        matches: [
+          {
+            key: "preview_theme_id",
+            expected: { any: ["6", "7"] },
+            actual: "3",
+            result: false,
+          },
+        ],
+        result: false,
+        depth: 3,
+      });
+
+      blockDebugLogger.updateCombinatorResult(true, 2); // OR passed
+      blockDebugLogger.updateConditionResult("route", true, 1); // route passed
+
+      // Second child of AND: simple setting condition
+      blockDebugLogger.logCondition({
+        type: "setting",
+        args: { name: "enable_feature" },
+        result: true,
+        depth: 1,
+      });
+
+      blockDebugLogger.updateCombinatorResult(true, 0); // AND passed
+
+      blockDebugLogger.endGroup(true);
+
+      // Expected groupCollapsed calls:
+      // 1. Main block group
+      // 2. AND (depth 0) - has children at depth 1
+      // 3. route (depth 1) - has children at depth 2
+      // 4. OR (depth 2) - has children at depth 3
+      // Note: route-state now uses console.log instead of groupCollapsed
+      assert.strictEqual(
+        this.consoleStub.groupCollapsed.callCount,
+        4,
+        "four groups collapsed (main + AND + route + OR)"
+      );
+
+      // Expected groupEnd calls should match groupCollapsed
+      assert.strictEqual(
+        this.consoleStub.groupEnd.callCount,
+        4,
+        "four groups ended (main + AND + route + OR)"
+      );
+
+      // Expected console.log calls:
+      // 1. setting (depth 1) - no children
+      // 2. queryParams[0] param-group (single key, logs directly)
+      // 3. queryParams[1] param-group (single key, logs directly)
+      // 4. route-state (current URL line)
+      assert.true(
+        this.consoleStub.log.callCount >= 4,
+        "at least four log calls for leaf conditions and route-state"
+      );
+    });
+  });
+
+  module("hasActiveGroup", function () {
+    test("returns false when no group active", function (assert) {
+      assert.false(blockDebugLogger.hasActiveGroup());
+    });
+
+    test("returns true when group is active", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      assert.true(blockDebugLogger.hasActiveGroup());
+      blockDebugLogger.endGroup(true);
+    });
+  });
+
+  module("logRouteState", function () {
+    test("displays checkmark when URL matches", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { urls: ["/latest"] },
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.logRouteState({
+        currentPath: "/latest",
+        expectedUrls: ["/latest"],
+        excludeUrls: undefined,
+        actualParams: {},
+        _unusedQueryParams: {},
+        depth: 1,
+        result: true,
+      });
+      blockDebugLogger.endGroup(true);
+
+      const routeStateCall = this.consoleStub.log
+        .getCalls()
+        .find((call) => call.args[0]?.includes?.("current URL"));
+      assert.true(!!routeStateCall, "route-state log was called");
+      assert.true(
+        routeStateCall.args[0].includes("\u2713"),
+        "displays checkmark for matching URL"
+      );
+    });
+
+    test("displays X when URL does not match", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { urls: ["/c/**"] },
+        result: false,
+        depth: 0,
+      });
+      blockDebugLogger.logRouteState({
+        currentPath: "/latest",
+        expectedUrls: ["/c/**"],
+        excludeUrls: undefined,
+        actualParams: {},
+        _unusedQueryParams: {},
+        depth: 1,
+        result: false,
+      });
+      blockDebugLogger.endGroup(false);
+
+      const routeStateCall = this.consoleStub.log
+        .getCalls()
+        .find((call) => call.args[0]?.includes?.("current URL"));
+      assert.true(!!routeStateCall, "route-state log was called");
+      assert.true(
+        routeStateCall.args[0].includes("\u2717"),
+        "displays X for non-matching URL"
+      );
+    });
+
+    test("includes actual and expected URLs in output", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { urls: ["/c/**"] },
+        result: false,
+        depth: 0,
+      });
+      blockDebugLogger.logRouteState({
+        currentPath: "/latest",
+        expectedUrls: ["/c/**"],
+        excludeUrls: undefined,
+        actualParams: {},
+        _unusedQueryParams: {},
+        depth: 1,
+        result: false,
+      });
+      blockDebugLogger.endGroup(false);
+
+      const routeStateCall = this.consoleStub.log
+        .getCalls()
+        .find((call) => call.args[0]?.includes?.("current URL"));
+      // The last argument should be an object with actual and expected
+      const dataArg = routeStateCall.args[routeStateCall.args.length - 1];
+      assert.strictEqual(dataArg.actual, "/latest", "includes actual URL");
+      assert.deepEqual(
+        dataArg.expected,
+        { urls: ["/c/**"] },
+        "includes expected URL patterns"
+      );
+    });
+
+    test("includes excludeUrls in expected when using exclusion", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { excludeUrls: ["$HOMEPAGE"] },
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.logRouteState({
+        currentPath: "/latest",
+        expectedUrls: undefined,
+        excludeUrls: ["$HOMEPAGE"],
+        actualParams: {},
+        _unusedQueryParams: {},
+        depth: 1,
+        result: true,
+      });
+      blockDebugLogger.endGroup(true);
+
+      const routeStateCall = this.consoleStub.log
+        .getCalls()
+        .find((call) => call.args[0]?.includes?.("current URL"));
+      const dataArg = routeStateCall.args[routeStateCall.args.length - 1];
+      assert.strictEqual(dataArg.actual, "/latest", "includes actual URL");
+      assert.deepEqual(
+        dataArg.expected,
+        { excludeUrls: ["$HOMEPAGE"] },
+        "wraps excludeUrls in object for clarity"
+      );
+    });
+
+    test("logs page type and params as siblings when using pages", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { pages: ["TOPIC_PAGES"], params: { id: 123 } },
+        result: true,
+        depth: 0,
+      });
+      blockDebugLogger.logRouteState({
+        currentPath: "/t/my-topic/123",
+        pages: ["TOPIC_PAGES"],
+        matchedPageType: "TOPIC_PAGES",
+        actualPageContext: {
+          pageType: "TOPIC_PAGES",
+          id: 123,
+          slug: "my-topic",
+        },
+        depth: 1,
+        result: true,
+      });
+      // Params are now logged via logCondition (like queryParams)
+      blockDebugLogger.logCondition({
+        type: "params",
+        args: { actual: { id: 123 }, expected: { id: 123 } },
+        result: true,
+        depth: 1,
+      });
+      blockDebugLogger.endGroup(true);
+
+      // Page type and params should be logged as siblings
+      const logCalls = this.consoleStub.log.getCalls();
+      const pageTypeCall = logCalls.find((call) =>
+        call.args[0]?.includes?.("on TOPIC_PAGES")
+      );
+      const paramsCall = logCalls.find((call) =>
+        call.args[0]?.includes?.("params")
+      );
+      const queryParamsCall = logCalls.find((call) =>
+        call.args[0]?.includes?.("queryParams")
+      );
+
+      assert.true(!!pageTypeCall, "page type was logged");
+      assert.true(!!paramsCall, "params was logged");
+      assert.false(
+        !!queryParamsCall,
+        "queryParams not logged without expected"
+      );
+    });
+
+    test("shows page type matched even when params do not match", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { pages: ["CATEGORY_PAGES"], params: { categoryId: 1 } },
+        result: false,
+        depth: 0,
+      });
+      blockDebugLogger.logRouteState({
+        currentPath: "/c/general/4",
+        pages: ["CATEGORY_PAGES"],
+        matchedPageType: null,
+        actualPageContext: {
+          pageType: "CATEGORY_PAGES",
+          categoryId: 4,
+          categorySlug: "general",
+        },
+        depth: 1,
+        result: false,
+      });
+      // Params are now logged via logCondition (like queryParams)
+      blockDebugLogger.logCondition({
+        type: "params",
+        args: { actual: { categoryId: 4 }, expected: { categoryId: 1 } },
+        result: false,
+        depth: 1,
+      });
+      blockDebugLogger.endGroup(false);
+
+      const logCalls = this.consoleStub.log.getCalls();
+
+      // Page type should show as matched (checkmark) because we ARE on CATEGORY_PAGES
+      const pageTypeCall = logCalls.find((call) =>
+        call.args[0]?.includes?.("on CATEGORY_PAGES")
+      );
+      assert.true(!!pageTypeCall, "page type was logged");
+      assert.true(
+        pageTypeCall.args[0].includes("\u2713"),
+        "shows checkmark for matching page type"
+      );
+
+      // Params should show as failed (X) because categoryId doesn't match
+      const paramsCall = logCalls.find((call) =>
+        call.args[0]?.includes?.("params")
+      );
+      assert.true(!!paramsCall, "params was logged");
+      assert.true(
+        paramsCall.args[0].includes("\u2717"),
+        "shows X for non-matching params"
+      );
+    });
+
+    test("shows actual page type when expected page type does not match", function (assert) {
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { pages: ["CATEGORY_PAGES"], params: { categoryId: 1 } },
+        result: false,
+        depth: 0,
+      });
+      blockDebugLogger.logRouteState({
+        currentPath: "/t/my-topic/123",
+        pages: ["CATEGORY_PAGES"],
+        params: { categoryId: 1 },
+        matchedPageType: null,
+        actualPageType: "TOPIC_PAGES",
+        actualPageContext: null,
+        _unusedQueryParams: {},
+        depth: 1,
+        result: false,
+      });
+      blockDebugLogger.endGroup(false);
+
+      const logCalls = this.consoleStub.log.getCalls();
+
+      // Should show "not on CATEGORY_PAGES (actual: TOPIC_PAGES)"
+      const pageTypeCall = logCalls.find((call) =>
+        call.args[0]?.includes?.("not on CATEGORY_PAGES")
+      );
+      assert.true(!!pageTypeCall, "page type mismatch was logged");
+      assert.true(
+        pageTypeCall.args[0].includes("(actual: TOPIC_PAGES)"),
+        "shows actual page type"
+      );
+    });
+  });
+
+  module("params with operators", function () {
+    test("logs params summary and OR combinator for { any: [...] }", function (assert) {
+      // Simulates the logging structure for params: { any: [...] }
+      // Both params summary and OR combinator should be logged
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+
+      // Route condition (parent)
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { pages: ["CATEGORY_PAGES"] },
+        result: true,
+        depth: 0,
+      });
+
+      // Page type matched
+      blockDebugLogger.logRouteState({
+        currentPath: "/c/general/4",
+        pages: ["CATEGORY_PAGES"],
+        matchedPageType: "CATEGORY_PAGES",
+        actualPageContext: { pageType: "CATEGORY_PAGES", categoryId: 4 },
+        depth: 1,
+        result: true,
+      });
+
+      // Params summary (logged before nested OR)
+      const paramsSpec = { _isParams: true };
+      blockDebugLogger.logCondition({
+        type: "params",
+        args: {
+          actual: { categoryId: 4 },
+          expected: { any: [{ categoryId: 1 }, { categoryId: 4 }] },
+        },
+        result: null,
+        depth: 1,
+        conditionSpec: paramsSpec,
+      });
+
+      // OR combinator (nested under params at deeper depth)
+      const orSpec = { any: [{ categoryId: 1 }, { categoryId: 4 }] };
+      blockDebugLogger.logCondition({
+        type: "OR",
+        args: "2 params specs",
+        result: null,
+        depth: 2,
+        conditionSpec: orSpec,
+      });
+
+      // Individual param checks (nested under OR)
+      blockDebugLogger.logParamGroup({
+        label: "params",
+        matches: [{ key: "categoryId", expected: 1, actual: 4, result: false }],
+        result: false,
+        depth: 3,
+      });
+      blockDebugLogger.logParamGroup({
+        label: "params",
+        matches: [{ key: "categoryId", expected: 4, actual: 4, result: true }],
+        result: true,
+        depth: 3,
+      });
+
+      // Update results
+      blockDebugLogger.updateCombinatorResult(orSpec, true);
+      blockDebugLogger.updateConditionResult(paramsSpec, true);
+
+      blockDebugLogger.endGroup(true);
+
+      const logCalls = this.consoleStub.log.getCalls();
+      const groupCalls = this.consoleStub.groupCollapsed.getCalls();
+      const allCalls = [...logCalls, ...groupCalls];
+
+      // Verify params summary was logged (may be in groupCollapsed if it has children)
+      const paramsSummaryCall = allCalls.find(
+        (call) =>
+          call.args[0]?.includes?.("params") &&
+          !call.args[0]?.includes?.("OR") &&
+          !call.args[0]?.includes?.("categoryId")
+      );
+      assert.true(!!paramsSummaryCall, "params summary was logged");
+
+      // Verify OR combinator was logged
+      const orCall = allCalls.find((call) => call.args[0]?.includes?.("OR"));
+      assert.true(!!orCall, "OR combinator was logged");
+    });
+
+    test("logs params summary and NOT combinator for { not: {...} }", function (assert) {
+      // Simulates the logging structure for params: { not: {...} }
+      // Both params summary and NOT combinator should be logged
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+
+      // Route condition (parent)
+      blockDebugLogger.logCondition({
+        type: "route",
+        args: { pages: ["CATEGORY_PAGES"] },
+        result: true,
+        depth: 0,
+      });
+
+      // Page type matched
+      blockDebugLogger.logRouteState({
+        currentPath: "/c/general/4",
+        pages: ["CATEGORY_PAGES"],
+        matchedPageType: "CATEGORY_PAGES",
+        actualPageContext: { pageType: "CATEGORY_PAGES", categoryId: 4 },
+        depth: 1,
+        result: true,
+      });
+
+      // Params summary (logged before nested NOT)
+      const paramsSpec = { _isParams: true };
+      blockDebugLogger.logCondition({
+        type: "params",
+        args: {
+          actual: { categoryId: 4 },
+          expected: { not: { categoryId: 10 } },
+        },
+        result: null,
+        depth: 1,
+        conditionSpec: paramsSpec,
+      });
+
+      // NOT combinator (nested under params at deeper depth)
+      const notSpec = { not: { categoryId: 10 } };
+      blockDebugLogger.logCondition({
+        type: "NOT",
+        args: null,
+        result: null,
+        depth: 2,
+        conditionSpec: notSpec,
+      });
+
+      // Inner param check (nested under NOT)
+      blockDebugLogger.logParamGroup({
+        label: "params",
+        matches: [
+          { key: "categoryId", expected: 10, actual: 4, result: false },
+        ],
+        result: false,
+        depth: 3,
+      });
+
+      // Update results (NOT inverts the inner false to true)
+      blockDebugLogger.updateCombinatorResult(notSpec, true);
+      blockDebugLogger.updateConditionResult(paramsSpec, true);
+
+      blockDebugLogger.endGroup(true);
+
+      const logCalls = this.consoleStub.log.getCalls();
+      const groupCalls = this.consoleStub.groupCollapsed.getCalls();
+      const allCalls = [...logCalls, ...groupCalls];
+
+      // Verify params summary was logged (may be in groupCollapsed if it has children)
+      const paramsSummaryCall = allCalls.find(
+        (call) =>
+          call.args[0]?.includes?.("params") &&
+          !call.args[0]?.includes?.("NOT") &&
+          !call.args[0]?.includes?.("categoryId")
+      );
+      assert.true(!!paramsSummaryCall, "params summary was logged");
+
+      // Verify NOT combinator was logged
+      const notCall = allCalls.find((call) => call.args[0]?.includes?.("NOT"));
+      assert.true(!!notCall, "NOT combinator was logged");
+    });
+
+    test("params at depth 1 renders before OR at depth 2 in tree", function (assert) {
+      // Verifies that params (depth 1) appears before OR (depth 2) in the log buffer
+      // The tree structure should have params as parent of OR
+      blockDebugLogger.startGroup("test-block", null, "outlet-name");
+
+      // Params at depth 1 (parent)
+      const paramsSpec = { _isParams: true };
+      blockDebugLogger.logCondition({
+        type: "params",
+        args: { actual: {}, expected: {} },
+        result: null,
+        depth: 1,
+        conditionSpec: paramsSpec,
+      });
+
+      // OR at depth 2 (child of params)
+      const orSpec = {};
+      blockDebugLogger.logCondition({
+        type: "OR",
+        args: "2 specs",
+        result: null,
+        depth: 2,
+        conditionSpec: orSpec,
+      });
+
+      blockDebugLogger.updateCombinatorResult(orSpec, true);
+      blockDebugLogger.updateConditionResult(paramsSpec, true);
+
+      blockDebugLogger.endGroup(true);
+
+      const logCalls = this.consoleStub.log.getCalls();
+      const groupCalls = this.consoleStub.groupCollapsed.getCalls();
+
+      // Params has children (OR at depth 2), so it's logged as groupCollapsed
+      const paramsCall = groupCalls.find((call) =>
+        call.args[0]?.includes?.("params")
+      );
+      assert.true(!!paramsCall, "params was logged as group (has children)");
+
+      // OR has no children, so it's logged with console.log
+      const orCall = logCalls.find((call) => call.args[0]?.includes?.("OR"));
+      assert.true(!!orCall, "OR was logged");
+
+      // Verify params group opened before OR was logged
+      // The group structure ensures params is the parent containing OR
+      assert.true(
+        groupCalls.some((call) => call.args[0]?.includes?.("params")),
+        "params group exists for tree hierarchy"
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/matching/outlet-matcher-test.js b/frontend/discourse/tests/unit/lib/blocks/matching/outlet-matcher-test.js
new file mode 100644
index 0000000000000..31cb382d3e872
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/matching/outlet-matcher-test.js
@@ -0,0 +1,494 @@
+import { module, test } from "qunit";
+import sinon from "sinon";
+import {
+  detectPatternConflicts,
+  isBlockPermittedInOutlet,
+  isNamespacedPattern,
+  matchOutletPattern,
+  validateOutletPatterns,
+  warnUnknownOutletPatterns,
+} from "discourse/lib/blocks/-internals/matching/outlet-matcher";
+
+module("Unit | Lib | Blocks | outlet-matcher", function () {
+  module("isNamespacedPattern", function () {
+    test("returns true for plugin-namespaced patterns", function (assert) {
+      assert.true(isNamespacedPattern("my-plugin:dashboard"));
+      assert.true(isNamespacedPattern("my-plugin:settings-panel"));
+      assert.true(isNamespacedPattern("discourse-ai:chat-sidebar"));
+    });
+
+    test("returns true for theme-namespaced patterns", function (assert) {
+      assert.true(isNamespacedPattern("my-theme:hero-section"));
+      assert.true(isNamespacedPattern("tactile-theme:main-outlet"));
+    });
+
+    test("returns false for core outlet patterns", function (assert) {
+      assert.false(isNamespacedPattern("sidebar-blocks"));
+      assert.false(isNamespacedPattern("homepage-blocks"));
+      assert.false(isNamespacedPattern("header-blocks"));
+    });
+
+    test("returns false for wildcard patterns without namespace", function (assert) {
+      assert.false(isNamespacedPattern("sidebar-*"));
+      assert.false(isNamespacedPattern("*-blocks"));
+      assert.false(isNamespacedPattern("**"));
+    });
+
+    test("returns true for wildcard patterns with namespace", function (assert) {
+      assert.true(isNamespacedPattern("my-plugin:*"));
+      assert.true(isNamespacedPattern("my-plugin:**"));
+      assert.true(isNamespacedPattern("*:outlet"));
+    });
+  });
+
+  module("matchOutletPattern", function () {
+    module("exact match", function () {
+      test("matches exact outlet names", function (assert) {
+        assert.true(matchOutletPattern("sidebar-blocks", "sidebar-blocks"));
+        assert.true(matchOutletPattern("homepage-blocks", "homepage-blocks"));
+      });
+
+      test("does not match different names", function (assert) {
+        assert.false(matchOutletPattern("sidebar-blocks", "homepage-blocks"));
+        assert.false(matchOutletPattern("hero-blocks", "header-blocks"));
+      });
+    });
+
+    module("single wildcard (*)", function () {
+      test("matches any characters", function (assert) {
+        assert.true(matchOutletPattern("sidebar-left", "sidebar-*"));
+        assert.true(matchOutletPattern("sidebar-right", "sidebar-*"));
+        assert.true(matchOutletPattern("sidebar-blocks", "sidebar-*"));
+      });
+
+      test("matches multiple hyphen segments (character wildcard)", function (assert) {
+        assert.true(matchOutletPattern("sidebar-left-top", "sidebar-*"));
+        assert.true(matchOutletPattern("sidebar-right-bottom", "sidebar-*"));
+      });
+
+      test("works at start of pattern", function (assert) {
+        assert.true(matchOutletPattern("hero-blocks", "*-blocks"));
+        assert.true(matchOutletPattern("sidebar-blocks", "*-blocks"));
+        assert.true(matchOutletPattern("homepage-blocks", "*-blocks"));
+      });
+
+      test("works in middle of pattern", function (assert) {
+        assert.true(
+          matchOutletPattern("admin-users-settings", "admin-*-settings")
+        );
+      });
+
+      test("matches empty after prefix (picomatch behavior)", function (assert) {
+        // In picomatch, * matches zero or more characters
+        assert.true(matchOutletPattern("sidebar-", "sidebar-*"));
+      });
+    });
+
+    module("double wildcard (**)", function () {
+      test("matches everything", function (assert) {
+        assert.true(matchOutletPattern("sidebar-blocks", "**"));
+        assert.true(matchOutletPattern("anything", "**"));
+      });
+
+      test("matches at end", function (assert) {
+        assert.true(matchOutletPattern("admin-plugins", "admin-**"));
+        assert.true(matchOutletPattern("admin-plugins-settings", "admin-**"));
+      });
+    });
+
+    module("brace expansion {...}", function () {
+      test("matches any option", function (assert) {
+        assert.true(
+          matchOutletPattern("sidebar-blocks", "{sidebar,homepage}-blocks")
+        );
+        assert.true(
+          matchOutletPattern("homepage-blocks", "{sidebar,homepage}-blocks")
+        );
+      });
+
+      test("does not match other values", function (assert) {
+        assert.false(
+          matchOutletPattern("hero-blocks", "{sidebar,homepage}-blocks")
+        );
+      });
+
+      test("works with wildcards", function (assert) {
+        assert.true(matchOutletPattern("sidebar-left", "{sidebar,footer}-*"));
+        assert.true(matchOutletPattern("footer-main", "{sidebar,footer}-*"));
+        assert.false(matchOutletPattern("header-blocks", "{sidebar,footer}-*"));
+      });
+    });
+
+    module("character class [...]", function () {
+      test("matches characters in class", function (assert) {
+        assert.true(matchOutletPattern("modal-1", "modal-[0-9]"));
+        assert.true(matchOutletPattern("modal-5", "modal-[0-9]"));
+      });
+
+      test("does not match characters outside class", function (assert) {
+        assert.false(matchOutletPattern("modal-a", "modal-[0-9]"));
+      });
+
+      test("works with wildcards", function (assert) {
+        assert.true(matchOutletPattern("modal-1-content", "modal-[0-9]*"));
+      });
+    });
+
+    module("question mark (?)", function () {
+      test("matches single character", function (assert) {
+        assert.true(matchOutletPattern("modal-1", "modal-?"));
+        assert.true(matchOutletPattern("modal-a", "modal-?"));
+      });
+
+      test("does not match multiple characters", function (assert) {
+        assert.false(matchOutletPattern("modal-12", "modal-?"));
+      });
+    });
+
+    module("negation !()", function () {
+      test("matches anything except pattern", function (assert) {
+        assert.true(matchOutletPattern("sidebar-blocks", "!(*-debug)"));
+        assert.true(matchOutletPattern("homepage-blocks", "!(*-debug)"));
+        assert.false(matchOutletPattern("sidebar-debug", "!(*-debug)"));
+      });
+    });
+
+    module("namespaced outlets", function () {
+      test("matches namespaced outlet exactly", function (assert) {
+        assert.true(
+          matchOutletPattern("my-plugin:dashboard", "my-plugin:dashboard")
+        );
+      });
+
+      test("matches namespaced outlet with wildcard", function (assert) {
+        assert.true(matchOutletPattern("my-plugin:dashboard", "my-plugin:*"));
+        assert.true(matchOutletPattern("my-plugin:settings", "my-plugin:*"));
+      });
+
+      test("matches any namespace with wildcard", function (assert) {
+        assert.true(matchOutletPattern("plugin-a:outlet", "*:outlet"));
+        assert.true(matchOutletPattern("plugin-b:outlet", "*:outlet"));
+      });
+    });
+  });
+
+  module("validateOutletPatterns", function () {
+    test("accepts null (no restrictions)", function (assert) {
+      assert.strictEqual(
+        validateOutletPatterns(null, "test-block", "allowedOutlets"),
+        undefined
+      );
+    });
+
+    test("accepts undefined (no restrictions)", function (assert) {
+      assert.strictEqual(
+        validateOutletPatterns(undefined, "test-block", "allowedOutlets"),
+        undefined
+      );
+    });
+
+    test("accepts valid patterns array", function (assert) {
+      assert.strictEqual(
+        validateOutletPatterns(
+          ["sidebar-*", "homepage-blocks"],
+          "test-block",
+          "allowedOutlets"
+        ),
+        undefined
+      );
+    });
+
+    test("accepts empty array", function (assert) {
+      assert.strictEqual(
+        validateOutletPatterns([], "test-block", "allowedOutlets"),
+        undefined
+      );
+    });
+
+    test("accepts advanced glob patterns", function (assert) {
+      assert.strictEqual(
+        validateOutletPatterns(
+          ["{sidebar,footer}-*", "modal-[0-9]*", "!(*-debug)"],
+          "test-block",
+          "allowedOutlets"
+        ),
+        undefined
+      );
+    });
+
+    test("accepts namespaced patterns", function (assert) {
+      assert.strictEqual(
+        validateOutletPatterns(
+          ["my-plugin:dashboard", "my-theme:*"],
+          "test-block",
+          "allowedOutlets"
+        ),
+        undefined
+      );
+    });
+  });
+
+  module("detectPatternConflicts", function () {
+    test("returns no conflict for null/undefined lists", function (assert) {
+      assert.deepEqual(detectPatternConflicts(null, null), { conflict: false });
+      assert.deepEqual(detectPatternConflicts(null, ["sidebar-*"]), {
+        conflict: false,
+      });
+      assert.deepEqual(detectPatternConflicts(["sidebar-*"], null), {
+        conflict: false,
+      });
+      assert.deepEqual(detectPatternConflicts(undefined, ["sidebar-*"]), {
+        conflict: false,
+      });
+    });
+
+    test("returns no conflict for empty lists", function (assert) {
+      assert.deepEqual(detectPatternConflicts([], []), { conflict: false });
+      assert.deepEqual(detectPatternConflicts([], ["sidebar-*"]), {
+        conflict: false,
+      });
+      assert.deepEqual(detectPatternConflicts(["sidebar-*"], []), {
+        conflict: false,
+      });
+    });
+
+    test("returns no conflict for non-overlapping patterns", function (assert) {
+      const result = detectPatternConflicts(["sidebar-*"], ["homepage-*"]);
+      assert.deepEqual(result, { conflict: false });
+    });
+
+    test("detects conflict with exact same pattern", function (assert) {
+      const result = detectPatternConflicts(
+        ["sidebar-blocks"],
+        ["sidebar-blocks"]
+      );
+      assert.true(result.conflict);
+      assert.strictEqual(result.details.outlet, "sidebar-blocks");
+    });
+
+    test("detects conflict when known outlet matches both", function (assert) {
+      const result = detectPatternConflicts(["*-blocks"], ["sidebar-*"]);
+      assert.true(result.conflict);
+      assert.strictEqual(result.details.outlet, "sidebar-blocks");
+    });
+
+    test("detects conflict with synthetic test strings", function (assert) {
+      const result = detectPatternConflicts(["custom-*"], ["custom-*"]);
+      assert.true(result.conflict);
+    });
+
+    test("detects conflict with overlapping wildcard patterns", function (assert) {
+      const result = detectPatternConflicts(["test-*"], ["*-outlet"]);
+      assert.true(result.conflict);
+    });
+  });
+
+  module("isBlockPermittedInOutlet", function () {
+    module("no restrictions", function () {
+      test("permits when both lists are null", function (assert) {
+        const result = isBlockPermittedInOutlet("sidebar-blocks", null, null);
+        assert.true(result.permitted);
+        assert.strictEqual(result.reason, undefined);
+      });
+
+      test("permits when both lists are undefined", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "sidebar-blocks",
+          undefined,
+          undefined
+        );
+        assert.true(result.permitted);
+      });
+    });
+
+    module("allowedOutlets only", function () {
+      test("permits when outlet matches allowed pattern", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "sidebar-blocks",
+          ["sidebar-*"],
+          null
+        );
+        assert.true(result.permitted);
+      });
+
+      test("denies when outlet does not match any allowed pattern", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "homepage-blocks",
+          ["sidebar-*"],
+          null
+        );
+        assert.false(result.permitted);
+        assert.true(
+          result.reason.includes("does not match any allowedOutlets pattern")
+        );
+      });
+
+      test("permits when outlet matches one of multiple allowed patterns", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "homepage-blocks",
+          ["sidebar-*", "homepage-*"],
+          null
+        );
+        assert.true(result.permitted);
+      });
+
+      test("denies when allowedOutlets is empty array (strict whitelist)", function (assert) {
+        const result = isBlockPermittedInOutlet("sidebar-blocks", [], null);
+        assert.false(result.permitted);
+      });
+    });
+
+    module("deniedOutlets only", function () {
+      test("denies when outlet matches denied pattern", function (assert) {
+        const result = isBlockPermittedInOutlet("sidebar-blocks", null, [
+          "sidebar-*",
+        ]);
+        assert.false(result.permitted);
+        assert.true(result.reason.includes("matches deniedOutlets pattern"));
+      });
+
+      test("permits when outlet does not match any denied pattern", function (assert) {
+        const result = isBlockPermittedInOutlet("homepage-blocks", null, [
+          "sidebar-*",
+        ]);
+        assert.true(result.permitted);
+      });
+
+      test("denies when outlet matches one of multiple denied patterns", function (assert) {
+        const result = isBlockPermittedInOutlet("sidebar-blocks", null, [
+          "sidebar-*",
+          "modal-*",
+        ]);
+        assert.false(result.permitted);
+      });
+
+      test("permits when deniedOutlets is empty array", function (assert) {
+        const result = isBlockPermittedInOutlet("sidebar-blocks", null, []);
+        assert.true(result.permitted);
+      });
+    });
+
+    module("both lists specified", function () {
+      test("permits when outlet matches allowed and not denied", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "sidebar-left",
+          ["sidebar-*"],
+          ["sidebar-debug"]
+        );
+        assert.true(result.permitted);
+      });
+
+      test("denies when outlet matches denied (deny wins)", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "sidebar-debug",
+          ["sidebar-*"],
+          ["*-debug"]
+        );
+        assert.false(result.permitted);
+        assert.true(result.reason.includes("matches deniedOutlets pattern"));
+      });
+
+      test("denies when outlet matches neither", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "homepage-blocks",
+          ["sidebar-*"],
+          ["modal-*"]
+        );
+        assert.false(result.permitted);
+        assert.true(
+          result.reason.includes("does not match any allowedOutlets pattern")
+        );
+      });
+    });
+
+    module("namespaced outlets", function () {
+      test("permits namespaced outlet when matches allowed", function (assert) {
+        const result = isBlockPermittedInOutlet(
+          "my-plugin:dashboard",
+          ["my-plugin:*"],
+          null
+        );
+        assert.true(result.permitted);
+      });
+
+      test("denies namespaced outlet when matches denied", function (assert) {
+        const result = isBlockPermittedInOutlet("my-plugin:debug", null, [
+          "*:debug",
+        ]);
+        assert.false(result.permitted);
+      });
+    });
+  });
+
+  module("warnUnknownOutletPatterns", function (hooks) {
+    let consoleSpy;
+
+    hooks.beforeEach(function () {
+      consoleSpy = sinon.spy(console, "warn");
+    });
+
+    hooks.afterEach(function () {
+      consoleSpy.restore();
+    });
+
+    test("does not warn for null patterns", function (assert) {
+      warnUnknownOutletPatterns(null, "test-block", "allowedOutlets");
+      assert.false(consoleSpy.called);
+    });
+
+    test("does not warn for empty patterns", function (assert) {
+      warnUnknownOutletPatterns([], "test-block", "allowedOutlets");
+      assert.false(consoleSpy.called);
+    });
+
+    test("does not warn for patterns matching known outlets", function (assert) {
+      warnUnknownOutletPatterns(["sidebar-*"], "test-block", "allowedOutlets");
+      assert.false(consoleSpy.called);
+    });
+
+    test("warns for unregistered namespaced patterns", function (assert) {
+      // Namespaced patterns are now validated against registered outlets
+      // If a custom outlet is not registered, a warning is issued
+      warnUnknownOutletPatterns(
+        ["my-plugin:custom-outlet", "my-theme:hero"],
+        "test-block",
+        "allowedOutlets"
+      );
+      assert.strictEqual(
+        consoleSpy.callCount,
+        2,
+        "warns for each unregistered namespaced pattern"
+      );
+    });
+
+    test("warns for patterns not matching any registered outlet", function (assert) {
+      warnUnknownOutletPatterns(
+        ["unknown-outlet-*"],
+        "test-block",
+        "allowedOutlets"
+      );
+      assert.true(consoleSpy.calledOnce);
+      assert.true(
+        consoleSpy.firstCall.args[0].includes(
+          "does not match any registered outlet"
+        )
+      );
+      assert.true(consoleSpy.firstCall.args[0].includes("test-block"));
+      assert.true(consoleSpy.firstCall.args[0].includes("allowedOutlets"));
+    });
+
+    test("warns for typos in outlet names", function (assert) {
+      warnUnknownOutletPatterns(["sidbar-*"], "test-block", "allowedOutlets");
+      assert.true(consoleSpy.calledOnce);
+    });
+
+    test("warns for each unmatched pattern", function (assert) {
+      warnUnknownOutletPatterns(
+        ["unknown-a", "unknown-b", "sidebar-*"],
+        "test-block",
+        "allowedOutlets"
+      );
+      assert.strictEqual(consoleSpy.callCount, 2);
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/matching/page-definitions-test.js b/frontend/discourse/tests/unit/lib/blocks/matching/page-definitions-test.js
new file mode 100644
index 0000000000000..392c8e23f393c
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/matching/page-definitions-test.js
@@ -0,0 +1,565 @@
+import { module, test } from "qunit";
+import {
+  getCurrentPageType,
+  getPageContext,
+  getParamsForPageType,
+  getValidParamNames,
+  isValidPageType,
+  PAGE_DEFINITIONS,
+  suggestPageType,
+  VALID_PAGE_TYPES,
+  validateParamsAgainstPages,
+  validateParamType,
+} from "discourse/lib/blocks/-internals/matching/page-definitions";
+
+module("Unit | Lib | blocks/matching/page-definitions", function () {
+  module("PAGE_DEFINITIONS", function () {
+    test("contains expected page types", function (assert) {
+      const expectedTypes = [
+        "CATEGORY_PAGES",
+        "TAG_PAGES",
+        "DISCOVERY_PAGES",
+        "HOMEPAGE",
+        "TOP_MENU",
+        "TOPIC_PAGES",
+        "USER_PAGES",
+        "ADMIN_PAGES",
+        "GROUP_PAGES",
+      ];
+
+      for (const type of expectedTypes) {
+        assert.true(type in PAGE_DEFINITIONS, `${type} should be defined`);
+      }
+    });
+
+    test("each page type has description and params", function (assert) {
+      for (const [name, definition] of Object.entries(PAGE_DEFINITIONS)) {
+        assert.strictEqual(
+          typeof definition.description,
+          "string",
+          `${name} should have a string description`
+        );
+        assert.strictEqual(
+          typeof definition.params,
+          "object",
+          `${name} should have params object`
+        );
+      }
+    });
+  });
+
+  module("VALID_PAGE_TYPES", function () {
+    test("is an array of strings", function (assert) {
+      assert.true(Array.isArray(VALID_PAGE_TYPES));
+      for (const type of VALID_PAGE_TYPES) {
+        assert.strictEqual(typeof type, "string");
+      }
+    });
+
+    test("matches PAGE_DEFINITIONS keys", function (assert) {
+      const definitionKeys = Object.keys(PAGE_DEFINITIONS);
+      assert.deepEqual(VALID_PAGE_TYPES.sort(), definitionKeys.sort());
+    });
+  });
+
+  module("isValidPageType", function () {
+    test("returns true for valid page types", function (assert) {
+      assert.true(isValidPageType("CATEGORY_PAGES"));
+      assert.true(isValidPageType("TOPIC_PAGES"));
+      assert.true(isValidPageType("HOMEPAGE"));
+    });
+
+    test("returns false for invalid page types", function (assert) {
+      assert.false(isValidPageType("INVALID_TYPE"));
+      assert.false(isValidPageType("category_pages"));
+      assert.false(isValidPageType(""));
+      assert.false(isValidPageType(null));
+    });
+  });
+
+  module("getParamsForPageType", function () {
+    test("returns params object for valid page type", function (assert) {
+      const params = getParamsForPageType("CATEGORY_PAGES");
+
+      assert.strictEqual(typeof params, "object");
+      assert.true("categoryId" in params);
+      assert.true("categorySlug" in params);
+      assert.true("parentCategoryId" in params);
+    });
+
+    test("returns null for invalid page type", function (assert) {
+      assert.strictEqual(getParamsForPageType("INVALID_TYPE"), null);
+    });
+
+    test("returns empty object for page types with no params", function (assert) {
+      const params = getParamsForPageType("HOMEPAGE");
+      assert.deepEqual(params, {});
+    });
+
+    test("each param has type and description", function (assert) {
+      const params = getParamsForPageType("TOPIC_PAGES");
+
+      for (const [name, definition] of Object.entries(params)) {
+        assert.true(
+          ["string", "number"].includes(definition.type),
+          `${name} should have valid type`
+        );
+        assert.strictEqual(
+          typeof definition.description,
+          "string",
+          `${name} should have description`
+        );
+      }
+    });
+  });
+
+  module("getValidParamNames", function () {
+    test("returns array of param names for valid page type", function (assert) {
+      const names = getValidParamNames("CATEGORY_PAGES");
+
+      assert.true(Array.isArray(names));
+      assert.true(names.includes("categoryId"));
+      assert.true(names.includes("categorySlug"));
+      assert.true(names.includes("parentCategoryId"));
+    });
+
+    test("returns empty array for invalid page type", function (assert) {
+      assert.deepEqual(getValidParamNames("INVALID_TYPE"), []);
+    });
+
+    test("returns empty array for page types with no params", function (assert) {
+      assert.deepEqual(getValidParamNames("HOMEPAGE"), []);
+    });
+  });
+
+  module("suggestPageType", function () {
+    test("suggests closest match for typos", function (assert) {
+      assert.strictEqual(suggestPageType("CATEGORY_PAGE"), "CATEGORY_PAGES");
+      assert.strictEqual(suggestPageType("TOPIC_PAGE"), "TOPIC_PAGES");
+    });
+
+    test("suggests match for case variations", function (assert) {
+      assert.strictEqual(suggestPageType("category_pages"), "CATEGORY_PAGES");
+    });
+
+    test("returns null for completely unrelated strings", function (assert) {
+      const result = suggestPageType("xyz123abc");
+      const isValidResult =
+        result === null || VALID_PAGE_TYPES.includes(result);
+      assert.true(isValidResult, "Should return null or a valid page type");
+    });
+  });
+
+  module("validateParamsAgainstPages", function () {
+    test("returns valid for empty params", function (assert) {
+      const result = validateParamsAgainstPages({}, ["CATEGORY_PAGES"]);
+      assert.true(result.valid);
+      assert.deepEqual(result.errors, []);
+    });
+
+    test("returns valid for null/undefined params", function (assert) {
+      assert.true(validateParamsAgainstPages(null, ["CATEGORY_PAGES"]).valid);
+      assert.true(
+        validateParamsAgainstPages(undefined, ["CATEGORY_PAGES"]).valid
+      );
+    });
+
+    test("returns valid for params present in all page types", function (assert) {
+      const result = validateParamsAgainstPages({ categoryId: 5 }, [
+        "CATEGORY_PAGES",
+      ]);
+      assert.true(result.valid);
+      assert.deepEqual(result.errors, []);
+    });
+
+    test("returns error for params not valid in any page type", function (assert) {
+      const result = validateParamsAgainstPages({ unknownParam: "value" }, [
+        "CATEGORY_PAGES",
+      ]);
+
+      assert.false(result.valid);
+      assert.strictEqual(result.errors.length, 1);
+      assert.true(result.errors[0].includes("unknownParam"));
+    });
+
+    test("returns error when param valid for some but not all page types", function (assert) {
+      // categoryId is valid for CATEGORY_PAGES but not TOPIC_PAGES
+      const result = validateParamsAgainstPages({ categoryId: 5 }, [
+        "CATEGORY_PAGES",
+        "TOPIC_PAGES",
+      ]);
+
+      assert.false(result.valid);
+      assert.strictEqual(result.errors.length, 1);
+      assert.true(result.errors[0].includes("categoryId"));
+      assert.true(result.errors[0].includes("not valid for all"));
+    });
+
+    test("validates multiple params", function (assert) {
+      const result = validateParamsAgainstPages(
+        { categoryId: 5, categorySlug: "general" },
+        ["CATEGORY_PAGES"]
+      );
+      assert.true(result.valid);
+    });
+  });
+
+  module("validateParamType", function () {
+    test("validates number type correctly", function (assert) {
+      const valid = validateParamType("categoryId", 5, "CATEGORY_PAGES");
+      assert.true(valid.valid);
+      assert.strictEqual(valid.error, null);
+    });
+
+    test("returns error for wrong number type", function (assert) {
+      const result = validateParamType("categoryId", "5", "CATEGORY_PAGES");
+
+      assert.false(result.valid);
+      assert.true(result.error.includes("must be a number"));
+      assert.true(result.error.includes("Hint"));
+    });
+
+    test("validates string type correctly", function (assert) {
+      const valid = validateParamType(
+        "categorySlug",
+        "general",
+        "CATEGORY_PAGES"
+      );
+      assert.true(valid.valid);
+    });
+
+    test("returns error for wrong string type", function (assert) {
+      const result = validateParamType("categorySlug", 123, "CATEGORY_PAGES");
+
+      assert.false(result.valid);
+      assert.true(result.error.includes("must be a string"));
+    });
+
+    test("returns error for unknown parameter", function (assert) {
+      const result = validateParamType(
+        "unknownParam",
+        "value",
+        "CATEGORY_PAGES"
+      );
+
+      assert.false(result.valid);
+      assert.true(result.error.includes("Unknown parameter"));
+    });
+
+    test("returns error for invalid page type", function (assert) {
+      const result = validateParamType("categoryId", 5, "INVALID_TYPE");
+
+      assert.false(result.valid);
+      assert.true(result.error.includes("Unknown parameter"));
+    });
+  });
+
+  module("getPageContext", function () {
+    module("CATEGORY_PAGES", function () {
+      test("returns context when category exists", function (assert) {
+        const services = {
+          router: {},
+          discovery: {
+            category: {
+              id: 5,
+              slug: "general",
+              parent_category_id: 2,
+            },
+          },
+        };
+
+        const context = getPageContext("CATEGORY_PAGES", services);
+
+        assert.deepEqual(context, {
+          categoryId: 5,
+          categorySlug: "general",
+          parentCategoryId: 2,
+        });
+      });
+
+      test("returns null when no category", function (assert) {
+        const services = {
+          router: {},
+          discovery: { category: null },
+        };
+
+        assert.strictEqual(getPageContext("CATEGORY_PAGES", services), null);
+      });
+    });
+
+    module("TAG_PAGES", function () {
+      test("returns context when tag exists", function (assert) {
+        const services = {
+          router: {},
+          discovery: {
+            tag: { name: "javascript" },
+            category: { id: 5, slug: "dev", parent_category_id: 1 },
+          },
+        };
+
+        const context = getPageContext("TAG_PAGES", services);
+
+        assert.deepEqual(context, {
+          tagId: "javascript",
+          categoryId: 5,
+          categorySlug: "dev",
+          parentCategoryId: 1,
+        });
+      });
+
+      test("returns null when no tag", function (assert) {
+        const services = {
+          router: {},
+          discovery: { tag: null },
+        };
+
+        assert.strictEqual(getPageContext("TAG_PAGES", services), null);
+      });
+    });
+
+    module("DISCOVERY_PAGES", function () {
+      test("returns context on discovery route", function (assert) {
+        const services = {
+          router: { currentRouteName: "discovery.latest" },
+          discovery: { onDiscoveryRoute: true, custom: false },
+        };
+
+        const context = getPageContext("DISCOVERY_PAGES", services);
+
+        assert.deepEqual(context, { filter: "latest" });
+      });
+
+      test("returns null when not on discovery route", function (assert) {
+        const services = {
+          router: { currentRouteName: "topic.show" },
+          discovery: { onDiscoveryRoute: false },
+        };
+
+        assert.strictEqual(getPageContext("DISCOVERY_PAGES", services), null);
+      });
+
+      test("returns null on custom homepage", function (assert) {
+        const services = {
+          router: { currentRouteName: "discovery.custom" },
+          discovery: { onDiscoveryRoute: true, custom: true },
+        };
+
+        assert.strictEqual(getPageContext("DISCOVERY_PAGES", services), null);
+      });
+    });
+
+    module("HOMEPAGE", function () {
+      test("returns empty object on custom homepage", function (assert) {
+        const services = {
+          router: {},
+          discovery: { custom: true },
+        };
+
+        assert.deepEqual(getPageContext("HOMEPAGE", services), {});
+      });
+
+      test("returns null when not on custom homepage", function (assert) {
+        const services = {
+          router: {},
+          discovery: { custom: false },
+        };
+
+        assert.strictEqual(getPageContext("HOMEPAGE", services), null);
+      });
+    });
+
+    module("TOP_MENU", function () {
+      test("returns context on top menu route", function (assert) {
+        const services = {
+          router: { currentRouteName: "discovery.top" },
+          discovery: {
+            onDiscoveryRoute: true,
+            category: null,
+            tag: null,
+            custom: false,
+          },
+        };
+
+        const context = getPageContext("TOP_MENU", services);
+
+        assert.deepEqual(context, { filter: "top" });
+      });
+
+      test("returns null on category page", function (assert) {
+        const services = {
+          router: { currentRouteName: "discovery.latest" },
+          discovery: {
+            onDiscoveryRoute: true,
+            category: { id: 5 },
+            tag: null,
+            custom: false,
+          },
+        };
+
+        assert.strictEqual(getPageContext("TOP_MENU", services), null);
+      });
+    });
+
+    module("TOPIC_PAGES", function () {
+      test("returns context on topic page", function (assert) {
+        const services = {
+          router: {
+            currentRouteName: "topic.show",
+            currentRoute: { params: { id: "123", slug: "hello-world" } },
+          },
+          discovery: {},
+        };
+
+        const context = getPageContext("TOPIC_PAGES", services);
+
+        assert.deepEqual(context, { id: 123, slug: "hello-world" });
+      });
+
+      test("returns null when not on topic page", function (assert) {
+        const services = {
+          router: { currentRouteName: "discovery.latest" },
+          discovery: {},
+        };
+
+        assert.strictEqual(getPageContext("TOPIC_PAGES", services), null);
+      });
+    });
+
+    module("USER_PAGES", function () {
+      test("returns context on user page", function (assert) {
+        const services = {
+          router: {
+            currentRouteName: "user.summary",
+            currentRoute: { params: { username: "johndoe" } },
+          },
+          discovery: {},
+        };
+
+        const context = getPageContext("USER_PAGES", services);
+
+        assert.deepEqual(context, { username: "johndoe" });
+      });
+
+      test("returns null when not on user page", function (assert) {
+        const services = {
+          router: { currentRouteName: "topic.show" },
+          discovery: {},
+        };
+
+        assert.strictEqual(getPageContext("USER_PAGES", services), null);
+      });
+    });
+
+    module("ADMIN_PAGES", function () {
+      test("returns empty object on admin page", function (assert) {
+        const services = {
+          router: { currentRouteName: "adminDashboard" },
+          discovery: {},
+        };
+
+        assert.deepEqual(getPageContext("ADMIN_PAGES", services), {});
+      });
+
+      test("returns null when not on admin page", function (assert) {
+        const services = {
+          router: { currentRouteName: "topic.show" },
+          discovery: {},
+        };
+
+        assert.strictEqual(getPageContext("ADMIN_PAGES", services), null);
+      });
+    });
+
+    module("GROUP_PAGES", function () {
+      test("returns context on group page", function (assert) {
+        const services = {
+          router: {
+            currentRouteName: "group.members",
+            currentRoute: { params: { name: "moderators" } },
+          },
+          discovery: {},
+        };
+
+        const context = getPageContext("GROUP_PAGES", services);
+
+        assert.deepEqual(context, { name: "moderators" });
+      });
+
+      test("returns null when not on group page", function (assert) {
+        const services = {
+          router: { currentRouteName: "topic.show" },
+          discovery: {},
+        };
+
+        assert.strictEqual(getPageContext("GROUP_PAGES", services), null);
+      });
+    });
+
+    test("returns null for invalid page type", function (assert) {
+      const services = { router: {}, discovery: {} };
+      assert.strictEqual(getPageContext("INVALID_TYPE", services), null);
+    });
+  });
+
+  module("getCurrentPageType", function () {
+    test("returns CATEGORY_PAGES when on category page", function (assert) {
+      const services = {
+        router: { currentRouteName: "discovery.latest" },
+        discovery: {
+          onDiscoveryRoute: true,
+          custom: false,
+          category: { id: 5, slug: "general" },
+          tag: null,
+        },
+      };
+
+      assert.strictEqual(getCurrentPageType(services), "CATEGORY_PAGES");
+    });
+
+    test("returns TOPIC_PAGES when on topic page", function (assert) {
+      const services = {
+        router: {
+          currentRouteName: "topic.show",
+          currentRoute: { params: { id: "123", slug: "hello" } },
+        },
+        discovery: {
+          onDiscoveryRoute: false,
+          category: null,
+          tag: null,
+        },
+      };
+
+      assert.strictEqual(getCurrentPageType(services), "TOPIC_PAGES");
+    });
+
+    test("returns HOMEPAGE when on custom homepage", function (assert) {
+      const services = {
+        router: { currentRouteName: "discovery.custom" },
+        discovery: {
+          custom: true,
+          category: null,
+          tag: null,
+        },
+      };
+
+      // HOMEPAGE comes before DISCOVERY_PAGES in iteration, so custom
+      // homepage should match HOMEPAGE
+      const result = getCurrentPageType(services);
+      assert.strictEqual(result, "HOMEPAGE");
+    });
+
+    test("returns null when no page type matches", function (assert) {
+      const services = {
+        router: { currentRouteName: "some.unknown.route" },
+        discovery: {
+          onDiscoveryRoute: false,
+          custom: false,
+          category: null,
+          tag: null,
+        },
+      };
+
+      assert.strictEqual(getCurrentPageType(services), null);
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/matching/url-matcher-test.js b/frontend/discourse/tests/unit/lib/blocks/matching/url-matcher-test.js
new file mode 100644
index 0000000000000..bde0365a40f9f
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/matching/url-matcher-test.js
@@ -0,0 +1,246 @@
+import { module, test } from "qunit";
+import {
+  matchesAnyPattern,
+  matchUrlPattern,
+  normalizePath,
+} from "discourse/lib/blocks/-internals/matching/url-matcher";
+import { setPrefix } from "discourse/lib/get-url";
+import { isValidGlobPattern } from "discourse/lib/glob-utils";
+
+module("Unit | Lib | Blocks | url-matcher", function (hooks) {
+  hooks.beforeEach(function () {
+    // Reset URL prefix to empty for clean tests
+    setPrefix("");
+  });
+
+  module("isValidGlobPattern", function () {
+    test("returns true for valid patterns", function (assert) {
+      assert.true(isValidGlobPattern("/c/**"));
+      assert.true(isValidGlobPattern("/{latest,top}"));
+      assert.true(isValidGlobPattern("/c/[0-9]*"));
+      assert.true(isValidGlobPattern("/t/*/123"));
+      assert.true(isValidGlobPattern("/**"));
+    });
+
+    test("returns false for unbalanced brackets", function (assert) {
+      assert.false(isValidGlobPattern("[unclosed"));
+      assert.false(isValidGlobPattern("/c/[unclosed"));
+    });
+
+    test("returns false for unbalanced braces", function (assert) {
+      assert.false(isValidGlobPattern("{unclosed"));
+      assert.false(isValidGlobPattern("/{latest,top"));
+    });
+
+    test("returns false for unbalanced parentheses", function (assert) {
+      assert.false(isValidGlobPattern("!(unclosed"));
+      assert.false(isValidGlobPattern("/!(admin"));
+    });
+  });
+
+  module("normalizePath", function () {
+    test("returns / for empty input", function (assert) {
+      assert.strictEqual(normalizePath(""), "/");
+      assert.strictEqual(normalizePath(null), "/");
+      assert.strictEqual(normalizePath(undefined), "/");
+    });
+
+    test("preserves root path", function (assert) {
+      assert.strictEqual(normalizePath("/"), "/");
+    });
+
+    test("removes trailing slash", function (assert) {
+      assert.strictEqual(normalizePath("/c/general/"), "/c/general");
+      assert.strictEqual(normalizePath("/latest/"), "/latest");
+    });
+
+    test("preserves trailing slash for root only", function (assert) {
+      assert.strictEqual(normalizePath("/"), "/");
+    });
+
+    test("strips query strings", function (assert) {
+      assert.strictEqual(normalizePath("/c/general?foo=bar"), "/c/general");
+      assert.strictEqual(
+        normalizePath("/latest?filter=solved&page=2"),
+        "/latest"
+      );
+    });
+
+    test("strips hash fragments", function (assert) {
+      assert.strictEqual(normalizePath("/c/general#section"), "/c/general");
+      assert.strictEqual(normalizePath("/t/topic/123#post_5"), "/t/topic/123");
+    });
+
+    test("strips both query string and hash", function (assert) {
+      assert.strictEqual(
+        normalizePath("/c/general?foo=bar#section"),
+        "/c/general"
+      );
+    });
+
+    test("strips subfolder prefix when configured", function (assert) {
+      setPrefix("/forum");
+      assert.strictEqual(normalizePath("/forum/c/general"), "/c/general");
+      assert.strictEqual(normalizePath("/forum/latest"), "/latest");
+      assert.strictEqual(normalizePath("/forum/"), "/");
+      assert.strictEqual(normalizePath("/forum"), "/");
+    });
+
+    test("handles complex subfolder with query and hash", function (assert) {
+      setPrefix("/discourse");
+      assert.strictEqual(
+        normalizePath("/discourse/c/general?foo=bar#section"),
+        "/c/general"
+      );
+    });
+  });
+
+  module("matchUrlPattern", function () {
+    module("exact match", function () {
+      test("matches exact path", function (assert) {
+        assert.true(matchUrlPattern("/latest", "/latest"));
+        assert.true(matchUrlPattern("/c/general", "/c/general"));
+      });
+
+      test("does not match different paths", function (assert) {
+        assert.false(matchUrlPattern("/latest", "/top"));
+        assert.false(matchUrlPattern("/c/general", "/c/support"));
+      });
+    });
+
+    module("single wildcard (*)", function () {
+      test("matches single path segment", function (assert) {
+        assert.true(matchUrlPattern("/c/general", "/c/*"));
+        assert.true(matchUrlPattern("/c/support", "/c/*"));
+        assert.true(matchUrlPattern("/t/hello", "/t/*"));
+      });
+
+      test("does not match multiple path segments", function (assert) {
+        assert.false(matchUrlPattern("/c/general/subcategory", "/c/*"));
+        assert.false(matchUrlPattern("/c/a/b/c", "/c/*"));
+      });
+
+      test("works in middle of pattern", function (assert) {
+        assert.true(matchUrlPattern("/t/my-topic/123", "/t/*/123"));
+        assert.true(matchUrlPattern("/u/john/summary", "/u/*/summary"));
+      });
+
+      test("does not match empty segment", function (assert) {
+        assert.false(matchUrlPattern("/c/", "/c/*"));
+      });
+    });
+
+    module("double wildcard (**)", function () {
+      test("matches zero segments", function (assert) {
+        assert.true(matchUrlPattern("/c", "/c/**"));
+      });
+
+      test("matches single segment", function (assert) {
+        assert.true(matchUrlPattern("/c/general", "/c/**"));
+      });
+
+      test("matches multiple segments", function (assert) {
+        assert.true(matchUrlPattern("/c/general/sub", "/c/**"));
+        assert.true(matchUrlPattern("/c/a/b/c/d", "/c/**"));
+      });
+
+      test("matches any path with /**", function (assert) {
+        assert.true(matchUrlPattern("/", "/**"));
+        assert.true(matchUrlPattern("/latest", "/**"));
+        assert.true(matchUrlPattern("/c/general/sub", "/**"));
+      });
+
+      test("does not match paths outside prefix", function (assert) {
+        assert.false(matchUrlPattern("/categories", "/c/**"));
+        assert.false(matchUrlPattern("/latest", "/c/**"));
+      });
+    });
+
+    module("combined wildcards", function () {
+      test("* followed by **", function (assert) {
+        assert.true(
+          matchUrlPattern("/u/john/preferences", "/u/*/preferences/**")
+        );
+        assert.true(
+          matchUrlPattern("/u/john/preferences/account", "/u/*/preferences/**")
+        );
+        assert.true(
+          matchUrlPattern(
+            "/u/john/preferences/account/security",
+            "/u/*/preferences/**"
+          )
+        );
+      });
+
+      test("multiple * wildcards", function (assert) {
+        assert.true(matchUrlPattern("/t/my-topic/123", "/t/*/*"));
+        assert.false(matchUrlPattern("/t/my-topic/123/5", "/t/*/*"));
+      });
+    });
+
+    module("character class [...]", function () {
+      test("matches characters in class", function (assert) {
+        assert.true(matchUrlPattern("/api/v1", "/api/v[123]"));
+        assert.true(matchUrlPattern("/api/v2", "/api/v[123]"));
+        assert.true(matchUrlPattern("/api/v3", "/api/v[123]"));
+      });
+
+      test("does not match characters outside class", function (assert) {
+        assert.false(matchUrlPattern("/api/v4", "/api/v[123]"));
+      });
+
+      test("works with wildcards", function (assert) {
+        assert.true(matchUrlPattern("/t/slug/123", "/t/*/[0-9]*"));
+        assert.false(matchUrlPattern("/t/slug/abc", "/t/*/[0-9]*"));
+      });
+    });
+
+    module("brace expansion {...}", function () {
+      test("matches any option", function (assert) {
+        assert.true(matchUrlPattern("/latest", "/{latest,top,new}"));
+        assert.true(matchUrlPattern("/top", "/{latest,top,new}"));
+        assert.true(matchUrlPattern("/new", "/{latest,top,new}"));
+      });
+
+      test("does not match other values", function (assert) {
+        assert.false(matchUrlPattern("/unread", "/{latest,top,new}"));
+      });
+
+      test("works with paths", function (assert) {
+        assert.true(matchUrlPattern("/c/general", "/c/{general,support}"));
+        assert.true(matchUrlPattern("/c/support", "/c/{general,support}"));
+        assert.false(matchUrlPattern("/c/other", "/c/{general,support}"));
+      });
+    });
+
+    module("question mark (?)", function () {
+      test("matches single character", function (assert) {
+        assert.true(matchUrlPattern("/api/v1", "/api/v?"));
+        assert.true(matchUrlPattern("/api/v2", "/api/v?"));
+      });
+
+      test("does not match multiple characters", function (assert) {
+        assert.false(matchUrlPattern("/api/v12", "/api/v?"));
+      });
+
+      test("does not match empty", function (assert) {
+        assert.false(matchUrlPattern("/api/v", "/api/v?"));
+      });
+    });
+  });
+
+  module("matchesAnyPattern", function () {
+    test("returns true when any pattern matches", function (assert) {
+      assert.true(matchesAnyPattern("/c/general", ["/c/**", "/tag/*"]));
+      assert.true(matchesAnyPattern("/tag/javascript", ["/c/**", "/tag/*"]));
+    });
+
+    test("returns false when no pattern matches", function (assert) {
+      assert.false(matchesAnyPattern("/latest", ["/c/**", "/tag/*"]));
+    });
+
+    test("returns false for empty patterns array", function (assert) {
+      assert.false(matchesAnyPattern("/c/general", []));
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/matching/value-matcher-test.js b/frontend/discourse/tests/unit/lib/blocks/matching/value-matcher-test.js
new file mode 100644
index 0000000000000..51d1d4c4be0fe
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/matching/value-matcher-test.js
@@ -0,0 +1,601 @@
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import sinon from "sinon";
+import {
+  isTypeMismatch,
+  matchParams,
+  matchValue,
+  validateParamSpec,
+} from "discourse/lib/blocks/-internals/matching/value-matcher";
+import { blockDebugLogger } from "discourse/static/dev-tools/block-debug/debug-logger";
+
+module("Unit | Lib | Blocks | value-matcher", function (hooks) {
+  setupTest(hooks);
+
+  module("isTypeMismatch", function () {
+    test("detects string/number mismatch", function (assert) {
+      assert.true(isTypeMismatch("3", 3));
+      assert.true(isTypeMismatch(3, "3"));
+      assert.true(isTypeMismatch("123", 123));
+    });
+
+    test("returns false when values actually match", function (assert) {
+      assert.false(isTypeMismatch("foo", "foo"));
+      assert.false(isTypeMismatch(123, 123));
+    });
+
+    test("returns false when values differ and no coercion would help", function (assert) {
+      assert.false(isTypeMismatch("3", 4));
+      assert.false(isTypeMismatch("foo", "bar"));
+      assert.false(isTypeMismatch("foo", 123));
+    });
+
+    test("detects mismatch in arrays", function (assert) {
+      assert.true(isTypeMismatch("3", [3, 4, 5]));
+      assert.true(isTypeMismatch(3, ["3", "4", "5"]));
+      assert.false(isTypeMismatch("6", [3, 4, 5]));
+    });
+
+    test("detects mismatch in { any: [...] }", function (assert) {
+      assert.true(isTypeMismatch("3", { any: [3, 4, 5] }));
+      assert.false(isTypeMismatch("6", { any: [3, 4, 5] }));
+    });
+  });
+
+  module("matchValue", function () {
+    module("exact matching", function () {
+      test("matches exact string value", function (assert) {
+        assert.true(matchValue({ actual: "foo", expected: "foo" }));
+        assert.false(matchValue({ actual: "foo", expected: "bar" }));
+      });
+
+      test("matches exact number value", function (assert) {
+        assert.true(matchValue({ actual: 123, expected: 123 }));
+        assert.false(matchValue({ actual: 123, expected: 456 }));
+      });
+
+      test("matches null and undefined", function (assert) {
+        assert.true(matchValue({ actual: null, expected: null }));
+        assert.true(matchValue({ actual: undefined, expected: undefined }));
+        assert.false(matchValue({ actual: null, expected: undefined }));
+      });
+
+      test("no type coercion: string does not match number", function (assert) {
+        assert.false(matchValue({ actual: "3", expected: 3 }));
+        assert.false(matchValue({ actual: 3, expected: "3" }));
+      });
+    });
+
+    module("array OR matching", function () {
+      test("matches if value is in array", function (assert) {
+        assert.true(matchValue({ actual: "foo", expected: ["foo", "bar"] }));
+        assert.true(matchValue({ actual: "bar", expected: ["foo", "bar"] }));
+        assert.false(matchValue({ actual: "baz", expected: ["foo", "bar"] }));
+      });
+
+      test("matches numbers in array", function (assert) {
+        assert.true(matchValue({ actual: 123, expected: [123, 456, 789] }));
+        assert.false(matchValue({ actual: 999, expected: [123, 456, 789] }));
+      });
+    });
+
+    module("regex matching", function () {
+      test("matches regex pattern", function (assert) {
+        assert.true(matchValue({ actual: "hello-world", expected: /^hello/ }));
+        assert.false(matchValue({ actual: "goodbye", expected: /^hello/ }));
+      });
+
+      test("converts non-string actual to string for regex", function (assert) {
+        assert.true(matchValue({ actual: 123, expected: /^12/ }));
+        assert.false(matchValue({ actual: 456, expected: /^12/ }));
+      });
+    });
+
+    module("NOT logic", function () {
+      test("{ not: value } inverts match", function (assert) {
+        assert.true(matchValue({ actual: "foo", expected: { not: "bar" } }));
+        assert.false(matchValue({ actual: "foo", expected: { not: "foo" } }));
+      });
+
+      test("{ not: [...] } inverts array OR", function (assert) {
+        assert.true(
+          matchValue({ actual: "baz", expected: { not: ["foo", "bar"] } })
+        );
+        assert.false(
+          matchValue({ actual: "foo", expected: { not: ["foo", "bar"] } })
+        );
+      });
+
+      test("nested NOT", function (assert) {
+        // not(not(foo)) === foo
+        assert.true(
+          matchValue({ actual: "foo", expected: { not: { not: "foo" } } })
+        );
+        assert.false(
+          matchValue({ actual: "bar", expected: { not: { not: "foo" } } })
+        );
+      });
+    });
+
+    module("ANY (OR) logic", function () {
+      test("{ any: [...] } matches if any spec matches", function (assert) {
+        assert.true(
+          matchValue({ actual: "foo", expected: { any: ["foo", "bar"] } })
+        );
+        assert.true(
+          matchValue({ actual: "bar", expected: { any: ["foo", "bar"] } })
+        );
+        assert.false(
+          matchValue({ actual: "baz", expected: { any: ["foo", "bar"] } })
+        );
+      });
+
+      test("{ any: [...] } with complex specs", function (assert) {
+        assert.true(
+          matchValue({
+            actual: "hello-world",
+            expected: { any: [/^hello/, "goodbye"] },
+          })
+        );
+        assert.true(
+          matchValue({
+            actual: "goodbye",
+            expected: { any: [/^hello/, "goodbye"] },
+          })
+        );
+        assert.false(
+          matchValue({
+            actual: "other",
+            expected: { any: [/^hello/, "goodbye"] },
+          })
+        );
+      });
+    });
+  });
+
+  module("matchParams", function () {
+    module("basic key matching", function () {
+      test("matches single key", function (assert) {
+        const actualParams = { id: 123 };
+        assert.true(matchParams({ actualParams, expectedParams: { id: 123 } }));
+        assert.false(
+          matchParams({ actualParams, expectedParams: { id: 456 } })
+        );
+      });
+
+      test("matches multiple keys (AND logic)", function (assert) {
+        const actualParams = { id: 123, slug: "my-topic" };
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: { id: 123, slug: "my-topic" },
+          })
+        );
+        assert.false(
+          matchParams({
+            actualParams,
+            expectedParams: { id: 123, slug: "other-topic" },
+          })
+        );
+      });
+
+      test("returns false if expected key is missing from actual", function (assert) {
+        const actualParams = { id: 123 };
+        assert.false(
+          matchParams({
+            actualParams,
+            expectedParams: { id: 123, slug: "my-topic" },
+          })
+        );
+      });
+    });
+
+    module("empty/null handling", function () {
+      test("returns true if no expected params", function (assert) {
+        assert.true(
+          matchParams({ actualParams: { id: 123 }, expectedParams: null })
+        );
+        assert.true(
+          matchParams({ actualParams: { id: 123 }, expectedParams: undefined })
+        );
+      });
+
+      test("returns true if expected params is empty object", function (assert) {
+        assert.true(
+          matchParams({ actualParams: { id: 123 }, expectedParams: {} })
+        );
+      });
+    });
+
+    module("value-level matching", function () {
+      test("supports array OR for values", function (assert) {
+        const actualParams = { id: 123 };
+        assert.true(
+          matchParams({ actualParams, expectedParams: { id: [123, 456] } })
+        );
+        assert.false(
+          matchParams({ actualParams, expectedParams: { id: [456, 789] } })
+        );
+      });
+
+      test("supports { any: [...] } OR for values", function (assert) {
+        const actualParams = { id: 123 };
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: { id: { any: [123, 456] } },
+          })
+        );
+        assert.false(
+          matchParams({
+            actualParams,
+            expectedParams: { id: { any: [456, 789] } },
+          })
+        );
+      });
+
+      test("supports regex for values", function (assert) {
+        const actualParams = { slug: "help-topic" };
+        assert.true(
+          matchParams({ actualParams, expectedParams: { slug: /^help-/ } })
+        );
+        assert.false(
+          matchParams({ actualParams, expectedParams: { slug: /^other-/ } })
+        );
+      });
+
+      test("supports NOT for values", function (assert) {
+        const actualParams = { id: 123 };
+        assert.true(
+          matchParams({ actualParams, expectedParams: { id: { not: 456 } } })
+        );
+        assert.false(
+          matchParams({ actualParams, expectedParams: { id: { not: 123 } } })
+        );
+      });
+    });
+
+    module("params-level AND/OR/NOT", function () {
+      test("array of specs = AND logic", function (assert) {
+        const actualParams = { id: 123, slug: "help-topic" };
+        // Both conditions must pass
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: [{ id: 123 }, { slug: /^help-/ }],
+          })
+        );
+        // First passes, second fails
+        assert.false(
+          matchParams({
+            actualParams,
+            expectedParams: [{ id: 123 }, { slug: /^other-/ }],
+          })
+        );
+      });
+
+      test("{ any: [...] } = OR logic", function (assert) {
+        const actualParams = { id: 123 };
+        // Either condition can pass
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: { any: [{ id: 123 }, { id: 456 }] },
+          })
+        );
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: { any: [{ id: 456 }, { id: 123 }] },
+          })
+        );
+        // Neither passes
+        assert.false(
+          matchParams({
+            actualParams,
+            expectedParams: { any: [{ id: 456 }, { id: 789 }] },
+          })
+        );
+      });
+
+      test("{ not: {...} } = NOT logic", function (assert) {
+        const actualParams = { id: 123 };
+        // NOT(id: 456) = true when id is 123
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: { not: { id: 456 } },
+          })
+        );
+        // NOT(id: 123) = false when id is 123
+        assert.false(
+          matchParams({
+            actualParams,
+            expectedParams: { not: { id: 123 } },
+          })
+        );
+      });
+
+      test("nested logic: OR containing NOT", function (assert) {
+        const actualParams = { id: 123, status: "open" };
+        // Match if id=456 OR status is NOT "closed"
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: {
+              any: [{ id: 456 }, { status: { not: "closed" } }],
+            },
+          })
+        );
+      });
+    });
+
+    module("backslash escape for reserved keys", function () {
+      test("\\\\any matches literal param named 'any'", function (assert) {
+        const actualParams = { any: "some-value" };
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: { "\\any": "some-value" },
+          })
+        );
+        assert.false(
+          matchParams({
+            actualParams,
+            expectedParams: { "\\any": "other-value" },
+          })
+        );
+      });
+
+      test("\\\\not matches literal param named 'not'", function (assert) {
+        const actualParams = { not: "some-value" };
+        assert.true(
+          matchParams({
+            actualParams,
+            expectedParams: { "\\not": "some-value" },
+          })
+        );
+      });
+
+      test("escape does not interfere with normal keys", function (assert) {
+        const actualParams = { id: 123, "\\id": 456 };
+        // Normal key
+        assert.true(matchParams({ actualParams, expectedParams: { id: 123 } }));
+        // Escaped key matches literal "\\id" key
+        assert.true(
+          matchParams({ actualParams, expectedParams: { "\\\\id": 456 } })
+        );
+      });
+    });
+  });
+
+  module("validateParamSpec", function () {
+    test("raises error for operator typos like 'an' instead of 'any'", function (assert) {
+      const errors = [];
+      validateParamSpec({ an: [1, 2, 3] }, "queryParams", (msg) =>
+        errors.push(msg)
+      );
+      assert.strictEqual(errors.length, 1);
+      assert.true(errors[0].includes('"an"'));
+      assert.true(errors[0].includes('Did you mean "any"'));
+    });
+
+    test("raises error for operator typos like 'nto' instead of 'not'", function (assert) {
+      const errors = [];
+      // Note: 'nto' has Jaro-Winkler ~0.6 with 'not', below 0.7 threshold
+      // So this won't trigger a suggestion - only very close typos do
+      validateParamSpec({ nto: { foo: "bar" } }, "params", (msg) =>
+        errors.push(msg)
+      );
+      // 'nto' isn't close enough to 'not' at 0.7 threshold
+      assert.strictEqual(errors.length, 0);
+    });
+
+    test("does not raise error for valid operator keys", function (assert) {
+      const errors = [];
+      validateParamSpec({ any: [1, 2, 3] }, "queryParams", (msg) =>
+        errors.push(msg)
+      );
+      validateParamSpec({ not: { foo: "bar" } }, "params", (msg) =>
+        errors.push(msg)
+      );
+      assert.strictEqual(errors.length, 0);
+    });
+
+    test("does not raise error for regular param keys", function (assert) {
+      const errors = [];
+      validateParamSpec(
+        { preview_theme_id: 3, filter: "solved" },
+        "queryParams",
+        (msg) => errors.push(msg)
+      );
+      assert.strictEqual(errors.length, 0);
+    });
+
+    test("validates nested specs recursively", function (assert) {
+      const errors = [];
+      validateParamSpec(
+        { any: [{ an: [1, 2] }, { filter: "solved" }] },
+        "queryParams",
+        (msg) => errors.push(msg)
+      );
+      assert.strictEqual(errors.length, 1);
+      assert.true(errors[0].includes("queryParams.any[0]"));
+    });
+
+    test("does not raise error for escaped keys", function (assert) {
+      const errors = [];
+      validateParamSpec({ "\\any": "literal-value" }, "params", (msg) =>
+        errors.push(msg)
+      );
+      assert.strictEqual(errors.length, 0);
+    });
+  });
+
+  module("logger integration", function (loggerHooks) {
+    loggerHooks.beforeEach(function () {
+      this.logConditionSpy = sinon.spy(blockDebugLogger, "logCondition");
+      this.updateCombinatorResultSpy = sinon.spy(
+        blockDebugLogger,
+        "updateCombinatorResult"
+      );
+    });
+
+    loggerHooks.afterEach(function () {
+      this.logConditionSpy.restore();
+      this.updateCombinatorResultSpy.restore();
+    });
+
+    module("combinator result is correctly updated", function () {
+      test("OR combinator calls updateCombinatorResult with true when one child matches", function (assert) {
+        const expectedParams = { any: [{ id: 123 }, { id: 456 }] };
+        const actualParams = { id: 123 };
+
+        const result = matchParams({
+          actualParams,
+          expectedParams,
+          context: { logger: blockDebugLogger },
+        });
+
+        assert.true(result, "OR should pass when one child matches");
+        assert.true(
+          this.updateCombinatorResultSpy.called,
+          "updateCombinatorResult should be called"
+        );
+
+        const orCall = this.updateCombinatorResultSpy
+          .getCalls()
+          .find((call) => call.args[1] === true);
+        assert.true(
+          Boolean(orCall),
+          "updateCombinatorResult should be called with true"
+        );
+      });
+
+      test("OR combinator calls updateCombinatorResult with false when no children match", function (assert) {
+        const expectedParams = { any: [{ id: 456 }, { id: 789 }] };
+        const actualParams = { id: 123 };
+
+        const result = matchParams({
+          actualParams,
+          expectedParams,
+          context: { logger: blockDebugLogger },
+        });
+
+        assert.false(result, "OR should fail when no children match");
+        assert.true(
+          this.updateCombinatorResultSpy.called,
+          "updateCombinatorResult should be called"
+        );
+
+        const orCall = this.updateCombinatorResultSpy
+          .getCalls()
+          .find((call) => call.args[1] === false);
+        assert.true(
+          Boolean(orCall),
+          "updateCombinatorResult should be called with false"
+        );
+      });
+
+      test("AND combinator calls updateCombinatorResult with true when all children match", function (assert) {
+        const expectedParams = [{ id: 123 }, { slug: "test" }];
+        const actualParams = { id: 123, slug: "test" };
+
+        const result = matchParams({
+          actualParams,
+          expectedParams,
+          context: { logger: blockDebugLogger },
+        });
+
+        assert.true(result, "AND should pass when all children match");
+        assert.true(
+          this.updateCombinatorResultSpy.called,
+          "updateCombinatorResult should be called"
+        );
+
+        const andCall = this.updateCombinatorResultSpy
+          .getCalls()
+          .find((call) => call.args[1] === true);
+        assert.true(
+          Boolean(andCall),
+          "updateCombinatorResult should be called with true"
+        );
+      });
+
+      test("AND combinator calls updateCombinatorResult with false when one child fails", function (assert) {
+        const expectedParams = [{ id: 123 }, { slug: "wrong" }];
+        const actualParams = { id: 123, slug: "test" };
+
+        const result = matchParams({
+          actualParams,
+          expectedParams,
+          context: { logger: blockDebugLogger },
+        });
+
+        assert.false(result, "AND should fail when one child fails");
+        assert.true(
+          this.updateCombinatorResultSpy.called,
+          "updateCombinatorResult should be called"
+        );
+
+        const andCall = this.updateCombinatorResultSpy
+          .getCalls()
+          .find((call) => call.args[1] === false);
+        assert.true(
+          Boolean(andCall),
+          "updateCombinatorResult should be called with false"
+        );
+      });
+
+      test("NOT combinator calls updateCombinatorResult with true when inner fails", function (assert) {
+        const expectedParams = { not: { id: 456 } };
+        const actualParams = { id: 123 };
+
+        const result = matchParams({
+          actualParams,
+          expectedParams,
+          context: { logger: blockDebugLogger },
+        });
+
+        assert.true(result, "NOT should pass when inner condition fails");
+        assert.true(
+          this.updateCombinatorResultSpy.called,
+          "updateCombinatorResult should be called"
+        );
+
+        const notCall = this.updateCombinatorResultSpy
+          .getCalls()
+          .find((call) => call.args[1] === true);
+        assert.true(
+          Boolean(notCall),
+          "updateCombinatorResult should be called with true"
+        );
+      });
+
+      test("NOT combinator calls updateCombinatorResult with false when inner passes", function (assert) {
+        const expectedParams = { not: { id: 123 } };
+        const actualParams = { id: 123 };
+
+        const result = matchParams({
+          actualParams,
+          expectedParams,
+          context: { logger: blockDebugLogger },
+        });
+
+        assert.false(result, "NOT should fail when inner condition passes");
+        assert.true(
+          this.updateCombinatorResultSpy.called,
+          "updateCombinatorResult should be called"
+        );
+
+        const notCall = this.updateCombinatorResultSpy
+          .getCalls()
+          .find((call) => call.args[1] === false);
+        assert.true(
+          Boolean(notCall),
+          "updateCombinatorResult should be called with false"
+        );
+      });
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/validation/args-test.js b/frontend/discourse/tests/unit/lib/blocks/validation/args-test.js
new file mode 100644
index 0000000000000..a89cf6ed65b73
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/validation/args-test.js
@@ -0,0 +1,2822 @@
+import Component from "@glimmer/component";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import { BlockError } from "discourse/lib/blocks/-internals/error";
+import {
+  validateArgName,
+  validateArgValue,
+  validateArrayItemType,
+} from "discourse/lib/blocks/-internals/validation/args";
+import {
+  validateArgsSchema,
+  validateBlockArgs,
+} from "discourse/lib/blocks/-internals/validation/block-args";
+import {
+  runCustomValidation,
+  validateConstraints,
+  validateConstraintsSchema,
+} from "discourse/lib/blocks/-internals/validation/constraints";
+
+module("Unit | Lib | blocks/validation/args", function () {
+  module("validateArgsSchema", function () {
+    test("accepts valid schema with all types", function (assert) {
+      const schema = {
+        title: { type: "string", required: true },
+        count: { type: "number", default: 5 },
+        enabled: { type: "boolean" },
+        tags: { type: "array", itemType: "string" },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts null/undefined schema", function (assert) {
+      assert.strictEqual(validateArgsSchema(null, "test-block"), undefined);
+      assert.strictEqual(
+        validateArgsSchema(undefined, "test-block"),
+        undefined
+      );
+    });
+
+    test("throws for missing type property", function (assert) {
+      const schema = {
+        title: { required: true },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /missing required "type" property/
+      );
+    });
+
+    test("throws for invalid type", function (assert) {
+      const schema = {
+        title: { type: "invalid" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid type "invalid"/
+      );
+    });
+
+    test("throws for unknown schema properties", function (assert) {
+      const schema = {
+        title: { type: "string", unknownProp: true },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /unknown properties: "unknownProp"/
+      );
+    });
+
+    test("throws for itemType on non-array type", function (assert) {
+      const schema = {
+        title: { type: "string", itemType: "string" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /"itemType" is only valid for array type/
+      );
+    });
+
+    test("throws for invalid itemType", function (assert) {
+      const schema = {
+        tags: { type: "array", itemType: "object" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid itemType "object"/
+      );
+    });
+
+    test("throws for non-boolean required", function (assert) {
+      const schema = {
+        title: { type: "string", required: "yes" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "required" value/
+      );
+    });
+
+    test("throws for pattern on non-string type", function (assert) {
+      const schema = {
+        count: { type: "number", pattern: /^\d+$/ },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /"pattern" is only valid for string type/
+      );
+    });
+
+    test("throws for non-RegExp pattern", function (assert) {
+      const schema = {
+        name: { type: "string", pattern: "^[a-z]+$" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "pattern" value. Must be a RegExp/
+      );
+    });
+
+    test("accepts valid pattern on string type", function (assert) {
+      const schema = {
+        name: { type: "string", pattern: /^[a-z][a-z0-9-]*$/ },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for default value not matching pattern", function (assert) {
+      const schema = {
+        name: {
+          type: "string",
+          pattern: /^[a-z][a-z0-9-]*$/,
+          default: "Invalid_Name",
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*does not match required pattern/
+      );
+    });
+
+    test("throws for required with default - contradictory options", function (assert) {
+      const schema = {
+        title: { type: "string", required: true, default: "Hello" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has both "required: true" and "default".*contradictory/
+      );
+    });
+
+    test("throws for default value with wrong type - string expected", function (assert) {
+      const schema = {
+        title: { type: "string", default: 123 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be a string/
+      );
+    });
+
+    test("throws for default value with wrong type - number expected", function (assert) {
+      const schema = {
+        count: { type: "number", default: "five" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be a number/
+      );
+    });
+
+    test("throws for default value with wrong type - boolean expected", function (assert) {
+      const schema = {
+        enabled: { type: "boolean", default: "true" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be a boolean/
+      );
+    });
+
+    test("throws for default value with wrong type - array expected", function (assert) {
+      const schema = {
+        tags: { type: "array", default: "tag1,tag2" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be an array/
+      );
+    });
+
+    test("throws for default array with wrong item types", function (assert) {
+      const schema = {
+        tags: { type: "array", itemType: "string", default: ["valid", 123] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be a string/
+      );
+    });
+
+    test("accepts valid default values", function (assert) {
+      const schema = {
+        title: { type: "string", default: "Hello" },
+        count: { type: "number", default: 42 },
+        enabled: { type: "boolean", default: true },
+        tags: { type: "array", itemType: "string", default: ["a", "b"] },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for min on non-number type", function (assert) {
+      const schema = {
+        title: { type: "string", min: 0 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "min" but type is "string".*only valid for number type/
+      );
+    });
+
+    test("throws for max on non-number type", function (assert) {
+      const schema = {
+        title: { type: "string", max: 100 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "max" but type is "string".*only valid for number type/
+      );
+    });
+
+    test("throws for integer on non-number type", function (assert) {
+      const schema = {
+        title: { type: "string", integer: true },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "integer" but type is "string".*only valid for number type/
+      );
+    });
+
+    test("throws for non-number min value", function (assert) {
+      const schema = {
+        count: { type: "number", min: "0" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "min" value.*Must be a number/
+      );
+    });
+
+    test("throws for non-number max value", function (assert) {
+      const schema = {
+        count: { type: "number", max: "100" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "max" value.*Must be a number/
+      );
+    });
+
+    test("throws for non-boolean integer value", function (assert) {
+      const schema = {
+        count: { type: "number", integer: "true" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "integer" value.*Must be a boolean/
+      );
+    });
+
+    test("throws for min greater than max", function (assert) {
+      const schema = {
+        count: { type: "number", min: 100, max: 0 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has min \(100\) greater than max \(0\)/
+      );
+    });
+
+    test("accepts valid min/max/integer on number type", function (assert) {
+      const schema = {
+        count: { type: "number", min: 0, max: 100 },
+        page: { type: "number", min: 1, integer: true },
+        percentage: { type: "number", min: 0, max: 1 },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for default value below min", function (assert) {
+      const schema = {
+        count: { type: "number", min: 0, default: -5 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be at least 0/
+      );
+    });
+
+    test("throws for default value above max", function (assert) {
+      const schema = {
+        count: { type: "number", max: 100, default: 150 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be at most 100/
+      );
+    });
+
+    test("throws for non-integer default with integer constraint", function (assert) {
+      const schema = {
+        count: { type: "number", integer: true, default: 5.5 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be an integer/
+      );
+    });
+
+    test("throws for minLength on non-string/array type", function (assert) {
+      const schema = {
+        count: { type: "number", minLength: 1 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "minLength" but type is "number".*only valid for string or array type/
+      );
+    });
+
+    test("throws for maxLength on non-string/array type", function (assert) {
+      const schema = {
+        enabled: { type: "boolean", maxLength: 10 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "maxLength" but type is "boolean".*only valid for string or array type/
+      );
+    });
+
+    test("throws for non-integer minLength value", function (assert) {
+      const schema = {
+        title: { type: "string", minLength: 1.5 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "minLength" value.*Must be a non-negative integer/
+      );
+    });
+
+    test("throws for negative minLength value", function (assert) {
+      const schema = {
+        title: { type: "string", minLength: -1 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "minLength" value.*Must be a non-negative integer/
+      );
+    });
+
+    test("throws for non-integer maxLength value", function (assert) {
+      const schema = {
+        title: { type: "string", maxLength: "10" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "maxLength" value.*Must be a non-negative integer/
+      );
+    });
+
+    test("throws for minLength greater than maxLength", function (assert) {
+      const schema = {
+        title: { type: "string", minLength: 10, maxLength: 5 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has minLength \(10\) greater than maxLength \(5\)/
+      );
+    });
+
+    test("accepts valid minLength/maxLength on string type", function (assert) {
+      const schema = {
+        title: { type: "string", minLength: 1, maxLength: 100 },
+        name: { type: "string", minLength: 0 },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts valid minLength/maxLength on array type", function (assert) {
+      const schema = {
+        tags: { type: "array", minLength: 1, maxLength: 10 },
+        items: { type: "array", minLength: 0 },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for enum on non-string/number type", function (assert) {
+      const schema = {
+        enabled: { type: "boolean", enum: [true, false] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "enum" but type is "boolean".*only valid for string or number type/
+      );
+    });
+
+    test("throws for enum that is not an array", function (assert) {
+      const schema = {
+        size: { type: "string", enum: "small" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "enum" value.*Must be an array with at least one element/
+      );
+    });
+
+    test("throws for empty enum array", function (assert) {
+      const schema = {
+        size: { type: "string", enum: [] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "enum" value.*Must be an array with at least one element/
+      );
+    });
+
+    test("throws for enum with wrong value types - string", function (assert) {
+      const schema = {
+        size: { type: "string", enum: ["small", 123] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /enum contains invalid value.*All values must be strings/
+      );
+    });
+
+    test("throws for enum with wrong value types - number", function (assert) {
+      const schema = {
+        priority: { type: "number", enum: [1, 2, "high"] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /enum contains invalid value.*All values must be numbers/
+      );
+    });
+
+    test("accepts valid string enum", function (assert) {
+      const schema = {
+        size: { type: "string", enum: ["small", "medium", "large"] },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts valid number enum", function (assert) {
+      const schema = {
+        priority: { type: "number", enum: [1, 2, 3, 5, 8] },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for default value not in enum - string", function (assert) {
+      const schema = {
+        size: {
+          type: "string",
+          enum: ["small", "medium", "large"],
+          default: "huge",
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be one of/
+      );
+    });
+
+    test("throws for default value not in enum - number", function (assert) {
+      const schema = {
+        priority: { type: "number", enum: [1, 2, 3], default: 5 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be one of/
+      );
+    });
+
+    test("throws for default string below minLength", function (assert) {
+      const schema = {
+        title: { type: "string", minLength: 5, default: "Hi" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be at least 5 characters/
+      );
+    });
+
+    test("throws for default string above maxLength", function (assert) {
+      const schema = {
+        code: { type: "string", maxLength: 3, default: "TOOLONG" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be at most 3 characters/
+      );
+    });
+
+    test("throws for default array below minLength", function (assert) {
+      const schema = {
+        tags: { type: "array", minLength: 2, default: ["one"] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must have at least 2 items/
+      );
+    });
+
+    test("throws for default array above maxLength", function (assert) {
+      const schema = {
+        tags: { type: "array", maxLength: 2, default: ["a", "b", "c"] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must have at most 2 items/
+      );
+    });
+
+    test("throws for itemEnum on non-array type", function (assert) {
+      const schema = {
+        size: { type: "string", itemEnum: ["sm", "md", "lg"] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "itemEnum" but type is "string".*only valid for array type/
+      );
+    });
+
+    test("throws for itemEnum that is not an array", function (assert) {
+      const schema = {
+        sizes: { type: "array", itemEnum: "small" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "itemEnum" value.*Must be an array with at least one element/
+      );
+    });
+
+    test("throws for empty itemEnum array", function (assert) {
+      const schema = {
+        sizes: { type: "array", itemEnum: [] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "itemEnum" value.*Must be an array with at least one element/
+      );
+    });
+
+    test("throws for itemEnum with wrong value types when itemType specified", function (assert) {
+      const schema = {
+        sizes: { type: "array", itemType: "string", itemEnum: ["sm", 123] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /itemEnum contains invalid value.*All values must be strings/
+      );
+    });
+
+    test("accepts valid string itemEnum", function (assert) {
+      const schema = {
+        sizes: {
+          type: "array",
+          itemType: "string",
+          itemEnum: ["sm", "md", "lg"],
+        },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts valid number itemEnum", function (assert) {
+      const schema = {
+        priorities: { type: "array", itemType: "number", itemEnum: [1, 2, 3] },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for default array with value not in itemEnum", function (assert) {
+      const schema = {
+        sizes: {
+          type: "array",
+          itemType: "string",
+          itemEnum: ["sm", "md", "lg"],
+          default: ["sm", "xl"],
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be one of/
+      );
+    });
+
+    test("accepts object type without properties", function (assert) {
+      const schema = {
+        metadata: { type: "object" },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts object type with properties schema", function (assert) {
+      const schema = {
+        user: {
+          type: "object",
+          properties: {
+            name: { type: "string", required: true },
+            age: { type: "number" },
+          },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts nested object properties", function (assert) {
+      const schema = {
+        data: {
+          type: "object",
+          properties: {
+            user: {
+              type: "object",
+              properties: {
+                name: { type: "string" },
+              },
+            },
+          },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for properties on non-object type", function (assert) {
+      const schema = {
+        title: { type: "string", properties: { foo: { type: "string" } } },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "properties" but type is "string".*only valid for object type/
+      );
+    });
+
+    test("throws for non-object properties value", function (assert) {
+      const schema = {
+        data: { type: "object", properties: "invalid" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "properties" value.*Must be an object/
+      );
+    });
+
+    test("throws for array properties value", function (assert) {
+      const schema = {
+        data: { type: "object", properties: [{ type: "string" }] },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "properties" value.*Must be an object/
+      );
+    });
+
+    test("throws for invalid property name in properties", function (assert) {
+      const schema = {
+        data: {
+          type: "object",
+          properties: {
+            "123invalid": { type: "string" },
+          },
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /property name "123invalid" is invalid/
+      );
+    });
+
+    test("throws for invalid property schema within properties", function (assert) {
+      const schema = {
+        data: {
+          type: "object",
+          properties: {
+            name: { type: "invalid" },
+          },
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid type "invalid"/
+      );
+    });
+
+    test("accepts valid default object value", function (assert) {
+      const schema = {
+        config: {
+          type: "object",
+          default: { key: "value" },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts valid default object with properties validation", function (assert) {
+      const schema = {
+        user: {
+          type: "object",
+          properties: {
+            name: { type: "string" },
+            age: { type: "number" },
+          },
+          default: { name: "John", age: 30 },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for default object with invalid property type", function (assert) {
+      const schema = {
+        user: {
+          type: "object",
+          properties: {
+            name: { type: "string" },
+          },
+          default: { name: 123 },
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be a string/
+      );
+    });
+
+    test("throws for non-object default value on object type", function (assert) {
+      const schema = {
+        config: { type: "object", default: "invalid" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid default value.*must be an object/
+      );
+    });
+
+    test("accepts instanceOf with function (class constructor)", function (assert) {
+      class MyClass {}
+      const schema = {
+        data: { type: "object", instanceOf: MyClass },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("accepts instanceOf with model string", function (assert) {
+      const schema = {
+        user: { type: "object", instanceOf: "model:user" },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for instanceOf on non-object type", function (assert) {
+      class MyClass {}
+      const schema = {
+        data: { type: "string", instanceOf: MyClass },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "instanceOf" but type is "string".*only valid for object type/
+      );
+    });
+
+    test("throws for instanceOf with invalid string format", function (assert) {
+      const schema = {
+        data: { type: "object", instanceOf: "invalid-format" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "instanceOf" value.*Must be a class constructor or a "model:\*" string/
+      );
+    });
+
+    test("throws for both instanceOf and properties together", function (assert) {
+      class MyClass {}
+      const schema = {
+        data: {
+          type: "object",
+          instanceOf: MyClass,
+          properties: { name: { type: "string" } },
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "instanceOf" and "properties".*mutually exclusive/
+      );
+    });
+
+    test("accepts instanceOfName with instanceOf", function (assert) {
+      class MyClass {}
+      const schema = {
+        data: {
+          type: "object",
+          instanceOf: MyClass,
+          instanceOfName: "MyClass",
+        },
+      };
+
+      assert.strictEqual(
+        validateArgsSchema(schema, "test-block"),
+        undefined,
+        "no error thrown"
+      );
+    });
+
+    test("throws for instanceOfName without instanceOf", function (assert) {
+      const schema = {
+        data: { type: "object", instanceOfName: "MyClass" },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "instanceOfName" but no "instanceOf".*only valid when "instanceOf" is also specified/
+      );
+    });
+
+    test("throws for non-string instanceOfName", function (assert) {
+      class MyClass {}
+      const schema = {
+        data: { type: "object", instanceOf: MyClass, instanceOfName: 123 },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /invalid "instanceOfName" value.*Must be a string/
+      );
+    });
+
+    test("throws for instanceOfName with model string instanceOf", function (assert) {
+      const schema = {
+        data: {
+          type: "object",
+          instanceOf: "model:user",
+          instanceOfName: "User",
+        },
+      };
+
+      assert.throws(
+        () => validateArgsSchema(schema, "test-block"),
+        /has "instanceOfName" with a "model:\*" instanceOf.*only valid for class references/
+      );
+    });
+  });
+
+  module("validateArgName", function () {
+    test("accepts valid arg names", function (assert) {
+      assert.true(validateArgName("title", { entityName: "test-block" }));
+      assert.true(validateArgName("myArg", { entityName: "test-block" }));
+      assert.true(validateArgName("arg123", { entityName: "test-block" }));
+      assert.true(validateArgName("my_arg", { entityName: "test-block" }));
+    });
+
+    test("throws for reserved arg name: id", function (assert) {
+      assert.throws(
+        () => validateArgName("id", { entityName: "test-block" }),
+        /reserved/i
+      );
+    });
+
+    test("throws for reserved arg name: children", function (assert) {
+      assert.throws(
+        () => validateArgName("children", { entityName: "test-block" }),
+        /reserved/i
+      );
+    });
+
+    test("throws for reserved arg name: conditions", function (assert) {
+      assert.throws(
+        () => validateArgName("conditions", { entityName: "test-block" }),
+        /reserved/i
+      );
+    });
+
+    test("throws for underscore-prefixed arg names", function (assert) {
+      assert.throws(
+        () => validateArgName("_private", { entityName: "test-block" }),
+        /invalid/i,
+        "underscore-prefixed names don't match required format"
+      );
+    });
+
+    test("throws for invalid arg name format", function (assert) {
+      assert.throws(
+        () => validateArgName("123invalid", { entityName: "test-block" }),
+        /invalid/i
+      );
+    });
+  });
+
+  module("validateArgValue", function () {
+    test("returns null for undefined value", function (assert) {
+      const result = validateArgValue(
+        undefined,
+        { type: "string" },
+        "title",
+        "test-block"
+      );
+      assert.strictEqual(result, null);
+    });
+
+    test("validates string type", function (assert) {
+      assert.strictEqual(
+        validateArgValue("hello", { type: "string" }, "title", "test-block"),
+        null
+      );
+
+      assert.true(
+        validateArgValue(
+          123,
+          { type: "string" },
+          "title",
+          "test-block"
+        )?.message.includes("must be a string")
+      );
+    });
+
+    test("validates string with pattern - valid value", function (assert) {
+      assert.strictEqual(
+        validateArgValue(
+          "valid-name",
+          { type: "string", pattern: /^[a-z][a-z0-9-]*$/ },
+          "name",
+          "test-block"
+        ),
+        null
+      );
+    });
+
+    test("validates string with pattern - invalid value", function (assert) {
+      const result = validateArgValue(
+        "Invalid_Name",
+        { type: "string", pattern: /^[a-z][a-z0-9-]*$/ },
+        "name",
+        "test-block"
+      );
+      assert.true(result?.message.includes("does not match required pattern"));
+    });
+
+    test("validates string with minLength constraint", function (assert) {
+      const schema = { type: "string", minLength: 3 };
+
+      assert.strictEqual(
+        validateArgValue("abc", schema, "title", "test-block"),
+        null,
+        "exact minLength passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue("abcdef", schema, "title", "test-block"),
+        null,
+        "above minLength passes"
+      );
+
+      assert.true(
+        validateArgValue("ab", schema, "title", "test-block")?.message.includes(
+          "must be at least 3 characters"
+        ),
+        "below minLength fails"
+      );
+    });
+
+    test("validates string with maxLength constraint", function (assert) {
+      const schema = { type: "string", maxLength: 5 };
+
+      assert.strictEqual(
+        validateArgValue("abcde", schema, "title", "test-block"),
+        null,
+        "exact maxLength passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue("abc", schema, "title", "test-block"),
+        null,
+        "below maxLength passes"
+      );
+
+      assert.true(
+        validateArgValue(
+          "abcdef",
+          schema,
+          "title",
+          "test-block"
+        )?.message.includes("must be at most 5 characters"),
+        "above maxLength fails"
+      );
+    });
+
+    test("validates string with enum constraint", function (assert) {
+      const schema = { type: "string", enum: ["small", "medium", "large"] };
+
+      assert.strictEqual(
+        validateArgValue("small", schema, "size", "test-block"),
+        null,
+        "valid enum value passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue("large", schema, "size", "test-block"),
+        null,
+        "another valid enum value passes"
+      );
+
+      assert.true(
+        validateArgValue(
+          "huge",
+          schema,
+          "size",
+          "test-block"
+        )?.message.includes('must be one of: "small", "medium", "large"'),
+        "invalid enum value fails"
+      );
+    });
+
+    test("suggests closest match for invalid enum string value", function (assert) {
+      const schema = { type: "string", enum: ["sm", "md", "lg", "xl", "2xl"] };
+
+      const result = validateArgValue("small", schema, "min", "test-block");
+
+      assert.true(
+        result?.message.includes('did you mean "sm"'),
+        "suggests closest match for typo"
+      );
+    });
+
+    test("validates number type", function (assert) {
+      assert.strictEqual(
+        validateArgValue(42, { type: "number" }, "count", "test-block"),
+        null
+      );
+
+      assert.true(
+        validateArgValue(
+          "42",
+          { type: "number" },
+          "count",
+          "test-block"
+        )?.message.includes("must be a number")
+      );
+
+      assert.true(
+        validateArgValue(
+          NaN,
+          { type: "number" },
+          "count",
+          "test-block"
+        )?.message.includes("must be a number")
+      );
+    });
+
+    test("validates number with min constraint", function (assert) {
+      const schema = { type: "number", min: 0 };
+
+      assert.strictEqual(
+        validateArgValue(0, schema, "count", "test-block"),
+        null,
+        "min boundary passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue(100, schema, "count", "test-block"),
+        null,
+        "above min passes"
+      );
+
+      assert.true(
+        validateArgValue(-1, schema, "count", "test-block")?.message.includes(
+          "must be at least 0"
+        ),
+        "below min fails"
+      );
+    });
+
+    test("validates number with max constraint", function (assert) {
+      const schema = { type: "number", max: 100 };
+
+      assert.strictEqual(
+        validateArgValue(100, schema, "count", "test-block"),
+        null,
+        "max boundary passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue(0, schema, "count", "test-block"),
+        null,
+        "below max passes"
+      );
+
+      assert.true(
+        validateArgValue(101, schema, "count", "test-block")?.message.includes(
+          "must be at most 100"
+        ),
+        "above max fails"
+      );
+    });
+
+    test("validates number with integer constraint", function (assert) {
+      const schema = { type: "number", integer: true };
+
+      assert.strictEqual(
+        validateArgValue(42, schema, "count", "test-block"),
+        null,
+        "integer passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue(0, schema, "count", "test-block"),
+        null,
+        "zero passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue(-5, schema, "count", "test-block"),
+        null,
+        "negative integer passes"
+      );
+
+      assert.true(
+        validateArgValue(3.14, schema, "count", "test-block")?.message.includes(
+          "must be an integer"
+        ),
+        "float fails"
+      );
+    });
+
+    test("validates number with combined constraints", function (assert) {
+      const schema = { type: "number", min: 1, max: 10, integer: true };
+
+      assert.strictEqual(
+        validateArgValue(5, schema, "page", "test-block"),
+        null,
+        "valid value passes"
+      );
+
+      assert.true(
+        validateArgValue(0, schema, "page", "test-block")?.message.includes(
+          "must be at least 1"
+        ),
+        "below min fails"
+      );
+
+      assert.true(
+        validateArgValue(11, schema, "page", "test-block")?.message.includes(
+          "must be at most 10"
+        ),
+        "above max fails"
+      );
+
+      assert.true(
+        validateArgValue(5.5, schema, "page", "test-block")?.message.includes(
+          "must be an integer"
+        ),
+        "non-integer fails"
+      );
+    });
+
+    test("validates number with enum constraint", function (assert) {
+      const schema = { type: "number", enum: [1, 2, 3, 5, 8] };
+
+      assert.strictEqual(
+        validateArgValue(1, schema, "priority", "test-block"),
+        null,
+        "valid enum value passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue(8, schema, "priority", "test-block"),
+        null,
+        "another valid enum value passes"
+      );
+
+      assert.true(
+        validateArgValue(4, schema, "priority", "test-block")?.message.includes(
+          "must be one of: 1, 2, 3, 5, 8"
+        ),
+        "invalid enum value fails"
+      );
+    });
+
+    test("validates boolean type", function (assert) {
+      assert.strictEqual(
+        validateArgValue(true, { type: "boolean" }, "enabled", "test-block"),
+        null
+      );
+
+      assert.true(
+        validateArgValue(
+          "true",
+          { type: "boolean" },
+          "enabled",
+          "test-block"
+        )?.message.includes("must be a boolean")
+      );
+    });
+
+    test("validates array type", function (assert) {
+      assert.strictEqual(
+        validateArgValue(["a", "b"], { type: "array" }, "tags", "test-block"),
+        null
+      );
+
+      assert.true(
+        validateArgValue(
+          "not-an-array",
+          { type: "array" },
+          "tags",
+          "test-block"
+        )?.message.includes("must be an array")
+      );
+    });
+
+    test("validates array itemType", function (assert) {
+      assert.strictEqual(
+        validateArgValue(
+          ["a", "b", "c"],
+          { type: "array", itemType: "string" },
+          "tags",
+          "test-block"
+        ),
+        null
+      );
+
+      assert.true(
+        validateArgValue(
+          ["a", 123, "c"],
+          { type: "array", itemType: "string" },
+          "tags",
+          "test-block"
+        )?.message.includes("must be a string")
+      );
+    });
+
+    test("validates array with minLength constraint", function (assert) {
+      const schema = { type: "array", minLength: 2 };
+
+      assert.strictEqual(
+        validateArgValue(["a", "b"], schema, "tags", "test-block"),
+        null,
+        "exact minLength passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue(["a", "b", "c"], schema, "tags", "test-block"),
+        null,
+        "above minLength passes"
+      );
+
+      assert.true(
+        validateArgValue(["a"], schema, "tags", "test-block")?.message.includes(
+          "must have at least 2 items"
+        ),
+        "below minLength fails"
+      );
+    });
+
+    test("validates array with maxLength constraint", function (assert) {
+      const schema = { type: "array", maxLength: 3 };
+
+      assert.strictEqual(
+        validateArgValue(["a", "b", "c"], schema, "tags", "test-block"),
+        null,
+        "exact maxLength passes"
+      );
+
+      assert.strictEqual(
+        validateArgValue(["a"], schema, "tags", "test-block"),
+        null,
+        "below maxLength passes"
+      );
+
+      assert.true(
+        validateArgValue(
+          ["a", "b", "c", "d"],
+          schema,
+          "tags",
+          "test-block"
+        )?.message.includes("must have at most 3 items"),
+        "above maxLength fails"
+      );
+    });
+
+    test("validates array with combined constraints", function (assert) {
+      const schema = {
+        type: "array",
+        minLength: 1,
+        maxLength: 5,
+        itemType: "string",
+      };
+
+      assert.strictEqual(
+        validateArgValue(["a", "b", "c"], schema, "tags", "test-block"),
+        null,
+        "valid array passes"
+      );
+
+      assert.true(
+        validateArgValue([], schema, "tags", "test-block")?.message.includes(
+          "must have at least 1 items"
+        ),
+        "empty array fails"
+      );
+
+      assert.true(
+        validateArgValue(
+          ["a", "b", "c", "d", "e", "f"],
+          schema,
+          "tags",
+          "test-block"
+        )?.message.includes("must have at most 5 items"),
+        "too many items fails"
+      );
+
+      assert.true(
+        validateArgValue(
+          ["a", 123, "c"],
+          schema,
+          "tags",
+          "test-block"
+        )?.message.includes("must be a string"),
+        "wrong item type fails"
+      );
+    });
+
+    test("validates array with itemEnum constraint - valid values", function (assert) {
+      const schema = {
+        type: "array",
+        itemType: "string",
+        itemEnum: ["home", "topic", "category", "user"],
+      };
+
+      assert.strictEqual(
+        validateArgValue(["home", "topic"], schema, "pages", "test-block"),
+        null,
+        "valid itemEnum values pass"
+      );
+
+      assert.strictEqual(
+        validateArgValue([], schema, "pages", "test-block"),
+        null,
+        "empty array passes"
+      );
+    });
+
+    test("validates array with itemEnum constraint - invalid value", function (assert) {
+      const schema = {
+        type: "array",
+        itemType: "string",
+        itemEnum: ["home", "topic", "category", "user"],
+      };
+
+      const result = validateArgValue(
+        ["home", "invalid", "topic"],
+        schema,
+        "pages",
+        "test-block"
+      );
+
+      assert.true(
+        result?.message.includes('pages[1]" must be one of'),
+        "error includes indexed arg name"
+      );
+      assert.true(
+        result?.message.includes('"home", "topic", "category", "user"'),
+        "error lists valid values"
+      );
+    });
+
+    test("suggests closest match for invalid itemEnum value", function (assert) {
+      const schema = {
+        type: "array",
+        itemType: "string",
+        itemEnum: ["home", "topic", "category", "user"],
+      };
+
+      const result = validateArgValue(
+        ["homepage"],
+        schema,
+        "pages",
+        "test-block"
+      );
+
+      assert.true(
+        result?.message.includes('did you mean "home"'),
+        "suggests closest match for typo"
+      );
+    });
+
+    test("validates object type - valid plain object", function (assert) {
+      assert.strictEqual(
+        validateArgValue(
+          { key: "value" },
+          { type: "object" },
+          "data",
+          "test-block"
+        ),
+        null
+      );
+    });
+
+    test("validates object type - rejects null", function (assert) {
+      assert.true(
+        validateArgValue(
+          null,
+          { type: "object" },
+          "data",
+          "test-block"
+        )?.message.includes("must be an object, got null")
+      );
+    });
+
+    test("validates object type - rejects array", function (assert) {
+      assert.true(
+        validateArgValue(
+          [],
+          { type: "object" },
+          "data",
+          "test-block"
+        )?.message.includes("must be an object, got array")
+      );
+    });
+
+    test("validates object type - rejects string", function (assert) {
+      assert.true(
+        validateArgValue(
+          "string",
+          { type: "object" },
+          "data",
+          "test-block"
+        )?.message.includes("must be an object, got string")
+      );
+    });
+
+    test("validates object type - rejects number", function (assert) {
+      assert.true(
+        validateArgValue(
+          123,
+          { type: "object" },
+          "data",
+          "test-block"
+        )?.message.includes("must be an object, got number")
+      );
+    });
+
+    test("validates object with properties schema - valid object", function (assert) {
+      const schema = {
+        type: "object",
+        properties: {
+          name: { type: "string" },
+          age: { type: "number" },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgValue(
+          { name: "John", age: 30 },
+          schema,
+          "user",
+          "test-block"
+        ),
+        null
+      );
+    });
+
+    test("validates object with properties schema - allows extra properties", function (assert) {
+      const schema = {
+        type: "object",
+        properties: {
+          name: { type: "string" },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgValue(
+          { name: "John", extra: "allowed" },
+          schema,
+          "user",
+          "test-block"
+        ),
+        null,
+        "extra properties not in schema are allowed"
+      );
+    });
+
+    test("validates object with properties schema - missing required property", function (assert) {
+      const schema = {
+        type: "object",
+        properties: {
+          name: { type: "string", required: true },
+        },
+      };
+
+      assert.true(
+        validateArgValue({}, schema, "user", "test-block")?.message.includes(
+          '"user.name" is required'
+        )
+      );
+    });
+
+    test("validates object with properties schema - invalid property type", function (assert) {
+      const schema = {
+        type: "object",
+        properties: {
+          name: { type: "string" },
+        },
+      };
+
+      assert.true(
+        validateArgValue(
+          { name: 123 },
+          schema,
+          "user",
+          "test-block"
+        )?.message.includes('"user.name" must be a string')
+      );
+    });
+
+    test("validates nested object properties", function (assert) {
+      const schema = {
+        type: "object",
+        properties: {
+          address: {
+            type: "object",
+            properties: {
+              city: { type: "string", required: true },
+            },
+          },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgValue(
+          { address: { city: "NYC" } },
+          schema,
+          "user",
+          "test-block"
+        ),
+        null,
+        "valid nested object passes"
+      );
+
+      assert.true(
+        validateArgValue(
+          { address: {} },
+          schema,
+          "user",
+          "test-block"
+        )?.message.includes('"user.address.city" is required'),
+        "missing nested required property fails"
+      );
+
+      assert.true(
+        validateArgValue(
+          { address: { city: 123 } },
+          schema,
+          "user",
+          "test-block"
+        )?.message.includes('"user.address.city" must be a string'),
+        "invalid nested property type fails"
+      );
+    });
+
+    test("validates object property with array type", function (assert) {
+      const schema = {
+        type: "object",
+        properties: {
+          tags: { type: "array", itemType: "string" },
+        },
+      };
+
+      assert.strictEqual(
+        validateArgValue({ tags: ["a", "b"] }, schema, "data", "test-block"),
+        null,
+        "valid array property passes"
+      );
+
+      assert.true(
+        validateArgValue(
+          { tags: "invalid" },
+          schema,
+          "data",
+          "test-block"
+        )?.message.includes('"data.tags" must be an array'),
+        "non-array value for array property fails"
+      );
+    });
+
+    test("validates instanceOf with direct class reference - valid", function (assert) {
+      class MyClass {}
+      const instance = new MyClass();
+      const schema = { type: "object", instanceOf: MyClass };
+
+      assert.strictEqual(
+        validateArgValue(instance, schema, "data", "test-block"),
+        null,
+        "valid instance passes"
+      );
+    });
+
+    test("validates instanceOf with direct class reference - invalid", function (assert) {
+      class MyClass {}
+      class OtherClass {}
+      const instance = new OtherClass();
+      // Use instanceOfName to get a reliable class name in error message
+      // (class names can be mangled by bundlers or minifiers)
+      const schema = {
+        type: "object",
+        instanceOf: MyClass,
+        instanceOfName: "MyClass",
+      };
+
+      assert.true(
+        validateArgValue(
+          instance,
+          schema,
+          "data",
+          "test-block"
+        )?.message.includes("must be an instance of MyClass"),
+        "wrong instance type fails"
+      );
+    });
+
+    test("validates instanceOf with direct class reference - plain object fails", function (assert) {
+      class MyClass {}
+      // Use instanceOfName to get a reliable class name in error message
+      const schema = {
+        type: "object",
+        instanceOf: MyClass,
+        instanceOfName: "MyClass",
+      };
+
+      assert.true(
+        validateArgValue({}, schema, "data", "test-block")?.message.includes(
+          "must be an instance of MyClass"
+        ),
+        "plain object fails instanceOf check"
+      );
+    });
+
+    test("validates instanceOf without instanceOfName uses generic fallback", function (assert) {
+      class MyClass {}
+      // Without instanceOfName, error message uses generic fallback
+      // (because class names can be mangled by bundlers or minifiers)
+      const schema = { type: "object", instanceOf: MyClass };
+
+      assert.true(
+        validateArgValue({}, schema, "data", "test-block")?.message.includes(
+          "must match the required class type"
+        ),
+        "uses generic fallback without instanceOfName"
+      );
+    });
+
+    test("validates instanceOf with model string - valid RestModel with __type", function (assert) {
+      // Create a mock that passes instanceof RestModel check
+      const RestModel = require("discourse/models/rest").default;
+      const mockModel = Object.create(RestModel.prototype);
+      mockModel.__type = "user";
+
+      const schema = { type: "object", instanceOf: "model:user" };
+
+      assert.strictEqual(
+        validateArgValue(mockModel, schema, "data", "test-block"),
+        null,
+        "RestModel instance with matching __type passes"
+      );
+    });
+
+    test("validates instanceOf with model string - wrong __type fails", function (assert) {
+      const RestModel = require("discourse/models/rest").default;
+      const mockModel = Object.create(RestModel.prototype);
+      mockModel.__type = "post";
+
+      const schema = { type: "object", instanceOf: "model:user" };
+
+      assert.true(
+        validateArgValue(
+          mockModel,
+          schema,
+          "data",
+          "test-block"
+        )?.message.includes("must be an instance of user model"),
+        "RestModel with wrong __type fails"
+      );
+    });
+
+    test("validates instanceOf with model string - plain object fails", function (assert) {
+      const plainObject = { __type: "user", name: "test" };
+      const schema = { type: "object", instanceOf: "model:user" };
+
+      assert.true(
+        validateArgValue(
+          plainObject,
+          schema,
+          "data",
+          "test-block"
+        )?.message.includes("must be an instance of user model"),
+        "plain object fails even with matching __type"
+      );
+    });
+  });
+
+  module("validateArrayItemType", function () {
+    test("validates string items", function (assert) {
+      assert.strictEqual(
+        validateArrayItemType("hello", "string", "tags", 0, "test-block"),
+        null
+      );
+
+      assert.true(
+        validateArrayItemType(
+          123,
+          "string",
+          "tags",
+          0,
+          "test-block"
+        )?.message.includes('tags[0]" must be a string')
+      );
+    });
+
+    test("validates number items", function (assert) {
+      assert.strictEqual(
+        validateArrayItemType(42, "number", "ids", 0, "test-block"),
+        null
+      );
+
+      assert.true(
+        validateArrayItemType(
+          "42",
+          "number",
+          "ids",
+          1,
+          "test-block"
+        )?.message.includes('ids[1]" must be a number')
+      );
+    });
+
+    test("validates boolean items", function (assert) {
+      assert.strictEqual(
+        validateArrayItemType(true, "boolean", "flags", 0, "test-block"),
+        null
+      );
+
+      assert.true(
+        validateArrayItemType(
+          1,
+          "boolean",
+          "flags",
+          2,
+          "test-block"
+        )?.message.includes('flags[2]" must be a boolean')
+      );
+    });
+  });
+
+  module("validateBlockArgs", function () {
+    test("validates required args are present", function (assert) {
+      @block("required-args-block", {
+        args: {
+          title: { type: "string", required: true },
+        },
+      })
+      class RequiredArgsBlock extends Component {}
+
+      try {
+        validateBlockArgs({ args: {} }, RequiredArgsBlock);
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(error instanceof BlockError);
+        assert.true(error.message.includes("missing required args.title"));
+        assert.strictEqual(error.path, "args.title");
+      }
+    });
+
+    test("validates arg types", function (assert) {
+      @block("typed-args-block", {
+        args: {
+          count: { type: "number" },
+        },
+      })
+      class TypedArgsBlock extends Component {}
+
+      try {
+        validateBlockArgs({ args: { count: "not-a-number" } }, TypedArgsBlock);
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(error instanceof BlockError);
+        assert.true(error.message.includes("must be a number"));
+        assert.strictEqual(error.path, "args.count");
+      }
+    });
+
+    test("passes for valid args", function (assert) {
+      @block("valid-args-block", {
+        args: {
+          title: { type: "string", required: true },
+          count: { type: "number" },
+        },
+      })
+      class ValidArgsBlock extends Component {}
+
+      assert.strictEqual(
+        validateBlockArgs(
+          { args: { title: "Hello", count: 5 } },
+          ValidArgsBlock
+        ),
+        undefined
+      );
+    });
+
+    test("throws when args provided but no schema declared", function (assert) {
+      @block("no-schema-block")
+      class NoSchemaBlock extends Component {}
+
+      try {
+        validateBlockArgs({ args: { anything: "goes" } }, NoSchemaBlock);
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(error instanceof BlockError);
+        assert.true(error.message.includes("does not declare an args schema"));
+        assert.strictEqual(error.path, "args");
+      }
+    });
+
+    test("passes when no args and no schema", function (assert) {
+      @block("no-args-no-schema-block")
+      class NoArgsNoSchemaBlock extends Component {}
+
+      assert.strictEqual(
+        validateBlockArgs({ args: {} }, NoArgsNoSchemaBlock),
+        undefined
+      );
+      assert.strictEqual(validateBlockArgs({}, NoArgsNoSchemaBlock), undefined);
+    });
+
+    test("throws for unknown args not declared in schema", function (assert) {
+      @block("known-args-block", {
+        args: {
+          title: { type: "string" },
+        },
+      })
+      class KnownArgsBlock extends Component {}
+
+      try {
+        validateBlockArgs(
+          { args: { title: "valid", unknownArg: "bad" } },
+          KnownArgsBlock
+        );
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(error instanceof BlockError);
+        assert.true(error.message.includes('unknown args "unknownArg"'));
+        assert.strictEqual(error.path, "args.unknownArg");
+      }
+    });
+
+    test("suggests correct arg name for typos", function (assert) {
+      @block("typo-args-block", {
+        args: {
+          showDescription: { type: "boolean" },
+        },
+      })
+      class TypoArgsBlock extends Component {}
+
+      try {
+        validateBlockArgs({ args: { shoDescription: true } }, TypoArgsBlock);
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(error instanceof BlockError);
+        assert.true(error.message.includes("shoDescription"));
+        assert.true(error.message.includes('did you mean "showDescription"'));
+        assert.strictEqual(error.path, "args.shoDescription");
+      }
+    });
+
+    test("typo in required arg produces unknown arg error with suggestion, not missing required error", function (assert) {
+      @block("typo-required-args-block", {
+        args: {
+          name: { type: "string", required: true },
+        },
+      })
+      class TypoRequiredArgsBlock extends Component {}
+
+      try {
+        // Typo: "nam" instead of "name"
+        validateBlockArgs({ args: { nam: "test" } }, TypoRequiredArgsBlock);
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(error instanceof BlockError);
+        // Should say "unknown" not "missing required"
+        assert.true(
+          error.message.includes("unknown"),
+          "error should mention unknown arg"
+        );
+        assert.false(
+          error.message.includes("missing required"),
+          "error should NOT mention missing required"
+        );
+        assert.true(
+          error.message.includes('did you mean "name"'),
+          "error should suggest the correct arg name"
+        );
+        assert.strictEqual(error.path, "args.nam");
+      }
+    });
+
+    test("validates nested object arg with correct error path", function (assert) {
+      @block("nested-object-block", {
+        args: {
+          user: {
+            type: "object",
+            properties: {
+              name: { type: "string" },
+            },
+          },
+        },
+      })
+      class NestedObjectBlock extends Component {}
+
+      try {
+        validateBlockArgs({ args: { user: { name: 123 } } }, NestedObjectBlock);
+        assert.true(false, "should have thrown");
+      } catch (error) {
+        assert.true(error instanceof BlockError, "should be BlockError");
+        assert.true(
+          error.message.includes("must be a string"),
+          `message should mention type error, got: ${error.message}`
+        );
+        assert.strictEqual(
+          error.path,
+          "args.user.name",
+          "error path should include nested property"
+        );
+      }
+    });
+  });
+
+  module("validateConstraintsSchema", function () {
+    test("accepts valid constraints", function (assert) {
+      const constraints = {
+        atLeastOne: ["id", "tag"],
+      };
+      const argsSchema = {
+        id: { type: "number" },
+        tag: { type: "string" },
+      };
+
+      assert.strictEqual(
+        validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        undefined
+      );
+    });
+
+    test("accepts null/undefined constraints", function (assert) {
+      assert.strictEqual(
+        validateConstraintsSchema(null, {}, "test-block"),
+        undefined
+      );
+      assert.strictEqual(
+        validateConstraintsSchema(undefined, {}, "test-block"),
+        undefined
+      );
+    });
+
+    test("throws for unknown constraint type", function (assert) {
+      const constraints = {
+        invalidConstraint: ["id", "tag"],
+      };
+      const argsSchema = {
+        id: { type: "number" },
+        tag: { type: "string" },
+      };
+
+      assert.throws(
+        () => validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        /unknown constraint type "invalidConstraint"/
+      );
+    });
+
+    test("suggests similar constraint type for typos", function (assert) {
+      const constraints = {
+        atleastOne: ["id", "tag"],
+      };
+      const argsSchema = {
+        id: { type: "number" },
+        tag: { type: "string" },
+      };
+
+      assert.throws(
+        () => validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        /did you mean "atLeastOne"/
+      );
+    });
+
+    test("throws if constraint value is not an array", function (assert) {
+      const constraints = {
+        atLeastOne: "id",
+      };
+      const argsSchema = {
+        id: { type: "number" },
+      };
+
+      assert.throws(
+        () => validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        /must be an array of arg names/
+      );
+    });
+
+    test("throws if constraint has fewer than 2 args", function (assert) {
+      const constraints = {
+        atLeastOne: ["id"],
+      };
+      const argsSchema = {
+        id: { type: "number" },
+      };
+
+      assert.throws(
+        () => validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        /must reference at least 2 args/
+      );
+    });
+
+    test("throws if constraint references unknown arg", function (assert) {
+      const constraints = {
+        atLeastOne: ["id", "unknownArg"],
+      };
+      const argsSchema = {
+        id: { type: "number" },
+        tag: { type: "string" },
+      };
+
+      assert.throws(
+        () => validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        /references unknown arg "unknownArg"/
+      );
+    });
+
+    test("suggests similar arg name for typos in constraint", function (assert) {
+      const constraints = {
+        atLeastOne: ["id", "tagh"],
+      };
+      const argsSchema = {
+        id: { type: "number" },
+        tag: { type: "string" },
+      };
+
+      assert.throws(
+        () => validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        /did you mean "tag"/
+      );
+    });
+
+    test("throws if constraint contains non-string value", function (assert) {
+      const constraints = {
+        atLeastOne: ["id", 123],
+      };
+      const argsSchema = {
+        id: { type: "number" },
+      };
+
+      assert.throws(
+        () => validateConstraintsSchema(constraints, argsSchema, "test-block"),
+        /contains non-string value/
+      );
+    });
+
+    module("vacuous constraint detection", function () {
+      test("atLeastOne is vacuous when arg has default", function (assert) {
+        const constraints = {
+          atLeastOne: ["id", "tag"],
+        };
+        const argsSchema = {
+          id: { type: "number", default: 1 },
+          tag: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /atLeastOne.*is always true because "id" has a default value/
+        );
+      });
+
+      test("exactlyOne is vacuous when multiple args have defaults", function (assert) {
+        const constraints = {
+          exactlyOne: ["id", "tag"],
+        };
+        const argsSchema = {
+          id: { type: "number", default: 1 },
+          tag: { type: "string", default: "foo" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /exactlyOne.*is always false because multiple args have default values/
+        );
+      });
+
+      test("exactlyOne is valid when only one arg has default", function (assert) {
+        const constraints = {
+          exactlyOne: ["id", "tag"],
+        };
+        const argsSchema = {
+          id: { type: "number", default: 1 },
+          tag: { type: "string" },
+        };
+
+        assert.strictEqual(
+          validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          undefined
+        );
+      });
+
+      test("allOrNone is vacuous when some but not all have defaults", function (assert) {
+        const constraints = {
+          allOrNone: ["width", "height"],
+        };
+        const argsSchema = {
+          width: { type: "number", default: 100 },
+          height: { type: "number" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /allOrNone.*is always false because only some args have defaults/
+        );
+      });
+
+      test("allOrNone is valid when all have defaults", function (assert) {
+        const constraints = {
+          allOrNone: ["width", "height"],
+        };
+        const argsSchema = {
+          width: { type: "number", default: 100 },
+          height: { type: "number", default: 200 },
+        };
+
+        assert.strictEqual(
+          validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          undefined
+        );
+      });
+
+      test("allOrNone is valid when none have defaults", function (assert) {
+        const constraints = {
+          allOrNone: ["width", "height"],
+        };
+        const argsSchema = {
+          width: { type: "number" },
+          height: { type: "number" },
+        };
+
+        assert.strictEqual(
+          validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          undefined
+        );
+      });
+    });
+
+    module("requires constraint schema validation", function () {
+      test("accepts valid requires constraint", function (assert) {
+        const constraints = {
+          requires: { dependent: "required" },
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+          required: { type: "string" },
+        };
+
+        assert.strictEqual(
+          validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          undefined
+        );
+      });
+
+      test("accepts requires with multiple dependencies", function (assert) {
+        const constraints = {
+          requires: { params: "pages", config: "enabled" },
+        };
+        const argsSchema = {
+          params: {},
+          pages: { type: "array" },
+          config: {},
+          enabled: { type: "boolean" },
+        };
+
+        assert.strictEqual(
+          validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          undefined
+        );
+      });
+
+      test("throws for requires that is not an object", function (assert) {
+        const constraints = {
+          requires: ["dependent", "required"],
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+          required: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /must be an object mapping dependent args to required args/
+        );
+      });
+
+      test("throws for requires that is null", function (assert) {
+        const constraints = {
+          requires: null,
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /must be an object mapping dependent args to required args/
+        );
+      });
+
+      test("throws for requires referencing unknown dependent arg", function (assert) {
+        const constraints = {
+          requires: { unknownArg: "required" },
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+          required: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /references unknown arg "unknownArg"/
+        );
+      });
+
+      test("suggests similar arg name for typo in dependent arg", function (assert) {
+        const constraints = {
+          requires: { dependant: "required" },
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+          required: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /did you mean "dependent"/
+        );
+      });
+
+      test("throws for requires referencing unknown required arg", function (assert) {
+        const constraints = {
+          requires: { dependent: "unknownRequired" },
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+          required: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /references unknown arg "unknownRequired"/
+        );
+      });
+
+      test("suggests similar arg name for typo in required arg", function (assert) {
+        const constraints = {
+          requires: { dependent: "reqiured" },
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+          required: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /did you mean "required"/
+        );
+      });
+
+      test("throws for requires with non-string value", function (assert) {
+        const constraints = {
+          requires: { dependent: 123 },
+        };
+        const argsSchema = {
+          dependent: { type: "string" },
+          required: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /value for "dependent" must be a string arg name/
+        );
+      });
+    });
+
+    module("incompatible constraint detection", function () {
+      test("exactlyOne + allOrNone on same args is an error", function (assert) {
+        const constraints = {
+          exactlyOne: ["id", "tag"],
+          allOrNone: ["id", "tag"],
+        };
+        const argsSchema = {
+          id: { type: "number" },
+          tag: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /"exactlyOne" and "allOrNone" conflict/
+        );
+      });
+
+      test("exactlyOne + atLeastOne on same args is an error", function (assert) {
+        const constraints = {
+          exactlyOne: ["id", "tag"],
+          atLeastOne: ["id", "tag"],
+        };
+        const argsSchema = {
+          id: { type: "number" },
+          tag: { type: "string" },
+        };
+
+        assert.throws(
+          () =>
+            validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          /"atLeastOne" is redundant with "exactlyOne"/
+        );
+      });
+
+      test("different constraints on different args is valid", function (assert) {
+        const constraints = {
+          exactlyOne: ["id", "tag"],
+          allOrNone: ["width", "height"],
+        };
+        const argsSchema = {
+          id: { type: "number" },
+          tag: { type: "string" },
+          width: { type: "number" },
+          height: { type: "number" },
+        };
+
+        assert.strictEqual(
+          validateConstraintsSchema(constraints, argsSchema, "test-block"),
+          undefined
+        );
+      });
+    });
+  });
+
+  module("validateConstraints", function () {
+    module("atLeastOne", function () {
+      test("passes when one arg is provided", function (assert) {
+        const constraints = { atLeastOne: ["id", "tag"] };
+        const args = { id: 123 };
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("passes when multiple args are provided", function (assert) {
+        const constraints = { atLeastOne: ["id", "tag"] };
+        const args = { id: 123, tag: "foo" };
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("fails when no args are provided", function (assert) {
+        const constraints = { atLeastOne: ["id", "tag"] };
+        const args = {};
+
+        const error = validateConstraints(constraints, args, "test-block");
+        assert.true(error.includes('at least one of "id", "tag"'));
+        assert.true(error.includes("must be provided"));
+      });
+    });
+
+    module("exactlyOne", function () {
+      test("passes when exactly one arg is provided", function (assert) {
+        const constraints = { exactlyOne: ["id", "tag"] };
+        const args = { id: 123 };
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("fails when no args are provided", function (assert) {
+        const constraints = { exactlyOne: ["id", "tag"] };
+        const args = {};
+
+        const error = validateConstraints(constraints, args, "test-block");
+        assert.true(error.includes('exactly one of "id", "tag"'));
+        assert.true(error.includes("but got none"));
+      });
+
+      test("fails when multiple args are provided", function (assert) {
+        const constraints = { exactlyOne: ["id", "tag"] };
+        const args = { id: 123, tag: "foo" };
+
+        const error = validateConstraints(constraints, args, "test-block");
+        assert.true(error.includes('exactly one of "id", "tag"'));
+        assert.true(error.includes("but got 2"));
+      });
+    });
+
+    module("allOrNone", function () {
+      test("passes when all args are provided", function (assert) {
+        const constraints = { allOrNone: ["width", "height"] };
+        const args = { width: 100, height: 200 };
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("passes when no args are provided", function (assert) {
+        const constraints = { allOrNone: ["width", "height"] };
+        const args = {};
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("fails when some but not all args are provided", function (assert) {
+        const constraints = { allOrNone: ["width", "height"] };
+        const args = { width: 100 };
+
+        const error = validateConstraints(constraints, args, "test-block");
+        assert.true(error.includes('"width", "height"'));
+        assert.true(error.includes("must be provided together or not at all"));
+        assert.true(error.includes('missing "height"'));
+      });
+    });
+
+    module("requires", function () {
+      test("passes when dependent arg not provided", function (assert) {
+        const constraints = { requires: { params: "pages" } };
+        const args = {};
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("passes when both dependent and required args provided", function (assert) {
+        const constraints = { requires: { params: "pages" } };
+        const args = { params: { categoryId: 5 }, pages: ["CATEGORY_PAGES"] };
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("passes when only required arg provided without dependent", function (assert) {
+        const constraints = { requires: { params: "pages" } };
+        const args = { pages: ["CATEGORY_PAGES"] };
+
+        assert.strictEqual(
+          validateConstraints(constraints, args, "test-block"),
+          null
+        );
+      });
+
+      test("fails when dependent provided but required missing", function (assert) {
+        const constraints = { requires: { params: "pages" } };
+        const args = { params: { categoryId: 5 } };
+
+        const error = validateConstraints(constraints, args, "test-block");
+        assert.true(error.includes('"params" requires "pages"'));
+        assert.true(error.includes("to be specified"));
+      });
+
+      test("validates multiple requires dependencies", function (assert) {
+        const constraints = {
+          requires: { params: "pages", config: "enabled" },
+        };
+
+        assert.strictEqual(
+          validateConstraints(
+            constraints,
+            { params: {}, pages: [], config: {}, enabled: true },
+            "test-block"
+          ),
+          null,
+          "all dependencies satisfied"
+        );
+
+        const error = validateConstraints(
+          constraints,
+          { params: {}, pages: [], config: {} },
+          "test-block"
+        );
+        assert.true(
+          error.includes('"config" requires "enabled"'),
+          "fails when one dependency unsatisfied"
+        );
+      });
+    });
+
+    test("accepts null/undefined constraints", function (assert) {
+      assert.strictEqual(validateConstraints(null, {}, "test-block"), null);
+      assert.strictEqual(
+        validateConstraints(undefined, {}, "test-block"),
+        null
+      );
+    });
+
+    test("validates multiple constraints", function (assert) {
+      const constraints = {
+        atLeastOne: ["a", "b"],
+        allOrNone: ["x", "y"],
+      };
+      const args = { a: 1, x: 10 };
+
+      const error = validateConstraints(constraints, args, "test-block");
+      assert.true(error.includes('missing "y"'));
+    });
+  });
+
+  module("runCustomValidation", function () {
+    test("returns null when validate returns undefined", function (assert) {
+      const validateFn = () => undefined;
+
+      assert.strictEqual(runCustomValidation(validateFn, {}), null);
+    });
+
+    test("returns null when validate returns null", function (assert) {
+      const validateFn = () => null;
+
+      assert.strictEqual(runCustomValidation(validateFn, {}), null);
+    });
+
+    test("returns array with single error when validate returns string", function (assert) {
+      const validateFn = () => "min must be less than max";
+
+      const errors = runCustomValidation(validateFn, {});
+      assert.deepEqual(errors, ["min must be less than max"]);
+    });
+
+    test("returns array when validate returns array of strings", function (assert) {
+      const validateFn = () => ["error 1", "error 2"];
+
+      const errors = runCustomValidation(validateFn, {});
+      assert.deepEqual(errors, ["error 1", "error 2"]);
+    });
+
+    test("filters out non-string and empty values from array", function (assert) {
+      const validateFn = () => ["valid error", "", 123, null, "another error"];
+
+      const errors = runCustomValidation(validateFn, {});
+      assert.deepEqual(errors, ["valid error", "another error"]);
+    });
+
+    test("returns null for empty array", function (assert) {
+      const validateFn = () => [];
+
+      assert.strictEqual(runCustomValidation(validateFn, {}), null);
+    });
+
+    test("returns null for non-function validateFn", function (assert) {
+      assert.strictEqual(runCustomValidation(null, {}), null);
+      assert.strictEqual(runCustomValidation(undefined, {}), null);
+      assert.strictEqual(runCustomValidation("not a function", {}), null);
+    });
+
+    test("passes args to validate function", function (assert) {
+      let receivedArgs;
+      const validateFn = (args) => {
+        receivedArgs = args;
+        return null;
+      };
+
+      const testArgs = { min: 5, max: 10 };
+      runCustomValidation(validateFn, testArgs);
+
+      assert.strictEqual(receivedArgs, testArgs);
+    });
+
+    test("can validate args relationships", function (assert) {
+      const validateFn = (args) => {
+        if (args.min > args.max) {
+          return "min must be less than or equal to max";
+        }
+      };
+
+      assert.strictEqual(
+        runCustomValidation(validateFn, { min: 5, max: 10 }),
+        null
+      );
+      assert.deepEqual(runCustomValidation(validateFn, { min: 15, max: 10 }), [
+        "min must be less than or equal to max",
+      ]);
+    });
+  });
+
+  module("@block decorator with constraints", function () {
+    test("stores constraints in block metadata", function (assert) {
+      @block("constraint-metadata-block", {
+        args: {
+          itemId: { type: "number" },
+          tag: { type: "string" },
+        },
+        constraints: {
+          atLeastOne: ["itemId", "tag"],
+        },
+      })
+      class ConstraintMetadataBlock extends Component {}
+
+      assert.deepEqual(getBlockMetadata(ConstraintMetadataBlock).constraints, {
+        atLeastOne: ["itemId", "tag"],
+      });
+    });
+
+    test("stores validate function in block metadata", function (assert) {
+      const validateFn = (args) => {
+        if (args.min > args.max) {
+          return "min must be less than max";
+        }
+      };
+
+      @block("validate-fn-block", {
+        args: {
+          min: { type: "number" },
+          max: { type: "number" },
+        },
+        validate: validateFn,
+      })
+      class ValidateFnBlock extends Component {}
+
+      assert.strictEqual(
+        getBlockMetadata(ValidateFnBlock).validate,
+        validateFn,
+        "validate function is stored"
+      );
+    });
+
+    test("throws at decoration time for invalid constraints", function (assert) {
+      assert.throws(() => {
+        @block("invalid-constraint-block", {
+          args: {
+            itemId: { type: "number" },
+          },
+          constraints: {
+            unknownConstraint: ["itemId", "other"],
+          },
+        })
+        class InvalidConstraintBlock extends Component {}
+        return InvalidConstraintBlock;
+      }, /unknown constraint type/);
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/validation/config-test.js b/frontend/discourse/tests/unit/lib/blocks/validation/config-test.js
new file mode 100644
index 0000000000000..349e5e4b8b54d
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/validation/config-test.js
@@ -0,0 +1,73 @@
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import { RESERVED_ARG_NAMES } from "discourse/lib/blocks/-internals/validation/args";
+import {
+  VALID_ENTRY_KEYS,
+  validateEntryKeys,
+  validateEntryTypes,
+} from "discourse/lib/blocks/-internals/validation/layout";
+
+module("Unit | Blocks | validation/layout", function (hooks) {
+  setupTest(hooks);
+
+  module("containerArgs in entry", function () {
+    test("containerArgs is a valid entry key", function (assert) {
+      assert.true(
+        VALID_ENTRY_KEYS.includes("containerArgs"),
+        "containerArgs is in VALID_ENTRY_KEYS"
+      );
+    });
+
+    test("containerArgs is a reserved arg name", function (assert) {
+      assert.true(
+        RESERVED_ARG_NAMES.includes("containerArgs"),
+        "containerArgs is in RESERVED_ARG_NAMES"
+      );
+    });
+
+    test("validateEntryKeys accepts containerArgs", function (assert) {
+      const entry = {
+        block: "test-block",
+        containerArgs: { name: "test" },
+      };
+
+      // Should not throw
+      validateEntryKeys(entry);
+      assert.true(true, "containerArgs accepted as valid entry key");
+    });
+
+    test("validateEntryTypes accepts containerArgs as object", function (assert) {
+      const entry = {
+        containerArgs: { name: "test" },
+      };
+
+      // Should not throw
+      validateEntryTypes(entry);
+      assert.true(true, "containerArgs as object accepted");
+    });
+
+    test("validateEntryTypes rejects containerArgs as array", function (assert) {
+      const entry = {
+        containerArgs: ["invalid"],
+      };
+
+      assert.throws(
+        () => validateEntryTypes(entry),
+        /"containerArgs" must be an object, got array/,
+        "containerArgs as array rejected"
+      );
+    });
+
+    test("validateEntryTypes rejects containerArgs as string", function (assert) {
+      const entry = {
+        containerArgs: "invalid",
+      };
+
+      assert.throws(
+        () => validateEntryTypes(entry),
+        /"containerArgs" must be an object, got string/,
+        "containerArgs as string rejected"
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/blocks/validation/layout-test.js b/frontend/discourse/tests/unit/lib/blocks/validation/layout-test.js
new file mode 100644
index 0000000000000..72976be366bc4
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/blocks/validation/layout-test.js
@@ -0,0 +1,512 @@
+import { module, test } from "qunit";
+import {
+  isReservedArgName,
+  RESERVED_ARG_NAMES,
+} from "discourse/lib/blocks/-internals/validation/args";
+import {
+  VALID_ENTRY_KEYS,
+  validateEntryIdFormat,
+  validateEntryKeys,
+  validateEntryTypes,
+} from "discourse/lib/blocks/-internals/validation/layout";
+
+module("Unit | Lib | blocks/validation/layout", function () {
+  module("RESERVED_ARG_NAMES", function () {
+    test("includes expected reserved names", function (assert) {
+      assert.true(RESERVED_ARG_NAMES.includes("args"));
+      assert.true(RESERVED_ARG_NAMES.includes("block"));
+      assert.true(RESERVED_ARG_NAMES.includes("classNames"));
+      assert.true(RESERVED_ARG_NAMES.includes("id"));
+      assert.true(RESERVED_ARG_NAMES.includes("outletName"));
+      assert.true(RESERVED_ARG_NAMES.includes("children"));
+      assert.true(RESERVED_ARG_NAMES.includes("conditions"));
+      // Note: __block$, __visible, etc. are reserved via startsWith("_") check
+    });
+
+    test("is frozen", function (assert) {
+      assert.true(Object.isFrozen(RESERVED_ARG_NAMES));
+    });
+  });
+
+  module("VALID_ENTRY_KEYS", function () {
+    test("includes expected entry keys", function (assert) {
+      assert.true(VALID_ENTRY_KEYS.includes("block"));
+      assert.true(VALID_ENTRY_KEYS.includes("args"));
+      assert.true(VALID_ENTRY_KEYS.includes("children"));
+      assert.true(VALID_ENTRY_KEYS.includes("conditions"));
+      assert.true(VALID_ENTRY_KEYS.includes("classNames"));
+      assert.true(VALID_ENTRY_KEYS.includes("id"));
+    });
+
+    test("is frozen", function (assert) {
+      assert.true(Object.isFrozen(VALID_ENTRY_KEYS));
+    });
+
+    test("has exactly 7 keys", function (assert) {
+      assert.strictEqual(VALID_ENTRY_KEYS.length, 7);
+    });
+  });
+
+  module("validateEntryKeys", function () {
+    test("passes validation for entry with all valid keys", function (assert) {
+      const config = {
+        block: "my-block",
+        args: { title: "Hello" },
+        children: [],
+        conditions: [{ type: "user" }],
+        classNames: "custom-class",
+      };
+
+      // Should not throw
+      validateEntryKeys(config);
+      assert.true(true, "validation passed without error");
+    });
+
+    test("passes validation for entry with only required key", function (assert) {
+      const config = { block: "my-block" };
+
+      validateEntryKeys(config);
+      assert.true(true, "validation passed without error");
+    });
+
+    test("throws error for unknown key with suggestion for 'condition' typo", function (assert) {
+      const config = {
+        block: "my-block",
+        condition: { type: "user" }, // typo: should be "conditions"
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) => {
+          return (
+            error.message.includes('"condition"') &&
+            error.message.includes('did you mean "conditions"?') &&
+            error.path === "condition"
+          );
+        },
+        "error message suggests correction and error path points to key"
+      );
+    });
+
+    test("throws error for unknown key with suggestion for 'arg' typo", function (assert) {
+      const config = {
+        block: "my-block",
+        arg: { title: "Hello" }, // typo: should be "args"
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) =>
+          error.message.includes('"arg"') &&
+          error.message.includes('did you mean "args"?'),
+        "error message suggests 'args'"
+      );
+    });
+
+    test("throws error for unknown key with suggestion for 'child' typo", function (assert) {
+      const config = {
+        block: "my-block",
+        child: [], // typo: should be "children"
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) =>
+          error.message.includes('"child"') &&
+          error.message.includes('did you mean "children"?'),
+        "error message suggests 'children'"
+      );
+    });
+
+    test("throws error for unknown key with suggestion for 'className' typo", function (assert) {
+      const config = {
+        block: "my-block",
+        className: "custom", // typo: should be "classNames"
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) =>
+          error.message.includes('"className"') &&
+          error.message.includes('did you mean "classNames"?'),
+        "error message suggests 'classNames'"
+      );
+    });
+
+    test("throws error for completely unknown key without suggestion", function (assert) {
+      const config = {
+        block: "my-block",
+        foo: "bar", // unknown key - too different from any valid key
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) => {
+          return (
+            error.message.includes('"foo"') &&
+            !error.message.includes("did you mean")
+          );
+        },
+        "error message includes unknown key without suggestion"
+      );
+    });
+
+    test("reports all unknown keys in single error message", function (assert) {
+      const config = {
+        block: "my-block",
+        condition: { type: "user" }, // typo
+        foo: "bar", // unknown
+        arg: { title: "Hello" }, // typo
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) => {
+          return (
+            error.message.includes('did you mean "conditions"?') &&
+            error.message.includes('did you mean "args"?') &&
+            error.message.includes('"foo"')
+          );
+        },
+        "error message includes all unknown keys with suggestions"
+      );
+    });
+
+    test("fuzzy matching: 'codition' suggests 'conditions'", function (assert) {
+      const config = {
+        block: "my-block",
+        codition: { type: "user" }, // 1 char different
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) =>
+          error.message.includes('"codition"') &&
+          error.message.includes('did you mean "conditions"?'),
+        "fuzzy matching finds close match"
+      );
+    });
+
+    test("fuzzy matching: 'conditons' (transposition) suggests 'conditions'", function (assert) {
+      const config = {
+        block: "my-block",
+        conditons: { type: "user" }, // transposed 'o' and 'n'
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) =>
+          error.message.includes('"conditons"') &&
+          error.message.includes('did you mean "conditions"?'),
+        "fuzzy matching handles transpositions"
+      );
+    });
+
+    test("fuzzy matching: 'condtions' (missing char) suggests 'conditions'", function (assert) {
+      const config = {
+        block: "my-block",
+        condtions: { type: "user" }, // missing 'i'
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) =>
+          error.message.includes('"condtions"') &&
+          error.message.includes('did you mean "conditions"?'),
+        "fuzzy matching handles missing characters"
+      );
+    });
+
+    test("singular/plural grammar: single key uses 'key'", function (assert) {
+      const config = {
+        block: "my-block",
+        condition: {}, // one unknown key
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) => error.message.includes("Unknown entry key:"),
+        "uses singular 'key' for one unknown key"
+      );
+    });
+
+    test("singular/plural grammar: multiple keys uses 'keys'", function (assert) {
+      const config = {
+        block: "my-block",
+        condition: {},
+        arg: {}, // two unknown keys
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) => error.message.includes("Unknown entry keys:"),
+        "uses plural 'keys' for multiple unknown keys"
+      );
+    });
+
+    test("error includes the path to the unknown key", function (assert) {
+      const config = {
+        block: "my-block",
+        foo: "bar",
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) => error.path === "foo",
+        "error path points to the unknown key"
+      );
+    });
+
+    test("includes valid keys in error message", function (assert) {
+      const config = {
+        block: "my-block",
+        unknown: "value",
+      };
+
+      assert.throws(
+        () => validateEntryKeys(config),
+        (error) => {
+          return (
+            error.message.includes("Valid keys are:") &&
+            error.message.includes("block") &&
+            error.message.includes("conditions")
+          );
+        },
+        "error message lists valid keys"
+      );
+    });
+  });
+
+  module("validateEntryTypes", function () {
+    test("passes for entry with valid types", function (assert) {
+      const config = {
+        block: "my-block",
+        args: { title: "Hello" },
+        children: [{ block: "child" }],
+        conditions: { type: "user" },
+        classNames: "custom-class",
+      };
+
+      validateEntryTypes(config);
+      assert.true(true, "validation passed without error");
+    });
+
+    test("passes for entry with no optional fields", function (assert) {
+      const config = { block: "my-block" };
+
+      validateEntryTypes(config);
+      assert.true(true, "validation passed without error");
+    });
+
+    test("throws for args as string", function (assert) {
+      assert.throws(
+        () => validateEntryTypes({ block: "my-block", args: "not-an-object" }),
+        /"args" must be an object.*got string/
+      );
+    });
+
+    test("throws for args as array", function (assert) {
+      assert.throws(
+        () =>
+          validateEntryTypes({
+            block: "my-block",
+            args: ["not", "an", "object"],
+          }),
+        /"args" must be an object.*got array/
+      );
+    });
+
+    test("allows args as null", function (assert) {
+      validateEntryTypes({ block: "my-block", args: null });
+      assert.true(true, "null args are allowed");
+    });
+
+    test("throws for children as string", function (assert) {
+      assert.throws(
+        () =>
+          validateEntryTypes({ block: "my-block", children: "not-an-array" }),
+        /"children" must be an array.*got string/
+      );
+    });
+
+    test("throws for children as object", function (assert) {
+      assert.throws(
+        () =>
+          validateEntryTypes({
+            block: "my-block",
+            children: { block: "child" },
+          }),
+        /"children" must be an array.*got object/
+      );
+    });
+
+    test("passes for classNames as string", function (assert) {
+      validateEntryTypes({ block: "my-block", classNames: "custom-class" });
+      assert.true(true, "validation passed for string classNames");
+    });
+
+    test("passes for classNames as array of strings", function (assert) {
+      validateEntryTypes({
+        block: "my-block",
+        classNames: ["class-one", "class-two"],
+      });
+      assert.true(true, "validation passed for string array classNames");
+    });
+
+    test("throws for classNames as number", function (assert) {
+      assert.throws(
+        () => validateEntryTypes({ block: "my-block", classNames: 123 }),
+        /"classNames" must be a string or array of strings.*got number/
+      );
+    });
+
+    test("throws for classNames as array with non-strings", function (assert) {
+      assert.throws(
+        () =>
+          validateEntryTypes({
+            block: "my-block",
+            classNames: ["valid", 123, "also-valid"],
+          }),
+        /"classNames" must be a string or array of strings.*array with non-string items/
+      );
+    });
+
+    test("passes for conditions as object", function (assert) {
+      validateEntryTypes({ block: "my-block", conditions: { type: "user" } });
+      assert.true(true, "validation passed for object conditions");
+    });
+
+    test("passes for conditions as array", function (assert) {
+      validateEntryTypes({
+        block: "my-block",
+        conditions: [{ type: "user" }],
+      });
+      assert.true(true, "validation passed for array conditions");
+    });
+
+    test("throws for conditions as string", function (assert) {
+      assert.throws(
+        () => validateEntryTypes({ block: "my-block", conditions: "user" }),
+        /"conditions" must be an object or array.*got string/
+      );
+    });
+
+    test("throws for conditions as number", function (assert) {
+      assert.throws(
+        () => validateEntryTypes({ block: "my-block", conditions: 123 }),
+        /"conditions" must be an object or array.*got number/
+      );
+    });
+
+    test("throws for conditions as boolean", function (assert) {
+      assert.throws(
+        () => validateEntryTypes({ block: "my-block", conditions: true }),
+        /"conditions" must be an object or array.*got boolean/
+      );
+    });
+
+    test("error includes the path to the invalid field", function (assert) {
+      assert.throws(
+        () => validateEntryTypes({ block: "my-block", args: "invalid" }),
+        (error) => error.path === "args",
+        "error path points to the invalid field"
+      );
+    });
+
+    test("error path for classNames", function (assert) {
+      assert.throws(
+        () => validateEntryTypes({ block: "my-block", classNames: 123 }),
+        (error) => error.path === "classNames",
+        "error path points to classNames"
+      );
+    });
+  });
+
+  module("isReservedArgName", function () {
+    test("returns true for explicitly reserved names", function (assert) {
+      assert.true(isReservedArgName("classNames"));
+      assert.true(isReservedArgName("id"));
+      assert.true(isReservedArgName("outletName"));
+      assert.true(isReservedArgName("children"));
+      assert.true(isReservedArgName("conditions"));
+    });
+
+    test("returns true for names starting with underscore", function (assert) {
+      assert.true(isReservedArgName("_private"));
+      assert.true(isReservedArgName("_internalState"));
+      assert.true(isReservedArgName("_"));
+      assert.true(isReservedArgName("__doubleUnderscore"));
+    });
+
+    test("returns false for regular names", function (assert) {
+      assert.false(isReservedArgName("title"));
+      assert.false(isReservedArgName("description"));
+      assert.false(isReservedArgName("user"));
+      assert.false(isReservedArgName("myCustomArg"));
+    });
+
+    test("returns false for names containing but not starting with underscore", function (assert) {
+      assert.false(isReservedArgName("my_arg"));
+      assert.false(isReservedArgName("some_value_here"));
+    });
+  });
+
+  module("validateEntryIdFormat", function () {
+    test("passes for valid id starting with letter", function (assert) {
+      validateEntryIdFormat({ block: "my-block", id: "featured-banner" });
+      validateEntryIdFormat({ block: "my-block", id: "a" });
+      validateEntryIdFormat({ block: "my-block", id: "abc123" });
+      validateEntryIdFormat({ block: "my-block", id: "my-block-1" });
+      assert.true(true, "validation passed");
+    });
+
+    test("passes when id is not provided", function (assert) {
+      validateEntryIdFormat({ block: "my-block" });
+      assert.true(true, "validation passed");
+    });
+
+    test("passes when id is undefined", function (assert) {
+      validateEntryIdFormat({ block: "my-block", id: undefined });
+      assert.true(true, "validation passed");
+    });
+
+    test("throws for id starting with number", function (assert) {
+      assert.throws(
+        () => validateEntryIdFormat({ block: "my-block", id: "123-block" }),
+        (error) =>
+          error.message.includes("must start with a lowercase letter") &&
+          error.path === "id"
+      );
+    });
+
+    test("throws for id with uppercase letters", function (assert) {
+      assert.throws(
+        () => validateEntryIdFormat({ block: "my-block", id: "Featured" }),
+        (error) => error.message.includes("lowercase")
+      );
+    });
+
+    test("throws for id with underscore", function (assert) {
+      assert.throws(
+        () => validateEntryIdFormat({ block: "my-block", id: "my_block" }),
+        (error) =>
+          error.message.includes("lowercase letters, numbers, and hyphens")
+      );
+    });
+
+    test("throws for id starting with hyphen", function (assert) {
+      assert.throws(
+        () => validateEntryIdFormat({ block: "my-block", id: "-invalid" }),
+        (error) => error.message.includes("must start with a lowercase letter")
+      );
+    });
+
+    test("throws for id with spaces", function (assert) {
+      assert.throws(
+        () => validateEntryIdFormat({ block: "my-block", id: "my block" }),
+        (error) =>
+          error.message.includes("lowercase letters, numbers, and hyphens")
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/dev-tools/console-logger-test.js b/frontend/discourse/tests/unit/lib/dev-tools/console-logger-test.js
new file mode 100644
index 0000000000000..711a7301e27cd
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/dev-tools/console-logger-test.js
@@ -0,0 +1,151 @@
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import sinon from "sinon";
+import {
+  getNextArgNumber,
+  logArgToConsole,
+  resetArgCounter,
+} from "discourse/static/dev-tools/lib/console-logger";
+
+module("Unit | Lib | dev-tools/console-logger", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    // Reset counter before each test
+    resetArgCounter();
+
+    // Stub console methods
+    this.consoleStub = {
+      log: sinon.stub(console, "log"),
+      warn: sinon.stub(console, "warn"),
+    };
+
+    // Track window properties we set
+    this.windowVars = [];
+  });
+
+  hooks.afterEach(function () {
+    // Restore console
+    this.consoleStub.log.restore();
+    this.consoleStub.warn.restore();
+
+    // Clean up window variables
+    for (const varName of this.windowVars) {
+      delete window[varName];
+    }
+  });
+
+  module("resetArgCounter", function () {
+    test("resets counter to 1", function (assert) {
+      // Increment counter a few times
+      logArgToConsole({ key: "test1", value: 1 });
+      this.windowVars.push("arg1");
+      logArgToConsole({ key: "test2", value: 2 });
+      this.windowVars.push("arg2");
+
+      assert.strictEqual(getNextArgNumber(), 3);
+
+      resetArgCounter();
+
+      assert.strictEqual(getNextArgNumber(), 1);
+    });
+  });
+
+  module("getNextArgNumber", function () {
+    test("returns current counter value", function (assert) {
+      assert.strictEqual(getNextArgNumber(), 1);
+    });
+
+    test("does not increment counter", function (assert) {
+      assert.strictEqual(getNextArgNumber(), 1);
+      assert.strictEqual(getNextArgNumber(), 1);
+      assert.strictEqual(getNextArgNumber(), 1);
+    });
+  });
+
+  module("logArgToConsole", function () {
+    test("returns assigned variable name", function (assert) {
+      const varName = logArgToConsole({ key: "test", value: 42 });
+      this.windowVars.push(varName);
+
+      assert.strictEqual(varName, "arg1");
+    });
+
+    test("increments counter for each call", function (assert) {
+      const first = logArgToConsole({ key: "a", value: 1 });
+      this.windowVars.push(first);
+      const second = logArgToConsole({ key: "b", value: 2 });
+      this.windowVars.push(second);
+      const third = logArgToConsole({ key: "c", value: 3 });
+      this.windowVars.push(third);
+
+      assert.strictEqual(first, "arg1");
+      assert.strictEqual(second, "arg2");
+      assert.strictEqual(third, "arg3");
+    });
+
+    test("stores value in window global", function (assert) {
+      const testValue = { foo: "bar" };
+      const varName = logArgToConsole({ key: "test", value: testValue });
+      this.windowVars.push(varName);
+
+      assert.strictEqual(window[varName], testValue);
+    });
+
+    test("logs to console with styled output", function (assert) {
+      logArgToConsole({ key: "myKey", value: 123 });
+      this.windowVars.push("arg1");
+
+      assert.true(this.consoleStub.log.calledOnce);
+
+      const args = this.consoleStub.log.firstCall.args;
+      assert.true(args[0].includes("myKey"));
+      assert.true(args[0].includes("arg1"));
+    });
+
+    test("includes prefix when provided", function (assert) {
+      logArgToConsole({ key: "test", value: 1, prefix: "plugin outlet" });
+      this.windowVars.push("arg1");
+
+      const args = this.consoleStub.log.firstCall.args;
+      assert.true(args[0].includes("[plugin outlet]"));
+    });
+
+    test("does not include prefix brackets when not provided", function (assert) {
+      logArgToConsole({ key: "test", value: 1 });
+      this.windowVars.push("arg1");
+
+      const args = this.consoleStub.log.firstCall.args;
+      assert.false(args[0].includes("["));
+    });
+
+    test("includes value as last argument for inspection", function (assert) {
+      const testValue = { complex: "object" };
+      logArgToConsole({ key: "test", value: testValue });
+      this.windowVars.push("arg1");
+
+      const args = this.consoleStub.log.firstCall.args;
+      assert.strictEqual(args[args.length - 1], testValue);
+    });
+
+    test("warns when overwriting existing global", function (assert) {
+      // Set up existing global
+      window.arg1 = "existing";
+      this.windowVars.push("arg1");
+
+      logArgToConsole({ key: "test", value: "new" });
+
+      assert.true(this.consoleStub.warn.calledOnce);
+      assert.true(
+        this.consoleStub.warn.firstCall.args[0].includes("Overwriting")
+      );
+    });
+
+    test("does not warn for fresh variable names", function (assert) {
+      logArgToConsole({ key: "test", value: 1 });
+      this.windowVars.push("arg1");
+
+      assert.false(this.consoleStub.warn.called);
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/dev-tools/value-formatter-test.js b/frontend/discourse/tests/unit/lib/dev-tools/value-formatter-test.js
new file mode 100644
index 0000000000000..f69530f185915
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/dev-tools/value-formatter-test.js
@@ -0,0 +1,199 @@
+import { module, test } from "qunit";
+import {
+  formatValue,
+  getTypeInfo,
+} from "discourse/static/dev-tools/lib/value-formatter";
+
+module("Unit | Lib | dev-tools/value-formatter", function () {
+  module("formatValue", function () {
+    module("basic types", function () {
+      test("formats null as literal", function (assert) {
+        assert.strictEqual(formatValue(null), "null");
+      });
+
+      test("formats undefined as literal", function (assert) {
+        assert.strictEqual(formatValue(undefined), "undefined");
+      });
+
+      test("formats numbers directly", function (assert) {
+        assert.strictEqual(formatValue(42), "42");
+        assert.strictEqual(formatValue(0), "0");
+        assert.strictEqual(formatValue(-5.5), "-5.5");
+        assert.strictEqual(formatValue(Infinity), "Infinity");
+      });
+
+      test("formats booleans directly", function (assert) {
+        assert.strictEqual(formatValue(true), "true");
+        assert.strictEqual(formatValue(false), "false");
+      });
+    });
+
+    module("strings", function () {
+      test("quotes strings", function (assert) {
+        assert.strictEqual(formatValue("hello"), '"hello"');
+        assert.strictEqual(formatValue(""), '""');
+      });
+
+      test("truncates long strings at 50 characters", function (assert) {
+        const longString = "a".repeat(60);
+        const result = formatValue(longString);
+
+        assert.strictEqual(result, `"${"a".repeat(50)}..."`);
+      });
+
+      test("does not truncate strings at exactly 50 characters", function (assert) {
+        const exactString = "a".repeat(50);
+        const result = formatValue(exactString);
+
+        assert.strictEqual(result, `"${exactString}"`);
+      });
+    });
+
+    module("arrays", function () {
+      test("shows array length by default", function (assert) {
+        assert.strictEqual(formatValue([1, 2, 3]), "Array(3)");
+        assert.strictEqual(formatValue([]), "Array(0)");
+      });
+
+      test("expands arrays when option is true", function (assert) {
+        assert.strictEqual(
+          formatValue([1, 2, 3], { expandArrays: true }),
+          "[1, 2, 3]"
+        );
+      });
+
+      test("expands nested arrays recursively", function (assert) {
+        assert.strictEqual(
+          formatValue([1, [2, 3]], { expandArrays: true }),
+          "[1, [2, 3]]"
+        );
+      });
+
+      test("formats array elements with quotes for strings", function (assert) {
+        assert.strictEqual(
+          formatValue(["a", "b"], { expandArrays: true }),
+          '["a", "b"]'
+        );
+      });
+    });
+
+    module("objects", function () {
+      test("shows constructor name for custom objects", function (assert) {
+        class User {}
+        const user = new User();
+
+        assert.strictEqual(formatValue(user), "User {...}");
+      });
+
+      test("shows generic {...} for plain objects", function (assert) {
+        assert.strictEqual(formatValue({}), "{...}");
+        assert.strictEqual(formatValue({ foo: 1 }), "{...}");
+      });
+    });
+
+    module("functions", function () {
+      test("shows function name", function (assert) {
+        function myFunction() {}
+        assert.strictEqual(formatValue(myFunction), "fn myFunction()");
+      });
+
+      test("shows anonymous for unnamed functions", function (assert) {
+        assert.strictEqual(
+          formatValue(() => {}),
+          "fn anonymous()"
+        );
+      });
+    });
+
+    module("symbols", function () {
+      test("formats symbols when option is true", function (assert) {
+        const sym = Symbol("test");
+        assert.strictEqual(
+          formatValue(sym, { handleSymbols: true }),
+          "Symbol(test)"
+        );
+      });
+
+      test("formats symbols without description", function (assert) {
+        const sym = Symbol();
+        assert.strictEqual(
+          formatValue(sym, { handleSymbols: true }),
+          "Symbol()"
+        );
+      });
+
+      test("does not format symbols by default", function (assert) {
+        const sym = Symbol("test");
+        // Without handleSymbols, falls through to String(value)
+        assert.strictEqual(formatValue(sym), "Symbol(test)");
+      });
+    });
+
+    module("RegExp", function () {
+      test("formats RegExp when option is true", function (assert) {
+        const regex = /test/gi;
+        assert.strictEqual(
+          formatValue(regex, { handleRegExp: true }),
+          "/test/gi"
+        );
+      });
+
+      test("shows constructor name by default", function (assert) {
+        const regex = /test/;
+        assert.strictEqual(formatValue(regex), "RegExp {...}");
+      });
+    });
+  });
+
+  module("getTypeInfo", function () {
+    test("returns 'null' for null", function (assert) {
+      assert.strictEqual(getTypeInfo(null), "null");
+    });
+
+    test("returns 'undefined' for undefined", function (assert) {
+      assert.strictEqual(getTypeInfo(undefined), "undefined");
+    });
+
+    test("returns 'array' for arrays", function (assert) {
+      assert.strictEqual(getTypeInfo([]), "array");
+      assert.strictEqual(getTypeInfo([1, 2, 3]), "array");
+    });
+
+    test("returns 'object' for objects", function (assert) {
+      assert.strictEqual(getTypeInfo({}), "object");
+      assert.strictEqual(getTypeInfo({ foo: 1 }), "object");
+    });
+
+    test("returns 'string' for strings", function (assert) {
+      assert.strictEqual(getTypeInfo("hello"), "string");
+      assert.strictEqual(getTypeInfo(""), "string");
+    });
+
+    test("returns 'number' for numbers", function (assert) {
+      assert.strictEqual(getTypeInfo(42), "number");
+      assert.strictEqual(getTypeInfo(0), "number");
+      assert.strictEqual(getTypeInfo(-5.5), "number");
+    });
+
+    test("returns 'boolean' for booleans", function (assert) {
+      assert.strictEqual(getTypeInfo(true), "boolean");
+      assert.strictEqual(getTypeInfo(false), "boolean");
+    });
+
+    test("returns 'function' for functions", function (assert) {
+      assert.strictEqual(
+        getTypeInfo(() => {}),
+        "function"
+      );
+      assert.strictEqual(
+        getTypeInfo(function named() {}),
+        "function"
+      );
+    });
+
+    test("returns 'symbol' for symbols", function (assert) {
+      assert.strictEqual(getTypeInfo(Symbol()), "symbol");
+      assert.strictEqual(getTypeInfo(Symbol("test")), "symbol");
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/outlet-args-test.js b/frontend/discourse/tests/unit/lib/outlet-args-test.js
new file mode 100644
index 0000000000000..4ec83dd4ae1a2
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/outlet-args-test.js
@@ -0,0 +1,147 @@
+import { module, test } from "qunit";
+import deprecatedOutletArgument from "discourse/helpers/deprecated-outlet-argument";
+import {
+  _setIncludeDeprecatedArgsProperty,
+  buildArgsWithDeprecations,
+  DEPRECATED_ARGS_KEY,
+} from "discourse/lib/outlet-args";
+
+module("Unit | Lib | outlet-args", function (hooks) {
+  hooks.afterEach(function () {
+    _setIncludeDeprecatedArgsProperty(false);
+  });
+
+  module("buildArgsWithDeprecations", function () {
+    test("combines args with deprecated args", function (assert) {
+      const args = { topic: "topic-value" };
+      const deprecatedArgs = {
+        oldTopic: deprecatedOutletArgument({
+          value: "old-topic-value",
+          message: "Use 'topic' instead",
+        }),
+      };
+
+      const result = buildArgsWithDeprecations(args, deprecatedArgs, {
+        outletName: "test-outlet",
+      });
+
+      assert.strictEqual(result.topic, "topic-value", "regular arg is present");
+      assert.strictEqual(
+        Object.keys(result).length,
+        2,
+        "both args are enumerable"
+      );
+    });
+
+    test("skips deprecated keys that already exist in args", function (assert) {
+      const args = { topic: "current-value" };
+      const deprecatedArgs = {
+        topic: deprecatedOutletArgument({
+          value: "deprecated-value",
+          message: "This should be skipped",
+        }),
+      };
+
+      const result = buildArgsWithDeprecations(args, deprecatedArgs, {
+        outletName: "test-outlet",
+      });
+
+      assert.strictEqual(
+        result.topic,
+        "current-value",
+        "uses value from args, not deprecatedArgs"
+      );
+      assert.strictEqual(
+        Object.keys(result).length,
+        1,
+        "only one key is defined"
+      );
+    });
+
+    test("does not include __deprecatedArgs__ by default", function (assert) {
+      const args = { topic: "topic-value" };
+      const deprecatedArgs = {
+        oldTopic: deprecatedOutletArgument({ value: "old-value" }),
+      };
+
+      const result = buildArgsWithDeprecations(args, deprecatedArgs, {
+        outletName: "test-outlet",
+      });
+
+      assert.strictEqual(
+        result[DEPRECATED_ARGS_KEY],
+        undefined,
+        "__deprecatedArgs__ is not present by default"
+      );
+    });
+
+    test("includes __deprecatedArgs__ when enabled", function (assert) {
+      _setIncludeDeprecatedArgsProperty(true);
+
+      const args = { topic: "topic-value" };
+      const deprecatedArgs = {
+        oldTopic: deprecatedOutletArgument({ value: "old-value" }),
+      };
+
+      const result = buildArgsWithDeprecations(args, deprecatedArgs, {
+        outletName: "test-outlet",
+      });
+
+      assert.strictEqual(
+        result[DEPRECATED_ARGS_KEY],
+        deprecatedArgs,
+        "__deprecatedArgs__ contains the raw deprecatedArgs object"
+      );
+    });
+
+    test("__deprecatedArgs__ is non-enumerable", function (assert) {
+      _setIncludeDeprecatedArgsProperty(true);
+
+      const args = { topic: "topic-value" };
+      const deprecatedArgs = {
+        oldTopic: deprecatedOutletArgument({ value: "old-value" }),
+      };
+
+      const result = buildArgsWithDeprecations(args, deprecatedArgs, {
+        outletName: "test-outlet",
+      });
+
+      assert.false(
+        Object.keys(result).includes(DEPRECATED_ARGS_KEY),
+        "__deprecatedArgs__ is not enumerable"
+      );
+      assert.strictEqual(
+        result[DEPRECATED_ARGS_KEY],
+        deprecatedArgs,
+        "but it is still accessible"
+      );
+    });
+
+    test("handles null/undefined args gracefully", function (assert) {
+      const deprecatedArgs = {
+        oldTopic: deprecatedOutletArgument({ value: "old-value" }),
+      };
+
+      const result = buildArgsWithDeprecations(null, deprecatedArgs, {
+        outletName: "test-outlet",
+      });
+
+      assert.strictEqual(
+        Object.keys(result).length,
+        1,
+        "only deprecated arg is present"
+      );
+    });
+
+    test("handles null/undefined deprecatedArgs gracefully", function (assert) {
+      const args = { topic: "topic-value" };
+
+      const result = buildArgsWithDeprecations(args, null, {
+        outletName: "test-outlet",
+      });
+
+      assert.strictEqual(result.topic, "topic-value", "regular arg is present");
+      assert.strictEqual(Object.keys(result).length, 1, "only one arg present");
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/lib/plugin-api-test.js b/frontend/discourse/tests/unit/lib/plugin-api-test.js
index 920217365d4ab..e896120ff5bcd 100644
--- a/frontend/discourse/tests/unit/lib/plugin-api-test.js
+++ b/frontend/discourse/tests/unit/lib/plugin-api-test.js
@@ -1,10 +1,20 @@
+import Component from "@glimmer/component";
 import EmberObject, { computed } from "@ember/object";
 import { getOwner } from "@ember/owner";
 import { setupTest } from "ember-qunit";
 import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import { BlockCondition, blockCondition } from "discourse/blocks/conditions";
 import { rollbackAllPrepends } from "discourse/lib/class-prepend";
 import discourseComputed from "discourse/lib/decorators";
 import { withPluginApi } from "discourse/lib/plugin-api";
+import {
+  getBlockEntry,
+  hasBlock,
+  hasConditionType,
+  isValidOutlet,
+  resetBlockRegistryForTesting,
+} from "discourse/tests/helpers/block-testing";
 
 module("Unit | Utility | plugin-api", function (hooks) {
   setupTest(hooks);
@@ -235,4 +245,122 @@ module("Unit | Utility | plugin-api", function (hooks) {
       "it works when rolled back and re-applied multiple times"
     );
   });
+
+  module("Block APIs", function (nestedHooks) {
+    nestedHooks.beforeEach(function () {
+      resetBlockRegistryForTesting();
+    });
+
+    module("registerBlock", function () {
+      test("registers a block class directly", function (assert) {
+        @block("api-direct-block")
+        class ApiDirectBlock extends Component {}
+
+        withPluginApi((api) => {
+          api.registerBlock(ApiDirectBlock);
+        });
+
+        assert.true(hasBlock("api-direct-block"));
+        assert.strictEqual(getBlockEntry("api-direct-block"), ApiDirectBlock);
+      });
+
+      test("registers a block factory with string name", function (assert) {
+        @block("api-factory-block")
+        class ApiFactoryBlock extends Component {}
+
+        withPluginApi((api) => {
+          api.registerBlock("api-factory-block", async () => ApiFactoryBlock);
+        });
+
+        assert.true(hasBlock("api-factory-block"));
+      });
+
+      test("throws when factory is missing for string name", function (assert) {
+        withPluginApi((api) => {
+          assert.throws(
+            () => api.registerBlock("missing-factory"),
+            /requires a factory function/
+          );
+        });
+      });
+
+      test("throws when factory is not a function", function (assert) {
+        withPluginApi((api) => {
+          assert.throws(
+            () => api.registerBlock("invalid-factory", "not a function"),
+            /requires a factory function/
+          );
+        });
+      });
+    });
+
+    module("registerBlockOutlet", function () {
+      test("registers a custom outlet", function (assert) {
+        withPluginApi((api) => {
+          api.registerBlockOutlet("api-custom-outlet");
+        });
+
+        assert.true(isValidOutlet("api-custom-outlet"));
+      });
+
+      test("registers outlet with options", function (assert) {
+        withPluginApi((api) => {
+          api.registerBlockOutlet("api-described-outlet", {
+            description: "A test outlet",
+          });
+        });
+
+        assert.true(isValidOutlet("api-described-outlet"));
+      });
+
+      test("works without options parameter", function (assert) {
+        withPluginApi((api) => {
+          api.registerBlockOutlet("api-no-options-outlet");
+        });
+
+        assert.true(isValidOutlet("api-no-options-outlet"));
+      });
+    });
+
+    module("registerBlockConditionType", function () {
+      test("registers a custom condition type", function (assert) {
+        @blockCondition({
+          type: "api-test-condition",
+          args: {
+            enabled: { type: "boolean" },
+          },
+        })
+        class ApiTestCondition extends BlockCondition {
+          evaluate(args) {
+            return args.enabled === true;
+          }
+        }
+
+        withPluginApi((api) => {
+          api.registerBlockConditionType(ApiTestCondition);
+        });
+
+        assert.true(hasConditionType("api-test-condition"));
+      });
+    });
+
+    module("renderBlocks", function () {
+      test("throws for unknown outlet", function (assert) {
+        @block("render-test-block")
+        class RenderTestBlock extends Component {}
+
+        withPluginApi((api) => {
+          api.registerBlock(RenderTestBlock);
+
+          assert.throws(
+            () =>
+              api.renderBlocks("nonexistent-outlet", [
+                { block: RenderTestBlock },
+              ]),
+            /Unknown block outlet/
+          );
+        });
+      });
+    });
+  });
 });
diff --git a/frontend/discourse/tests/unit/lib/string-similarity-test.js b/frontend/discourse/tests/unit/lib/string-similarity-test.js
new file mode 100644
index 0000000000000..7be05df52302a
--- /dev/null
+++ b/frontend/discourse/tests/unit/lib/string-similarity-test.js
@@ -0,0 +1,156 @@
+import { module, test } from "qunit";
+import {
+  findClosestMatch,
+  formatWithSuggestion,
+} from "discourse/lib/string-similarity";
+
+module("Unit | Lib | string-similarity", function () {
+  module("findClosestMatch", function () {
+    const candidates = ["block", "args", "children", "conditions", "name"];
+
+    test("returns exact match with distance 0", function (assert) {
+      assert.strictEqual(findClosestMatch("block", candidates), "block");
+      assert.strictEqual(
+        findClosestMatch("conditions", candidates),
+        "conditions"
+      );
+    });
+
+    test("returns closest match within threshold", function (assert) {
+      assert.strictEqual(
+        findClosestMatch("condition", candidates),
+        "conditions"
+      );
+      assert.strictEqual(
+        findClosestMatch("conditon", candidates),
+        "conditions"
+      );
+      assert.strictEqual(findClosestMatch("blok", candidates), "block");
+    });
+
+    test("returns null when no match within threshold", function (assert) {
+      assert.strictEqual(findClosestMatch("foo", candidates), null);
+      assert.strictEqual(findClosestMatch("xyz", candidates), null);
+      assert.strictEqual(
+        findClosestMatch("completely_different", candidates),
+        null
+      );
+    });
+
+    test("respects minSimilarity option", function (assert) {
+      // "condition" vs "conditions" has high similarity (~0.97)
+      assert.strictEqual(
+        findClosestMatch("condition", candidates, { minSimilarity: 0.95 }),
+        "conditions"
+      );
+      // With very high threshold, even close matches are rejected
+      assert.strictEqual(
+        findClosestMatch("conditon", candidates, { minSimilarity: 0.99 }),
+        null
+      );
+      // With lower threshold, more distant matches are accepted
+      assert.strictEqual(
+        findClosestMatch("conditon", candidates, { minSimilarity: 0.8 }),
+        "conditions"
+      );
+    });
+
+    test("is case insensitive by default", function (assert) {
+      assert.strictEqual(findClosestMatch("BLOCK", candidates), "block");
+      assert.strictEqual(
+        findClosestMatch("CONDITIONS", candidates),
+        "conditions"
+      );
+      assert.strictEqual(
+        findClosestMatch("Condition", candidates),
+        "conditions"
+      );
+    });
+
+    test("respects caseSensitive option", function (assert) {
+      assert.strictEqual(
+        findClosestMatch("BLOCK", candidates, { caseSensitive: true }),
+        null
+      );
+      assert.strictEqual(
+        findClosestMatch("block", candidates, { caseSensitive: true }),
+        "block"
+      );
+    });
+
+    test("returns closest when multiple matches within threshold", function (assert) {
+      // Test with distinct candidates where best match is unambiguous
+      const testCandidates = ["settings", "conditions", "arguments"];
+      // "settins" is clearly closest to "settings" (1 char diff)
+      assert.strictEqual(
+        findClosestMatch("settins", testCandidates),
+        "settings"
+      );
+      // "conditons" is clearly closest to "conditions"
+      assert.strictEqual(
+        findClosestMatch("conditons", testCandidates),
+        "conditions"
+      );
+    });
+
+    test("handles empty candidates array", function (assert) {
+      assert.strictEqual(findClosestMatch("anything", []), null);
+    });
+
+    test("handles single candidate", function (assert) {
+      assert.strictEqual(
+        findClosestMatch("condition", ["conditions"]),
+        "conditions"
+      );
+      assert.strictEqual(findClosestMatch("xyz", ["conditions"]), null);
+    });
+  });
+
+  module("formatWithSuggestion", function () {
+    const validValues = ["block", "args", "conditions"];
+
+    test("formats with suggestion when close match found", function (assert) {
+      assert.strictEqual(
+        formatWithSuggestion("condition", validValues),
+        '"condition" (did you mean "conditions"?)'
+      );
+      assert.strictEqual(
+        formatWithSuggestion("conditon", validValues),
+        '"conditon" (did you mean "conditions"?)'
+      );
+      assert.strictEqual(
+        formatWithSuggestion("blok", validValues),
+        '"blok" (did you mean "block"?)'
+      );
+    });
+
+    test("formats without suggestion when no close match", function (assert) {
+      assert.strictEqual(formatWithSuggestion("foo", validValues), '"foo"');
+      assert.strictEqual(formatWithSuggestion("xyz", validValues), '"xyz"');
+    });
+
+    test("passes options to findClosestMatch", function (assert) {
+      // With very high threshold, no suggestion is returned
+      assert.strictEqual(
+        formatWithSuggestion("codition", validValues, { minSimilarity: 0.99 }),
+        '"codition"'
+      );
+      // With lower threshold, suggestion is returned
+      assert.strictEqual(
+        formatWithSuggestion("codition", validValues, { minSimilarity: 0.8 }),
+        '"codition" (did you mean "conditions"?)'
+      );
+    });
+
+    test("handles empty validValues array", function (assert) {
+      assert.strictEqual(formatWithSuggestion("anything", []), '"anything"');
+    });
+
+    test("handles exact match", function (assert) {
+      assert.strictEqual(
+        formatWithSuggestion("block", validValues),
+        '"block" (did you mean "block"?)'
+      );
+    });
+  });
+});
diff --git a/frontend/discourse/tests/unit/services/blocks-test.js b/frontend/discourse/tests/unit/services/blocks-test.js
new file mode 100644
index 0000000000000..80fbe7421c2ce
--- /dev/null
+++ b/frontend/discourse/tests/unit/services/blocks-test.js
@@ -0,0 +1,612 @@
+import Component from "@glimmer/component";
+import { getOwner } from "@ember/owner";
+import { setupTest } from "ember-qunit";
+import { module, test } from "qunit";
+import { block } from "discourse/blocks";
+import { BlockCondition, blockCondition } from "discourse/blocks/conditions";
+import { getBlockMetadata } from "discourse/lib/blocks/-internals/decorator";
+import {
+  registerBlock,
+  registerConditionType,
+  withTestBlockRegistration,
+  withTestConditionRegistration,
+} from "discourse/tests/helpers/block-testing";
+
+module("Unit | Service | blocks", function (hooks) {
+  setupTest(hooks);
+
+  hooks.beforeEach(function () {
+    this.blocks = getOwner(this).lookup("service:blocks");
+  });
+
+  module("block registry", function () {
+    test("hasBlock returns true for registered blocks", function (assert) {
+      @block("registry-test-block")
+      class RegistryTestBlock extends Component {}
+
+      withTestBlockRegistration(() => {
+        registerBlock(RegistryTestBlock);
+      });
+
+      assert.true(this.blocks.hasBlock("registry-test-block"));
+    });
+
+    test("hasBlock returns false for unregistered blocks", function (assert) {
+      assert.false(this.blocks.hasBlock("nonexistent-block"));
+    });
+
+    test("getBlock returns registered block class", function (assert) {
+      @block("get-block-test")
+      class GetBlockTest extends Component {}
+
+      withTestBlockRegistration(() => {
+        registerBlock(GetBlockTest);
+      });
+
+      const result = this.blocks.getBlock("get-block-test");
+      assert.strictEqual(getBlockMetadata(result)?.blockName, "get-block-test");
+    });
+
+    test("getBlock returns undefined for unregistered blocks", function (assert) {
+      assert.strictEqual(this.blocks.getBlock("nonexistent"), undefined);
+    });
+
+    test("listBlocks returns all registered blocks", function (assert) {
+      @block("list-block-a")
+      class ListBlockA extends Component {}
+
+      @block("list-block-b")
+      class ListBlockB extends Component {}
+
+      withTestBlockRegistration(() => {
+        registerBlock(ListBlockA);
+        registerBlock(ListBlockB);
+      });
+
+      const blocks = this.blocks.listBlocks();
+      const names = blocks.map((b) => getBlockMetadata(b)?.blockName);
+
+      assert.true(names.includes("list-block-a"));
+      assert.true(names.includes("list-block-b"));
+    });
+
+    test("listBlocksWithMetadata returns blocks with metadata", function (assert) {
+      @block("metadata-list-block", {
+        description: "A test block with metadata",
+        args: {
+          title: { type: "string", required: true },
+        },
+      })
+      class MetadataListBlock extends Component {}
+
+      withTestBlockRegistration(() => {
+        registerBlock(MetadataListBlock);
+      });
+
+      const blocksWithMeta = this.blocks.listBlocksWithMetadata();
+      const found = blocksWithMeta.find(
+        (b) => b.name === "metadata-list-block"
+      );
+
+      assert.true(!!found, "block found in list");
+      assert.strictEqual(
+        found.metadata.description,
+        "A test block with metadata"
+      );
+      assert.deepEqual(found.metadata.args, {
+        title: { type: "string", required: true },
+      });
+    });
+  });
+
+  module("built-in conditions", function () {
+    test("registers built-in condition types", function (assert) {
+      assert.true(this.blocks.hasConditionType("route"));
+      assert.true(this.blocks.hasConditionType("user"));
+      assert.true(this.blocks.hasConditionType("setting"));
+      assert.true(this.blocks.hasConditionType("viewport"));
+    });
+
+    test("getRegisteredConditionTypes returns all built-in types", function (assert) {
+      const types = this.blocks.getRegisteredConditionTypes();
+      assert.true(types.includes("route"));
+      assert.true(types.includes("user"));
+      assert.true(types.includes("setting"));
+      assert.true(types.includes("viewport"));
+    });
+  });
+
+  module("_registerConditionType", function () {
+    test("registers a custom condition type", function (assert) {
+      @blockCondition({
+        type: "test-custom",
+        args: {},
+      })
+      class BlockTestCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockTestCondition);
+      });
+      assert.true(this.blocks.hasConditionType("test-custom"));
+    });
+
+    test("throws if class does not use decorator", function (assert) {
+      class NotDecoratedCondition extends BlockCondition {
+        static type = "not-decorated";
+
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.throws(
+        () =>
+          withTestConditionRegistration(() => {
+            registerConditionType(NotDecoratedCondition);
+          }),
+        /must use the @blockCondition decorator/
+      );
+    });
+
+    test("throws if type is already registered", function (assert) {
+      @blockCondition({
+        type: "route",
+        args: {},
+      })
+      class BlockDuplicateCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      assert.throws(
+        () =>
+          withTestConditionRegistration(() => {
+            registerConditionType(BlockDuplicateCondition);
+          }),
+        /already registered/
+      );
+    });
+  });
+
+  module("validate", function () {
+    test("passes for null/undefined conditions", function (assert) {
+      assert.strictEqual(this.blocks.validate(null), undefined);
+      assert.strictEqual(this.blocks.validate(undefined), undefined);
+    });
+
+    test("throws for missing type", function (assert) {
+      assert.throws(
+        () => this.blocks.validate({ foo: "bar" }),
+        /missing "type" property/
+      );
+    });
+
+    test("throws for unknown type", function (assert) {
+      assert.throws(
+        () => this.blocks.validate({ type: "unknown-type" }),
+        /Unknown condition type/
+      );
+    });
+
+    test("validates array of conditions (AND)", function (assert) {
+      assert.throws(
+        () =>
+          this.blocks.validate([
+            { type: "user", loggedIn: true },
+            { type: "unknown" },
+          ]),
+        /Unknown condition type/
+      );
+    });
+
+    test("validates 'any' combinator (OR)", function (assert) {
+      assert.throws(
+        () => this.blocks.validate({ any: "not-an-array" }),
+        /"any" must be an array of conditions/
+      );
+
+      assert.throws(
+        () =>
+          this.blocks.validate({
+            any: [{ type: "user", loggedIn: true }, { type: "unknown" }],
+          }),
+        /Unknown condition type/
+      );
+    });
+
+    test("validates 'not' combinator", function (assert) {
+      assert.throws(
+        () => this.blocks.validate({ not: [{ type: "user" }] }),
+        /"not" must be a single condition object/
+      );
+
+      assert.throws(
+        () => this.blocks.validate({ not: { type: "unknown" } }),
+        /Unknown condition type/
+      );
+    });
+
+    test("throws for extra keys alongside 'any' combinator", function (assert) {
+      assert.throws(
+        () =>
+          this.blocks.validate({
+            any: [{ type: "user" }],
+            extraKey: "value",
+          }),
+        /extra keys.*extraKey.*Only "any" is allowed/
+      );
+
+      assert.throws(
+        () =>
+          this.blocks.validate({
+            any: [{ type: "user" }],
+            type: "user",
+            loggedIn: true,
+          }),
+        /extra keys.*type.*loggedIn.*Only "any" is allowed/
+      );
+    });
+
+    test("throws for extra keys alongside 'not' combinator", function (assert) {
+      assert.throws(
+        () =>
+          this.blocks.validate({
+            not: { type: "user" },
+            extraKey: "value",
+          }),
+        /extra keys.*extraKey.*Only "not" is allowed/
+      );
+
+      assert.throws(
+        () =>
+          this.blocks.validate({
+            not: { type: "user" },
+            type: "user",
+          }),
+        /extra keys.*type.*Only "not" is allowed/
+      );
+    });
+  });
+
+  module("evaluate", function () {
+    test("returns true for null/undefined conditions", function (assert) {
+      assert.true(this.blocks.evaluate(null));
+      assert.true(this.blocks.evaluate(undefined));
+    });
+
+    test("returns false for unknown type", function (assert) {
+      assert.false(this.blocks.evaluate({ type: "unknown-type" }));
+    });
+
+    test("evaluates array of conditions with AND logic", function (assert) {
+      @blockCondition({
+        type: "always-true",
+        args: {},
+      })
+      class BlockAlwaysTrueCondition extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      @blockCondition({
+        type: "always-false",
+        args: {},
+      })
+      class BlockAlwaysFalseCondition extends BlockCondition {
+        evaluate() {
+          return false;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockAlwaysTrueCondition);
+        registerConditionType(BlockAlwaysFalseCondition);
+      });
+
+      assert.true(
+        this.blocks.evaluate([{ type: "always-true" }, { type: "always-true" }])
+      );
+
+      assert.false(
+        this.blocks.evaluate([
+          { type: "always-true" },
+          { type: "always-false" },
+        ])
+      );
+    });
+
+    test("evaluates 'any' combinator with OR logic", function (assert) {
+      @blockCondition({
+        type: "always-true-2",
+        args: {},
+      })
+      class BlockAlwaysTrueCondition2 extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      @blockCondition({
+        type: "always-false-2",
+        args: {},
+      })
+      class BlockAlwaysFalseCondition2 extends BlockCondition {
+        evaluate() {
+          return false;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockAlwaysTrueCondition2);
+        registerConditionType(BlockAlwaysFalseCondition2);
+      });
+
+      assert.true(
+        this.blocks.evaluate({
+          any: [{ type: "always-false-2" }, { type: "always-true-2" }],
+        })
+      );
+
+      assert.false(
+        this.blocks.evaluate({
+          any: [{ type: "always-false-2" }, { type: "always-false-2" }],
+        })
+      );
+    });
+
+    test("evaluates 'not' combinator", function (assert) {
+      @blockCondition({
+        type: "always-true-3",
+        args: {},
+      })
+      class BlockAlwaysTrueCondition3 extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      @blockCondition({
+        type: "always-false-3",
+        args: {},
+      })
+      class BlockAlwaysFalseCondition3 extends BlockCondition {
+        evaluate() {
+          return false;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockAlwaysTrueCondition3);
+        registerConditionType(BlockAlwaysFalseCondition3);
+      });
+
+      assert.false(this.blocks.evaluate({ not: { type: "always-true-3" } }));
+      assert.true(this.blocks.evaluate({ not: { type: "always-false-3" } }));
+    });
+
+    test("passes args to condition evaluate method", function (assert) {
+      let receivedArgs;
+
+      @blockCondition({
+        type: "arg-capturing",
+        args: {
+          foo: { type: "any" },
+          baz: { type: "any" },
+        },
+      })
+      class BlockArgCapturingCondition extends BlockCondition {
+        evaluate(args) {
+          receivedArgs = args;
+          return true;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockArgCapturingCondition);
+      });
+      this.blocks.evaluate({ type: "arg-capturing", foo: "bar", baz: 123 });
+
+      assert.deepEqual(receivedArgs, { foo: "bar", baz: 123 });
+    });
+
+    test("returns true for empty AND array (vacuous truth)", function (assert) {
+      assert.true(this.blocks.evaluate([]));
+    });
+
+    test("returns false for empty OR array (any)", function (assert) {
+      assert.false(this.blocks.evaluate({ any: [] }));
+    });
+
+    test("evaluates nested combinators (NOT within OR within AND)", function (assert) {
+      @blockCondition({
+        type: "nested-true",
+        args: {},
+      })
+      class BlockNestedTrue extends BlockCondition {
+        evaluate() {
+          return true;
+        }
+      }
+
+      @blockCondition({
+        type: "nested-false",
+        args: {},
+      })
+      class BlockNestedFalse extends BlockCondition {
+        evaluate() {
+          return false;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockNestedTrue);
+        registerConditionType(BlockNestedFalse);
+      });
+
+      // AND with OR inside: [{ any: [false, true] }] => true
+      assert.true(
+        this.blocks.evaluate([
+          {
+            any: [{ type: "nested-false" }, { type: "nested-true" }],
+          },
+        ])
+      );
+
+      // AND with NOT inside OR: [{ any: [{ not: { type: "nested-true" } }] }] => false
+      assert.false(
+        this.blocks.evaluate([
+          {
+            any: [{ not: { type: "nested-true" } }],
+          },
+        ])
+      );
+
+      // Complex: AND[ OR[NOT(false), false], true ] => AND[ OR[true, false], true ] => AND[true, true] => true
+      assert.true(
+        this.blocks.evaluate([
+          {
+            any: [{ not: { type: "nested-false" } }, { type: "nested-false" }],
+          },
+          { type: "nested-true" },
+        ])
+      );
+    });
+
+    test("passes outletArgs to condition evaluate context", function (assert) {
+      let receivedContext;
+
+      @blockCondition({
+        type: "context-capturing",
+        args: {},
+      })
+      class BlockContextCapturing extends BlockCondition {
+        evaluate(args, context) {
+          receivedContext = context;
+          return true;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockContextCapturing);
+      });
+
+      const outletArgs = { topic: { id: 123 }, user: { admin: true } };
+      this.blocks.evaluate({ type: "context-capturing" }, { outletArgs });
+
+      assert.deepEqual(receivedContext.outletArgs, outletArgs);
+    });
+
+    test("passes outletArgs through NOT combinator", function (assert) {
+      let receivedOutletArgs;
+
+      @blockCondition({
+        type: "not-outlet-args",
+        args: {},
+      })
+      class BlockNotOutletArgs extends BlockCondition {
+        evaluate(args, context) {
+          receivedOutletArgs = context?.outletArgs;
+          return false;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockNotOutletArgs);
+      });
+
+      const outletArgs = { topic: { closed: true } };
+      this.blocks.evaluate(
+        { not: { type: "not-outlet-args" } },
+        { outletArgs }
+      );
+
+      assert.deepEqual(
+        receivedOutletArgs,
+        outletArgs,
+        "outletArgs should be passed through NOT combinator"
+      );
+    });
+
+    test("passes outletArgs through nested AND/OR/NOT combinators", function (assert) {
+      let callCount = 0;
+      const receivedOutletArgs = [];
+
+      @blockCondition({
+        type: "deep-outlet-args",
+        args: {},
+      })
+      class BlockDeepOutletArgs extends BlockCondition {
+        evaluate(args, context) {
+          callCount++;
+          receivedOutletArgs.push(context?.outletArgs);
+          return true;
+        }
+      }
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockDeepOutletArgs);
+      });
+
+      const outletArgs = { data: "test-value" };
+
+      // Complex nested: AND[ OR[ NOT(condition) ] ]
+      this.blocks.evaluate(
+        [
+          {
+            any: [{ not: { type: "deep-outlet-args" } }],
+          },
+        ],
+        { outletArgs }
+      );
+
+      assert.strictEqual(callCount, 1, "condition should be called once");
+      assert.deepEqual(
+        receivedOutletArgs[0],
+        outletArgs,
+        "outletArgs should be passed through all combinator levels"
+      );
+    });
+  });
+
+  module("condition service injection", function () {
+    test("conditions can inject services", function (assert) {
+      let injectedSiteSettings;
+
+      @blockCondition({
+        type: "service-injection-test",
+        args: {},
+      })
+      class BlockServiceInjectionCondition extends BlockCondition {
+        evaluate() {
+          injectedSiteSettings = this.siteSettings;
+          return true;
+        }
+      }
+
+      // Manually inject service since we can't use @service decorator in test
+      Object.defineProperty(
+        BlockServiceInjectionCondition.prototype,
+        "siteSettings",
+        {
+          get() {
+            return getOwner(this).lookup("service:site-settings");
+          },
+        }
+      );
+
+      withTestConditionRegistration(() => {
+        registerConditionType(BlockServiceInjectionCondition);
+      });
+      this.blocks.evaluate({ type: "service-injection-test" });
+
+      assert.true(!!injectedSiteSettings, "siteSettings was injected");
+      assert.strictEqual(typeof injectedSiteSettings.title, "string");
+    });
+  });
+});
diff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb
index fc45dda8aa927..6552c01f5147e 100644
--- a/lib/svg_sprite.rb
+++ b/lib/svg_sprite.rb
@@ -76,6 +76,7 @@ module SvgSprite
         copy
         crosshairs
         cube
+        cubes
         desktop
         diagram-project
         discourse-amazon
@@ -109,6 +110,7 @@ module SvgSprite
         envelope
         eye
         eye-dropper
+        eye-slash
         fab-android
         fab-apple
         fab-chrome
diff --git a/package.json b/package.json
index 8d4ad4613b58e..a83355e8a1e95 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "license": "GPL-2.0-only",
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "^7.29.0",
-    "@discourse/lint-configs": "^2.39.0",
+    "@discourse/lint-configs": "^2.40.0",
     "@discourse/moment-timezone-names-translations": "^1.0.0",
     "@fortawesome/fontawesome-free": "7.1.0",
     "@glint/ember-tsc": "^1.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a5983c29202b9..03ee09759d1ef 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,8 +35,8 @@ importers:
         specifier: ^7.29.0
         version: 7.29.0(@babel/core@7.29.0)
       '@discourse/lint-configs':
-        specifier: ^2.39.0
-        version: 2.39.0(ember-template-lint@7.9.3)(eslint@9.39.2(jiti@2.6.1))(postcss@8.5.6)(prettier@3.8.1)(stylelint@17.1.0(typescript@5.9.3))
+        specifier: ^2.40.0
+        version: 2.40.0(ember-template-lint@7.9.3)(eslint@9.39.2(jiti@2.6.1))(postcss@8.5.6)(prettier@3.8.1)(stylelint@17.1.0(typescript@5.9.3))
       '@discourse/moment-timezone-names-translations':
         specifier: ^1.0.0
         version: 1.0.0
@@ -328,6 +328,9 @@ importers:
       photoswipe:
         specifier: 5.4.4
         version: 5.4.4
+      picomatch:
+        specifier: ^4.0.3
+        version: 4.0.3
       pikaday:
         specifier: ^1.8.2
         version: 1.8.2
@@ -1755,8 +1758,8 @@ packages:
   '@discourse/itsatrap@2.0.10':
     resolution: {integrity: sha512-Jn1gdiyHMGUsmUfLFf4Q7VnTAv0l7NePbegU6pKhKHEmbzV3FosGxq30fTOYgVyTS1bxqGjlA6LvQttJpv3ROw==}
 
-  '@discourse/lint-configs@2.39.0':
-    resolution: {integrity: sha512-InvOpS2n5WVAQ8XATkDbryoBqGR+s933MOSaAnXKhB4SMTLiTkYp1QicFa8XOb+Qlkjv7DawSaR42rhLg+7nNw==}
+  '@discourse/lint-configs@2.40.0':
+    resolution: {integrity: sha512-bVZ4qeBv02UOt7tTL7xSmp69n4NcQ6fAS6gp+J+iA5x2BFBxqaY7xdxVbxlTHoYkZdyNRl8PruDrmTpyPyf8CA==}
     peerDependencies:
       ember-template-lint: 7.9.3
       eslint: 9.39.2
@@ -10416,7 +10419,7 @@ snapshots:
 
   '@discourse/itsatrap@2.0.10': {}
 
-  '@discourse/lint-configs@2.39.0(ember-template-lint@7.9.3)(eslint@9.39.2(jiti@2.6.1))(postcss@8.5.6)(prettier@3.8.1)(stylelint@17.1.0(typescript@5.9.3))':
+  '@discourse/lint-configs@2.40.0(ember-template-lint@7.9.3)(eslint@9.39.2(jiti@2.6.1))(postcss@8.5.6)(prettier@3.8.1)(stylelint@17.1.0(typescript@5.9.3))':
     dependencies:
       '@babel/core': 7.29.0(supports-color@8.1.1)
       '@babel/eslint-parser': 7.28.6(@babel/core@7.29.0)(eslint@9.39.2(jiti@2.6.1))
diff --git a/spec/fixtures/themes/dev-tools-test-theme/about.json b/spec/fixtures/themes/dev-tools-test-theme/about.json
new file mode 100644
index 0000000000000..4fb687d2fa740
--- /dev/null
+++ b/spec/fixtures/themes/dev-tools-test-theme/about.json
@@ -0,0 +1,4 @@
+{
+  "name": "Dev Tools Test Theme",
+  "component": true
+}
diff --git a/spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/api-initializers/test-blocks.gjs b/spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/api-initializers/test-blocks.gjs
new file mode 100644
index 0000000000000..ef88a903ffa4a
--- /dev/null
+++ b/spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/api-initializers/test-blocks.gjs
@@ -0,0 +1,161 @@
+import { apiInitializer } from "discourse/lib/api";
+import BlockGroup from "discourse/blocks/builtin/block-group";
+import {
+  CombinedAdminCategoryBlock,
+  CombinedLoggedInTL1Block,
+  ConditionalBlock,
+  DebugArgsBlock,
+  DebugConditionsBlock,
+  NestedGhostLeafBlock,
+  OrAdminOrModeratorBlock,
+  OrderFifthBlock,
+  OrderFirstBlock,
+  OrderFourthBlock,
+  OrderSecondBlock,
+  OrderThirdBlock,
+  RouteCategoryBlock,
+  RouteDiscoveryBlock,
+  RouteTopicBlock,
+  SettingBadgesEnabledBlock,
+  TestBlock,
+  UserAdminBlock,
+  UserLoggedInBlock,
+  UserModeratorBlock,
+  UserTrustLevel2Block,
+  ViewportDesktopBlock,
+  ViewportMobileBlock,
+} from "../pre-initializers/register-test-blocks";
+
+export default apiInitializer((api) => {
+  api.renderBlocks("hero-blocks", [
+    // Dev tools test blocks (existing)
+    { block: TestBlock, args: { title: "Test Title" } },
+    { block: ConditionalBlock, conditions: [{ type: "user", admin: true }] },
+
+    // User condition blocks
+    {
+      block: UserLoggedInBlock,
+      conditions: [{ type: "user", loggedIn: true }],
+    },
+    {
+      block: UserAdminBlock,
+      conditions: [{ type: "user", admin: true }],
+    },
+    {
+      block: UserModeratorBlock,
+      conditions: [{ type: "user", moderator: true }],
+    },
+    {
+      block: UserTrustLevel2Block,
+      conditions: [{ type: "user", minTrustLevel: 2 }],
+    },
+
+    // Route condition blocks
+    {
+      block: RouteCategoryBlock,
+      conditions: [{ type: "route", pages: ["CATEGORY_PAGES"] }],
+    },
+    {
+      block: RouteTopicBlock,
+      conditions: [{ type: "route", urls: ["/t/**"] }],
+    },
+    {
+      block: RouteDiscoveryBlock,
+      conditions: [{ type: "route", pages: ["DISCOVERY_PAGES"] }],
+    },
+
+    // Setting condition blocks
+    {
+      block: SettingBadgesEnabledBlock,
+      conditions: [{ type: "setting", name: "enable_badges", enabled: true }],
+    },
+
+    // Combined condition blocks (AND logic)
+    {
+      block: CombinedLoggedInTL1Block,
+      conditions: [
+        { type: "user", loggedIn: true },
+        { type: "user", minTrustLevel: 1 },
+      ],
+    },
+    {
+      block: CombinedAdminCategoryBlock,
+      conditions: [
+        { type: "user", admin: true },
+        { type: "route", pages: ["CATEGORY_PAGES"] },
+      ],
+    },
+
+    // OR condition block
+    {
+      block: OrAdminOrModeratorBlock,
+      conditions: [
+        {
+          any: [{ type: "user", admin: true }, { type: "user", moderator: true }],
+        },
+      ],
+    },
+
+    // Block ordering blocks (in specific order)
+    { block: OrderFirstBlock },
+    { block: OrderSecondBlock },
+    { block: OrderThirdBlock },
+    { block: OrderFourthBlock },
+    { block: OrderFifthBlock },
+
+    // Viewport condition blocks
+    {
+      block: ViewportMobileBlock,
+      conditions: [{ type: "viewport", max: "sm" }],
+    },
+    {
+      block: ViewportDesktopBlock,
+      conditions: [{ type: "viewport", min: "lg" }],
+    },
+
+    // Debug tools test blocks
+    {
+      block: DebugArgsBlock,
+      args: { title: "Debug Title", count: 42, enabled: true },
+    },
+    {
+      block: DebugConditionsBlock,
+      conditions: [
+        { type: "user", admin: true },
+        { type: "user", minTrustLevel: 2 },
+      ],
+    },
+
+    // Nested ghost blocks test - 4 levels deep with all children having failing conditions
+    // This tests that ghost blocks are shown for container blocks when all children are hidden
+    {
+      block: BlockGroup,
+      id: "level-1",
+      classNames: "deep-ghosts",
+      children: [
+        {
+          block: BlockGroup,
+          id: "level-2",
+          children: [
+            {
+              block: BlockGroup,
+              id: "level-3",
+              children: [
+                {
+                  block: BlockGroup,
+                  id: "level-4",
+                  children: [
+                    {
+                      block: NestedGhostLeafBlock,
+                      conditions: [{ type: "user", admin: true }],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
+  ]);
+});
diff --git a/spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/pre-initializers/register-test-blocks.gjs b/spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/pre-initializers/register-test-blocks.gjs
new file mode 100644
index 0000000000000..d82081b589540
--- /dev/null
+++ b/spec/fixtures/themes/dev-tools-test-theme/javascripts/discourse/pre-initializers/register-test-blocks.gjs
@@ -0,0 +1,253 @@
+import Component from "@glimmer/component";
+import { block } from "discourse/blocks";
+import { withPluginApi } from "discourse/lib/plugin-api";
+
+/*
+ * Dev Tools Test Blocks (existing)
+ */
+
+@block("theme:dev-tools-test:dev-tools-test-block", {
+  args: { title: { type: "string" } },
+})
+export class TestBlock extends Component {
+  <template>
+    <div class="dev-tools-test-block">{{@title}}</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:dev-tools-conditional-block")
+export class ConditionalBlock extends Component {
+  <template>
+    <div class="dev-tools-conditional-block">Admin Only</div>
+  </template>
+}
+
+/*
+ * User Condition Test Blocks
+ */
+
+@block("theme:dev-tools-test:user-logged-in-block")
+export class UserLoggedInBlock extends Component {
+  <template>
+    <div class="block-user-logged-in">Logged In User Content</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:user-admin-block")
+export class UserAdminBlock extends Component {
+  <template>
+    <div class="block-user-admin">Admin Only Content</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:user-moderator-block")
+export class UserModeratorBlock extends Component {
+  <template>
+    <div class="block-user-moderator">Moderator Content</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:user-trust-level-2-block")
+export class UserTrustLevel2Block extends Component {
+  <template>
+    <div class="block-user-trust-level-2">Trust Level 2+ Content</div>
+  </template>
+}
+
+/*
+ * Route Condition Test Blocks
+ */
+
+@block("theme:dev-tools-test:route-category-block")
+export class RouteCategoryBlock extends Component {
+  <template>
+    <div class="block-route-category">Category Page Content</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:route-topic-block")
+export class RouteTopicBlock extends Component {
+  <template>
+    <div class="block-route-topic">Topic Page Content</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:route-discovery-block")
+export class RouteDiscoveryBlock extends Component {
+  <template>
+    <div class="block-route-discovery">Discovery Page Content</div>
+  </template>
+}
+
+/*
+ * Setting Condition Test Blocks
+ */
+
+@block("theme:dev-tools-test:setting-badges-enabled-block")
+export class SettingBadgesEnabledBlock extends Component {
+  <template>
+    <div class="block-setting-badges-enabled">Badges Enabled Content</div>
+  </template>
+}
+
+/*
+ * Combined Condition Test Blocks
+ */
+
+@block("theme:dev-tools-test:combined-logged-in-tl1-block")
+export class CombinedLoggedInTL1Block extends Component {
+  <template>
+    <div class="block-combined-logged-in-tl1">Logged In + TL1 Content</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:combined-admin-category-block")
+export class CombinedAdminCategoryBlock extends Component {
+  <template>
+    <div class="block-combined-admin-category">Admin on Category Page</div>
+  </template>
+}
+
+/*
+ * OR Condition Test Block
+ */
+
+@block("theme:dev-tools-test:or-admin-or-moderator-block")
+export class OrAdminOrModeratorBlock extends Component {
+  <template>
+    <div class="block-or-admin-or-moderator">Admin OR Moderator Content</div>
+  </template>
+}
+
+/*
+ * Block Ordering Test Blocks
+ */
+
+@block("theme:dev-tools-test:order-first-block")
+export class OrderFirstBlock extends Component {
+  <template>
+    <div class="block-order-first" data-order="1">First Block</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:order-second-block")
+export class OrderSecondBlock extends Component {
+  <template>
+    <div class="block-order-second" data-order="2">Second Block</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:order-third-block")
+export class OrderThirdBlock extends Component {
+  <template>
+    <div class="block-order-third" data-order="3">Third Block</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:order-fourth-block")
+export class OrderFourthBlock extends Component {
+  <template>
+    <div class="block-order-fourth" data-order="4">Fourth Block</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:order-fifth-block")
+export class OrderFifthBlock extends Component {
+  <template>
+    <div class="block-order-fifth" data-order="5">Fifth Block</div>
+  </template>
+}
+
+/*
+ * Viewport Condition Test Blocks
+ */
+
+@block("theme:dev-tools-test:viewport-mobile-block")
+export class ViewportMobileBlock extends Component {
+  <template>
+    <div class="block-viewport-mobile">Mobile Only Content</div>
+  </template>
+}
+
+@block("theme:dev-tools-test:viewport-desktop-block")
+export class ViewportDesktopBlock extends Component {
+  <template>
+    <div class="block-viewport-desktop">Desktop Only Content</div>
+  </template>
+}
+
+/*
+ * Debug Tools Test Blocks (enhanced)
+ */
+
+@block("theme:dev-tools-test:debug-args-block", {
+  args: {
+    title: { type: "string", required: true },
+    count: { type: "number", default: 0 },
+    enabled: { type: "boolean", default: true },
+  },
+})
+export class DebugArgsBlock extends Component {
+  <template>
+    <div class="block-debug-args">
+      <span class="title">{{@title}}</span>
+      <span class="count">{{@count}}</span>
+      <span class="enabled">{{if @enabled "yes" "no"}}</span>
+    </div>
+  </template>
+}
+
+@block("theme:dev-tools-test:debug-conditions-block")
+export class DebugConditionsBlock extends Component {
+  <template>
+    <div class="block-debug-conditions">Admin + TL2 Content</div>
+  </template>
+}
+
+/*
+ * Nested Ghost Block Test - leaf block for deep nesting test
+ */
+
+@block("theme:dev-tools-test:nested-ghost-leaf-block")
+export class NestedGhostLeafBlock extends Component {
+  <template>
+    <div class="block-nested-ghost-leaf">Deeply Nested Content</div>
+  </template>
+}
+
+/**
+ * Pre-initializer that registers all test blocks.
+ * Runs before "freeze-block-registry" to ensure blocks are available
+ * before the registry is frozen.
+ */
+export default {
+  before: "freeze-block-registry",
+
+  initialize() {
+    withPluginApi((api) => {
+      api.registerBlock(TestBlock);
+      api.registerBlock(ConditionalBlock);
+      api.registerBlock(UserLoggedInBlock);
+      api.registerBlock(UserAdminBlock);
+      api.registerBlock(UserModeratorBlock);
+      api.registerBlock(UserTrustLevel2Block);
+      api.registerBlock(RouteCategoryBlock);
+      api.registerBlock(RouteTopicBlock);
+      api.registerBlock(RouteDiscoveryBlock);
+      api.registerBlock(SettingBadgesEnabledBlock);
+      api.registerBlock(CombinedLoggedInTL1Block);
+      api.registerBlock(CombinedAdminCategoryBlock);
+      api.registerBlock(OrAdminOrModeratorBlock);
+      api.registerBlock(OrderFirstBlock);
+      api.registerBlock(OrderSecondBlock);
+      api.registerBlock(OrderThirdBlock);
+      api.registerBlock(OrderFourthBlock);
+      api.registerBlock(OrderFifthBlock);
+      api.registerBlock(ViewportMobileBlock);
+      api.registerBlock(ViewportDesktopBlock);
+      api.registerBlock(DebugArgsBlock);
+      api.registerBlock(DebugConditionsBlock);
+      api.registerBlock(NestedGhostLeafBlock);
+    });
+  },
+};
diff --git a/spec/system/blocks_spec.rb b/spec/system/blocks_spec.rb
new file mode 100644
index 0000000000000..273813220bd24
--- /dev/null
+++ b/spec/system/blocks_spec.rb
@@ -0,0 +1,283 @@
+# frozen_string_literal: true
+
+describe "Block conditions", type: :system do
+  fab!(:theme) do
+    theme_dir = "#{Rails.root}/spec/fixtures/themes/dev-tools-test-theme"
+    theme = RemoteTheme.import_theme_from_directory(theme_dir)
+    Theme.find(SiteSetting.default_theme_id).child_themes << theme
+    theme
+  end
+
+  fab!(:admin)
+  fab!(:moderator)
+  fab!(:trust_level_2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
+  fab!(:trust_level_1_user) { Fabricate(:user, trust_level: TrustLevel[1]) }
+  fab!(:trust_level_0_user) { Fabricate(:user, trust_level: TrustLevel[0]) }
+  fab!(:category)
+  fab!(:post)
+  fab!(:topic) { post.topic }
+
+  let(:blocks) { PageObjects::Components::Blocks.new }
+
+  describe "user conditions" do
+    context "when anonymous" do
+      it "hides logged-in-only blocks" do
+        visit("/latest")
+
+        expect(blocks).to have_no_block("user-logged-in")
+        expect(blocks).to have_no_block("user-admin")
+        expect(blocks).to have_no_block("user-moderator")
+        expect(blocks).to have_no_block("user-trust-level-2")
+      end
+    end
+
+    context "when logged in as regular user (TL0)" do
+      before { sign_in(trust_level_0_user) }
+
+      it "shows logged-in blocks but not role-specific blocks" do
+        visit("/latest")
+
+        expect(blocks).to have_block("user-logged-in")
+        expect(blocks).to have_no_block("user-admin")
+        expect(blocks).to have_no_block("user-moderator")
+        expect(blocks).to have_no_block("user-trust-level-2")
+      end
+    end
+
+    context "when logged in as TL2 user" do
+      before { sign_in(trust_level_2_user) }
+
+      it "shows trust level blocks" do
+        visit("/latest")
+
+        expect(blocks).to have_block("user-logged-in")
+        expect(blocks).to have_block("user-trust-level-2")
+        expect(blocks).to have_no_block("user-admin")
+      end
+    end
+
+    context "when logged in as moderator" do
+      before { sign_in(moderator) }
+
+      it "shows moderator blocks" do
+        visit("/latest")
+
+        expect(blocks).to have_block("user-logged-in")
+        expect(blocks).to have_block("user-moderator")
+        expect(blocks).to have_no_block("user-admin")
+      end
+    end
+
+    context "when logged in as admin" do
+      before { sign_in(admin) }
+
+      it "shows admin blocks" do
+        visit("/latest")
+
+        expect(blocks).to have_block("user-logged-in")
+        expect(blocks).to have_block("user-admin")
+        # Admins are also moderators
+        expect(blocks).to have_block("user-moderator")
+      end
+    end
+  end
+
+  describe "route conditions" do
+    before { sign_in(trust_level_2_user) }
+
+    it "shows discovery blocks on discovery pages" do
+      visit("/latest")
+
+      expect(blocks).to have_block("route-discovery")
+      expect(blocks).to have_no_block("route-category")
+      expect(blocks).to have_no_block("route-topic")
+    end
+
+    it "shows category blocks on category pages" do
+      visit("/c/#{category.slug}/#{category.id}")
+
+      expect(blocks).to have_block("route-discovery")
+      expect(blocks).to have_block("route-category")
+      expect(blocks).to have_no_block("route-topic")
+    end
+
+    it "shows topic blocks on topic pages" do
+      visit("/t/#{topic.slug}/#{topic.id}")
+
+      expect(blocks).to have_block("route-topic")
+      expect(blocks).to have_no_block("route-discovery")
+      expect(blocks).to have_no_block("route-category")
+    end
+  end
+
+  describe "route navigation (SPA)" do
+    before { sign_in(trust_level_2_user) }
+
+    it "re-evaluates blocks when navigating from discovery to topic via click" do
+      visit("/latest")
+
+      expect(blocks).to have_block("route-discovery")
+      expect(blocks).to have_no_block("route-topic")
+
+      find(".topic-list-item .raw-topic-link[data-topic-id='#{topic.id}']").click
+
+      expect(blocks).to have_block("route-topic")
+      expect(blocks).to have_no_block("route-discovery")
+    end
+
+    it "re-evaluates blocks when navigating from topic back to discovery" do
+      visit("/t/#{topic.slug}/#{topic.id}")
+
+      expect(blocks).to have_block("route-topic")
+      expect(blocks).to have_no_block("route-discovery")
+
+      find("#site-logo").click
+
+      expect(blocks).to have_block("route-discovery")
+      expect(blocks).to have_no_block("route-topic")
+    end
+
+    it "re-evaluates combined conditions when navigating to category page" do
+      sign_in(admin)
+      visit("/latest")
+
+      expect(blocks).to have_no_block("combined-admin-category")
+
+      find(".sidebar-section-link", text: category.name).click
+
+      expect(blocks).to have_block("combined-admin-category")
+    end
+  end
+
+  describe "setting conditions" do
+    before { sign_in(trust_level_2_user) }
+
+    context "when enable_badges is true" do
+      before { SiteSetting.enable_badges = true }
+
+      it "shows setting-dependent block" do
+        visit("/latest")
+
+        expect(blocks).to have_block("setting-badges-enabled")
+      end
+    end
+
+    context "when enable_badges is false" do
+      before { SiteSetting.enable_badges = false }
+
+      it "hides setting-dependent block" do
+        visit("/latest")
+
+        expect(blocks).to have_no_block("setting-badges-enabled")
+      end
+    end
+  end
+
+  describe "combined conditions (AND logic)" do
+    context "with logged-in + TL1 requirement" do
+      it "hides block when not logged in" do
+        visit("/latest")
+
+        expect(blocks).to have_no_block("combined-logged-in-tl1")
+      end
+
+      it "hides block when logged in but below TL1" do
+        sign_in(trust_level_0_user)
+        visit("/latest")
+
+        expect(blocks).to have_no_block("combined-logged-in-tl1")
+      end
+
+      it "shows block when logged in and at TL1+" do
+        sign_in(trust_level_1_user)
+        visit("/latest")
+
+        expect(blocks).to have_block("combined-logged-in-tl1")
+      end
+    end
+
+    context "with admin + category route requirement" do
+      it "hides block when admin but not on category page" do
+        sign_in(admin)
+        visit("/latest")
+
+        expect(blocks).to have_no_block("combined-admin-category")
+      end
+
+      it "hides block when on category page but not admin" do
+        sign_in(trust_level_2_user)
+        visit("/c/#{category.slug}/#{category.id}")
+
+        expect(blocks).to have_no_block("combined-admin-category")
+      end
+
+      it "shows block when admin AND on category page" do
+        sign_in(admin)
+        visit("/c/#{category.slug}/#{category.id}")
+
+        expect(blocks).to have_block("combined-admin-category")
+      end
+    end
+  end
+
+  describe "OR conditions (any combinator)" do
+    it "hides block when neither admin nor moderator" do
+      sign_in(trust_level_2_user)
+      visit("/latest")
+
+      expect(blocks).to have_no_block("or-admin-or-moderator")
+    end
+
+    it "shows block when moderator (not admin)" do
+      sign_in(moderator)
+      visit("/latest")
+
+      expect(blocks).to have_block("or-admin-or-moderator")
+    end
+
+    it "shows block when admin (not just moderator)" do
+      sign_in(admin)
+      visit("/latest")
+
+      expect(blocks).to have_block("or-admin-or-moderator")
+    end
+  end
+
+  describe "block ordering" do
+    before { sign_in(trust_level_2_user) }
+
+    it "renders blocks in the order they were configured" do
+      visit("/latest")
+
+      expect(blocks).to have_block("order-first")
+      expect(blocks).to have_block("order-second")
+      expect(blocks).to have_block("order-third")
+      expect(blocks).to have_block("order-fourth")
+      expect(blocks).to have_block("order-fifth")
+
+      expect(blocks.has_blocks_in_order?([1, 2, 3, 4, 5])).to be true
+    end
+  end
+
+  describe "viewport conditions" do
+    before { sign_in(trust_level_2_user) }
+
+    context "when on desktop viewport (default)" do
+      it "shows desktop-only blocks and hides mobile-only blocks" do
+        visit("/latest")
+
+        expect(blocks).to have_block("viewport-desktop")
+        expect(blocks).to have_no_block("viewport-mobile")
+      end
+    end
+
+    context "when on mobile viewport", mobile: true do
+      it "shows mobile-only blocks and hides desktop-only blocks" do
+        visit("/latest")
+
+        expect(blocks).to have_block("viewport-mobile")
+        expect(blocks).to have_no_block("viewport-desktop")
+      end
+    end
+  end
+end
diff --git a/spec/system/dev_tools_spec.rb b/spec/system/dev_tools_spec.rb
index 4bf63bd86163a..3d3a0133bb6a8 100644
--- a/spec/system/dev_tools_spec.rb
+++ b/spec/system/dev_tools_spec.rb
@@ -1,42 +1,192 @@
 # frozen_string_literal: true
 
 describe "Discourse dev tools", type: :system do
-  it "works" do
-    # Open site and check it loads successfully, with no dev-tools
-    visit("/latest")
-    expect(page).to have_css("#site-logo")
-    expect(page).not_to have_css(".dev-tools-toolbar")
-
-    # Enable dev tools, and wait for page to reload
-    page.driver.with_playwright_page { |pw_page| pw_page.evaluate("window.enableDevTools()") }
-
-    expect(page).to have_css(".dev-tools-toolbar")
-
-    # Turn on plugin outlet debugging, and check they appear
-    find(".dev-tools-toolbar .toggle-plugin-outlets").click
-    expect(page).to have_css(".plugin-outlet-info", minimum: 10)
-
-    # Open a tooltip
-    find(".plugin-outlet-info[data-outlet-name=home-logo-contents__before]").hover
-    expect(page).to have_css(".plugin-outlet-info__wrapper")
-
-    # Check the outletArgs are shown
-    expect(page).to have_css(".plugin-outlet-info__wrapper .key", text: "title")
-    expect(page).to have_css(
-      ".plugin-outlet-info__wrapper .value",
-      text: "\"#{SiteSetting.title}\"",
-    )
-
-    # Turn off plugin outlet debugging, and check they disappeared
-    find(".dev-tools-toolbar .toggle-plugin-outlets").click
-    expect(page).not_to have_css(".plugin-outlet-info")
-
-    # Disable dev tools
-    find(".dev-tools-toolbar .disable-dev-tools").click
-
-    # Check reloaded successfully
-    expect(page).not_to have_css(".dev-tools-toolbar")
-    expect(page).to have_css("#site-logo")
-    expect(page).not_to have_css(".dev-tools-toolbar")
+  let(:toolbar) { PageObjects::Components::DevTools::Toolbar.new }
+  let(:plugin_outlet_debug) { PageObjects::Components::DevTools::PluginOutletDebug.new }
+  let(:block_debug) { PageObjects::Components::DevTools::BlockDebug.new }
+
+  describe "toolbar" do
+    it "can be enabled and disabled" do
+      visit("/latest")
+      expect(page).to have_css("#site-logo")
+      expect(toolbar).to have_no_toolbar
+
+      toolbar.enable
+      expect(toolbar).to have_toolbar
+
+      toolbar.disable
+      expect(toolbar).to have_no_toolbar
+      expect(page).to have_css("#site-logo")
+    end
+  end
+
+  describe "plugin outlet debugging" do
+    it "shows plugin outlet overlays with tooltips" do
+      visit("/latest")
+      toolbar.enable
+      toolbar.toggle_plugin_outlets
+
+      expect(plugin_outlet_debug).to have_outlets(minimum: 10)
+
+      plugin_outlet_debug.hover_outlet("home-logo-contents__before")
+      expect(plugin_outlet_debug).to have_tooltip
+      expect(plugin_outlet_debug).to have_arg(key: "@title")
+      expect(plugin_outlet_debug).to have_arg_value(value: "\"#{SiteSetting.title}\"")
+      expect(plugin_outlet_debug).to have_github_link
+
+      toolbar.toggle_plugin_outlets
+      expect(plugin_outlet_debug).to have_no_outlets
+    end
+
+    it "shows wrapper outlet indicator" do
+      visit("/latest")
+      toolbar.enable
+      toolbar.toggle_plugin_outlets
+
+      expect(plugin_outlet_debug).to have_wrapper_outlet
+    end
+  end
+
+  describe "block debugging" do
+    it "shows block outlet boundaries with tooltip" do
+      visit("/latest")
+      toolbar.enable
+      toolbar.toggle_block_outlet_boundaries
+
+      expect(block_debug).to have_outlet_boundary
+      block_debug.hover_outlet_badge
+      expect(block_debug).to have_outlet_tooltip
+      expect(block_debug).to have_outlet_github_link
+    end
+
+    context "with test theme blocks" do
+      fab!(:theme) do
+        theme_dir = "#{Rails.root}/spec/fixtures/themes/dev-tools-test-theme"
+        theme = RemoteTheme.import_theme_from_directory(theme_dir)
+        Theme.find(SiteSetting.default_theme_id).child_themes << theme
+        theme
+      end
+
+      it "shows block visual overlay with tooltip" do
+        visit("/latest")
+        toolbar.enable
+        toolbar.toggle_block_visual_overlay
+
+        expect(block_debug).to have_block_info("theme:dev-tools-test:dev-tools-test-block")
+        block_debug.hover_block_badge("theme:dev-tools-test:dev-tools-test-block")
+        expect(block_debug).to have_block_tooltip
+        expect(block_debug).to have_block_title("dev-tools-test-block")
+        expect(block_debug).to have_block_location("hero-blocks")
+        expect(block_debug).to have_block_arg(key: "title")
+      end
+
+      it "shows correct block count in outlet boundary tooltip" do
+        visit("/latest")
+        toolbar.enable
+        toolbar.toggle_block_outlet_boundaries
+
+        block_debug.hover_outlet_badge("hero-blocks")
+        expect(block_debug).to have_outlet_tooltip
+        expect(block_debug).to have_outlet_block_count(23)
+      end
+
+      it "shows ghost blocks for failed conditions" do
+        visit("/latest") # Anonymous user, admin condition fails
+        toolbar.enable
+        toolbar.toggle_ghost_blocks
+
+        expect(block_debug).to have_ghost_block("theme:dev-tools-test:dev-tools-conditional-block")
+        block_debug.hover_ghost_badge("theme:dev-tools-test:dev-tools-conditional-block")
+        expect(block_debug).to have_ghost_tooltip
+        expect(block_debug).to have_conditions
+      end
+
+      it "shows conditions as failed with condition type" do
+        visit("/latest") # Anonymous user, admin condition fails
+        toolbar.enable
+        toolbar.toggle_ghost_blocks
+
+        block_debug.hover_ghost_badge("theme:dev-tools-test:dev-tools-conditional-block")
+        expect(block_debug).to have_failed_conditions
+        expect(block_debug).to have_condition_type("user")
+      end
+
+      it "shows multiple condition types for combined conditions" do
+        visit("/latest") # Anonymous user, admin + TL2 condition fails
+        toolbar.enable
+        toolbar.toggle_ghost_blocks
+
+        block_debug.hover_ghost_badge("theme:dev-tools-test:debug-conditions-block")
+        expect(block_debug).to have_failed_conditions
+        expect(block_debug).to have_condition_type("AND")
+        expect(block_debug).to have_condition_type("user")
+      end
+
+      it "shows block args values in tooltip" do
+        visit("/latest")
+        toolbar.enable
+        toolbar.toggle_block_visual_overlay
+
+        expect(block_debug).to have_block_info("theme:dev-tools-test:debug-args-block")
+        block_debug.hover_block_badge("theme:dev-tools-test:debug-args-block")
+        expect(block_debug).to have_block_tooltip
+        expect(block_debug).to have_block_arg(key: "title")
+        expect(block_debug).to have_block_arg(key: "count")
+        expect(block_debug).to have_block_arg(key: "enabled")
+      end
+
+      it "shows ghost blocks with combined conditions" do
+        visit("/latest") # Anonymous user, admin + TL2 condition fails
+        toolbar.enable
+        toolbar.toggle_ghost_blocks
+
+        expect(block_debug).to have_ghost_block("theme:dev-tools-test:debug-conditions-block")
+        block_debug.hover_ghost_badge("theme:dev-tools-test:debug-conditions-block")
+        expect(block_debug).to have_ghost_tooltip
+        expect(block_debug).to have_conditions
+      end
+
+      it "shows nested ghost blocks for groups with all children hidden (4 levels deep)" do
+        visit("/latest") # Anonymous user, all nested children fail admin condition
+        toolbar.enable
+        toolbar.toggle_ghost_blocks
+
+        # The outermost group should appear as a ghost since all its children are hidden
+        expect(block_debug).to have_ghost_block("group")
+
+        # Verify all 4 levels of nested groups appear as ghosts
+        expect(page).to have_css(".block-debug-ghost[data-block-name='group']", minimum: 4)
+
+        # The leaf block should also appear as a ghost
+        expect(block_debug).to have_ghost_block("theme:dev-tools-test:nested-ghost-leaf-block")
+      end
+
+      it "reactively shows and hides overlays when toggling without page refresh" do
+        visit("/latest")
+        toolbar.enable
+
+        # Initially no overlays
+        expect(block_debug).to have_no_block_info
+        expect(block_debug).to have_no_ghost_block
+
+        # Enable visual overlay and ghost blocks - should appear without page refresh
+        toolbar.toggle_block_visual_overlay
+        toolbar.toggle_ghost_blocks
+        expect(block_debug).to have_block_info("theme:dev-tools-test:dev-tools-test-block")
+        expect(block_debug).to have_ghost_block("theme:dev-tools-test:dev-tools-conditional-block")
+
+        # Disable both - should disappear without page refresh
+        toolbar.toggle_block_visual_overlay
+        toolbar.toggle_ghost_blocks
+        expect(block_debug).to have_no_block_info
+        expect(block_debug).to have_no_ghost_block
+
+        # Re-enable to confirm reactivity works both ways
+        toolbar.toggle_block_visual_overlay
+        toolbar.toggle_ghost_blocks
+        expect(block_debug).to have_block_info("theme:dev-tools-test:dev-tools-test-block")
+        expect(block_debug).to have_ghost_block("theme:dev-tools-test:dev-tools-conditional-block")
+      end
+    end
   end
 end
diff --git a/spec/system/page_objects/components/blocks.rb b/spec/system/page_objects/components/blocks.rb
new file mode 100644
index 0000000000000..6be5ea1557273
--- /dev/null
+++ b/spec/system/page_objects/components/blocks.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    class Blocks < PageObjects::Components::Base
+      def has_block?(name)
+        page.has_css?(".block-#{name}", wait: 5)
+      end
+
+      def has_no_block?(name)
+        page.has_no_css?(".block-#{name}", wait: 5)
+      end
+
+      def block_text(name)
+        find(".block-#{name}").text
+      end
+
+      def block_count(outlet_name)
+        page.all("[class*='#{outlet_name}__block']").count
+      end
+
+      def ordered_blocks_in_outlet(outlet_name)
+        page.all(".#{outlet_name}__block [data-order]").map { |el| el["data-order"].to_i }
+      end
+
+      def has_blocks_in_order?(expected_order)
+        actual = ordered_blocks_in_outlet("hero-blocks")
+        actual == expected_order
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/dev_tools/block_debug.rb b/spec/system/page_objects/components/dev_tools/block_debug.rb
new file mode 100644
index 0000000000000..2c1d31d5a1b0c
--- /dev/null
+++ b/spec/system/page_objects/components/dev_tools/block_debug.rb
@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module DevTools
+      class BlockDebug < PageObjects::Components::Base
+        # Outlet boundary methods
+        def has_outlet_boundary?
+          page.has_css?(".block-outlet-debug")
+        end
+
+        def has_no_outlet_boundary?
+          page.has_no_css?(".block-outlet-debug")
+        end
+
+        def hover_outlet_badge(name = nil)
+          selector =
+            name ? ".block-outlet-debug[data-outlet-name='#{name}']" : ".block-outlet-debug"
+          # Use JavaScript click to bypass any overlapping tooltip elements
+          page.execute_script(
+            "document.querySelector(\"#{selector} .block-outlet-debug__badge\").click()",
+          )
+          self
+        end
+
+        def has_outlet_tooltip?
+          page.has_css?(".outlet-info__wrapper")
+        end
+
+        def has_outlet_github_link?
+          page.has_css?(".outlet-info__heading .github-link")
+        end
+
+        def has_outlet_block_count?(count)
+          text = count == 1 ? "1 block" : "#{count} blocks"
+          page.has_css?(".outlet-info__stat", text: text)
+        end
+
+        # Block visual overlay methods
+        def has_block_info?(block_name = nil)
+          selector =
+            block_name ? ".block-debug-info[data-block-name='#{block_name}']" : ".block-debug-info"
+          page.has_css?(selector)
+        end
+
+        def has_no_block_info?(block_name = nil)
+          selector =
+            block_name ? ".block-debug-info[data-block-name='#{block_name}']" : ".block-debug-info"
+          page.has_no_css?(selector)
+        end
+
+        def hover_block_badge(block_name = nil)
+          selector =
+            block_name ? ".block-debug-info[data-block-name='#{block_name}']" : ".block-debug-info"
+          # Use JavaScript click to bypass any overlapping tooltip elements
+          page.execute_script("document.querySelector(\"#{selector} .block-debug-badge\").click()")
+          self
+        end
+
+        def has_block_tooltip?
+          page.has_css?(".block-debug-tooltip")
+        end
+
+        def has_block_title?(name)
+          page.has_css?(".block-debug-tooltip__title", text: name)
+        end
+
+        def has_block_location?(location)
+          page.has_css?(".block-debug-tooltip__location", text: location)
+        end
+
+        def has_block_arg?(key:)
+          page.has_css?(".outlet-args-table__key", text: "@#{key}")
+        end
+
+        # Ghost block methods
+        def has_ghost_block?(block_name = nil)
+          selector =
+            (
+              if block_name
+                ".block-debug-ghost[data-block-name='#{block_name}']"
+              else
+                ".block-debug-ghost"
+              end
+            )
+          page.has_css?(selector)
+        end
+
+        def has_no_ghost_block?(block_name = nil)
+          selector =
+            (
+              if block_name
+                ".block-debug-ghost[data-block-name='#{block_name}']"
+              else
+                ".block-debug-ghost"
+              end
+            )
+          page.has_no_css?(selector)
+        end
+
+        def hover_ghost_badge(block_name = nil)
+          selector =
+            (
+              if block_name
+                ".block-debug-ghost[data-block-name='#{block_name}']"
+              else
+                ".block-debug-ghost"
+              end
+            )
+          # Use JavaScript click to bypass any overlapping tooltip elements
+          page.execute_script(
+            "document.querySelector(\"#{selector} .block-debug-ghost__badge\").click()",
+          )
+          self
+        end
+
+        def has_ghost_tooltip?
+          page.has_css?(".block-debug-tooltip.--ghost")
+        end
+
+        def has_conditions?
+          page.has_css?(".block-debug-conditions")
+        end
+
+        def has_failed_conditions?
+          page.has_css?(".block-debug-conditions.--failed")
+        end
+
+        def has_passed_conditions?
+          page.has_css?(".block-debug-conditions.--passed")
+        end
+
+        def has_condition_type?(type)
+          page.has_css?(".block-debug-condition__type", text: type)
+        end
+
+        def condition_types
+          page.all(".block-debug-condition__type").map(&:text)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/dev_tools/plugin_outlet_debug.rb b/spec/system/page_objects/components/dev_tools/plugin_outlet_debug.rb
new file mode 100644
index 0000000000000..6be862a3e63e1
--- /dev/null
+++ b/spec/system/page_objects/components/dev_tools/plugin_outlet_debug.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module DevTools
+      class PluginOutletDebug < PageObjects::Components::Base
+        def hover_outlet(name)
+          find(".plugin-outlet-debug[data-outlet-name='#{name}']").hover
+          self
+        end
+
+        def has_outlets?(minimum: 1)
+          page.has_css?(".plugin-outlet-debug", minimum: minimum)
+        end
+
+        def has_no_outlets?
+          page.has_no_css?(".plugin-outlet-debug")
+        end
+
+        def has_tooltip?
+          page.has_css?(".outlet-info__wrapper")
+        end
+
+        def has_wrapper_outlet?
+          page.has_css?(".plugin-outlet-debug.--wrapper")
+        end
+
+        def has_github_link?
+          page.has_css?(".outlet-info__heading .github-link")
+        end
+
+        def has_arg?(key:)
+          page.has_css?(".outlet-args-table__key", text: key)
+        end
+
+        def has_arg_value?(value:)
+          page.has_css?(".outlet-args-table__value", text: value)
+        end
+
+        def has_wrapper_label?
+          page.has_css?(".outlet-info__heading", text: "(wrapper)")
+        end
+      end
+    end
+  end
+end
diff --git a/spec/system/page_objects/components/dev_tools/toolbar.rb b/spec/system/page_objects/components/dev_tools/toolbar.rb
new file mode 100644
index 0000000000000..a5fbd927f15f9
--- /dev/null
+++ b/spec/system/page_objects/components/dev_tools/toolbar.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module PageObjects
+  module Components
+    module DevTools
+      class Toolbar < PageObjects::Components::Base
+        def enable
+          page.driver.with_playwright_page { |pw| pw.evaluate("window.enableDevTools()") }
+          has_toolbar? # Wait for toolbar to appear
+          self
+        end
+
+        def disable
+          find(".dev-tools-toolbar .disable-dev-tools").click
+          self
+        end
+
+        def toggle_plugin_outlets
+          find(".dev-tools-toolbar .toggle-plugin-outlets").click
+          self
+        end
+
+        def open_blocks_menu
+          find(".dev-tools-toolbar .toggle-blocks").click
+          self
+        end
+
+        def close_blocks_menu
+          find(".dev-tools-toolbar .toggle-blocks").click if page.has_css?(".block-debug-menu")
+          self
+        end
+
+        def toggle_block_visual_overlay
+          open_blocks_menu
+          find(".block-debug-menu label", text: "Visual overlay").click
+          close_blocks_menu
+          self
+        end
+
+        def toggle_ghost_blocks
+          open_blocks_menu
+          find(".block-debug-menu label", text: "Ghost blocks").click
+          close_blocks_menu
+          self
+        end
+
+        def toggle_block_outlet_boundaries
+          open_blocks_menu
+          find(".block-debug-menu label", text: "Outlet boundaries").click
+          close_blocks_menu
+          self
+        end
+
+        def has_toolbar?
+          page.has_css?(".dev-tools-toolbar")
+        end
+
+        def has_no_toolbar?
+          page.has_no_css?(".dev-tools-toolbar")
+        end
+      end
+    end
+  end
+end
diff --git a/tsconfig-base.json b/tsconfig-base.json
index e590cc7ef49c0..47e3ec8f2ff12 100644
--- a/tsconfig-base.json
+++ b/tsconfig-base.json
@@ -3,7 +3,7 @@
     "plugins": [{
       "name": "@glint/tsserver-plugin"
     }],
-    "target": "es2021",
+    "target": "es2022",
     "module": "es2022",
     "moduleResolution": "bundler",
     "experimentalDecorators": true,

From 3a278b25a3d20de70e49118e20e5cd96458b2760 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Wed, 25 Feb 2026 16:30:17 -0500
Subject: [PATCH 082/168] UX: update styling of icebreaker step for onboarding
 (#38066)

Updates styles for the onboarding icebreaker step including making the
cards buttons, adding focus styles, and updating copy.

Before:
<img width="500" alt="image"
src="https://github.com/user-attachments/assets/b23b7c80-0fe6-4b2b-a9b2-0ccf7e17682e"
/>


After:
<img width="500" alt="image"
src="https://github.com/user-attachments/assets/399e126b-e59b-431f-adc8-746d275354a5"
/>

---------

Co-authored-by: Gabriel Grubba <gabriel@discourse.org>
---
 .../components/admin-onboarding-banner.scss   | 48 ++++++++----
 config/locales/client.en.yml                  |  6 +-
 .../modal/predefined-topics-options.gjs       | 76 +++++++------------
 .../modal/start-posting-options.gjs           |  8 --
 .../admin-onboarding/start-posting-option.gjs |  2 +-
 .../admin-onboarding-banner-test.gjs          |  4 +-
 .../admin_onboarding_predefined_topics.rb     |  4 +-
 7 files changed, 68 insertions(+), 80 deletions(-)

diff --git a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss b/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
index a66a8d04bd9a7..7e502ae56b66b 100644
--- a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
+++ b/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
@@ -105,32 +105,50 @@
 }
 
 .start-posting-options-modal {
+  .modal-options {
+    display: flex;
+    flex-direction: column;
+    gap: var(--space-8);
+  }
+
   .option {
-    padding-bottom: var(--space-4);
+    p {
+      margin: var(--space-2) 0;
+    }
   }
 }
 
 .predefined-topic-options-modal {
-  .d-modal__subtitle-text {
-    padding: var(--space-2) 0;
-  }
-
-  &__header {
+  &__list {
     display: flex;
-    align-items: center;
-    justify-content: space-between;
+    flex-direction: column;
+    gap: var(--space-4);
   }
 
   &__card {
-    margin-bottom: var(--space-4);
-  }
-
-  &__content {
-    border-bottom: 1px solid var(--content-border-color);
+    display: flex;
+    flex-direction: column;
+    align-items: start;
+    text-align: left;
+    width: 100%;
+    padding: var(--space-4);
+    border: 1px solid var(--content-border-color);
+    border-radius: var(--d-border-radius);
+    background: var(--secondary);
+
+    &:focus-visible,
+    &:hover {
+      outline: 2px solid var(--tertiary);
+
+      .predefined-topic-options-modal__title {
+        color: var(--tertiary);
+      }
+    }
   }
 
-  &__card:last-child > &__content {
-    border-bottom: none;
+  &__title {
+    display: block;
+    font-weight: bold;
   }
 
   &__body {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 2ecabbac60adf..bc79d8b71d22b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -503,10 +503,10 @@ en:
         description: "Give people something to talk about together"
         action: "Icebreaker ideas"
         choose_option: "How would you like to start?"
-        predefined_topics: "Pre-defined Topics"
-        predefined_topics_subtitle: "Break the ice with one of the following conversation starters. <br/> Pick one and customize it to your liking:"
+        predefined_topics: "Icebreaker templates"
+        predefined_topics_subtitle: "Give new members something to talk about, pick a template to edit and make your own."
         predefined_topics_description: "Pick from a collection of conversation starters to get discussions going"
-        use_predefined: "Use pre-defined Topics"
+        use_predefined: "Browse templates"
         start_with_this: "Start with this"
         back: "Back"
         icebreakers:
diff --git a/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs b/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs
index b0c840f4e3c9d..fadf220ea01e9 100644
--- a/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs
+++ b/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs
@@ -1,9 +1,8 @@
 import Component from "@glimmer/component";
 import { concat, fn } from "@ember/helper";
+import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
-import { htmlSafe } from "@ember/template";
-import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
 import { i18n } from "discourse-i18n";
 
@@ -28,11 +27,6 @@ export default class PredefinedTopicOptions extends Component {
     });
   }
 
-  @action
-  cancel() {
-    this.args.closeModal();
-  }
-
   @action
   handleSelectTopic(topic) {
     this.args.closeModal();
@@ -43,55 +37,41 @@ export default class PredefinedTopicOptions extends Component {
     <DModal
       class="predefined-topic-options-modal"
       @title={{i18n "admin_onboarding_banner.start_posting.predefined_topics"}}
-      @subtitle={{htmlSafe
-        (i18n
-          "admin_onboarding_banner.start_posting.predefined_topics_subtitle"
-        )
+      @subtitle={{i18n
+        "admin_onboarding_banner.start_posting.predefined_topics_subtitle"
       }}
-      @closeModal={{this.cancel}}
+      @closeModal={{@closeModal}}
     >
       <:body>
         <div class="predefined-topic-options-modal__list">
           {{#each this.icebreakerTopics as |topic|}}
-            <div class="predefined-topic-options-modal__card">
-              <div class="predefined-topic-options-modal__content">
-                <div class="predefined-topic-options-modal__header">
-                  <h4 class="predefined-topic-options-modal__title">
-                    {{i18n
-                      (concat
-                        "admin_onboarding_banner.start_posting.icebreakers."
-                        topic
-                        ".title"
-                      )
-                    }}
-                  </h4>
-                  <DButton
-                    @icon="far-pen-to-square"
-                    @action={{fn this.handleSelectTopic topic}}
-                    class="predefined-topic-options-modal__select-btn btn-primary"
-                  />
-                </div>
-                <p class="predefined-topic-options-modal__body">
-                  {{i18n
-                    (concat
-                      "admin_onboarding_banner.start_posting.icebreakers."
-                      topic
-                      ".body"
-                    )
-                  }}
-                </p>
-              </div>
-            </div>
+            <button
+              type="button"
+              class="predefined-topic-options-modal__card"
+              {{on "click" (fn this.handleSelectTopic topic)}}
+            >
+              <span class="predefined-topic-options-modal__title">
+                {{i18n
+                  (concat
+                    "admin_onboarding_banner.start_posting.icebreakers."
+                    topic
+                    ".title"
+                  )
+                }}
+              </span>
+              <p class="predefined-topic-options-modal__body">
+                {{i18n
+                  (concat
+                    "admin_onboarding_banner.start_posting.icebreakers."
+                    topic
+                    ".body"
+                  )
+                }}
+              </p>
+            </button>
           {{/each}}
         </div>
       </:body>
-      <:footer>
-        <DButton
-          @label="cancel"
-          @action={{this.cancel}}
-          class="predefined-topic-options-modal__cancel-button btn-transparent"
-        />
-      </:footer>
     </DModal>
   </template>
 }
diff --git a/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs b/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs
index ccdc7e21c7ad4..78eb8235759e5 100644
--- a/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs
+++ b/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs
@@ -1,4 +1,3 @@
-import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
 import { i18n } from "discourse-i18n";
 
@@ -15,13 +14,6 @@ const StartPostingOptions = <template>
         {{/each}}
       </div>
     </:body>
-    <:footer>
-      <DButton
-        @label="cancel"
-        @action={{@closeModal}}
-        class="btn-transparent cancel-button"
-      />
-    </:footer>
   </DModal>
 </template>;
 
diff --git a/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
index 3de3172f24480..e3809779e959a 100644
--- a/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
+++ b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
@@ -35,7 +35,7 @@ export default class StartPostingOption extends Component {
       <DButton
         @label={{this.actionLabel}}
         @action={{this.onSelect}}
-        class="btn-primary"
+        class="btn-default"
       />
     </div>
   </template>
diff --git a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
index b396a952096c9..27e899b7a4fbc 100644
--- a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
+++ b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
@@ -87,9 +87,7 @@ acceptance("Admin - Onboarding Banner", function (needs) {
     await step.clickAction();
 
     assert.dom(".predefined-topic-options-modal__card").exists({ count: 4 });
-    await click(
-      ".predefined-topic-options-modal__card:last-child .predefined-topic-options-modal__select-btn"
-    );
+    await click(".predefined-topic-options-modal__card:last-child");
 
     await click(".create");
     await visit("/");
diff --git a/spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb b/spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb
index c8f7fdc73e6f0..88f6faeabea49 100644
--- a/spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb
+++ b/spec/system/page_objects/modals/admin_onboarding_predefined_topics.rb
@@ -22,11 +22,11 @@ def topic_card_count
       end
 
       def select_topic(index)
-        topic_cards[index].find(".predefined-topic-options-modal__select-btn").click
+        topic_cards[index].click
       end
 
       def cancel
-        find(".predefined-topic-options-modal__cancel-button").click
+        close
       end
     end
   end

From b4925714f5411a9c8d0981bf664e12fbfe3a5bf4 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <70247653+Grubba27@users.noreply.github.com>
Date: Wed, 25 Feb 2026 18:56:53 -0300
Subject: [PATCH 083/168] DEV: Add informative blocks with category elements to
 chat (#37932)

Introduces a new "informative" block type for chat messages that can
display category information.

This enables bots to present structured category information and other
informational content in chat with blocks.

This is how it looks:

## Examples:
<img width="227" height="129" alt="Screenshot 2026-02-25 at 14 51 52"
src="https://github.com/user-attachments/assets/40f08255-ae5b-4106-a654-8c709bd588e3"
/>

`{ type: "category", title: "Support", color: "0088CC" }`

---

<img width="291" height="136" alt="Screenshot 2026-02-25 at 14 50 56"
src="https://github.com/user-attachments/assets/64815423-672a-42b8-ac4d-b5ccc816b941"
/>

`{ type: "category", title: "Support", color: "0088CC", description:
"Get help from the community" }`

---

<img width="338" height="154" alt="Screenshot 2026-02-25 at 15 02 07"
src="https://github.com/user-attachments/assets/89f820a5-a4d5-41fd-b3e7-8ea674c19a67"
/>

`{ type: "category", title: "Dev", color: "E45735", description:
"Development related discussions", parent_name: "Meta", parent_color:
"0088CC" }`

---

You can have multiple elements per block and they _shoud_ take only one
row:

<img width="459" height="345" alt="Screenshot 2026-02-25 at 15 32 39"
src="https://github.com/user-attachments/assets/710faf9a-c85c-42b2-ab33-5c7e68ea6496"
/>
<img width="530" height="183" alt="Screenshot 2026-02-25 at 15 33 08"
src="https://github.com/user-attachments/assets/d10d444d-b252-42bc-affc-56cd9f5724ca"
/>


## How to use
The only required params are: `type`,`title` and `color`
```rb
      ChatSDK::Message.create(
        raw: " ",
        blocks: [
          {
            type: "informative",
            elements: [
              {
                type: "category",
                title: "Support",
                color: "0088CC",
                description: "Get help from the community",
              },
            ],
          },
        ],
        guardian: bot_guardian,
        channel_id: bot_channel_id,
      )
```
---
 .../app/serializers/chat/block_serializer.rb  |   2 +
 .../blocks/elements/category_serializer.rb    |  55 +++++
 .../components/chat-message/blocks/block.gjs  |   3 +
 .../chat-message/blocks/element.gjs           |   3 +
 .../chat-message/blocks/elements/category.gjs |  57 +++++
 .../chat-message/blocks/informative.gjs       |  15 ++
 .../common/chat-message-blocks.scss           |  80 +++++++
 .../chat/lib/chat/schemas/message_blocks.rb   |  68 +++++-
 plugins/chat/spec/models/chat/message_spec.rb |   3 +
 .../system/chat_informative_blocks_spec.rb    | 195 ++++++++++++++++++
 10 files changed, 480 insertions(+), 1 deletion(-)
 create mode 100644 plugins/chat/app/serializers/chat/blocks/elements/category_serializer.rb
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/category.gjs
 create mode 100644 plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/informative.gjs
 create mode 100644 plugins/chat/spec/system/chat_informative_blocks_spec.rb

diff --git a/plugins/chat/app/serializers/chat/block_serializer.rb b/plugins/chat/app/serializers/chat/block_serializer.rb
index bc508ef9ed168..c07af08c8a61a 100644
--- a/plugins/chat/app/serializers/chat/block_serializer.rb
+++ b/plugins/chat/app/serializers/chat/block_serializer.rb
@@ -19,6 +19,8 @@ def self.element_serializer_for(type)
       case type
       when "button"
         Chat::Blocks::Elements::ButtonSerializer
+      when "category"
+        Chat::Blocks::Elements::CategorySerializer
       else
         raise "no serializer for #{type}"
       end
diff --git a/plugins/chat/app/serializers/chat/blocks/elements/category_serializer.rb b/plugins/chat/app/serializers/chat/blocks/elements/category_serializer.rb
new file mode 100644
index 0000000000000..b7a2a2057841a
--- /dev/null
+++ b/plugins/chat/app/serializers/chat/blocks/elements/category_serializer.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Chat
+  module Blocks
+    module Elements
+      class CategorySerializer < ApplicationSerializer
+        attributes :type, :title, :color, :description, :url, :parent_name, :parent_color
+
+        def type
+          object["type"]
+        end
+
+        def title
+          object["title"]
+        end
+
+        def color
+          object["color"]
+        end
+
+        def description
+          object["description"]
+        end
+
+        def include_description?
+          object["description"].present?
+        end
+
+        def url
+          object["url"]
+        end
+
+        def include_url?
+          object["url"].present?
+        end
+
+        def parent_name
+          object["parent_name"]
+        end
+
+        def include_parent_name?
+          object["parent_name"].present?
+        end
+
+        def parent_color
+          object["parent_color"]
+        end
+
+        def include_parent_color?
+          object["parent_color"].present?
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/block.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/block.gjs
index c7ec6422f7a20..0ff13a30d2f65 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/block.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/block.gjs
@@ -1,11 +1,14 @@
 import Component from "@glimmer/component";
 import Actions from "./actions";
+import Informative from "./informative";
 
 export default class Block extends Component {
   get blockForType() {
     switch (this.args.definition.type) {
       case "actions":
         return Actions;
+      case "informative":
+        return Informative;
       default:
         throw new Error(`Unknown block type: ${this.args.definition.type}`);
     }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/element.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/element.gjs
index da88e987d018d..d8bec1b746673 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/element.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/element.gjs
@@ -1,11 +1,14 @@
 import Component from "@glimmer/component";
 import Button from "./elements/button";
+import CategoryElement from "./elements/category";
 
 export default class Element extends Component {
   get elementForType() {
     switch (this.args.definition.type) {
       case "button":
         return Button;
+      case "category":
+        return CategoryElement;
       default:
         throw new Error(`Unknown element type: ${this.args.definition.type}`);
     }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/category.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/category.gjs
new file mode 100644
index 0000000000000..bb29eb83d6931
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/category.gjs
@@ -0,0 +1,57 @@
+import Component from "@glimmer/component";
+import { htmlSafe } from "@ember/template";
+
+export default class CategoryElement extends Component {
+  get boxStyle() {
+    let style = `--category-badge-color: #${this.args.definition.color}`;
+    if (this.args.definition.parent_color) {
+      style += `; --parent-category-badge-color: #${this.args.definition.parent_color}`;
+    }
+    return htmlSafe(style);
+  }
+
+  get parentBadgeStyle() {
+    return this.args.definition.parent_color
+      ? htmlSafe(
+          `--category-badge-color: #${this.args.definition.parent_color}`
+        )
+      : null;
+  }
+
+  <template>
+    <div class="block__category" style={{this.boxStyle}}>
+      <div class="block__category-inner">
+        <div class="block__category-heading">
+          {{#if @definition.url}}
+            <a href={{@definition.url}} class="block__category-link">
+              <span class="badge-category --style-square">
+                <span class="badge-category__name">{{@definition.title}}</span>
+              </span>
+            </a>
+          {{else}}
+            <span class="badge-category --style-square">
+              <span class="badge-category__name">{{@definition.title}}</span>
+            </span>
+          {{/if}}
+        </div>
+        {{#if @definition.parent_name}}
+          <div class="block__category-parent">
+            <span
+              class="badge-category --style-square"
+              style={{this.parentBadgeStyle}}
+            >
+              <span
+                class="badge-category__name"
+              >{{@definition.parent_name}}</span>
+            </span>
+          </div>
+        {{/if}}
+        {{#if @definition.description}}
+          <div class="block__category-description">
+            {{@definition.description}}
+          </div>
+        {{/if}}
+      </div>
+    </div>
+  </template>
+}
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/informative.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/informative.gjs
new file mode 100644
index 0000000000000..9298c11fe2470
--- /dev/null
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/informative.gjs
@@ -0,0 +1,15 @@
+import Element from "./element";
+
+const Informative = <template>
+  <div class="block__informative-wrapper">
+    <div class="block__informative">
+      {{#each @definition.elements as |elementDefinition|}}
+        <div class="block__informative-item">
+          <Element @definition={{elementDefinition}} />
+        </div>
+      {{/each}}
+    </div>
+  </div>
+</template>;
+
+export default Informative;
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-blocks.scss b/plugins/chat/assets/stylesheets/common/chat-message-blocks.scss
index 331eadac50955..122a4a1609c6b 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-blocks.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-blocks.scss
@@ -17,4 +17,84 @@
       width: 18px;
     }
   }
+
+  .block__informative-wrapper {
+    margin: 0.5em 0;
+  }
+
+  .block__informative {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5em;
+    padding: 0.5em 0;
+  }
+
+  .block__informative-item {
+    display: flex;
+    align-items: stretch;
+  }
+
+  .block__category {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    box-sizing: border-box;
+    border-width: 0;
+    border-radius: var(--d-border-radius);
+    background-color: var(--d-category-box-background-color);
+    border-left-width: var(--d-category-border-accent-width);
+    border-style: solid;
+    border-color: var(--category-badge-color, var(--primary-low));
+    width: 100%;
+  }
+
+  .block__category-inner {
+    box-sizing: border-box;
+    width: 100%;
+    padding: 1em;
+    display: flex;
+    flex-direction: column;
+    gap: 0.5em;
+    border-width: var(--d-category-border-box-width);
+    border-left-width: 0;
+    border-style: solid;
+    border-color: var(--primary-low);
+    border-top-right-radius: var(--d-border-radius);
+    border-bottom-right-radius: var(--d-border-radius);
+  }
+
+  .block__category-heading {
+    margin-bottom: 0.5em;
+
+    .badge-category__wrapper {
+      font-size: var(--font-up-2);
+    }
+
+    .badge-category__name {
+      font-weight: bold;
+      color: var(--primary);
+    }
+
+    .block__category-link {
+      text-decoration: none;
+      color: inherit;
+
+      &:hover {
+        .badge-category__name {
+          color: var(--tertiary);
+        }
+      }
+    }
+  }
+
+  .block__category-parent {
+    font-size: var(--font-down-1);
+    color: var(--primary-high);
+  }
+
+  .block__category-description {
+    font-size: var(--font-0);
+    color: var(--primary-high);
+    line-height: var(--line-height-medium);
+  }
 }
diff --git a/plugins/chat/lib/chat/schemas/message_blocks.rb b/plugins/chat/lib/chat/schemas/message_blocks.rb
index a631a814ef9d0..672b37f945248 100644
--- a/plugins/chat/lib/chat/schemas/message_blocks.rb
+++ b/plugins/chat/lib/chat/schemas/message_blocks.rb
@@ -47,6 +47,46 @@ module Schemas
       additionalProperties: false,
     }
 
+    CategoryV1 = {
+      type: "object",
+      properties: {
+        schema_version: {
+          type: "integer",
+        },
+        type: {
+          type: "string",
+          enum: ["category"],
+        },
+        title: {
+          type: "string",
+          maxLength: 50,
+        },
+        color: {
+          type: "string",
+          pattern: "^[0-9A-Fa-f]{6}$",
+        },
+        description: {
+          type: "string",
+          maxLength: 500,
+        },
+        url: {
+          type: "string",
+          maxLength: 500,
+          pattern: "^(https://|/)",
+        },
+        parent_name: {
+          type: "string",
+          maxLength: 50,
+        },
+        parent_color: {
+          type: "string",
+          pattern: "^[0-9A-Fa-f]{6}$",
+        },
+      },
+      required: %w[schema_version type title color],
+      additionalProperties: false,
+    }
+
     ActionsV1 = {
       type: "object",
       properties: {
@@ -73,6 +113,32 @@ module Schemas
       additionalProperties: false,
     }
 
-    MessageBlocks = { type: "array", maxItems: 5, items: { oneOf: [ActionsV1] } }
+    InformativeV1 = {
+      type: "object",
+      properties: {
+        type: {
+          type: "string",
+          enum: ["informative"],
+        },
+        schema_version: {
+          type: "integer",
+        },
+        block_id: {
+          type: "string",
+          maxLength: 255,
+        },
+        elements: {
+          type: "array",
+          maxItems: 10,
+          items: {
+            oneOf: [CategoryV1],
+          },
+        },
+      },
+      required: %w[schema_version type elements],
+      additionalProperties: false,
+    }
+
+    MessageBlocks = { type: "array", maxItems: 5, items: { oneOf: [ActionsV1, InformativeV1] } }
   end
 end
diff --git a/plugins/chat/spec/models/chat/message_spec.rb b/plugins/chat/spec/models/chat/message_spec.rb
index 9b6d1298cee79..759b87f905b1d 100644
--- a/plugins/chat/spec/models/chat/message_spec.rb
+++ b/plugins/chat/spec/models/chat/message_spec.rb
@@ -85,6 +85,9 @@
           [
             "value at `/0/elements/0/type` is not one of: [\"button\"]",
             "object at `/0/elements/0` is missing required properties: text",
+            "value at `/0/type` is not one of: [\"informative\"]",
+            "value at `/0/elements/0/type` is not one of: [\"category\"]",
+            "object at `/0/elements/0` is missing required properties: title, color",
           ],
         )
       end
diff --git a/plugins/chat/spec/system/chat_informative_blocks_spec.rb b/plugins/chat/spec/system/chat_informative_blocks_spec.rb
new file mode 100644
index 0000000000000..28c595b07b082
--- /dev/null
+++ b/plugins/chat/spec/system/chat_informative_blocks_spec.rb
@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+RSpec.describe "Informative blocks in chat messages", type: :system do
+  fab!(:user)
+  fab!(:channel_1, :chat_channel)
+
+  let(:chat_page) { PageObjects::Pages::Chat.new }
+
+  before do
+    chat_system_bootstrap
+    channel_1.add(user)
+    sign_in(user)
+  end
+
+  context "with a simple category element" do
+    fab!(:message_1) do
+      Fabricate(
+        :chat_message,
+        user: Discourse.system_user,
+        chat_channel: channel_1,
+        blocks: [
+          {
+            type: "informative",
+            elements: [{ type: "category", title: "Support", color: "0088CC" }],
+          },
+        ],
+      )
+    end
+
+    it "renders the category title" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page).to have_css(".block__category")
+      expect(page).to have_css(".badge-category__name", text: "Support")
+    end
+  end
+
+  context "with a category element with description" do
+    fab!(:message_1) do
+      Fabricate(
+        :chat_message,
+        user: Discourse.system_user,
+        chat_channel: channel_1,
+        blocks: [
+          {
+            type: "informative",
+            elements: [
+              {
+                type: "category",
+                title: "Support",
+                color: "0088CC",
+                description: "Get help from the community",
+              },
+            ],
+          },
+        ],
+      )
+    end
+
+    it "renders the category description" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page).to have_css(".block__category-description", text: "Get help from the community")
+    end
+  end
+
+  context "with a category element with a relative URL" do
+    fab!(:message_1) do
+      Fabricate(
+        :chat_message,
+        user: Discourse.system_user,
+        chat_channel: channel_1,
+        blocks: [
+          {
+            type: "informative",
+            elements: [{ type: "category", title: "Support", color: "0088CC", url: "/c/support" }],
+          },
+        ],
+      )
+    end
+
+    it "renders a link wrapping the category badge" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page).to have_css("a.block__category-link[href='/c/support']")
+      expect(page).to have_css("a.block__category-link .badge-category__name", text: "Support")
+    end
+  end
+
+  context "with a category element with an https:// URL" do
+    fab!(:message_1) do
+      Fabricate(
+        :chat_message,
+        user: Discourse.system_user,
+        chat_channel: channel_1,
+        blocks: [
+          {
+            type: "informative",
+            elements: [
+              { type: "category", title: "Support", color: "0088CC", url: "https://discourse.org" },
+            ],
+          },
+        ],
+      )
+    end
+
+    it "renders a link wrapping the category badge" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page).to have_css("a.block__category-link[href='https://discourse.org']")
+      expect(page).to have_css("a.block__category-link .badge-category__name", text: "Support")
+    end
+  end
+
+  context "with a category element with a javascript: URL" do
+    it "rejects the message as invalid" do
+      message =
+        Chat::Message.new(
+          user: Discourse.system_user,
+          chat_channel: channel_1,
+          message: "Here are some categories:",
+          blocks: [
+            {
+              type: "informative",
+              elements: [
+                { type: "category", title: "Support", color: "0088CC", url: "javascript:alert(1)" },
+              ],
+            },
+          ],
+        )
+
+      expect(message).not_to be_valid
+      expect(message.errors[:blocks]).to be_present
+    end
+  end
+
+  context "with a category element with a parent category" do
+    fab!(:message_1) do
+      Fabricate(
+        :chat_message,
+        user: Discourse.system_user,
+        chat_channel: channel_1,
+        blocks: [
+          {
+            type: "informative",
+            elements: [
+              {
+                type: "category",
+                title: "Dev",
+                color: "E45735",
+                description: "Development related discussions",
+                parent_name: "Meta",
+                parent_color: "0088CC",
+              },
+            ],
+          },
+        ],
+      )
+    end
+
+    it "renders the child category in the heading and parent in its own row" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page).to have_css(".block__category-heading .badge-category__name", text: "Dev")
+      expect(page).to have_css(".block__category-parent .badge-category__name", text: "Meta")
+    end
+  end
+
+  context "with multiple category elements in one block" do
+    fab!(:message_1) do
+      Fabricate(
+        :chat_message,
+        user: Discourse.system_user,
+        chat_channel: channel_1,
+        blocks: [
+          {
+            type: "informative",
+            elements: [
+              { type: "category", title: "Support", color: "0088CC" },
+              { type: "category", title: "Feedback", color: "25AAE2" },
+            ],
+          },
+        ],
+      )
+    end
+
+    it "renders all category elements" do
+      chat_page.visit_channel(channel_1)
+
+      expect(page).to have_css(".block__informative-item", count: 2)
+      expect(page).to have_css(".badge-category__name", text: "Support")
+      expect(page).to have_css(".badge-category__name", text: "Feedback")
+    end
+  end
+end

From b04f795c75ab33225fcac491dae129078151ac4f Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 26 Feb 2026 06:08:16 +0800
Subject: [PATCH 084/168] DEV: Add `DISCOURSE_DISABLE_MAJOR_GC_DURING_REQUESTS
 ` env for OOB major GC (#38052)

When `DISCOURSE_DISABLE_MAJOR_GC_DURING_REQUESTS` is set, disable major
GC marks during request processing via
`GC.config(rgengc_allow_full_mark: false)` and trigger `GC.start`
between requests whenever `GC.latest_gc_info(:need_major_by)` indicates
one is needed. Silently no-ops on Ruby versions that don't support the
`rgengc_allow_full_mark` config key.
---
 config/pitchfork.conf.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/pitchfork.conf.rb b/config/pitchfork.conf.rb
index 8583deff9af36..81360ca83d370 100644
--- a/config/pitchfork.conf.rb
+++ b/config/pitchfork.conf.rb
@@ -73,10 +73,20 @@
   Discourse.before_fork
 end
 
+oob_gc_enabled = ENV["DISCOURSE_DISABLE_MAJOR_GC_DURING_REQUESTS"] && RUBY_VERSION >= "3.4"
+
 after_worker_fork do |server, worker|
   DiscourseEvent.trigger(:web_fork_started)
   Discourse.after_fork
   SignalTrapLogger.instance.after_fork
+
+  GC.config(rgengc_allow_full_mark: false) if oob_gc_enabled
+end
+
+if oob_gc_enabled
+  after_request_complete do |_server, _worker, _rack_env|
+    GC.start if GC.latest_gc_info(:need_major_by)
+  end
 end
 
 before_service_worker_ready do |server, service_worker|

From 1a6615107255951c2fc669126749ab53892e7d30 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Wed, 25 Feb 2026 23:23:23 +0100
Subject: [PATCH 085/168] DEV: Correctly move data-explorer admin code to admin
 bundle (#38064)

A followup to #38022
---
 .../{ => admin}/assets/javascripts/admin/adapters/query.js        | 0
 .../admin/templates/admin-plugins/show/explorer/details.gjs       | 0
 .../admin/templates/admin-plugins/show/explorer/index.gjs         | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename plugins/discourse-data-explorer/{ => admin}/assets/javascripts/admin/adapters/query.js (100%)
 rename plugins/discourse-data-explorer/{ => admin}/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs (100%)
 rename plugins/discourse-data-explorer/{ => admin}/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs (100%)

diff --git a/plugins/discourse-data-explorer/assets/javascripts/admin/adapters/query.js b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/adapters/query.js
similarity index 100%
rename from plugins/discourse-data-explorer/assets/javascripts/admin/adapters/query.js
rename to plugins/discourse-data-explorer/admin/assets/javascripts/admin/adapters/query.js
diff --git a/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs
similarity index 100%
rename from plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs
rename to plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/details.gjs
diff --git a/plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
similarity index 100%
rename from plugins/discourse-data-explorer/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
rename to plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs

From b2b9b486e557e8341414c047ba8227ab550e1bb8 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Wed, 25 Feb 2026 23:23:36 +0100
Subject: [PATCH 086/168] DEV: Remove leftover code (#38065)

A follow-up to 4e2a5a8fc063af0752fd0a1b20b1c69af3a6c2a4
---
 .../stylesheets/common/base/reviewables.scss  | 50 --------------
 .../components/reviewable-chat-message.gjs    | 68 -------------------
 .../components/reviewable-ai-chat-message.gjs | 66 ------------------
 .../components/reviewable-ai-post.gjs         | 37 ----------
 .../reviewable-post-voting-comment.gjs        | 66 ------------------
 5 files changed, 287 deletions(-)
 delete mode 100644 plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.gjs
 delete mode 100644 plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs
 delete mode 100644 plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-post.gjs
 delete mode 100644 plugins/discourse-post-voting/assets/javascripts/discourse/components/reviewable-post-voting-comment.gjs

diff --git a/app/assets/stylesheets/common/base/reviewables.scss b/app/assets/stylesheets/common/base/reviewables.scss
index 93e4e00fb2de9..c86777cf3ea86 100644
--- a/app/assets/stylesheets/common/base/reviewables.scss
+++ b/app/assets/stylesheets/common/base/reviewables.scss
@@ -7,12 +7,6 @@
     margin-bottom: 1em;
   }
 
-  .flagged-post-header {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-  }
-
   .status {
     color: var(--primary-medium);
 
@@ -378,24 +372,6 @@
     }
   }
 
-  .reviewable-post-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    max-width: 100%;
-
-    .reviewable-reply-to {
-      display: flex;
-      align-items: center;
-      color: var(--primary-medium);
-      font-size: 0.9em;
-
-      .d-icon {
-        margin-right: 0.5em;
-      }
-    }
-  }
-
   .post-contents {
     width: 100%;
     min-width: 0; // Flexbox fix
@@ -548,25 +524,6 @@
     font-weight: bold;
   }
 
-  .reviewable-contents {
-    display: flex;
-    flex-wrap: wrap;
-    margin: 1.5rem 0 1rem;
-    background: var(--secondary);
-    padding: 1rem;
-
-    @include viewport.until(sm) {
-      .reviewable-post-header,
-      .post-body {
-        max-width: 100%;
-
-        p {
-          overflow-x: scroll;
-        }
-      }
-    }
-  }
-
   .reviewable-actions {
     display: flex;
     flex-wrap: wrap;
@@ -583,13 +540,6 @@
   opacity: 0.7;
 }
 
-.reviewable-deleted {
-  .reviewable-contents .post-contents .post-body {
-    background-color: var(--danger-low-mid);
-    padding: 0.5em;
-  }
-}
-
 .blur-images {
   img:not(.avatar, .emoji) {
     filter: blur(10px);
diff --git a/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.gjs b/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.gjs
deleted file mode 100644
index dfc8206f5ef64..0000000000000
--- a/plugins/chat/assets/javascripts/discourse/components/reviewable-chat-message.gjs
+++ /dev/null
@@ -1,68 +0,0 @@
-import Component from "@glimmer/component";
-import { cached } from "@glimmer/tracking";
-import { array } from "@ember/helper";
-import { LinkTo } from "@ember/routing";
-import { htmlSafe } from "@ember/template";
-import ReviewableCreatedBy from "discourse/components/reviewable-created-by";
-import ReviewablePostHeader from "discourse/components/reviewable-post-header";
-import { or } from "discourse/truth-helpers";
-import { i18n } from "discourse-i18n";
-import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";
-import ChatChannel from "discourse/plugins/chat/discourse/models/chat-channel";
-
-export default class ReviewableChatMessage extends Component {
-  @cached
-  get channel() {
-    if (!this.args.reviewable.chat_channel) {
-      return;
-    }
-    return ChatChannel.create(this.args.reviewable.chat_channel);
-  }
-
-  <template>
-    {{#if this.channel}}
-      <div class="flagged-post-header">
-        <LinkTo
-          @route="chat.channel.near-message"
-          @models={{array
-            this.channel.slugifiedTitle
-            this.channel.id
-            @reviewable.target_id
-          }}
-        >
-          <ChannelTitle @channel={{this.channel}} />
-        </LinkTo>
-      </div>
-    {{/if}}
-
-    <div class="post-contents-wrapper">
-      <ReviewableCreatedBy @user={{@reviewable.target_created_by}} />
-      <div class="post-contents">
-        <ReviewablePostHeader
-          @reviewable={{@reviewable}}
-          @createdBy={{@reviewable.target_created_by}}
-        />
-
-        <div class="post-body">
-          {{htmlSafe
-            (or @reviewable.payload.message_cooked @reviewable.cooked)
-          }}
-        </div>
-
-        {{#if @reviewable.payload.transcript_topic_id}}
-          <div class="transcript">
-            <LinkTo
-              @route="topic"
-              @models={{array "-" @reviewable.payload.transcript_topic_id}}
-              class="btn btn-small"
-            >
-              {{i18n "review.transcript.view"}}
-            </LinkTo>
-          </div>
-        {{/if}}
-
-        {{yield}}
-      </div>
-    </div>
-  </template>
-}
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs
deleted file mode 100644
index f2e4a38fa7dd0..0000000000000
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-chat-message.gjs
+++ /dev/null
@@ -1,66 +0,0 @@
-import Component from "@glimmer/component";
-import { array } from "@ember/helper";
-import { LinkTo } from "@ember/routing";
-import { htmlSafe } from "@ember/template";
-import ReviewableCreatedBy from "discourse/components/reviewable-created-by";
-import ReviewablePostHeader from "discourse/components/reviewable-post-header";
-import { optionalRequire } from "discourse/lib/utilities";
-import { or } from "discourse/truth-helpers";
-import ModelAccuracies from "./model-accuracies";
-
-export default class ReviewableAiChatMessage extends Component {
-  get chatChannel() {
-    if (!this.args.reviewable.chat_channel) {
-      return;
-    }
-
-    const ChatChannel = optionalRequire(
-      "discourse/plugins/chat/discourse/models/chat-channel"
-    );
-
-    return ChatChannel.create(this.args.reviewable.chat_channel);
-  }
-
-  get ChatChannelTitle() {
-    return optionalRequire(
-      "discourse/plugins/chat/discourse/components/chat-channel-title"
-    );
-  }
-
-  <template>
-    {{#if this.chatChannel}}
-      <div class="flagged-post-header">
-        <LinkTo
-          @route="chat.channel.near-message"
-          @models={{array
-            this.chatChannel.slugifiedTitle
-            this.chatChannel.id
-            @reviewable.target_id
-          }}
-        >
-          <this.ChatChannelTitle @channel={{this.chatChannel}} />
-        </LinkTo>
-      </div>
-    {{/if}}
-
-    <div class="post-contents-wrapper">
-      <ReviewableCreatedBy @user={{@reviewable.target_created_by}} />
-      <div class="post-contents">
-        <ReviewablePostHeader
-          @reviewable={{@reviewable}}
-          @createdBy={{@reviewable.target_created_by}}
-        />
-
-        <div class="post-body">
-          {{htmlSafe
-            (or @reviewable.payload.message_cooked @reviewable.cooked)
-          }}
-        </div>
-
-        {{yield}}
-
-        <ModelAccuracies @accuracies={{@reviewable.payload.accuracies}} />
-      </div>
-    </div>
-  </template>
-}
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-post.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-post.gjs
deleted file mode 100644
index 48a35cccf4b68..0000000000000
--- a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable-ai-post.gjs
+++ /dev/null
@@ -1,37 +0,0 @@
-import { htmlSafe } from "@ember/template";
-import ReviewableCreatedBy from "discourse/components/reviewable-created-by";
-import ReviewablePostEdits from "discourse/components/reviewable-post-edits";
-import ReviewablePostHeader from "discourse/components/reviewable-post-header";
-import ReviewableTopicLink from "discourse/components/reviewable-topic-link";
-import { i18n } from "discourse-i18n";
-import ModelAccuracies from "./model-accuracies";
-
-const ReviewableAiPost = <template>
-  <div class="flagged-post-header">
-    <ReviewableTopicLink @reviewable={{@reviewable}} />
-    <ReviewablePostEdits @reviewable={{@reviewable}} />
-  </div>
-
-  <div class="post-contents-wrapper">
-    <ReviewableCreatedBy @user={{@reviewable.target_created_by}} />
-    <div class="post-contents">
-      <ReviewablePostHeader
-        @reviewable={{@reviewable}}
-        @createdBy={{@reviewable.target_created_by}}
-      />
-      <div class="post-body">
-        {{#if @reviewable.blank_post}}
-          <p>{{i18n "review.deleted_post"}}</p>
-        {{else}}
-          {{htmlSafe @reviewable.cooked}}
-        {{/if}}
-      </div>
-
-      {{yield}}
-
-      <ModelAccuracies @accuracies={{@reviewable.payload.accuracies}} />
-    </div>
-  </div>
-</template>;
-
-export default ReviewableAiPost;
diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/reviewable-post-voting-comment.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/reviewable-post-voting-comment.gjs
deleted file mode 100644
index 35d298ac041c5..0000000000000
--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/reviewable-post-voting-comment.gjs
+++ /dev/null
@@ -1,66 +0,0 @@
-import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import { array } from "@ember/helper";
-import { LinkTo } from "@ember/routing";
-import { service } from "@ember/service";
-import { htmlSafe } from "@ember/template";
-import ReviewableCreatedBy from "discourse/components/reviewable-created-by";
-import ReviewablePostHeader from "discourse/components/reviewable-post-header";
-import categoryBadge from "discourse/helpers/category-badge";
-import { or } from "discourse/truth-helpers";
-import { i18n } from "discourse-i18n";
-
-export default class ReviewablePostVotingComment extends Component {
-  @service store;
-
-  @tracked post;
-
-  constructor() {
-    super(...arguments);
-    this.fetchPost();
-  }
-
-  async fetchPost() {
-    const post = await this.store.find("post", this.args.reviewable.post_id);
-    this.post = post;
-  }
-
-  <template>
-    <div class="post-topic">
-      <a class="title-text" href={{this.post.url}}>
-        {{htmlSafe @reviewable.topic.fancyTitle}}</a>
-      {{categoryBadge @reviewable.category}}
-    </div>
-
-    <div class="post-contents-wrapper">
-      <ReviewableCreatedBy @user={{@reviewable.target_created_by}} />
-
-      <div class="post-contents">
-        <ReviewablePostHeader
-          @reviewable={{@reviewable}}
-          @createdBy={{@reviewable.target_created_by}}
-        />
-
-        <div class="post-body">
-          {{htmlSafe
-            (or @reviewable.payload.comment_cooked @reviewable.cooked)
-          }}
-        </div>
-
-        {{#if @reviewable.payload.transcript_topic_id}}
-          <div class="transcript">
-            <LinkTo
-              @route="topic"
-              @models={{array "-" @reviewable.payload.transcript_topic_id}}
-              class="btn btn-small"
-            >
-              {{i18n "review.transcript.view"}}
-            </LinkTo>
-          </div>
-        {{/if}}
-
-        {{yield}}
-      </div>
-    </div>
-  </template>
-}

From 2b09c9f73676dee32b71abc7e49808d0438cfe1b Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Wed, 25 Feb 2026 15:13:27 -0800
Subject: [PATCH 087/168] DEV: add email preview digest outlet (#38067)

This update adds a wrapper plugin outlet to the preview summary page
---
 .../templates/admin-email/preview-digest.gjs  | 175 +++++++++---------
 1 file changed, 89 insertions(+), 86 deletions(-)

diff --git a/frontend/discourse/admin/templates/admin-email/preview-digest.gjs b/frontend/discourse/admin/templates/admin-email/preview-digest.gjs
index 2958651615803..87c8c84e41bb8 100644
--- a/frontend/discourse/admin/templates/admin-email/preview-digest.gjs
+++ b/frontend/discourse/admin/templates/admin-email/preview-digest.gjs
@@ -4,108 +4,111 @@ import ConditionalLoadingSpinner from "discourse/components/conditional-loading-
 import DButton from "discourse/components/d-button";
 import DPageSubheader from "discourse/components/d-page-subheader";
 import DatePickerPast from "discourse/components/date-picker-past";
+import PluginOutlet from "discourse/components/plugin-outlet";
 import TextField from "discourse/components/text-field";
 import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";
 import { i18n } from "discourse-i18n";
 
 export default <template>
-  <DPageSubheader
-    @descriptionLabel={{i18n
-      "admin.config.email.sub_pages.preview_summary.header_description"
-    }}
-  />
+  <PluginOutlet @name="admin-email-preview-digest">
+    <DPageSubheader
+      @descriptionLabel={{i18n
+        "admin.config.email.sub_pages.preview_summary.header_description"
+      }}
+    />
 
-  <div class="admin-controls email-preview">
-    <div class="controls">
-      <div class="inline-form">
-        <label for="last-seen">{{i18n "admin.email.last_seen_user"}}</label>
-        <DatePickerPast @value={{@controller.lastSeen}} @id="last-seen" />
-        <label>{{i18n "admin.email.user"}}:</label>
-        <EmailGroupUserChooser
-          @value={{@controller.username}}
-          @onChange={{@controller.updateUsername}}
-          @options={{hash
-            maximum=1
-            caretDownIcon="angle-down"
-            caretUpIcon="angle-up"
-          }}
-        />
-        <DButton
-          @action={{@controller.refresh}}
-          @label="admin.email.refresh"
-          class="btn-primary digest-refresh-button"
-        />
-        <div class="toggle">
-          <label>{{i18n "admin.email.format"}}</label>
-          {{#if @controller.showHtml}}
-            <span>{{i18n "admin.email.html"}}</span>
-            |
-            <a
-              href
-              {{on "click" @controller.toggleShowHtml}}
-              class="show-text-link"
-            >
-              {{i18n "admin.email.text"}}
-            </a>
-          {{else}}
-            <a
-              href
-              {{on "click" @controller.toggleShowHtml}}
-              class="show-html-link"
-            >{{i18n "admin.email.html"}}</a>
-            |
-            <span>{{i18n "admin.email.text"}}</span>
-          {{/if}}
+    <div class="admin-controls email-preview">
+      <div class="controls">
+        <div class="inline-form">
+          <label for="last-seen">{{i18n "admin.email.last_seen_user"}}</label>
+          <DatePickerPast @value={{@controller.lastSeen}} @id="last-seen" />
+          <label>{{i18n "admin.email.user"}}:</label>
+          <EmailGroupUserChooser
+            @value={{@controller.username}}
+            @onChange={{@controller.updateUsername}}
+            @options={{hash
+              maximum=1
+              caretDownIcon="angle-down"
+              caretUpIcon="angle-up"
+            }}
+          />
+          <DButton
+            @action={{@controller.refresh}}
+            @label="admin.email.refresh"
+            class="btn-primary digest-refresh-button"
+          />
+          <div class="toggle">
+            <label>{{i18n "admin.email.format"}}</label>
+            {{#if @controller.showHtml}}
+              <span>{{i18n "admin.email.html"}}</span>
+              |
+              <a
+                href
+                {{on "click" @controller.toggleShowHtml}}
+                class="show-text-link"
+              >
+                {{i18n "admin.email.text"}}
+              </a>
+            {{else}}
+              <a
+                href
+                {{on "click" @controller.toggleShowHtml}}
+                class="show-html-link"
+              >{{i18n "admin.email.html"}}</a>
+              |
+              <span>{{i18n "admin.email.text"}}</span>
+            {{/if}}
+          </div>
         </div>
       </div>
     </div>
-  </div>
 
-  <ConditionalLoadingSpinner @condition={{@controller.loading}}>
+    <ConditionalLoadingSpinner @condition={{@controller.loading}}>
 
-    <div class="email-preview-digest">
-      {{#if @controller.showSendEmailForm}}
-        <div class="controls">
-          <div class="inline-form">
-            {{#if @controller.sendingEmail}}
-              {{i18n "admin.email.sending_test"}}
-            {{else}}
-              <label>{{i18n "admin.email.send_digest_label"}}</label>
-              <TextField
-                @value={{@controller.email}}
-                @placeholderKey="admin.email.test_email_address"
-              />
-              <DButton
-                @action={{@controller.sendEmail}}
-                @disabled={{@controller.sendEmailDisabled}}
-                @label="admin.email.send_digest"
-                class="btn-default"
-              />
-              {{#if @controller.sentEmail}}
-                <span class="result-message">{{i18n
-                    "admin.email.sent_test"
-                  }}</span>
+      <div class="email-preview-digest">
+        {{#if @controller.showSendEmailForm}}
+          <div class="controls">
+            <div class="inline-form">
+              {{#if @controller.sendingEmail}}
+                {{i18n "admin.email.sending_test"}}
+              {{else}}
+                <label>{{i18n "admin.email.send_digest_label"}}</label>
+                <TextField
+                  @value={{@controller.email}}
+                  @placeholderKey="admin.email.test_email_address"
+                />
+                <DButton
+                  @action={{@controller.sendEmail}}
+                  @disabled={{@controller.sendEmailDisabled}}
+                  @label="admin.email.send_digest"
+                  class="btn-default"
+                />
+                {{#if @controller.sentEmail}}
+                  <span class="result-message">{{i18n
+                      "admin.email.sent_test"
+                    }}</span>
+                {{/if}}
               {{/if}}
-            {{/if}}
+            </div>
           </div>
-        </div>
-      {{/if}}
+        {{/if}}
 
-      <div class="preview-output">
-        {{#if @controller.showHtml}}
-          {{#if @controller.htmlEmpty}}
-            <p>{{i18n "admin.email.no_result"}}</p>
+        <div class="preview-output">
+          {{#if @controller.showHtml}}
+            {{#if @controller.htmlEmpty}}
+              <p>{{i18n "admin.email.no_result"}}</p>
+            {{else}}
+              <iframe
+                title={{i18n "admin.email.html_preview"}}
+                srcdoc={{@controller.model.html_content}}
+              ></iframe>
+            {{/if}}
           {{else}}
-            <iframe
-              title={{i18n "admin.email.html_preview"}}
-              srcdoc={{@controller.model.html_content}}
-            ></iframe>
+            <pre>{{@controller.model.text_content}}</pre>
           {{/if}}
-        {{else}}
-          <pre>{{@controller.model.text_content}}</pre>
-        {{/if}}
+        </div>
       </div>
-    </div>
 
-  </ConditionalLoadingSpinner>
+    </ConditionalLoadingSpinner>
+  </PluginOutlet>
 </template>

From 2ff2389812c0b979918783c86beec2c4bcfb7d0c Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 26 Feb 2026 09:37:56 +1000
Subject: [PATCH 088/168] UX: Use d-table classes instead of legacy
 d-admin-table (#38048)

In https://github.com/discourse/discourse/pull/33531 we
introduced the d-table class as a generic alternative to
d-admin-table, meant to replace it. However we didn't
update
https://meta.discourse.org/t/creating-consistent-admin-interfaces/326780
properly, nor did we update all places in the code that used
the old CSS classes, so over time we've ended up with a mix of both.

This commit updates all admin tables to use the new d-table classes, and
removes the old d-admin-table classes, updating templates, CSS, and
system specs as necessary.

We will remove the admin_table.scss file in a followup PR, since
other plugins may be using these classes.
---
 .../components/admin-plugins-list-item.gjs    |  8 ++---
 .../admin-user-upcoming-changes.gjs           |  4 +--
 .../admin/components/theme-site-settings.gjs  |  6 ++--
 .../admin/components/automation-list.gjs      | 34 +++++++++----------
 .../common/discourse-automation.scss          | 14 ++++----
 .../admin-chat-incoming-webhooks-list.gjs     | 28 +++++++--------
 .../admin/components/house-ads-list.gjs       | 10 +++---
 .../page_objects/pages/admin_house_ads.rb     |  8 ++---
 .../components/ai-embeddings-list-editor.gjs  | 14 ++++----
 .../components/ai-llms-list-editor.gjs        | 14 ++++----
 .../components/ai-persona-list-editor.gjs     | 16 ++++-----
 .../components/ai-secrets-list-editor.gjs     | 14 ++++----
 .../components/ai-tool-list-editor.gjs        | 10 +++---
 .../modules/ai-bot/common/ai-persona.scss     | 16 ++++-----
 .../modules/llms/common/ai-llms-editor.scss   |  2 +-
 .../admin-plugins/show/explorer/index.gjs     | 20 +++++------
 .../pages/admin_theme_site_settings.rb        |  2 +-
 17 files changed, 109 insertions(+), 111 deletions(-)

diff --git a/frontend/discourse/admin/components/admin-plugins-list-item.gjs b/frontend/discourse/admin/components/admin-plugins-list-item.gjs
index 121f035b50a98..f1ba9228b80d5 100644
--- a/frontend/discourse/admin/components/admin-plugins-list-item.gjs
+++ b/frontend/discourse/admin/components/admin-plugins-list-item.gjs
@@ -95,13 +95,13 @@ export default class AdminPluginsListItem extends Component {
         <div class="admin-plugins-list__name-with-badges">
           {{#if this.pluginUrl}}
             <a
-              class="d-admin-row__overview-name admin-plugins-list__name"
+              class="d-table__overview-name admin-plugins-list__name"
               href={{this.pluginUrl}}
             >
               {{@plugin.nameTitleized}}
             </a>
           {{else}}
-            <div class="d-admin-row__overview-name admin-plugins-list__name">
+            <div class="d-table__overview-name admin-plugins-list__name">
               {{@plugin.nameTitleized}}
             </div>
           {{/if}}
@@ -120,10 +120,10 @@ export default class AdminPluginsListItem extends Component {
             @outletArgs={{lazyHash plugin=@plugin}}
           />
         </div>
-        <div class="d-admin-row__overview-author admin-plugins-list__author">
+        <div class="d-table__overview-author admin-plugins-list__author">
           {{@plugin.author}}
         </div>
-        <div class="d-admin-row__overview-about admin-plugins-list__about">
+        <div class="d-table__overview-about admin-plugins-list__about">
           {{@plugin.about}}
           {{#if @plugin.linkUrl}}
             <a
diff --git a/frontend/discourse/admin/components/admin-user-upcoming-changes.gjs b/frontend/discourse/admin/components/admin-user-upcoming-changes.gjs
index 3b4a9f674b233..34e45345ff0e2 100644
--- a/frontend/discourse/admin/components/admin-user-upcoming-changes.gjs
+++ b/frontend/discourse/admin/components/admin-user-upcoming-changes.gjs
@@ -61,7 +61,7 @@ export default class AdminUserUpcomingChanges extends Component {
                   {{/if}}
                 </td>
                 <td class="d-table__cell">
-                  <div class="d-admin-row__mobile-label">
+                  <div class="d-table__mobile-label">
                     {{i18n "user.upcoming_changes.for_user.enabled"}}
                   </div>
 
@@ -74,7 +74,7 @@ export default class AdminUserUpcomingChanges extends Component {
                   </span>
                 </td>
                 <td class="d-table__cell">
-                  <div class="d-admin-row__mobile-label">
+                  <div class="d-table__mobile-label">
                     {{i18n "user.upcoming_changes.for_user.why"}}
                   </div>
 
diff --git a/frontend/discourse/admin/components/theme-site-settings.gjs b/frontend/discourse/admin/components/theme-site-settings.gjs
index f8b7a0d798818..5b35cc114b0f7 100644
--- a/frontend/discourse/admin/components/theme-site-settings.gjs
+++ b/frontend/discourse/admin/components/theme-site-settings.gjs
@@ -106,8 +106,8 @@ export default class ThemeSiteSettings extends Component {
             }}
           >
             <:content as |filteredSettings|>
-              <table class="d-admin-table admin-theme-site-settings">
-                <thead>
+              <table class="d-table admin-theme-site-settings">
+                <thead class="d-table__header">
                   <tr>
                     <th>{{i18n "admin.theme_site_settings.setting"}}</th>
                     <th>{{i18n "admin.theme_site_settings.default_value"}}</th>
@@ -117,7 +117,7 @@ export default class ThemeSiteSettings extends Component {
                 <tbody>
                   {{#each filteredSettings as |fs|}}
                     <tr
-                      class="admin-theme-site-settings-row d-admin-row__content"
+                      class="admin-theme-site-settings-row d-table__row"
                       data-setting-name={{fs.name}}
                     >
                       <td class="admin-theme-site-settings-row__setting">
diff --git a/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjs b/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjs
index d39341536a0b4..d9fba417336af 100644
--- a/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjs
+++ b/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjs
@@ -97,8 +97,8 @@ export default class AutomationList extends Component {
       </DPageSubheader>
 
       {{#if @model.content.length}}
-        <table class="d-admin-table automations">
-          <thead>
+        <table class="d-table automations">
+          <thead class="d-table__header">
             <tr>
               <th>{{i18n
                   "discourse_automation.models.automation.name.label"
@@ -120,13 +120,13 @@ export default class AutomationList extends Component {
           </thead>
           <tbody>
             {{#each @model.content as |automation|}}
-              <tr class="d-admin-row__content">
+              <tr class="d-table__row">
                 {{#if automation.script.not_found}}
                   <td
                     colspan="5"
-                    class="d-admin-row__detail alert alert-danger"
+                    class="d-table__cell --detail alert alert-danger"
                   >
-                    <div class="d-admin-row__mobile-label">
+                    <div class="d-table__mobile-label">
                       {{i18n
                         "discourse_automation.models.automation.status.label"
                       }}
@@ -140,9 +140,9 @@ export default class AutomationList extends Component {
                 {{else if automation.trigger.not_found}}
                   <td
                     colspan="5"
-                    class="d-admin-row__detail alert alert-danger"
+                    class="d-table__cell --detail alert alert-danger"
                   >
-                    <div class="d-admin-row__mobile-label">
+                    <div class="d-table__mobile-label">
                       {{i18n
                         "discourse_automation.models.automation.status.label"
                       }}
@@ -154,15 +154,15 @@ export default class AutomationList extends Component {
                     }}
                   </td>
                 {{else}}
-                  <td class="d-admin-row__overview automations__name">
+                  <td class="d-table__cell --overview automations__name">
                     {{if
                       automation.name
                       automation.name
                       (i18n "discourse_automation.unnamed_automation")
                     }}
                   </td>
-                  <td class="d-admin-row__detail automations__updated-by">
-                    <div class="d-admin-row__mobile-label">
+                  <td class="d-table__cell --detail automations__updated-by">
+                    <div class="d-table__mobile-label">
                       {{i18n
                         "discourse_automation.models.automation.last_updated_by.label"
                       }}
@@ -177,8 +177,8 @@ export default class AutomationList extends Component {
                       {{formatDate automation.updated_at leaveAgo="true"}}
                     </div>
                   </td>
-                  <td class="d-admin-row__detail automations__runs">
-                    <div class="d-admin-row__mobile-label">
+                  <td class="d-table__cell --detail automations__runs">
+                    <div class="d-table__mobile-label">
                       {{i18n
                         "discourse_automation.models.automation.runs.label"
                       }}
@@ -199,8 +199,8 @@ export default class AutomationList extends Component {
                       </a>
                     {{/if}}
                   </td>
-                  <td class="d-admin-row__detail automations__last-run">
-                    <div class="d-admin-row__mobile-label">
+                  <td class="d-table__cell --detail automations__last-run">
+                    <div class="d-table__mobile-label">
                       {{i18n
                         "discourse_automation.models.automation.last_run.label"
                       }}
@@ -214,8 +214,8 @@ export default class AutomationList extends Component {
                       -
                     {{/if}}
                   </td>
-                  <td class="d-admin-row__detail automations__enabled">
-                    <div class="d-admin-row__mobile-label">
+                  <td class="d-table__cell --detail automations__enabled">
+                    <div class="d-table__mobile-label">
                       {{i18n
                         "discourse_automation.models.automation.enabled.label"
                       }}
@@ -233,7 +233,7 @@ export default class AutomationList extends Component {
                   </td>
                 {{/if}}
 
-                <td class="d-admin-row__controls automations__controls">
+                <td class="d-table__cell --controls automations__controls">
                   <LinkTo
                     @route="adminPlugins.show.automation.edit"
                     @model={{automation.id}}
diff --git a/plugins/automation/assets/stylesheets/common/discourse-automation.scss b/plugins/automation/assets/stylesheets/common/discourse-automation.scss
index bee9b7d1138b7..62c70789b1948 100644
--- a/plugins/automation/assets/stylesheets/common/discourse-automation.scss
+++ b/plugins/automation/assets/stylesheets/common/discourse-automation.scss
@@ -29,8 +29,8 @@
     margin-top: 1em;
   }
 
-  .d-admin-table.automations {
-    .d-admin-row__content {
+  .d-table.automations {
+    .d-table__row {
       @include viewport.until(md) {
         display: grid;
         grid-template-columns: 1fr;
@@ -38,31 +38,31 @@
       }
     }
 
-    .d-admin-row__name {
+    .automations__name {
       @include viewport.until(md) {
         order: 1;
       }
     }
 
-    .d-admin-row__detail.automations__runs {
+    .d-table__cell.--detail.automations__runs {
       @include viewport.until(md) {
         order: 2; // move below the name to avoid empty spacing
       }
     }
 
-    .d-admin-row__detail.automations__updated-by {
+    .d-table__cell.--detail.automations__updated-by {
       @include viewport.until(md) {
         order: 3;
       }
     }
 
-    .d-admin-row__detail.automations__enabled {
+    .d-table__cell.--detail.automations__enabled {
       @include viewport.until(md) {
         order: 5;
       }
     }
 
-    .d-admin-row__controls.automations__controls {
+    .d-table__cell.--controls.automations__controls {
       text-align: right;
       display: flex;
       flex-direction: row;
diff --git a/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs b/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs
index 01e5ec63a60f8..63358f2460a8f 100644
--- a/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs
+++ b/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs
@@ -49,8 +49,8 @@ export default class AdminChatIncomingWebhooksList extends Component {
   }
 
   <template>
-    <table class="d-admin-table">
-      <thead>
+    <table class="d-table">
+      <thead class="d-table__header">
         <th>{{i18n "chat.incoming_webhooks.name"}}</th>
         <th>{{i18n "chat.incoming_webhooks.emoji"}}</th>
         <th>{{i18n "chat.incoming_webhooks.username"}}</th>
@@ -61,39 +61,39 @@ export default class AdminChatIncomingWebhooksList extends Component {
       <tbody>
         {{#each this.sortedWebhooks as |webhook|}}
           <tr
-            class="d-admin-row__content incoming-chat-webhooks-row"
+            class="d-table__row incoming-chat-webhooks-row"
             data-webhook-id={{webhook.id}}
           >
-            <td class="d-admin-row__overview">
-              <div class="d-admin-row__overview-name">
+            <td class="d-table__cell --overview">
+              <div class="d-table__overview-name">
                 {{webhook.name}}
               </div>
-              <div class="d-admin-row__overview-about">
+              <div class="d-table__overview-about">
                 {{webhook.description}}
               </div>
             </td>
-            <td class="d-admin-row__detail">
-              <div class="d-admin-row__mobile-label">
+            <td class="d-table__cell --detail">
+              <div class="d-table__mobile-label">
                 {{i18n "chat.incoming_webhooks.emoji"}}
               </div>
               {{replaceEmoji webhook.emoji}}
             </td>
-            <td class="d-admin-row__detail">
-              <div class="d-admin-row__mobile-label">
+            <td class="d-table__cell --detail">
+              <div class="d-table__mobile-label">
                 {{i18n "chat.incoming_webhooks.username"}}
               </div>
               {{webhook.username}}
             </td>
-            <td class="d-admin-row__detail">
-              <div class="d-admin-row__mobile-label">
+            <td class="d-table__cell --detail">
+              <div class="d-table__mobile-label">
                 {{i18n "chat.incoming_webhooks.channel"}}
               </div>
               <ChannelTitle @channel={{webhook.chat_channel}} />
             </td>
             <td
-              class="d-admin-row__controls incoming-chat-webhooks-row__controls"
+              class="d-table__cell --controls incoming-chat-webhooks-row__controls"
             >
-              <div class="d-admin-row__controls-options">
+              <div class="d-table__cell-actions">
                 <LinkTo
                   @route="adminPlugins.show.discourse-chat-incoming-webhooks.edit"
                   @model={{webhook.id}}
diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list.gjs
index 0c53055437ffd..97d847f003f7f 100644
--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list.gjs
+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list.gjs
@@ -2,8 +2,8 @@ import { LinkTo } from "@ember/routing";
 import { i18n } from "discourse-i18n";
 
 const HouseAdsList = <template>
-  <table class="d-admin-table house-ads-table" ...attributes>
-    <thead>
+  <table class="d-table house-ads-table" ...attributes>
+    <thead class="d-table__header">
       <tr>
         <th>{{i18n "admin.adplugin.house_ads.name"}}</th>
         <th></th>
@@ -11,11 +11,11 @@ const HouseAdsList = <template>
     </thead>
     <tbody>
       {{#each @houseAds as |ad|}}
-        <tr class="d-admin-row__content" data-house-ad-id={{ad.id}}>
-          <td class="d-admin-row__overview">
+        <tr class="d-table__row" data-house-ad-id={{ad.id}}>
+          <td class="d-table__cell --overview">
             {{ad.name}}
           </td>
-          <td class="d-admin-row__controls">
+          <td class="d-table__cell --controls">
             <LinkTo
               @route="adminPlugins.show.houseAds.show"
               @model={{ad.id}}
diff --git a/plugins/discourse-adplugin/spec/system/page_objects/pages/admin_house_ads.rb b/plugins/discourse-adplugin/spec/system/page_objects/pages/admin_house_ads.rb
index 51aa48a4bf1ea..2b4958057047c 100644
--- a/plugins/discourse-adplugin/spec/system/page_objects/pages/admin_house_ads.rb
+++ b/plugins/discourse-adplugin/spec/system/page_objects/pages/admin_house_ads.rb
@@ -24,18 +24,16 @@ def click_back
       end
 
       def click_ad(name)
-        find(".house-ads-table tr.d-admin-row__content", text: name).find(
-          ".house-ads-table__edit",
-        ).click
+        find(".house-ads-table tr.d-table__row", text: name).find(".house-ads-table__edit").click
         self
       end
 
       def has_ad_listed?(name)
-        has_css?(".house-ads-table tr.d-admin-row__content", text: name)
+        has_css?(".house-ads-table tr.d-table__row", text: name)
       end
 
       def has_no_ad_listed?(name)
-        has_no_css?(".house-ads-table tr.d-admin-row__content", text: name)
+        has_no_css?(".house-ads-table tr.d-table__row", text: name)
       end
 
       def click_delete
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjs
index 2fa1aaca9d921..e159ae16d200a 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjs
@@ -44,8 +44,8 @@ export default class AiEmbeddingsListEditor extends Component {
         </DPageSubheader>
 
         {{#if this.hasEmbeddingElements}}
-          <table class="d-admin-table">
-            <thead>
+          <table class="d-table">
+            <thead class="d-table__header">
               <tr>
                 <th>{{i18n "discourse_ai.embeddings.display_name"}}</th>
                 <th>{{i18n "discourse_ai.embeddings.provider"}}</th>
@@ -54,16 +54,16 @@ export default class AiEmbeddingsListEditor extends Component {
             </thead>
             <tbody>
               {{#each @embeddings.content as |embedding|}}
-                <tr class="ai-embeddings-list__row d-admin-row__content">
-                  <td class="d-admin-row__overview">
+                <tr class="ai-embeddings-list__row d-table__row">
+                  <td class="d-table__cell --overview">
                     <div class="ai-embeddings-list__name">
                       <strong>
                         {{embedding.display_name}}
                       </strong>
                     </div>
                   </td>
-                  <td class="d-admin-row__detail">
-                    <div class="d-admin-row__mobile-label">
+                  <td class="d-table__cell --detail">
+                    <div class="d-table__mobile-label">
                       {{i18n "discourse_ai.embeddings.provider"}}
                     </div>
                     {{i18n
@@ -72,7 +72,7 @@ export default class AiEmbeddingsListEditor extends Component {
                       )
                     }}
                   </td>
-                  <td class="d-admin-row__controls">
+                  <td class="d-table__cell --controls">
                     {{#if embedding.seeded}}
                       <DTooltip
                         class="ai-embeddings-list__edit-disabled-tooltip"
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjs
index b6ab55f872d5c..90c8d412a9be5 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjs
@@ -160,8 +160,8 @@ export default class AiLlmsListEditor extends Component {
             <DPageSubheader
               @titleLabel={{i18n "discourse_ai.llms.configured.title"}}
             />
-            <table class="d-admin-table">
-              <thead>
+            <table class="d-table">
+              <thead class="d-table__header">
                 <tr>
                   <th>{{i18n "discourse_ai.llms.display_name"}}</th>
                   <th>{{i18n "discourse_ai.llms.provider"}}</th>
@@ -172,9 +172,9 @@ export default class AiLlmsListEditor extends Component {
                 {{#each @llms.content as |llm|}}
                   <tr
                     data-llm-id={{llm.name}}
-                    class="ai-llm-list__row d-admin-row__content"
+                    class="ai-llm-list__row d-table__row"
                   >
-                    <td class="d-admin-row__overview">
+                    <td class="d-table__cell --overview">
 
                       <div class="ai-llm-list__name">
                         <strong>
@@ -225,15 +225,15 @@ export default class AiLlmsListEditor extends Component {
                         </div>
                       {{/if}}
                     </td>
-                    <td class="d-admin-row__detail">
-                      <div class="d-admin-row__mobile-label">
+                    <td class="d-table__cell --detail">
+                      <div class="d-table__mobile-label">
                         {{i18n "discourse_ai.llms.provider"}}
                       </div>
                       {{i18n
                         (concat "discourse_ai.llms.providers." llm.provider)
                       }}
                     </td>
-                    <td class="d-admin-row__controls">
+                    <td class="d-table__cell --controls">
                       <DButton
                         class="btn btn-default btn-small ai-llm-list__edit-button"
                         @label="discourse_ai.llms.edit"
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-persona-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
index 2162bd2c4f7a5..400651d927fb7 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-persona-list-editor.gjs
@@ -263,11 +263,11 @@ export default class AiPersonaListEditor extends Component {
             <:content as |filteredPersonas|>
               <table
                 class={{concatClass
-                  "content-list ai-persona-list-editor d-admin-table"
+                  "content-list ai-persona-list-editor d-table"
                   (concat "--layout-" this.currentLayout.id)
                 }}
               >
-                <thead>
+                <thead class="d-table__header">
                   <tr>
                     <th>{{i18n "discourse_ai.ai_persona.name"}}</th>
                     <th>{{i18n "discourse_ai.llms.short_title"}}</th>
@@ -279,12 +279,12 @@ export default class AiPersonaListEditor extends Component {
                     <tr
                       data-persona-id={{persona.id}}
                       class={{concatClass
-                        "ai-persona-list__row d-admin-row__content"
+                        "ai-persona-list__row d-table__row"
                         (if persona.priority "--priority")
                         (if persona.enabled "--enabled")
                       }}
                     >
-                      <td class="d-admin-row__overview">
+                      <td class="d-table__cell --overview">
                         <div class="ai-persona-list__name-with-description">
                           <h3 class="ai-persona-list__name">
                             {{#if persona.user}}
@@ -297,7 +297,7 @@ export default class AiPersonaListEditor extends Component {
                           </div>
                         </div>
                       </td>
-                      <td class="d-admin-row__llms">
+                      <td class="ai-persona-list__llms">
                         {{#if persona.default_llm}}
                           <span class="--card-label">
                             {{i18n "discourse_ai.ai_persona.llms_list"}}
@@ -310,7 +310,7 @@ export default class AiPersonaListEditor extends Component {
                           />
                         {{/if}}
                       </td>
-                      <td class="d-admin-row__features">
+                      <td class="ai-persona-list__features">
                         {{#if persona.features.length}}
                           <span class="--card-label">
                             {{i18n
@@ -319,7 +319,7 @@ export default class AiPersonaListEditor extends Component {
                             }}
                           </span>
                           {{#each persona.features as |feature index|}}
-                            <span class="d-admin-row__row-feature-list">
+                            <span class="ai-persona-list__feature-list">
                               {{#if (gt index 0)}}, {{/if}}
                               <DButton
                                 class="btn-flat btn-small ai-persona-list__row-item-feature"
@@ -337,7 +337,7 @@ export default class AiPersonaListEditor extends Component {
                           {{/each}}
                         {{/if}}
                       </td>
-                      <td class="d-admin-row__controls">
+                      <td class="d-table__cell --controls">
                         <LinkTo
                           @route="adminPlugins.show.discourse-ai-personas.edit"
                           @model={{persona}}
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjs
index 6ba9d4cdae05f..8c804b711d347 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjs
@@ -40,8 +40,8 @@ export default class AiSecretsListEditor extends Component {
         </DPageSubheader>
 
         {{#if this.hasSecrets}}
-          <table class="d-admin-table ai-secret-list-editor__table">
-            <thead>
+          <table class="d-table ai-secret-list-editor__table">
+            <thead class="d-table__header">
               <tr>
                 <th>{{i18n "discourse_ai.secrets.name"}}</th>
                 <th>{{i18n "discourse_ai.secrets.used_by"}}</th>
@@ -52,13 +52,13 @@ export default class AiSecretsListEditor extends Component {
               {{#each @secrets.content as |secret|}}
                 <tr
                   data-secret-id={{secret.id}}
-                  class="ai-secret-list__row d-admin-row__content"
+                  class="ai-secret-list__row d-table__row"
                 >
-                  <td class="d-admin-row__overview">
+                  <td class="d-table__cell --overview">
                     <strong>{{secret.name}}</strong>
                   </td>
-                  <td class="d-admin-row__detail ai-secret-list__usage">
-                    <div class="d-admin-row__mobile-label">
+                  <td class="d-table__cell --detail ai-secret-list__usage">
+                    <div class="d-table__mobile-label">
                       {{i18n "discourse_ai.secrets.used_by"}}
                     </div>
                     {{#if secret.used_by}}
@@ -102,7 +102,7 @@ export default class AiSecretsListEditor extends Component {
                       </span>
                     {{/if}}
                   </td>
-                  <td class="d-admin-row__controls">
+                  <td class="d-table__cell --controls">
                     <DButton
                       class="btn btn-default btn-small ai-secret-list__edit-button"
                       @label="discourse_ai.secrets.edit"
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
index c34434a2baa4b..0f09e52e87b4d 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjs
@@ -270,8 +270,8 @@ export default class AiToolListEditor extends Component {
       </DPageSubheader>
 
       {{#if @tools.content}}
-        <table class="d-admin-table ai-tool-list-editor">
-          <thead>
+        <table class="d-table ai-tool-list-editor">
+          <thead class="d-table__header">
             <th>{{i18n "discourse_ai.tools.name"}}</th>
             <th></th>
           </thead>
@@ -279,9 +279,9 @@ export default class AiToolListEditor extends Component {
             {{#each @tools.content as |tool|}}
               <tr
                 data-tool-id={{tool.id}}
-                class="ai-tool-list__row d-admin-row__content"
+                class="ai-tool-list__row d-table__row"
               >
-                <td class="d-admin-row__overview">
+                <td class="d-table__cell --overview">
                   <div class="ai-tool-list__name-with-description">
                     <div class="ai-tool-list__name">
                       <strong>
@@ -319,7 +319,7 @@ export default class AiToolListEditor extends Component {
                     {{/if}}
                   </div>
                 </td>
-                <td class="d-admin-row__controls">
+                <td class="d-table__cell --controls">
                   <LinkTo
                     @route="adminPlugins.show.discourse-ai-tools.edit"
                     @model={{tool}}
diff --git a/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-persona.scss b/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-persona.scss
index 4049a9a5318bb..820eca33e172d 100644
--- a/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-persona.scss
+++ b/plugins/discourse-ai/assets/stylesheets/modules/ai-bot/common/ai-persona.scss
@@ -10,8 +10,8 @@
       border: none;
       padding: 0;
 
-      &.d-admin-row__llms,
-      &.d-admin-row__features {
+      &.ai-persona-list__llms,
+      &.ai-persona-list__features {
         padding-block: 0;
 
         .--card-label {
@@ -93,7 +93,7 @@
       display: none;
     }
 
-    .d-admin-row__content {
+    .d-table__row {
       display: grid;
       grid-template-rows: auto 1fr auto auto;
       grid-template-columns: 1fr auto;
@@ -101,7 +101,7 @@
       padding: var(--space-2) var(--space-4) var(--space-4);
       border-radius: var(--d-border-radius);
 
-      .d-admin-row__overview,
+      .d-table__cell.--overview,
       .ai-persona-list__name-with-description {
         display: contents;
       }
@@ -126,12 +126,12 @@
         margin: var(--space-2) 0;
       }
 
-      .d-admin-row__controls {
+      .d-table__cell.--controls {
         grid-row: 1;
         grid-column: 2;
       }
 
-      .d-admin-row__features {
+      .ai-persona-list__features {
         grid-row: 4;
         grid-column: 1 / span 2;
         padding: 0;
@@ -141,7 +141,7 @@
         }
       }
 
-      .d-admin-row__llms {
+      .ai-persona-list__llms {
         grid-row: 3;
         grid-column: 1 / span 2;
         padding: 0;
@@ -191,7 +191,7 @@
     }
   }
 
-  .d-admin-row__row-feature-list {
+  .ai-persona-list__feature-list {
     color: var(--primary-medium);
   }
 }
diff --git a/plugins/discourse-ai/assets/stylesheets/modules/llms/common/ai-llms-editor.scss b/plugins/discourse-ai/assets/stylesheets/modules/llms/common/ai-llms-editor.scss
index 19cafb6251abc..b59ac5e751254 100644
--- a/plugins/discourse-ai/assets/stylesheets/modules/llms/common/ai-llms-editor.scss
+++ b/plugins/discourse-ai/assets/stylesheets/modules/llms/common/ai-llms-editor.scss
@@ -49,7 +49,7 @@
 .ai-tool-list-editor__current,
 .ai-persona-list-editor__current,
 .ai-llms-list-editor__configured {
-  .d-admin-table {
+  .d-table {
     @include viewport.from(md) {
       th,
       td {
diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
index 0ff27c851894e..667a7fcd733a3 100644
--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
@@ -88,8 +88,8 @@ export default <template>
             <ConditionalLoadingSpinner @condition={{@controller.loading}} />
 
             <div class="container discourse-data-explorer-query-list">
-              <table class="d-admin-table recent-queries">
-                <thead class="heading-container">
+              <table class="d-table recent-queries">
+                <thead class="d-table__header heading-container">
                   <th class="col heading name">
                     <div
                       role="button"
@@ -149,8 +149,8 @@ export default <template>
                 </thead>
                 <tbody>
                   {{#each filteredQueries as |query|}}
-                    <tr class="d-admin-row__content query-row">
-                      <td class="d-admin-row__overview">
+                    <tr class="d-table__row query-row">
+                      <td class="d-table__cell --overview">
                         <a
                           class="query-link"
                           href={{getURL
@@ -169,8 +169,8 @@ export default <template>
                           <div class="query-desc">{{query.description}}</div>
                         </a>
                       </td>
-                      <td class="d-admin-row__detail query-created-by">
-                        <div class="d-admin-row__mobile-label">
+                      <td class="d-table__cell --detail query-created-by">
+                        <div class="d-table__mobile-label">
                           {{i18n "explorer.query_user"}}
                         </div>
                         {{#if query.username}}
@@ -181,8 +181,8 @@ export default <template>
                           </div>
                         {{/if}}
                       </td>
-                      <td class="d-admin-row__detail query-group-names">
-                        <div class="d-admin-row__mobile-label">
+                      <td class="d-table__cell --detail query-group-names">
+                        <div class="d-table__mobile-label">
                           {{i18n "explorer.query_groups"}}
                         </div>
                         <div class="group-names">
@@ -194,8 +194,8 @@ export default <template>
                           {{/unless}}
                         </div>
                       </td>
-                      <td class="d-admin-row__detail query-created-at">
-                        <div class="d-admin-row__mobile-label">
+                      <td class="d-table__cell --detail query-created-at">
+                        <div class="d-table__mobile-label">
                           {{i18n "explorer.query_time"}}
                         </div>
                         {{#if query.last_run_at}}
diff --git a/spec/system/page_objects/pages/admin_theme_site_settings.rb b/spec/system/page_objects/pages/admin_theme_site_settings.rb
index 0ae7e471bd5b4..b138952c21731 100644
--- a/spec/system/page_objects/pages/admin_theme_site_settings.rb
+++ b/spec/system/page_objects/pages/admin_theme_site_settings.rb
@@ -32,7 +32,7 @@ def theme_overriding_css(theme)
 
       def setting_row(setting_name)
         page.find(
-          ".d-admin-row__content.admin-theme-site-settings-row[data-setting-name='#{setting_name}']",
+          ".d-table__row.admin-theme-site-settings-row[data-setting-name='#{setting_name}']",
         )
       end
     end

From 63b8d4c711283e69e91ba23f39c0093b6269ef42 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 26 Feb 2026 13:16:42 +1000
Subject: [PATCH 089/168] FEATURE: Remove experimental label & setting toggle
 for what's new (#38008)

We now have upcoming changes which makes the related setting toggle
and experimental label for the what's new page redundant. This commit
removes both as a first step towards merging these two pages together.
---
 app/assets/stylesheets/admin/dashboard.scss   |  21 ---
 config/locales/client.en.yml                  |  17 ---
 .../components/dashboard-new-feature-item.gjs | 129 ----------------
 .../components/dashboard-new-features.gjs     |  29 +---
 lib/discourse_updates.rb                      |  14 --
 spec/lib/discourse_updates_spec.rb            |  35 -----
 spec/system/admin_whats_new_spec.rb           | 142 ------------------
 7 files changed, 1 insertion(+), 386 deletions(-)

diff --git a/app/assets/stylesheets/admin/dashboard.scss b/app/assets/stylesheets/admin/dashboard.scss
index eaf802aab59b9..2804b0525c440 100644
--- a/app/assets/stylesheets/admin/dashboard.scss
+++ b/app/assets/stylesheets/admin/dashboard.scss
@@ -741,17 +741,6 @@
   }
 }
 
-.admin-new-feature-item__header-experimental {
-  color: var(--tertiary);
-  background-color: var(--tertiary-very-low);
-  padding: 0.5em;
-  font-size: var(--font-down-3);
-  margin-left: 0.5rem;
-  font-weight: 400;
-  border-radius: var(--d-border-radius);
-  display: inline-block;
-}
-
 .admin-new-feature-item__body {
   display: flex;
   justify-content: space-between;
@@ -825,13 +814,3 @@
     }
   }
 }
-
-.admin-new-features__experiments-filter {
-  display: flex;
-  margin-bottom: 1em;
-  align-items: center;
-
-  .d-toggle-switch {
-    margin-right: 0.5em;
-  }
-}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index bc79d8b71d22b..d76b77452881b 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -6490,23 +6490,6 @@ en:
           no_new_features_found: "There are no items in the feed or your selected filter returned no results. You can see previous new feature announcements on <a href='%{url}' target='_blank'>the Discourse Meta community</a>."
           no_new_features_error: "There was an error loading the feed. You can see previous new feature announcements on <a href='%{url}' target='_blank'>the Discourse Meta community</a>."
           learn_more: "Learn more..."
-          experimental: "Experimental"
-          only_experiments: "Only show experimental features"
-          experiment_enabled: "You have enabled the experimental feature."
-          experiment_disabled: "You have disabled the experimental feature."
-          feature_enabled: "You have enabled the feature."
-          feature_disabled: "You have disabled the feature."
-          toggled_too_fast: "You have switched the toggle too fast. Please wait a few seconds before trying again."
-          experiment_tooltip:
-            title_disabled: "Try this experimental feature"
-            title_enabled: "Turn off experimental feature"
-            content_disabled: "Give our newest feature in development a spin! It's still in the experimental stage, so we might remove it at any time. You can opt out whenever you like.<br/><br/>Changing this will enable the feature for all users."
-            content_enabled: "Changing this will disable the feature for all users."
-          feature_tooltip:
-            title_disabled: "Try this feature"
-            title_enabled: "Turn off feature"
-            content_disabled: "Give this new feature a spin! You can opt out whenever you like.<br/><br/>Changing this will enable the feature for all users."
-            content_enabled: "Changing this will disable the feature for all users."
 
         last_checked: "Last checked"
         refresh_problems: "Refresh"
diff --git a/frontend/discourse/admin/components/dashboard-new-feature-item.gjs b/frontend/discourse/admin/components/dashboard-new-feature-item.gjs
index d7be3b22a3229..bd019fbc413c7 100644
--- a/frontend/discourse/admin/components/dashboard-new-feature-item.gjs
+++ b/frontend/discourse/admin/components/dashboard-new-feature-item.gjs
@@ -1,115 +1,14 @@
-/* eslint-disable ember/no-tracked-properties-from-args */
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
-import { on } from "@ember/modifier";
-import { action } from "@ember/object";
-import { service } from "@ember/service";
 import { dasherize } from "@ember/string";
-import { htmlSafe } from "@ember/template";
 import CookText from "discourse/components/cook-text";
-import DToggleSwitch from "discourse/components/d-toggle-switch";
-import DTooltip from "discourse/float-kit/components/d-tooltip";
-import icon from "discourse/helpers/d-icon";
-import { ajax } from "discourse/lib/ajax";
-import { popupAjaxError } from "discourse/lib/ajax-error";
 import { and, not } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
 
 export default class DiscourseNewFeatureItem extends Component {
-  @service toasts;
-
-  @tracked settingEnabled = this.args.item.setting_enabled;
-  @tracked toggleSettingDisabled = false;
-
-  get isExperiment() {
-    return this.args.item.experiment;
-  }
-
   get identifier() {
     return this.args.item.title ? dasherize(this.args.item.title) : null;
   }
 
-  @action
-  async toggleExperiment() {
-    if (this.toggleSettingDisabled) {
-      this.toasts.error({
-        duration: "short",
-        data: {
-          message: i18n("admin.dashboard.new_features.toggled_too_fast"),
-        },
-      });
-      return;
-    }
-    this.settingEnabled = !this.settingEnabled;
-    this.toggleSettingDisabled = true;
-
-    setTimeout(() => {
-      this.toggleSettingDisabled = false;
-    }, 5000);
-    try {
-      await ajax("/admin/toggle-feature", {
-        type: "POST",
-        data: {
-          setting_name: this.args.item.related_site_setting,
-          enabled: this.settingEnabled,
-        },
-      });
-
-      const enabledMsg = this.isExperiment
-        ? "admin.dashboard.new_features.experiment_enabled"
-        : "admin.dashboard.new_features.feature_enabled";
-      const disabledMsg = this.isExperiment
-        ? "admin.dashboard.new_features.experiment_disabled"
-        : "admin.dashboard.new_features.feature_disabled";
-
-      this.toasts.success({
-        duration: "short",
-        data: {
-          message: this.settingEnabled ? i18n(enabledMsg) : i18n(disabledMsg),
-        },
-      });
-    } catch (error) {
-      this.settingEnabled = !this.settingEnabled;
-      return popupAjaxError(error);
-    }
-  }
-
-  get tooltipTitle() {
-    const experimentalTitleEnabled = this.isExperiment
-      ? "admin.dashboard.new_features.experiment_tooltip.title_enabled"
-      : "admin.dashboard.new_features.feature_tooltip.title_enabled";
-
-    const experimentalTitleDisabled = this.isExperiment
-      ? "admin.dashboard.new_features.feature_tooltip.title_disabled"
-      : "admin.dashboard.new_features.feature_tooltip.title_disabled";
-
-    return htmlSafe(
-      i18n(
-        this.settingEnabled
-          ? experimentalTitleEnabled
-          : experimentalTitleDisabled
-      )
-    );
-  }
-
-  get tooltipDescription() {
-    const experimentalDescriptionEnabled = this.isExperiment
-      ? "admin.dashboard.new_features.experiment_tooltip.content_enabled"
-      : "admin.dashboard.new_features.feature_tooltip.content_enabled";
-
-    const experimentalDescriptionDisabled = this.isExperiment
-      ? "admin.dashboard.new_features.experiment_tooltip.content_disabled"
-      : "admin.dashboard.new_features.feature_tooltip.content_disabled";
-
-    return htmlSafe(
-      i18n(
-        this.settingEnabled
-          ? experimentalDescriptionEnabled
-          : experimentalDescriptionDisabled
-      )
-    );
-  }
-
   <template>
     <div
       class="admin-new-feature-item"
@@ -124,12 +23,6 @@ export default class DiscourseNewFeatureItem extends Component {
           {{/if}}
           <h3>
             {{@item.title}}
-            {{#if @item.experiment}}
-              <span class="admin-new-feature-item__header-experimental">
-                {{icon "flask"}}
-                {{i18n "admin.dashboard.new_features.experimental"}}
-              </span>
-            {{/if}}
           </h3>
         </div>
 
@@ -159,28 +52,6 @@ export default class DiscourseNewFeatureItem extends Component {
                 </a>
               {{/if}}
             </div>
-            {{#if @item.related_site_setting}}
-              <div class="admin-new-feature-item__feature-toggle">
-                <DTooltip>
-                  <:trigger>
-                    <DToggleSwitch
-                      @state={{this.settingEnabled}}
-                      {{on "click" this.toggleExperiment}}
-                    />
-                  </:trigger>
-                  <:content>
-                    <div class="admin-new-feature-item__tooltip">
-                      <div class="admin-new-feature-item__tooltip-header">
-                        {{this.tooltipTitle}}
-                      </div>
-                      <div class="admin-new-feature-item__tooltip-content">
-                        {{this.tooltipDescription}}
-                      </div>
-                    </div>
-                  </:content>
-                </DTooltip>
-              </div>
-            {{/if}}
           </div>
         </div>
       </div>
diff --git a/frontend/discourse/admin/components/dashboard-new-features.gjs b/frontend/discourse/admin/components/dashboard-new-features.gjs
index 9777255135cb6..2d9fb5c8161ca 100644
--- a/frontend/discourse/admin/components/dashboard-new-features.gjs
+++ b/frontend/discourse/admin/components/dashboard-new-features.gjs
@@ -1,14 +1,11 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
-import { on } from "@ember/modifier";
-import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { service } from "@ember/service";
 import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";
 import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";
 import DashboardNewFeatureItem from "discourse/admin/components/dashboard-new-feature-item";
 import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
-import DToggleSwitch from "discourse/components/d-toggle-switch";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { bind } from "discourse/lib/decorators";
@@ -20,7 +17,6 @@ export default class DashboardNewFeatures extends Component {
   @tracked newFeatures = null;
   @tracked isLoading = true;
   @tracked feedError = false;
-  @tracked onlyExperiments = false;
 
   constructor() {
     super(...arguments);
@@ -62,7 +58,7 @@ export default class DashboardNewFeatures extends Component {
   get groupedNewFeatures() {
     return Object.keys(this.newFeatures)
       .map((date) => {
-        const visibleFeatures = this.newFeatures[date].filter(this.showFeature);
+        const visibleFeatures = this.newFeatures[date];
 
         if (visibleFeatures.length === 0) {
           return null;
@@ -94,35 +90,12 @@ export default class DashboardNewFeatures extends Component {
     return "";
   }
 
-  @bind
-  showFeature(feature) {
-    if (!this.onlyExperiments) {
-      return true;
-    }
-
-    return feature.experiment === true;
-  }
-
-  @action
-  toggleOnlyExperiments() {
-    this.onlyExperiments = !this.onlyExperiments;
-  }
-
   <template>
     <div
       class="admin-config-area__primary-content"
       {{didInsert this.loadNewFeatures}}
     >
       <ConditionalLoadingSpinner @condition={{this.isLoading}}>
-        <div class="admin-new-features__experiments-filter">
-          <DToggleSwitch
-            @state={{this.onlyExperiments}}
-            {{on "click" this.toggleOnlyExperiments}}
-          />
-          <span>
-            {{i18n "admin.dashboard.new_features.only_experiments"}}
-          </span>
-        </div>
         {{#each this.groupedNewFeatures as |groupedFeatures|}}
           <AdminConfigAreaCard
             class="admin-new-features__group"
diff --git a/lib/discourse_updates.rb b/lib/discourse_updates.rb
index 5ce75f283b844..4d8bd60d8404a 100644
--- a/lib/discourse_updates.rb
+++ b/lib/discourse_updates.rb
@@ -153,20 +153,6 @@ def new_features(force_refresh: false)
         end
       return nil if entries.nil?
 
-      entries.map! do |item|
-        next item if !item["related_site_setting"]
-
-        if !SiteSetting.respond_to?(item["related_site_setting"]) ||
-             SiteSetting.type_supervisor.get_type(item["related_site_setting"].to_sym) != :bool
-          item["related_site_setting"] = nil
-          item["setting_enabled"] = false
-        else
-          item["setting_enabled"] = SiteSetting.send(item["related_site_setting"].to_sym) if item
-        end
-
-        item
-      end
-
       entries.select! do |item|
         begin
           valid_version =
diff --git a/spec/lib/discourse_updates_spec.rb b/spec/lib/discourse_updates_spec.rb
index ba7bdf21d4c5f..78e0e76590d88 100644
--- a/spec/lib/discourse_updates_spec.rb
+++ b/spec/lib/discourse_updates_spec.rb
@@ -277,41 +277,6 @@ def stub_data(latest, missing, critical, updated_at)
       expect(result[1]["title"]).to eq("Bells")
     end
 
-    it "correctly shows features with correct boolean site settings" do
-      features_with_versions = [
-        {
-          "emoji" => "🤾",
-          "title" => "Bells",
-          "created_at" => 2.days.ago,
-          "related_site_setting" => "enable_mobile_theme",
-        },
-        {
-          "emoji" => "🙈",
-          "title" => "Whistles",
-          "created_at" => 3.days.ago,
-          "related_site_setting" => "default_theme_id",
-        },
-        {
-          "emoji" => "🙈",
-          "title" => "Confetti",
-          "created_at" => 4.days.ago,
-          "related_site_setting" => "wrong value",
-        },
-      ]
-
-      Discourse.redis.set("new_features", MultiJson.dump(features_with_versions))
-      DiscourseUpdates.last_installed_version = "2.7.0.beta2"
-      result = DiscourseUpdates.new_features
-
-      expect(result.length).to eq(3)
-      expect(result[0]["setting_enabled"]).to eq(true)
-      expect(result[0]["related_site_setting"]).to eq("enable_mobile_theme")
-      expect(result[1]["setting_enabled"]).to eq(false)
-      expect(result[1]["related_site_setting"]).to be_nil
-      expect(result[2]["setting_enabled"]).to eq(false)
-      expect(result[2]["related_site_setting"]).to be_nil
-    end
-
     it "correctly shows features when related plugins are installed" do
       Discourse.stubs(:plugins_by_name).returns({ "discourse-ai" => true })
 
diff --git a/spec/system/admin_whats_new_spec.rb b/spec/system/admin_whats_new_spec.rb
index d2b62abc6ffd1..df8d66f698411 100644
--- a/spec/system/admin_whats_new_spec.rb
+++ b/spec/system/admin_whats_new_spec.rb
@@ -128,146 +128,4 @@ def set_new_features_payload(payload)
     expect(whats_new_page).to have_emoji
     expect(whats_new_page).to have_no_screenshot
   end
-
-  describe "items with a related_site_setting" do
-    before do
-      set_new_features_payload(
-        [
-          {
-            "id" => 7,
-            "user_id" => 1,
-            "emoji" => "😍",
-            "title" => "New feature",
-            "description" => "New feature description",
-            "link" => "https://meta.discourse.org",
-            "tier" => [],
-            "discourse_version" => "",
-            "created_at" => "2023-11-10T02:52:41.462Z",
-            "updated_at" => "2023-11-10T04:28:47.020Z",
-            "related_site_setting" => "enable_form_templates",
-            "experiment" => false,
-          },
-        ],
-      )
-    end
-
-    it "toggles the attached site setting and shows the correct state" do
-      whats_new_page.visit
-      whats_new_page.within_new_feature_item("New feature") do
-        expect(whats_new_page.enable_item_toggle.unchecked?).to be_truthy
-        whats_new_page.enable_item_toggle.toggle
-      end
-      expect(page).to have_content(I18n.t("admin_js.admin.dashboard.new_features.feature_enabled"))
-      whats_new_page.visit
-      expect(SiteSetting.enable_form_templates).to be true
-      expect(whats_new_page.enable_item_toggle.checked?).to be_truthy
-    end
-  end
-
-  describe "experimental items" do
-    it "displays experimental feature toggle and has the correct state" do
-      set_new_features_payload(
-        [
-          {
-            "id" => 7,
-            "user_id" => 1,
-            "emoji" => "😍",
-            "title" => "New feature",
-            "description" => "New feature description",
-            "link" => "https://meta.discourse.org",
-            "tier" => [],
-            "discourse_version" => "",
-            "created_at" => "2023-11-10T02:52:41.462Z",
-            "updated_at" => "2023-11-10T04:28:47.020Z",
-            "related_site_setting" => "enable_form_templates",
-            "experiment" => false,
-          },
-        ],
-      )
-      whats_new_page.visit
-      expect(whats_new_page).to have_toggle_feature_button()
-    end
-
-    it "displays experimental text next to feature title when feature is experimental" do
-      set_new_features_payload(
-        [
-          {
-            "id" => 7,
-            "user_id" => 1,
-            "emoji" => "😍",
-            "title" => "New feature",
-            "description" => "New feature description",
-            "link" => "https://meta.discourse.org",
-            "tier" => [],
-            "discourse_version" => "",
-            "created_at" => "2023-11-10T02:52:41.462Z",
-            "updated_at" => "2023-11-10T04:28:47.020Z",
-            "related_site_setting" => "enable_form_templates",
-            "experiment" => true,
-          },
-        ],
-      )
-      whats_new_page.visit
-      expect(whats_new_page).to have_experimental_text
-    end
-
-    it "does not display experimental text next to feature title when feature is not experimental" do
-      set_new_features_payload(
-        [
-          {
-            "id" => 7,
-            "user_id" => 1,
-            "emoji" => "😍",
-            "title" => "New feature",
-            "description" => "New feature description",
-            "link" => "https://meta.discourse.org",
-            "tier" => [],
-            "discourse_version" => "",
-            "created_at" => "2023-11-10T02:52:41.462Z",
-            "updated_at" => "2023-11-10T04:28:47.020Z",
-          },
-        ],
-      )
-      whats_new_page.visit
-      expect(whats_new_page).to have_no_experimental_text
-    end
-
-    it "allows filtering to only show experimental items" do
-      set_new_features_payload(
-        [
-          {
-            "id" => 7,
-            "user_id" => 1,
-            "emoji" => "😍",
-            "title" => "New feature",
-            "description" => "New feature description",
-            "link" => "https://meta.discourse.org",
-            "tier" => [],
-            "discourse_version" => "",
-            "created_at" => "2023-11-10T02:52:41.462Z",
-            "updated_at" => "2023-11-10T04:28:47.020Z",
-            "related_site_setting" => "enable_form_templates",
-            "experiment" => true,
-          },
-          {
-            "id" => 8,
-            "user_id" => 1,
-            "emoji" => "🥹",
-            "title" => "Non experimental feature",
-            "description" => "Cool description",
-            "link" => "https://meta.discourse.org",
-            "tier" => [],
-            "discourse_version" => "",
-            "created_at" => "2023-11-10T02:52:41.462Z",
-            "updated_at" => "2023-11-10T04:28:47.020Z",
-            "related_site_setting" => nil,
-            "experiment" => false,
-          },
-        ],
-      )
-      whats_new_page.visit
-      whats_new_page.toggle_experiments_only
-      expect(whats_new_page).to have_experimental_text
-    end
-  end
 end

From c7f5fac25db7335c4cbdf3a5533c9ab3b9ad0d96 Mon Sep 17 00:00:00 2001
From: Natalie Tay <natalie.tay@gmail.com>
Date: Thu, 26 Feb 2026 13:16:47 +0800
Subject: [PATCH 090/168] DEV: Remove dead code n locs (#38050)

These are not used any more.
---
 .../discourse/components/ai-translations.gjs         | 12 ------------
 plugins/discourse-ai/config/locales/client.en.yml    |  2 --
 2 files changed, 14 deletions(-)

diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs
index aefb19f521d9d..172e423beaf07 100644
--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs
+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs
@@ -124,12 +124,6 @@ export default class AiTranslations extends Component {
     );
   }
 
-  get descriptionTooltip() {
-    return i18n("discourse_ai.translations.stats.description_tooltip", {
-      count: this.total,
-    });
-  }
-
   @action
   navigateToLocalizationSettings() {
     this.router.transitionTo("adminConfig.localization.settings", {
@@ -250,12 +244,6 @@ export default class AiTranslations extends Component {
     }
   }
 
-  get descriptionKey() {
-    return this.done === this.total
-      ? "discourse_ai.translations.stats.complete_language_detection_description"
-      : "discourse_ai.translations.stats.incomplete_language_detection_description";
-  }
-
   get backfillStatusMessage() {
     if (
       this.args.model?.backfill_enabled &&
diff --git a/plugins/discourse-ai/config/locales/client.en.yml b/plugins/discourse-ai/config/locales/client.en.yml
index 1be7fe905d3f2..1fa6521260b60 100644
--- a/plugins/discourse-ai/config/locales/client.en.yml
+++ b/plugins/discourse-ai/config/locales/client.en.yml
@@ -386,8 +386,6 @@ en:
           enable_translations: "Enable automatic translations"
         stats:
           title: "Translation statistics"
-          complete_language_detection_description: "All %{total} eligible posts have their language detected."
-          incomplete_language_detection_description: "%{done} of %{total} eligible posts have their language detected."
           backfill_disabled: "Backfilling is disabled, only new posts will be translated."
           backfill_message: "<a href='%{settingsUrl}'>Backfill settings</a> are configured to translate all posts after %{date} — this is estimated to take %{eta}."
           eta_minutes:

From 28080d48b34fdb878da713eb54cfddb75061657b Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Thu, 26 Feb 2026 06:53:03 +0100
Subject: [PATCH 091/168] UX: add overflow for FAQ nav pills (#38059)

Currently our FAQ page nav-pills can overflow and cause a page shift:
<img width="766" height="1424" alt="CleanShot 2026-02-25 at 14 41 16@2x"
src="https://github.com/user-attachments/assets/b41ad773-6e68-4988-9a5c-b9d0a9c43293"
/>

This commit:
* removes the gap to save some space (there is enough space due to the
button internal padding)
* sets an overflow handler
---
 app/assets/stylesheets/common/base/faqs.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/common/base/faqs.scss b/app/assets/stylesheets/common/base/faqs.scss
index bb5d28488cac1..fea77aaaa2a13 100644
--- a/app/assets/stylesheets/common/base/faqs.scss
+++ b/app/assets/stylesheets/common/base/faqs.scss
@@ -30,6 +30,8 @@
 
   .nav-pills {
     margin: 0 0 2em;
+    gap: 0;
+    overflow: auto;
   }
 
   ul:not(.nav-pills),

From 421aa628258d914b142bbe3bac72ab6be12b4d01 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Thu, 26 Feb 2026 07:56:33 +0100
Subject: [PATCH 092/168] DEV: update sort order of plugin reports (#38054)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Plugin report groups on the admin reporting page were ordered by the
title of whichever report in each plugin happened to
come first alphabetically — not by the plugin name itself.
This meant the group order was unintuitive and could shift when the
interface language changed.
See
https://meta.discourse.org/t/admin-reporting-analysis-incremental-changes/395768/8

This commit sorts the plugin groups by their display name instead.
---
 .../admin/components/admin-reports.gjs        | 10 ++--
 .../tests/acceptance/reports-test.js          | 48 +++++++++++++++++++
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/frontend/discourse/admin/components/admin-reports.gjs b/frontend/discourse/admin/components/admin-reports.gjs
index 6a66f753bc398..0fe73a9145134 100644
--- a/frontend/discourse/admin/components/admin-reports.gjs
+++ b/frontend/discourse/admin/components/admin-reports.gjs
@@ -141,13 +141,15 @@ export default class AdminReports extends Component {
       pluginGroups.get(pluginName).push(report);
     }
 
-    for (const [pluginName, pluginReportsList] of pluginGroups) {
-      groupedReports.push({
+    const sortedPluginGroups = [...pluginGroups.entries()]
+      .map(([pluginName, pluginReportsList]) => ({
         key: `plugin-${pluginName}`,
         name: pluginReportsList[0].plugin_display_name || pluginName,
         reports: pluginReportsList,
-      });
-    }
+      }))
+      .sort((a, b) => a.name.localeCompare(b.name));
+
+    groupedReports.push(...sortedPluginGroups);
 
     return groupedReports;
   }
diff --git a/frontend/discourse/tests/acceptance/reports-test.js b/frontend/discourse/tests/acceptance/reports-test.js
index 1fed6cac81379..bd710c64d166b 100644
--- a/frontend/discourse/tests/acceptance/reports-test.js
+++ b/frontend/discourse/tests/acceptance/reports-test.js
@@ -31,3 +31,51 @@ acceptance("Reports", function (needs) {
     assert.dom(".export-csv-btn").exists();
   });
 });
+
+acceptance("Reports | Plugin groups sorted by display name", function (needs) {
+  needs.user();
+  needs.settings({ reporting_improvements: true });
+  needs.pretender((server, helper) => {
+    server.get("/admin/reports", () => {
+      return helper.response({
+        reports: [
+          {
+            title: "Zebra Report",
+            description: "From zebra plugin",
+            type: "zebra_report",
+            plugin: "zebra-plugin",
+            plugin_display_name: "Zebra Analytics",
+          },
+          {
+            title: "Alpha Report",
+            description: "From alpha plugin",
+            type: "alpha_report",
+            plugin: "alpha-plugin",
+            plugin_display_name: "Alpha Metrics",
+          },
+          {
+            title: "Middle Report",
+            description: "From middle plugin",
+            type: "middle_report",
+            plugin: "middle-plugin",
+            plugin_display_name: "Middle Stats",
+          },
+        ],
+      });
+    });
+  });
+
+  test("plugin report groups are sorted alphabetically by display name", async function (assert) {
+    await visit("/admin/reports");
+
+    const groupTitles = [
+      ...document.querySelectorAll(".admin-reports-group__title"),
+    ].map((el) => el.textContent.trim());
+
+    assert.deepEqual(groupTitles, [
+      "Alpha Metrics",
+      "Middle Stats",
+      "Zebra Analytics",
+    ]);
+  });
+});

From e3491e63ddb3358bd383fea097e9d8371c448806 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 26 Feb 2026 17:06:49 +1000
Subject: [PATCH 093/168] FIX: Redirect data explorer API calls to the new
 endpoint (#38069)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup e8287d22b08587fa77dbb72c1c8f2d56304b184d

The above commit didn't cover redirecting API calls like
POST /admin/plugins/explorer/queries/:id/run. This commit
makes sure all the route redirects are there, here is the
list:

- GET /admin/plugins/explorer — redirect →
/admin/plugins/discourse-data-explorer
- GET /admin/plugins/explorer/queries — redirect →
/admin/plugins/discourse-data-explorer/queries
- GET /admin/plugins/explorer/queries/:id — redirect →
/admin/plugins/discourse-data-explorer/queries/%{id}
- GET /admin/plugins/explorer/schema — query#schema
- GET /admin/plugins/explorer/groups — query#groups
- POST /admin/plugins/explorer/queries — query#create
- PUT /admin/plugins/explorer/queries/:id — query#update
- DELETE /admin/plugins/explorer/queries/:id — query#destroy
- POST /admin/plugins/explorer/queries/:id/run — query#run

Also added specs to cover legacy routes
---
 .../discourse-data-explorer/config/routes.rb  | 12 ++++
 .../spec/requests/query_controller_spec.rb    | 71 +++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/plugins/discourse-data-explorer/config/routes.rb b/plugins/discourse-data-explorer/config/routes.rb
index b3f11d7f95a08..106891739b34c 100644
--- a/plugins/discourse-data-explorer/config/routes.rb
+++ b/plugins/discourse-data-explorer/config/routes.rb
@@ -32,4 +32,16 @@
         redirect("/admin/plugins/discourse-data-explorer/queries")
   get "/admin/plugins/explorer/queries/:id" =>
         redirect("/admin/plugins/discourse-data-explorer/queries/%{id}")
+
+  # Legacy /admin/plugins/explorer/ API routes - route directly to controller
+  # since redirects don't preserve POST/PUT/DELETE request bodies
+  get "/admin/plugins/explorer/schema" => "discourse_data_explorer/query#schema"
+  get "/admin/plugins/explorer/groups" => "discourse_data_explorer/query#groups"
+  post "/admin/plugins/explorer/queries" => "discourse_data_explorer/query#create"
+  put "/admin/plugins/explorer/queries/:id" => "discourse_data_explorer/query#update"
+  delete "/admin/plugins/explorer/queries/:id" => "discourse_data_explorer/query#destroy"
+  post "/admin/plugins/explorer/queries/:id/run" => "discourse_data_explorer/query#run",
+       :constraints => {
+         format: /(json|csv)/,
+       }
 end
diff --git a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
index e8df25acb2bf7..cb75514c1c647 100644
--- a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
+++ b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
@@ -712,4 +712,75 @@ def limited_request(query_id, headers = {})
       end
     end
   end
+
+  describe "legacy /admin/plugins/explorer/ routes" do
+    fab!(:admin)
+
+    before { sign_in(admin) }
+
+    it "redirects GET /admin/plugins/explorer/queries to /admin/plugins/discourse-data-explorer/queries" do
+      get "/admin/plugins/explorer/queries"
+      expect(response).to redirect_to("/admin/plugins/discourse-data-explorer/queries")
+    end
+
+    it "redirects GET /admin/plugins/explorer/queries/:id to /admin/plugins/discourse-data-explorer/queries/:id" do
+      query = make_query("SELECT 1 as value")
+      get "/admin/plugins/explorer/queries/#{query.id}"
+      expect(response).to redirect_to("/admin/plugins/discourse-data-explorer/queries/#{query.id}")
+    end
+
+    it "serves GET /admin/plugins/explorer/schema.json" do
+      get "/admin/plugins/explorer/schema.json"
+      expect(response.status).to eq(200)
+      expect(response.parsed_body).to be_a(Hash)
+      expect(response.parsed_body.keys).to include("posts")
+    end
+
+    it "serves GET /admin/plugins/explorer/groups.json" do
+      get "/admin/plugins/explorer/groups.json"
+      expect(response.status).to eq(200)
+    end
+
+    it "serves POST /admin/plugins/explorer/queries.json" do
+      post "/admin/plugins/explorer/queries.json",
+           params: {
+             query: {
+               name: "Legacy route test",
+               description: "Testing legacy route",
+               sql: "SELECT 1",
+             },
+           }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["query"]["name"]).to eq("Legacy route test")
+    end
+
+    it "serves PUT /admin/plugins/explorer/queries/:id.json" do
+      query = make_query("SELECT 1 as value")
+      put "/admin/plugins/explorer/queries/#{query.id}.json",
+          params: {
+            query: {
+              name: "Updated via legacy route",
+              sql: query.sql,
+            },
+          }
+      expect(response.status).to eq(200)
+      expect(query.reload.name).to eq("Updated via legacy route")
+    end
+
+    it "serves DELETE /admin/plugins/explorer/queries/:id.json" do
+      query = make_query("SELECT 1 as value")
+      delete "/admin/plugins/explorer/queries/#{query.id}.json"
+      expect(response.status).to eq(200)
+      expect(query.reload.hidden).to eq(true)
+    end
+
+    it "serves POST /admin/plugins/explorer/queries/:id/run.json" do
+      query = make_query("SELECT 42 as legacy_value")
+      post "/admin/plugins/explorer/queries/#{query.id}/run.json", params: { params: {}.to_json }
+      expect(response.status).to eq(200)
+      expect(response.parsed_body["success"]).to eq(true)
+      expect(response.parsed_body["columns"]).to eq(["legacy_value"])
+      expect(response.parsed_body["rows"]).to eq([[42]])
+    end
+  end
 end

From 968b611223028f2dab7e8ca1f3d183a7b492e189 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Thu, 26 Feb 2026 17:07:03 +1000
Subject: [PATCH 094/168] UX: Introduce d-table__overview-link (#38070)

We were inconsistently linking the name/description for tables
in the admin UIs. This introduces a new class, d-table__overview-link,
that
standardises how these links are applied across the admin UIs, and the
guidelines at
https://meta.discourse.org/t/creating-consistent-admin-interfaces/326780
will be updated accordingly.

<img width="1129" height="561" alt="image"
src="https://github.com/user-attachments/assets/e877b105-3042-4df1-bc83-1a4f80719f93"
/>
---
 .../common/components/table-layout.scss       | 11 +++++
 .../admin-config-areas/components.gjs         | 22 ++++------
 .../admin/components/admin-flag-item.gjs      | 32 ++++++++-------
 .../components/admin-plugins-list-item.gjs    |  2 +-
 .../components/admin-user-field-item.gjs      | 24 +++++------
 .../components/color-palette-list-item.gjs    | 20 +++------
 .../admin-plugins/show/explorer/index.gjs     | 41 ++++++++++---------
 .../assets/stylesheets/explorer.scss          |  4 +-
 8 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/app/assets/stylesheets/common/components/table-layout.scss b/app/assets/stylesheets/common/components/table-layout.scss
index ea58b647ebcc5..6097761560724 100644
--- a/app/assets/stylesheets/common/components/table-layout.scss
+++ b/app/assets/stylesheets/common/components/table-layout.scss
@@ -138,6 +138,17 @@
     color: var(--primary);
   }
 
+  .d-table__overview-link {
+    color: var(--primary);
+
+    .d-table__overview-name {
+      &:hover,
+      &:focus {
+        color: var(--tertiary);
+      }
+    }
+  }
+
   a.d-table__overview-name {
     &:visited {
       color: currentcolor;
diff --git a/frontend/discourse/admin/components/admin-config-areas/components.gjs b/frontend/discourse/admin/components/admin-config-areas/components.gjs
index 692f642478a39..bfc8a3a4b9892 100644
--- a/frontend/discourse/admin/components/admin-config-areas/components.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/components.gjs
@@ -4,6 +4,7 @@ import { tracked } from "@glimmer/tracking";
 import { array, concat, hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
+import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";
 import AdminFilterControls from "discourse/admin/components/admin-filter-controls";
@@ -56,8 +57,8 @@ const STATUS_FILTER_OPTIONS = [
 
 export default class AdminConfigAreasComponents extends Component {
   @service modal;
-  @service router;
   @service toasts;
+  @service router;
 
   @tracked loading = true;
   @tracked components = [];
@@ -286,7 +287,6 @@ export default class AdminConfigAreasComponents extends Component {
 class ComponentRow extends Component {
   @service toasts;
   @service dialog;
-  @service router;
 
   @tracked enabled = this.args.component.enabled;
   @tracked hasUpdates = this.args.component.remote_theme?.commits_behind > 0;
@@ -340,14 +340,6 @@ class ComponentRow extends Component {
     );
   }
 
-  get editUrl() {
-    return this.router.urlFor(
-      "adminCustomizeThemes.show",
-      "themes",
-      this.args.component.id
-    );
-  }
-
   @action
   async toggleEnabled() {
     this.disableToggle = true;
@@ -474,9 +466,13 @@ class ComponentRow extends Component {
         {{if this.hasUpdates 'has-update'}}"
     >
       <td class="d-table__cell --overview">
-        <a class="d-table__overview-name" href={{this.editUrl}}>
-          {{@component.name}}
-        </a>
+        <LinkTo
+          class="d-table__overview-link"
+          @route="adminCustomizeThemes.show"
+          @models={{array "themes" @component.id}}
+        >
+          <div class="d-table__overview-name">{{@component.name}}</div>
+        </LinkTo>
         {{#if @component.remote_theme.authors}}
           <div
             class="d-table__overview-author admin-config-components__author-name"
diff --git a/frontend/discourse/admin/components/admin-flag-item.gjs b/frontend/discourse/admin/components/admin-flag-item.gjs
index 689a12e0b4253..f882d71f17bcc 100644
--- a/frontend/discourse/admin/components/admin-flag-item.gjs
+++ b/frontend/discourse/admin/components/admin-flag-item.gjs
@@ -4,6 +4,7 @@ import { tracked } from "@glimmer/tracking";
 import { fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
+import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import { SYSTEM_FLAG_IDS } from "discourse/admin/lib/constants";
@@ -48,13 +49,6 @@ export default class AdminFlagItem extends Component {
       : "admin.config_areas.flags.form.non_deletable";
   }
 
-  get editUrl() {
-    if (!this.canEdit) {
-      return null;
-    }
-    return this.router.urlFor("adminConfig.flags.edit", this.args.flag);
-  }
-
   @action
   toggleFlagEnabled(flag) {
     this.enabled = !this.enabled;
@@ -135,19 +129,27 @@ export default class AdminFlagItem extends Component {
       }}
     >
       <td class="d-table__cell --overview">
-        {{#if this.editUrl}}
-          <a
-            class="d-table__overview-name admin-flag-item__name"
-            href={{this.editUrl}}
-          >{{@flag.name}}</a>
+        {{#if this.canEdit}}
+          <LinkTo
+            @route="adminConfig.flags.edit"
+            @model={{@flag}}
+            class="d-table__overview-link"
+          >
+            <div
+              class="d-table__overview-name admin-flag-item__name"
+            >{{@flag.name}}</div>
+            <div class="d-table__overview-about">{{htmlSafe
+                @flag.description
+              }}</div>
+          </LinkTo>
         {{else}}
           <div
             class="d-table__overview-name admin-flag-item__name"
           >{{@flag.name}}</div>
+          <div class="d-table__overview-about">{{htmlSafe
+              @flag.description
+            }}</div>
         {{/if}}
-        <div class="d-table__overview-about">{{htmlSafe
-            @flag.description
-          }}</div>
       </td>
       <td class="d-table__cell --detail">
         <div class="d-table__mobile-label">
diff --git a/frontend/discourse/admin/components/admin-plugins-list-item.gjs b/frontend/discourse/admin/components/admin-plugins-list-item.gjs
index f1ba9228b80d5..19cb69a35e6cd 100644
--- a/frontend/discourse/admin/components/admin-plugins-list-item.gjs
+++ b/frontend/discourse/admin/components/admin-plugins-list-item.gjs
@@ -95,7 +95,7 @@ export default class AdminPluginsListItem extends Component {
         <div class="admin-plugins-list__name-with-badges">
           {{#if this.pluginUrl}}
             <a
-              class="d-table__overview-name admin-plugins-list__name"
+              class="d-table__overview-name admin-plugins-list__name d-table__overview-link"
               href={{this.pluginUrl}}
             >
               {{@plugin.nameTitleized}}
diff --git a/frontend/discourse/admin/components/admin-user-field-item.gjs b/frontend/discourse/admin/components/admin-user-field-item.gjs
index a9e294aa48bc6..a547de2ac5e9f 100644
--- a/frontend/discourse/admin/components/admin-user-field-item.gjs
+++ b/frontend/discourse/admin/components/admin-user-field-item.gjs
@@ -1,5 +1,6 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
+import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import { USER_FIELD_FLAGS } from "discourse/admin/lib/constants";
@@ -35,10 +36,6 @@ export default class AdminUserFieldItem extends Component {
       .join(", ");
   }
 
-  get editUrl() {
-    return this.router.urlFor("adminUserFields.edit", this.args.userField);
-  }
-
   @action
   moveUp() {
     this.args.moveUpAction(this.args.userField);
@@ -70,15 +67,18 @@ export default class AdminUserFieldItem extends Component {
   <template>
     <tr class="d-table__row admin-user_field-item">
       <td class="d-table__cell --overview">
-        <a
-          class="d-table__overview-name admin-user_field-item__name"
-          href={{this.editUrl}}
+        <LinkTo
+          class="d-table__overview-link"
+          @route="adminUserFields.edit"
+          @model={{@userField}}
         >
-          {{@userField.name}}
-        </a>
-        <div class="d-table__overview-about">{{htmlSafe
-            @userField.description
-          }}</div>
+          <div class="d-table__overview-name admin-user_field-item__name">
+            {{@userField.name}}
+          </div>
+          <div class="d-table__overview-about">{{htmlSafe
+              @userField.description
+            }}</div>
+        </LinkTo>
         <div class="d-table__overview-flags">{{this.flags}}</div>
       </td>
       <td class="d-table__cell --detail">
diff --git a/frontend/discourse/admin/components/color-palette-list-item.gjs b/frontend/discourse/admin/components/color-palette-list-item.gjs
index f344193da6360..1285b74325954 100644
--- a/frontend/discourse/admin/components/color-palette-list-item.gjs
+++ b/frontend/discourse/admin/components/color-palette-list-item.gjs
@@ -3,7 +3,6 @@ import { tracked } from "@glimmer/tracking";
 import { array, fn } from "@ember/helper";
 import { action } from "@ember/object";
 import { LinkTo } from "@ember/routing";
-import { service } from "@ember/service";
 import ColorPalettePreview from "discourse/components/color-palette-preview";
 import DButton from "discourse/components/d-button";
 import DropdownMenu from "discourse/components/dropdown-menu";
@@ -16,8 +15,6 @@ import { not } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
 
 export default class ColorPaletteListItem extends Component {
-  @service router;
-
   @tracked isLoading = false;
 
   get isBuiltInDefault() {
@@ -66,16 +63,6 @@ export default class ColorPaletteListItem extends Component {
     );
   }
 
-  get editUrl() {
-    if (!this.canEdit) {
-      return null;
-    }
-    return this.router.urlFor(
-      "adminConfig.colorPalettes.show",
-      this.args.scheme.id
-    );
-  }
-
   @bind
   setAsDefaultLabel(mode) {
     const themeName = this.args.defaultTheme?.name || "Default";
@@ -113,8 +100,11 @@ export default class ColorPaletteListItem extends Component {
         />
 
         <div class="color-palette__details">
-          {{#if this.editUrl}}
-            <h3><a href={{this.editUrl}}>{{@scheme.description}}</a></h3>
+          {{#if this.canEdit}}
+            <h3><LinkTo
+                @route="adminConfig.colorPalettes.show"
+                @model={{@scheme.id}}
+              >{{@scheme.description}}</LinkTo></h3>
           {{else}}
             <h3>{{@scheme.description}}</h3>
           {{/if}}
diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
index 667a7fcd733a3..d57ace885c1f8 100644
--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
@@ -1,4 +1,4 @@
-import { array, concat, fn } from "@ember/helper";
+import { array, fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { LinkTo } from "@ember/routing";
 import AdminFilterControls from "discourse/admin/components/admin-filter-controls";
@@ -9,7 +9,6 @@ import PickFilesButton from "discourse/components/pick-files-button";
 import TableHeaderToggle from "discourse/components/table-header-toggle";
 import ageWithTooltip from "discourse/helpers/age-with-tooltip";
 import icon from "discourse/helpers/d-icon";
-import getURL from "discourse/lib/get-url";
 import { not } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
 import ShareReport from "discourse/plugins/discourse-data-explorer/discourse/components/share-report";
@@ -151,23 +150,22 @@ export default <template>
                   {{#each filteredQueries as |query|}}
                     <tr class="d-table__row query-row">
                       <td class="d-table__cell --overview">
-                        <a
-                          class="query-link"
-                          href={{getURL
-                            (concat
-                              "/admin/plugins/discourse-data-explorer/queries/"
-                              query.id
-                            )
-                          }}
+                        <LinkTo
+                          class="d-table__overview-link"
+                          @route="adminPlugins.show.explorer.details"
+                          @model={{query.id}}
                         >
-                          <strong class="query-name">{{query.name}}</strong>
-                          {{#if query.is_default}}
-                            <span class="query-badge">{{i18n
-                                "explorer.default_query"
-                              }}</span>
-                          {{/if}}
+                          <div
+                            class="d-table__overview-name query-name"
+                          >{{query.name}}
+                            {{#if query.is_default}}
+                              <span class="query-badge">{{i18n
+                                  "explorer.default_query"
+                                }}</span>
+                            {{/if}}
+                          </div>
                           <div class="query-desc">{{query.description}}</div>
-                        </a>
+                        </LinkTo>
                       </td>
                       <td class="d-table__cell --detail query-created-by">
                         <div class="d-table__mobile-label">
@@ -175,9 +173,12 @@ export default <template>
                         </div>
                         {{#if query.username}}
                           <div>
-                            <a href="/u/{{query.username}}/activity">
-                              <span>{{query.username}}</span>
-                            </a>
+                            <LinkTo
+                              @route="user.summary"
+                              @model={{query.username}}
+                            >
+                              {{query.username}}
+                            </LinkTo>
                           </div>
                         {{/if}}
                       </td>
diff --git a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
index 6320fd4916239..e31ee64614cc9 100644
--- a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
+++ b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
@@ -436,8 +436,8 @@ table.group-reports {
     }
   }
 
-  .query-row {
-    a.query-link {
+  .d-table__row.query-row {
+    .d-table__overview-link {
       @include viewport.until(md) {
         max-width: 75ch;
       }

From 9f4e335b568ba462446f3015d2e092c729808bbc Mon Sep 17 00:00:00 2001
From: Alan Guo Xiang Tan <gxtan1990@gmail.com>
Date: Thu, 26 Feb 2026 15:13:24 +0800
Subject: [PATCH 095/168] FIX: SMTP banner incorrectly showing on
 login-required sites (#38074)

Follow-up to 9f7d0d34c6dc3892eade6b2619f82935a67e324e

On login-required sites, the anonymous site payload omits
`email_configured`, so the falsy check in the `GlobalNotice` component
treated the missing field as "not configured" and showed the SMTP
warning banner on the login page. Switch to a strict `=== false` check.
---
 frontend/discourse/app/components/global-notice.gjs |  2 +-
 .../discourse/tests/acceptance/email-notice-test.js | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/discourse/app/components/global-notice.gjs b/frontend/discourse/app/components/global-notice.gjs
index 878b97d934ebb..f90e3a1b55ff1 100644
--- a/frontend/discourse/app/components/global-notice.gjs
+++ b/frontend/discourse/app/components/global-notice.gjs
@@ -172,7 +172,7 @@ export default class GlobalNotice extends Component {
           id: "alert-emails-disabled",
         })
       );
-    } else if (!this.site.email_configured && !isDevelopment()) {
+    } else if (this.site.email_configured === false && !isDevelopment()) {
       notices.push(
         Notice.create({
           text: i18n("emails_are_disabled_no_smtp"),
diff --git a/frontend/discourse/tests/acceptance/email-notice-test.js b/frontend/discourse/tests/acceptance/email-notice-test.js
index f469042109a40..e6df4d6d77c17 100644
--- a/frontend/discourse/tests/acceptance/email-notice-test.js
+++ b/frontend/discourse/tests/acceptance/email-notice-test.js
@@ -70,3 +70,16 @@ acceptance("Email Disabled Banner - no SMTP configured", function (needs) {
     assert.dom(".alert-emails-disabled").exists();
   });
 });
+
+acceptance(
+  "Email Disabled Banner - email_configured absent from site data",
+  function (needs) {
+    needs.site({});
+
+    test("no banner when email_configured is absent", async function (assert) {
+      this.siteSettings.disable_emails = "no";
+      await visit("/login");
+      assert.dom(".alert-emails-disabled").doesNotExist();
+    });
+  }
+);

From f5f65714e8d20b64556cdb25e8a17dc7c95e39d8 Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Thu, 26 Feb 2026 04:12:48 -0500
Subject: [PATCH 096/168] I18N: Update translations (#38076)

---
 config/locales/client.ar.yml                  | 25 +++----
 config/locales/client.be.yml                  | 13 +++-
 config/locales/client.bg.yml                  |  9 +++
 config/locales/client.bs_BA.yml               |  8 +++
 config/locales/client.ca.yml                  |  8 +++
 config/locales/client.cs.yml                  | 25 +++----
 config/locales/client.da.yml                  |  9 ++-
 config/locales/client.de.yml                  | 26 +++-----
 config/locales/client.el.yml                  | 24 ++-----
 config/locales/client.es.yml                  | 24 ++-----
 config/locales/client.et.yml                  |  8 +++
 config/locales/client.fa_IR.yml               | 16 ++---
 config/locales/client.fi.yml                  | 25 +++----
 config/locales/client.fr.yml                  | 17 +++--
 config/locales/client.gl.yml                  |  8 +++
 config/locales/client.he.yml                  | 25 +++----
 config/locales/client.hr.yml                  | 25 +++----
 config/locales/client.hu.yml                  | 25 +++----
 config/locales/client.hy.yml                  |  7 ++
 config/locales/client.id.yml                  |  6 ++
 config/locales/client.it.yml                  | 17 +++--
 config/locales/client.ja.yml                  | 25 +++----
 config/locales/client.ko.yml                  |  7 ++
 config/locales/client.lt.yml                  |  8 +++
 config/locales/client.lv.yml                  |  8 +++
 config/locales/client.nb_NO.yml               |  9 +++
 config/locales/client.nl.yml                  | 16 ++---
 config/locales/client.pl_PL.yml               | 65 ++++++++++++-------
 config/locales/client.pt.yml                  | 20 +++---
 config/locales/client.pt_BR.yml               | 17 +++--
 config/locales/client.ro.yml                  | 16 ++---
 config/locales/client.ru.yml                  | 25 +++----
 config/locales/client.sk.yml                  | 17 +++--
 config/locales/client.sl.yml                  |  7 ++
 config/locales/client.sq.yml                  |  8 +++
 config/locales/client.sr.yml                  |  9 +++
 config/locales/client.sv.yml                  |  8 +++
 config/locales/client.sw.yml                  |  7 ++
 config/locales/client.te.yml                  |  8 +++
 config/locales/client.th.yml                  |  8 +++
 config/locales/client.tr_TR.yml               | 17 +++--
 config/locales/client.ug.yml                  | 21 +++---
 config/locales/client.uk.yml                  | 24 ++-----
 config/locales/client.ur.yml                  | 25 +++----
 config/locales/client.vi.yml                  | 25 +++----
 config/locales/client.zh_CN.yml               | 25 +++----
 config/locales/client.zh_TW.yml               | 16 ++---
 config/locales/server.de.yml                  |  4 +-
 config/locales/server.pl_PL.yml               |  3 +
 plugins/chat/config/locales/client.de.yml     |  2 +
 plugins/chat/config/locales/client.pl_PL.yml  |  2 +
 plugins/chat/config/locales/client.zh_CN.yml  |  2 +
 .../discourse-ai/config/locales/client.ar.yml |  2 -
 .../discourse-ai/config/locales/client.de.yml |  2 -
 .../discourse-ai/config/locales/client.he.yml |  2 -
 .../discourse-ai/config/locales/client.ja.yml |  2 -
 .../config/locales/client.pl_PL.yml           |  2 -
 .../discourse-ai/config/locales/client.ro.yml |  2 -
 .../discourse-ai/config/locales/client.uk.yml |  2 -
 .../config/locales/client.zh_CN.yml           |  2 -
 60 files changed, 417 insertions(+), 403 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index d7bafde994ebb..f32429bd79a7c 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -6,6 +6,12 @@
 
 ar:
   js:
+    blocks:
+      ghost:
+        status: "الحالة"
+        in_location: "في"
+        hidden: "مخفي"
+        failed: "فشل"
     carousel:
       go_to_slide: "الانتقال إلى الشريحة %{index}"
       previous: "الشريحة السابقة"
@@ -543,6 +549,8 @@ ar:
       pill: "مُقترح"
       pm_title: "الرسائل المقترحة"
     admin_onboarding_banner:
+      start_posting:
+        back: "رجوع"
       spread_the_word:
         action: "نسخ الرابط"
         copied_to_clipboard: "تم نسخ الرابط إلى الحافظة!"
@@ -7022,23 +7030,6 @@ ar:
           title: "ما الجديد؟"
           subtitle: "نحن نصدر ميزات وتحسينات جديدة طوال الوقت. تغطي هذه الصفحة أبرز النقاط، ولكن يمكنك النقر على \"معرفة المزيد\" للاطلاع على ملاحظات الإصدار الشاملة."
           learn_more: "معرفة المزيد..."
-          experimental: "تجريبي"
-          only_experiments: "عرض الميزات التجريبية فقط"
-          experiment_enabled: "لقد فعَّلت الميزة التجريبية."
-          experiment_disabled: "لقد أوقفت الميزة التجريبية."
-          feature_enabled: "تم تفعيل هذه الميزة بنجاح."
-          feature_disabled: "تم تعطيل هذه الميزة."
-          toggled_too_fast: "لقد بدلت الزر بسرعة كبيرة. يُرجى الانتظار بضع ثوانٍ قبل إعادة المحاولة."
-          experiment_tooltip:
-            title_disabled: "جرّب هذه الميزة التجريبية"
-            title_enabled: "إيقاف تشغيل الميزة التجريبية"
-            content_disabled: "جرّب أحدث ميزاتنا قيد التطوير! ما زالت في المرحلة التجريبية، لذلك قد نزيلها في أي وقت. يمكنك إيقافها متى شئت.<br/><br/>سيؤدي تغيير هذا الإعداد إلى تفعيل الميزة لجميع المستخدمين."
-            content_enabled: "سيؤدي تغيير هذا إلى الإعداد إلى إيقاف الميزة لجميع المستخدمين."
-          feature_tooltip:
-            title_disabled: "جرب هذه الميزة"
-            title_enabled: "إيقاف تشغيل الميزة"
-            content_disabled: "جرّب هذه الميزة الجديدة! يمكنك إلغاء الاشتراك متى شئت.<br/><br/>سيؤدي تغيير هذا إلى تفعيل الميزة لجميع المستخدمين."
-            content_enabled: "سيؤدي تغيير هذا إلى الإعداد إلى إيقاف الميزة لجميع المستخدمين."
         last_checked: "تاريخ آخر تحقُّق"
         refresh_problems: "تحديث"
         no_problems: "لم يتم العثور على مشكلات."
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 2cfa1ad8aa38e..8b0b2f23af68c 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -6,6 +6,10 @@
 
 be:
   js:
+    blocks:
+      ghost:
+        status: "Статус"
+        failed: "памылка"
     number:
       format:
         separator: ","
@@ -409,6 +413,9 @@ be:
       pill: "Звязаныя паведамленні"
     suggested_topics:
       pm_title: "Прапанаваныя паведамленні"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Назад"
     about:
       edit: "Рэдагаваць гэту старонку"
       simple_title: "Пра сайт"
@@ -1434,8 +1441,8 @@ be:
           other: "Выдаліць тэмы"
         dismiss_read: "Адхіліць усе непрачытаныя"
         dismiss_new: "Адхіліць новыя"
-        toggle: "пераключыць масавы выбар тэм"
-        actions: "Масавыя дзеянні"
+        toggle: "Пераключыць групавы выбар тэм"
+        actions: "Групавыя дзеянні"
         close_topics: "Закрыць тэмы"
         archive_topics: "Архіваваць тэмы"
         move_messages_to_inbox: "Перамясціць ва Уваходныя"
@@ -1456,7 +1463,7 @@ be:
       close_topics:
         name: "Закрыць"
       archive_topics:
-        name: "У архіў"
+        name: "У Архіў"
       move_messages_to_inbox:
         name: "Ва Уваходныя"
       delete_topics:
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 5986227396a08..0675cc27ab69c 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -6,6 +6,12 @@
 
 bg:
   js:
+    blocks:
+      ghost:
+        status: "Статус"
+        in_location: "в"
+        hidden: "скрит"
+        failed: "провалени"
     number:
       format:
         separator: "."
@@ -279,6 +285,9 @@ bg:
       pill: "Свързани съобщения"
     suggested_topics:
       pm_title: "Предложени съобщения"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Назад"
     about:
       edit: "Редактирайте тази страница"
       simple_title: "Относно"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 59e7c76939265..165d5dd59d3f1 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -6,6 +6,11 @@
 
 bs_BA:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        hidden: "hidden"
+        failed: "neuspješno"
     number:
       format:
         separator: "."
@@ -264,6 +269,9 @@ bs_BA:
       pill: "Povezane Poruke"
     suggested_topics:
       pm_title: "Preporučene Poruke"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Prethodno"
     about:
       edit: "Edit this page"
       simple_title: "O nama"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index d38c8897ff244..7f0c8993c3eb2 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -6,6 +6,11 @@
 
 ca:
   js:
+    blocks:
+      ghost:
+        status: "Estat"
+        hidden: "amagat"
+        failed: "fallits"
     number:
       format:
         separator: "."
@@ -292,6 +297,9 @@ ca:
       pill: "Missatges relacionats"
     suggested_topics:
       pm_title: "Missatges recomanats"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Enrere"
     about:
       edit: "Edita aquesta pàgina"
       simple_title: "Quant a"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 5ed2af18a19fb..32d7cd3dfcc85 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -6,6 +6,12 @@
 
 cs:
   js:
+    blocks:
+      ghost:
+        status: "Stav"
+        in_location: "v"
+        hidden: "skrytý"
+        failed: "neúspěšný"
     carousel:
       go_to_slide: "Přejít na snímek č. %{index}"
       previous: "Předchozí snímek"
@@ -482,6 +488,8 @@ cs:
       pm_title: "Doporučené zprávy"
     admin_onboarding_banner:
       launch_in_easy_steps: "Odstartujte v %{step_count} snadných krocích"
+      start_posting:
+        back: "Zpět"
       spread_the_word:
         action: "Kopírovat odkaz"
         copied_to_clipboard: "Odkaz zkopírován do schránky!"
@@ -6521,23 +6529,6 @@ cs:
           subtitle: "Neustále vydáváme nové funkce a vylepšení. Tato stránka obsahuje hlavní body, ale kliknutím na „Další informace“ zobrazíte rozsáhlé poznámky k verzi."
           no_new_features_error: "Při načítání zdroje došlo k chybě. Předchozí oznámení o nových funkcích můžete vidět na <a href='%{url}' target='_blank'>komunitě Discourse Meta</a>."
           learn_more: "Více informací..."
-          experimental: "Experimentální"
-          only_experiments: "Zobrazit pouze experimentální funkce"
-          experiment_enabled: "Povolili jste experimentální funkci."
-          experiment_disabled: "Vypnuli jste experimentální funkci."
-          feature_enabled: "Funkci jste povolili."
-          feature_disabled: "Funkci jste zakázali."
-          toggled_too_fast: "Přepínač jste přepnuli příliš rychle. Počkejte prosím několik vteřin před dalším pokusem."
-          experiment_tooltip:
-            title_disabled: "Vyzkoušejte tuto experimentální funkci"
-            title_enabled: "Vypněte experimentální funkci"
-            content_disabled: "Vyzkoušejte naši nejnovější funkci ve vývoji! Je stále v experimentální fázi, takže ji můžeme kdykoli odstranit. Můžete se odhlásit, kdykoli budete chtít.<br/><br/>Přepnutím ji povolíte pro všechny uživatele."
-            content_enabled: "Změna tohoto nastavení vypnete funkci pro všechny uživatele."
-          feature_tooltip:
-            title_disabled: "Vyzkoušejte tuto funkci"
-            title_enabled: "Vypnout funkci"
-            content_disabled: "Vyzkoušejte tuto novou funkci! Můžete ji vypnout, kdykoli budete chtít.<br/><br/>Přepnutím povolíte funkci povolí pro všechny uživatele."
-            content_enabled: "Změna tohoto nastavení vypnete funkci pro všechny uživatele."
         last_checked: "Naposledy zkontrolováno"
         refresh_problems: "Obnovit"
         no_problems: "Nenalezeny žádné problémy."
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index cdb9f029edf5f..10b43b63a26dc 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -6,6 +6,12 @@
 
 da:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "i"
+        hidden: "skjult"
+        failed: "fejlet"
     number:
       format:
         separator: "."
@@ -397,6 +403,8 @@ da:
       pill: "Foreslået"
       pm_title: "Foreslåede beskeder"
     admin_onboarding_banner:
+      start_posting:
+        back: "Tilbage"
       spread_the_word:
         action: "Kopiér link"
     about:
@@ -4576,7 +4584,6 @@ da:
         new_features:
           title: "Hvad er nyt?"
           learn_more: "Lær mere..."
-          experimental: "Eksperimentel"
         last_checked: "Sidst kontrolleret"
         refresh_problems: "Opdatér"
         no_problems: "Ingen problemer fundet."
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 190104abab9ca..cfff7a1f4dccb 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -6,6 +6,12 @@
 
 de:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "in"
+        hidden: "versteckt"
+        failed: "fehlgeschlagen"
     carousel:
       go_to_slide: "Gehe zu Folie %{index}"
       previous: "Vorherige Folie"
@@ -329,6 +335,8 @@ de:
       theme_source: "Theme <a target='_blank' href='%{path}'>'%{name}'</a>"
       plugin_source: "Plug-in '%{name}'"
       unknown_source: "Eines deiner Themes oder Plug-ins"
+    dev_tools:
+      disable_dev_tools: "Entwicklertools deaktivieren"
     s3:
       regions:
         ap_northeast_1: "Asien-Pazifik (Tokio)"
@@ -429,6 +437,7 @@ de:
         title: "Beginne mit dem Erstellen von Beiträgen"
         description: "Gib den Leuten etwas, worüber sie gemeinsam reden können"
         action: "Fragen zum Einstieg"
+        back: "Zurück"
         icebreakers:
           fun_facts:
             title: "Was sind ein paar interessante Fakten über dich?"
@@ -6063,23 +6072,6 @@ de:
           no_new_features_found: "Es gibt keine Einträge im Feed oder der ausgewählte Filter hat keine Ergebnisse zurückgegeben. Du kannst frühere Ankündigungen neuer Funktionen in der <a href='%{url}' target='_blank'>Discourse Meta Community</a> sehen."
           no_new_features_error: "Es gab einen Fehler beim Laden des Feeds. Du kannst frühere Ankündigungen neuer Funktionen in der <a href='%{url}' target='_blank'>Discourse Meta Community</a> sehen."
           learn_more: "Mehr erfahren …"
-          experimental: "Experimentell"
-          only_experiments: "Nur experimentelle Funktionen anzeigen"
-          experiment_enabled: "Du hast die experimentelle Funktion aktiviert."
-          experiment_disabled: "Du hast die experimentelle Funktion deaktiviert."
-          feature_enabled: "Du hast die Funktion aktiviert."
-          feature_disabled: "Du hast die Funktion deaktiviert."
-          toggled_too_fast: "Du hast den Umschalter zu schnell betätigt. Bitte warte ein paar Sekunden, bevor du es erneut versuchst."
-          experiment_tooltip:
-            title_disabled: "Probiere diese experimentelle Funktion aus"
-            title_enabled: "Experimentelle Funktion ausschalten"
-            content_disabled: "Teste unsere neueste Funktion, die sich gerade in der Entwicklung befindet! Sie ist noch im Experimentierstadium und kann daher wieder entfernt werden. Du kannst dich jederzeit abmelden, wenn du willst.<br/><br/>Wenn du dies änderst, wird die Funktion für alle Benutzer aktiv."
-            content_enabled: "Wenn du dies änderst, wird die Funktion für alle Benutzer deaktiviert."
-          feature_tooltip:
-            title_disabled: "Probiere diese Funktion aus"
-            title_enabled: "Deaktiviere diese Funktion"
-            content_disabled: "Teste diese neue Funktion! Du kannst sie jederzeit wieder deaktivieren, wenn du möchtest.<br/><br/>Wenn du dies änderst, wird die Funktion für alle Benutzer aktiviert."
-            content_enabled: "Wenn du dies änderst, wird die Funktion für alle Benutzer deaktiviert."
         last_checked: "Zuletzt geprüft"
         refresh_problems: "Aktualisieren"
         no_problems: "Es wurden keine Probleme gefunden."
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 88683d5946374..662b7a85396ab 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -6,6 +6,12 @@
 
 el:
   js:
+    blocks:
+      ghost:
+        status: "Κατάσταση"
+        in_location: "σε"
+        hidden: "κρυφό"
+        failed: "απέτυχε"
     carousel:
       go_to_slide: "Μετάβαση στη διαφάνεια %{index}"
       previous: "Προηγούμενη διαφάνεια"
@@ -416,6 +422,7 @@ el:
       pm_title: "Προτεινόμενα μηνύματα"
     admin_onboarding_banner:
       start_posting:
+        back: "Πίσω"
         icebreakers:
           coolest_thing_you_have_seen_today:
             title: "Ποιο είναι το πιο ωραίο πράγμα που είδατε σήμερα;"
@@ -5717,23 +5724,6 @@ el:
         new_features:
           title: "Τι νέο υπάρχει;"
           learn_more: "Μάθε περισσότερα..."
-          experimental: "Πειραματικό"
-          only_experiments: "Εμφάνιση μόνο πειραματικών λειτουργιών"
-          experiment_enabled: "Έχετε ενεργοποιήσει την πειραματική λειτουργία."
-          experiment_disabled: "Έχετε απενεργοποιήσει την πειραματική λειτουργία."
-          feature_enabled: "Έχετε ενεργοποιήσει τη λειτουργία."
-          feature_disabled: "Έχετε απενεργοποιήσει τη λειτουργία."
-          toggled_too_fast: "Αλλάξατε την εναλλαγή πολύ γρήγορα. Περιμένετε λίγα δευτερόλεπτα πριν προσπαθήσετε ξανά."
-          experiment_tooltip:
-            title_disabled: "Δοκιμάστε αυτήν την πειραματική λειτουργία"
-            title_enabled: "Απενεργοποιήστε την πειραματική λειτουργία"
-            content_disabled: "Δώστε μια ματιά στην υπό ανάπτυξη νεότερη λειτουργία μας! Είναι ακόμα στο πειραματικό στάδιο, οπότε μπορεί να το αφαιρέσουμε ανά πάσα στιγμή. Μπορείτε να εξαιρεθείτε όποτε θέλετε.<br/><br/>Αλλάζοντας αυτήν την επιλογή, θα ενεργοποιήσει τη λειτουργία για όλους τους χρήστες."
-            content_enabled: "Αλλάζοντας αυτό θα απενεργοποιηθεί η λειτουργία για όλους τους χρήστες."
-          feature_tooltip:
-            title_disabled: "Δοκιμάστε αυτήν τη λειτουργία"
-            title_enabled: "Απενεργοποίηση λειτουργίας"
-            content_disabled: "Δοκιμάστε αυτήν τη νέα λειτουργία! Μπορείτε να εξαιρεθείτε όποτε θέλετε.<br/><br/>Αλλάζοντας αυτήν την επιλογή, η λειτουργία θα είναι διαθέσιμη σε όλους τους χρήστες."
-            content_enabled: "Αλλάζοντας αυτό θα απενεργοποιηθεί η λειτουργία για όλους τους χρήστες."
         last_checked: "Τελευταίος έλεγχος"
         refresh_problems: "Ανανέωση"
         no_problems: "Δεν βρέθηκε κανένα πρόβλημα."
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 5a2c35b12ab4a..65dab3652bbd3 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -6,6 +6,12 @@
 
 es:
   js:
+    blocks:
+      ghost:
+        status: "Estado"
+        in_location: "en"
+        hidden: "oculto"
+        failed: "falló"
     number:
       format:
         separator: ","
@@ -414,6 +420,7 @@ es:
       start_posting:
         title: "Empezar a publicar"
         action: "Ideas para romper el hielo"
+        back: "Atrás"
         icebreakers:
           introduce_yourself:
             title: "Preséntate"
@@ -5843,23 +5850,6 @@ es:
           title: "Novedades"
           subtitle: "Lanzamos nuevas funciones y mejoras continuamente. Esta página cubre los aspectos más destacados, pero puedes hacer clic en «Más información» para ver las notas de la versión completa."
           learn_more: "Más información..."
-          experimental: "Experimental"
-          only_experiments: "Mostrar solo características experimentales"
-          experiment_enabled: "Has activado la característica experimental."
-          experiment_disabled: "Has desactivado la característica experimental."
-          feature_enabled: "Has activado la característica."
-          feature_disabled: "Has desactivado la característica."
-          toggled_too_fast: "Has activado el interruptor demasiado rápido. Espera unos segundos antes de volver a intentarlo."
-          experiment_tooltip:
-            title_disabled: "Prueba esta característica experimental"
-            title_enabled: "Desactivar la característica experimental"
-            content_disabled: "¡Prueba nuestra nueva característica en desarrollo! Aún está en fase experimental, por lo que podríamos eliminarla en cualquier momento. Puedes excluirte cuando quieras.<br/><br/>Si cambias esto, se activará la característica para todos los usuarios."
-            content_enabled: "Si cambias esto, se desactivará la característica para todos los usuarios."
-          feature_tooltip:
-            title_disabled: "Probar esta característica"
-            title_enabled: "Desactivar características"
-            content_disabled: "¡Prueba esta característica! Puedes desactivarla cuando quieras.<br/><br/>Al cambiar esta opción, la característica estará disponible para todos los usuarios."
-            content_enabled: "Si cambias esto, se desactivará la característica para todos los usuarios."
         last_checked: "Ultima comprobación"
         refresh_problems: "Volver a cargar"
         no_problems: "No se ha encontrado ningún problema."
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 0101f30bcc6ef..5a030b9efd91c 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -6,6 +6,11 @@
 
 et:
   js:
+    blocks:
+      ghost:
+        status: "Staatus"
+        hidden: "peidetud"
+        failed: "ebaõnnestunud"
     number:
       format:
         separator: "."
@@ -245,6 +250,9 @@ et:
       title: "Uued ja lugemata teemad"
       pill: "Soovitatud"
       pm_title: "Soovitatud sõnumid"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Tagasi"
     about:
       edit: "Muuda seda lehekülge"
       simple_title: "Teave"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index a8e4232d2a771..3b2a68c5cbd20 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -6,6 +6,12 @@
 
 fa_IR:
   js:
+    blocks:
+      ghost:
+        status: "وضعیت"
+        in_location: "در"
+        hidden: "مخفی"
+        failed: "ناموفق"
     number:
       format:
         separator: "."
@@ -340,6 +346,8 @@ fa_IR:
       pill: "پیشنهادی"
       pm_title: "پیام‌های پیشنهادی"
     admin_onboarding_banner:
+      start_posting:
+        back: "بازگشت"
       spread_the_word:
         action: "رونوشت پیوند"
         copied_to_clipboard: "پیوند در کلیپ بورد کپی شد!"
@@ -5102,14 +5110,6 @@ fa_IR:
           title: "چه چیزی جدید شده؟"
           subtitle: "ما همیشه در حال انتشار ویژگی ها و بهبودهای جدید هستیم. این صفحه نکات برجسته را پوشش می‌دهد، اما می‌توانید روی «بیشتر بدانید» کلیک کنید تا یادداشت‌های انتشار گسترده را ببینید."
           learn_more: "بیشتر بدانید..."
-          experimental: "آزمایشی"
-          experiment_enabled: "شما ویژگی آزمایشی را فعال کرده‌اید."
-          experiment_disabled: "شما ویژگی آزمایشی را غیرفعال کرده‌اید."
-          experiment_tooltip:
-            title_enabled: "ویژگی آزمایشی را خاموش کنید"
-            content_enabled: "با تغییر این تنظیم، این ویژگی برای همه کاربران غیرفعال می‌شود."
-          feature_tooltip:
-            content_enabled: "با تغییر این تنظیم، این ویژگی برای همه کاربران غیرفعال می‌شود."
         last_checked: " آخرین بررسی"
         refresh_problems: "تازه کردن"
         no_problems: "هیچ مشکلات پیدا نشد."
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index d4b222f1d3a3d..5ed273bf894e9 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -6,6 +6,12 @@
 
 fi:
   js:
+    blocks:
+      ghost:
+        status: "Tila"
+        in_location: "kohteessa"
+        hidden: "piilotettu"
+        failed: "epäonnistui"
     number:
       format:
         separator: ","
@@ -401,6 +407,8 @@ fi:
       pill: "Ehdotukset"
       pm_title: "Viestiehdotukset"
     admin_onboarding_banner:
+      start_posting:
+        back: "Takaisin"
       spread_the_word:
         action: "Kopioi linkki"
         copied_to_clipboard: "Linkki kopioitiin leikepöydälle!"
@@ -5602,23 +5610,6 @@ fi:
           title: "Mitä uutta?"
           subtitle: "Julkaisemme jatkuvasti uusia ominaisuuksia ja parannuksia. Tämä sivu kattaa kohokohdat, mutta voit katsoa kattavat julkaisutiedot napsauttamalla Lisätietoja."
           learn_more: "Lisätietoja..."
-          experimental: "Kokeellinen"
-          only_experiments: "Näytä vain kokeelliset ominaisuudet"
-          experiment_enabled: "Olet ottanut kokeellisen ominaisuuden käyttöön."
-          experiment_disabled: "Olet poistanut kokeellisen ominaisuuden käytöstä."
-          feature_enabled: "Olet ottanut ominaisuuden käyttöön."
-          feature_disabled: "Olet poistanut ominaisuuden käytöstä."
-          toggled_too_fast: "Olet vaihtanut valitsinta liian nopeasti. Odota muutama sekunti ennen kuin yrität uudelleen."
-          experiment_tooltip:
-            title_disabled: "Kokeile tätä kokeellista ominaisuutta"
-            title_enabled: "Poista kokeellinen ominaisuus käytöstä"
-            content_disabled: "Kokeile uusinta kehitysvaiheessa olevaa ominaisuuttamme! Se on vielä kokeiluvaiheessa, joten voimme poistaa sen milloin tahansa. Voit poistaa sen käytöstä milloin tahansa.<br/><br/>Tämän muuttaminen ottaa ominaisuuden käyttöön kaikille käyttäjille."
-            content_enabled: "Tämän muuttaminen poistaa ominaisuuden käytöstä kaikilta käyttäjiltä."
-          feature_tooltip:
-            title_disabled: "Kokeile tätä ominaisuutta"
-            title_enabled: "Poista ominaisuus käytöstä"
-            content_disabled: "Kokeile tätä uutta ominaisuutta! Voit poistaa sen käytöstä milloin tahansa.<br/><br/>Tämän muuttaminen ottaa ominaisuuden käyttöön kaikille käyttäjille."
-            content_enabled: "Tämän muuttaminen poistaa ominaisuuden käytöstä kaikilta käyttäjiltä."
         last_checked: "Viimeksi tarkistettu"
         refresh_problems: "Päivitä"
         no_problems: "Ongelmia ei löytynyt."
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 43e77969d248b..04ecbdf1e12d5 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -6,6 +6,12 @@
 
 fr:
   js:
+    blocks:
+      ghost:
+        status: "Statut"
+        in_location: "dans"
+        hidden: "masqué"
+        failed: "échec"
     number:
       format:
         separator: ","
@@ -406,6 +412,8 @@ fr:
       pill: "Suggérés"
       pm_title: "Messages suggérés"
     admin_onboarding_banner:
+      start_posting:
+        back: "Retour"
       spread_the_word:
         action: "Copier le lien"
         copied_to_clipboard: "Lien copié dans le presse-papiers!"
@@ -5628,15 +5636,6 @@ fr:
           title: "Quoi de neuf ?"
           subtitle: "Nous publions de nouvelles fonctionnalités et améliorations en permanence. Cette page présente les grandes lignes, mais vous pouvez cliquer sur « En savoir plus » pour accéder à des notes de mise à jour détaillées."
           learn_more: "En savoir plus…"
-          experimental: "Expérimental"
-          only_experiments: "Afficher uniquement les fonctionnalités expérimentales"
-          experiment_enabled: "Vous avez activé la fonctionnalité expérimentale."
-          experiment_disabled: "Vous avez désactivé la fonctionnalité expérimentale."
-          experiment_tooltip:
-            title_enabled: "Désactiver la fonctionnalité expérimentale"
-            content_enabled: "La modification de cette option désactivera la fonctionnalité pour tous les utilisateurs."
-          feature_tooltip:
-            content_enabled: "La modification de cette option désactivera la fonctionnalité pour tous les utilisateurs."
         last_checked: "Dernière vérification"
         refresh_problems: "Actualiser"
         no_problems: "Aucun problème n'a été trouvé."
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index ac76fe3829996..241ea76656c79 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -6,6 +6,11 @@
 
 gl:
   js:
+    blocks:
+      ghost:
+        status: "Estado"
+        hidden: "agochado"
+        failed: "fallou"
     number:
       format:
         separator: ","
@@ -243,6 +248,9 @@ gl:
       pill: "Mensaxes relacionadas"
     suggested_topics:
       pm_title: "Mensaxes suxeridas"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Volver"
     about:
       edit: "Editar esta páxina"
       simple_title: "Verbo de"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 0951b5f7fb86d..4e80e96c0d16c 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -6,6 +6,12 @@
 
 he:
   js:
+    blocks:
+      ghost:
+        status: "מצב"
+        in_location: "בתוך"
+        hidden: "מוסתר"
+        failed: "נכשל"
     carousel:
       go_to_slide: "מעבר לשקופית %{index}"
       previous: "השקופית הקודמת"
@@ -479,6 +485,8 @@ he:
       pill: "מוצע"
       pm_title: "הודעות מוצעות"
     admin_onboarding_banner:
+      start_posting:
+        back: "חזרה"
       spread_the_word:
         action: "העתקת קישור"
         copied_to_clipboard: "קישור הועתק ללוח הגזירים!"
@@ -6417,23 +6425,6 @@ he:
           subtitle: "אנו מוציאים לאור יכולות ושיפורים חדשים כל הזמן. העמוד הזה מסקר את הנקודות החשובות אבל ניתן ללחוץ על ‚מידע נוסף’ כדי לצפות בהערות ההוצאה לאור המפורטות."
           no_new_features_error: "אירעה שגיאה בטעינת ערוץ העדכונים. ניתן לראות הכרזות קודמות על יכולות חדשות ב<a href='%{url}' target='_blank'>קהילת Discourse Meta</a>."
           learn_more: "מידע נוסף…"
-          experimental: "ניסיוני"
-          only_experiments: "להציג יכולות ניסיוניות בלבד"
-          experiment_enabled: "הפעלת את היכולת הניסיונית."
-          experiment_disabled: "השבתת את היכולת הניסיונית."
-          feature_enabled: "הפעלת את היכולת."
-          feature_disabled: "השבתת את היכולת."
-          toggled_too_fast: "החלפת את מצב המתג מהר מדי. נא לחכות כמה שניות בטרם החלפת המצב שוב."
-          experiment_tooltip:
-            title_disabled: "התנסות ביכולת הניסיונית הזאת"
-            title_enabled: "כיבוי יכולת ניסיונית"
-            content_disabled: "מזמינים אותך לעשות סיבוב על היכולת החדשה שאנו מפתחים! היא עדיין בשלבי ניסוי, לכן יכול להיות שנסיר אותה בכל רגע נתון. אפשר לכבות אותה בכל רגע נתון.<br/><br/>שינוי ההגדרה הזאת יפעיל את היכולת לכל המשתמשים."
-            content_enabled: "שינוי מצב ההגדרה הזאת ישבית את היכולת לכל המשתמשים."
-          feature_tooltip:
-            title_disabled: "התנסות ביכולת הזאת"
-            title_enabled: "כיבוי היכולת"
-            content_disabled: "כדאי להתנסות ביכולת החדשה! אפשר להפסיק את ההתנסות בכל רגע נתון.<br/><br/>שינוי ההגדרה הזאת יפעיל את היכולת לכל המשתמשים."
-            content_enabled: "שינוי מצב ההגדרה הזאת ישבית את היכולת לכל המשתמשים."
         last_checked: "נבדק לאחרונה"
         refresh_problems: "רענן"
         no_problems: "לא נמצאו בעיות."
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index f8c4cbb03393a..e10f0cf06b0a0 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -6,6 +6,12 @@
 
 hr:
   js:
+    blocks:
+      ghost:
+        status: "Statust"
+        in_location: "u"
+        hidden: "skriveno"
+        failed: "neuspješno"
     number:
       format:
         separator: "."
@@ -436,6 +442,8 @@ hr:
       pill: "Predloženo"
       pm_title: "Predložene poruke"
     admin_onboarding_banner:
+      start_posting:
+        back: "Natrag"
       spread_the_word:
         action: "Kopirajte poveznicu"
     about:
@@ -5806,23 +5814,6 @@ hr:
           title: "Što je novo?"
           subtitle: "Neprestano objavljujemo nove značajke i poboljšanja. Ova stranica pokriva najvažnije, ali možete kliknuti na 'Saznajte više' da biste vidjeli opsežne bilješke o izdanju."
           learn_more: "Saznajte više..."
-          experimental: "Eksperimentalno"
-          only_experiments: "Prikaži samo eksperimentalne značajke"
-          experiment_enabled: "Uspješno ste uključili eksperimentalnu značajku."
-          experiment_disabled: "Uspješno ste isključili eksperimentalnu značajku."
-          feature_enabled: "Omogućili ste značajku."
-          feature_disabled: "Onemogućili ste značajku."
-          toggled_too_fast: "Prebrzо ste promijenili postavku. Pričekajte nekoliko sekundi prije ponovnog pokušaja."
-          experiment_tooltip:
-            title_disabled: "Isprobajte ovu eksperimentalnu značajku"
-            title_enabled: "Isključite eksperimentalnu značajku"
-            content_disabled: "Isprobajte našu najnoviju značajku koja je u razvoju! Još je u eksperimentalnoj fazi, pa je možemo ukloniti u bilo kojem trenutku. Možete je isključiti bilo kada.<br/><br/>Promjena ove postavke omogućit će značajku za sve korisnike."
-            content_enabled: "Promjenom ove postavke onemogućit ćete značajku za sve korisnike."
-          feature_tooltip:
-            title_disabled: "Isprobajte ovu značajku"
-            title_enabled: "Isključite značajku"
-            content_disabled: "Isprobajte ovu novu značajku! Možete je isključiti bilo kada.<br/><br/>Promjena ove postavke omogućit će značajku za sve korisnike."
-            content_enabled: "Promjenom ove postavke onemogućit ćete značajku za sve korisnike."
         last_checked: "Zadnje provjereno"
         refresh_problems: "Osvježi"
         no_problems: "Nisu pronađeni problemi."
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index d859894a37539..6d25ba9fa850a 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -6,6 +6,12 @@
 
 hu:
   js:
+    blocks:
+      ghost:
+        status: "Állapot"
+        in_location: "ebben:"
+        hidden: "rejtett"
+        failed: "sikertelen"
     carousel:
       go_to_slide: "%{index} elemre ugrás"
       previous: "Előző elem"
@@ -415,6 +421,8 @@ hu:
       pill: "Ajánlott"
       pm_title: "Ajánlott üzenetek"
     admin_onboarding_banner:
+      start_posting:
+        back: "Vissza"
       spread_the_word:
         action: "Hivatkozás másolása"
         copied_to_clipboard: "Hivatkozás vágólapra másolva!"
@@ -5962,23 +5970,6 @@ hu:
           subtitle: "Folyamatosan új funkciókat és fejlesztéseket adunk ki. Ez az oldal a legfontosabbakat tartalmazza, de a 'Tudjon meg többet' gombra kattintva részletes kiadási jegyzeteket is megtekinthet."
           no_new_features_error: "Hiba történt a hírfolyam betöltésekor. A korábbi új funkciókkal kapcsolatos bejelentéseket a <a href='%{url}' target='_blank'>Discourse Meta közösség</a>oldalán tekintheti meg."
           learn_more: "Tudjon meg többet..."
-          experimental: "Kísérleti"
-          only_experiments: "Csak kísérleti funkciók megjelenítése"
-          experiment_enabled: "Engedélyezte a kísérleti funkciót."
-          experiment_disabled: "Letiltotta a kísérleti funkciót."
-          feature_enabled: "Engedélyezted a funkciót."
-          feature_disabled: "Letiltottad a funkciót."
-          toggled_too_fast: "Túl gyorsan kapcsoltad a kapcsolót. Várj néhány másodpercet, mielőtt újra próbálkozol."
-          experiment_tooltip:
-            title_disabled: "Próbálja ki ezt a kísérleti funkciót"
-            title_enabled: "Kísérleti funkció kikapcsolása"
-            content_disabled: "Próbálja ki legújabb fejlesztés alatt álló funkciónkat! Még kísérleti stádiumban van, így bármikor eltávolíthatjuk. Bármikor leiratkozhat.<br/><br/>Ennek a módosítása minden felhasználó számára engedélyezi a funkciót."
-            content_enabled: "Ennek módosítása letiltja a funkciót minden felhasználó számára."
-          feature_tooltip:
-            title_disabled: "Próbálja ki ezt a funkciót"
-            title_enabled: "Kapcsolja ki a funkciót"
-            content_disabled: "Próbálja ki ezt az új funkciót! Bármikor leiratkozhat.<br/><br/>Megváltoztatása esetén a funkció minden felhasználó számára engedélyezve lesz."
-            content_enabled: "Ennek módosítása letiltja a funkciót minden felhasználó számára."
         last_checked: "Utoljára ellenőrizve"
         refresh_problems: "Újratöltés"
         no_problems: "Nem találtunk semmilyen problémát."
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 0245055ab635c..8e6bf1ce69ad8 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -6,6 +6,11 @@
 
 hy:
   js:
+    blocks:
+      ghost:
+        status: "Ստատուս"
+        hidden: "թաքցված"
+        failed: "ձախողված"
     number:
       format:
         separator: "."
@@ -292,6 +297,8 @@ hy:
       pill: "Առաջարկվում է"
       pm_title: "Առաջարկվող Հաղորդագրություններ"
     admin_onboarding_banner:
+      start_posting:
+        back: "Ետ"
       spread_the_word:
         action: "Պատճենել հղումը"
     about:
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index 657dc8d0a3c63..e433b4cae69ff 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -6,6 +6,10 @@
 
 id:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        failed: "gagal"
     number:
       format:
         separator: ","
@@ -250,6 +254,8 @@ id:
       pill: "Disarankan"
       pm_title: "Pesan Yang Disarankan"
     admin_onboarding_banner:
+      start_posting:
+        back: "Kembali"
       spread_the_word:
         copied_to_clipboard: "Tautan disalin ke papan klip!"
     about:
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index d380ea47f3353..ccd2bbedb48d8 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -6,6 +6,12 @@
 
 it:
   js:
+    blocks:
+      ghost:
+        status: "Stato"
+        in_location: "in"
+        hidden: "nascosto"
+        failed: "non riuscito"
     number:
       format:
         separator: ","
@@ -401,6 +407,8 @@ it:
       pill: "Suggeriti"
       pm_title: "Messaggi Suggeriti"
     admin_onboarding_banner:
+      start_posting:
+        back: "Indietro"
       spread_the_word:
         action: "Copia link"
         copied_to_clipboard: "Link copiato negli appunti!"
@@ -5599,15 +5607,6 @@ it:
           title: "Cosa c'è di nuovo?"
           subtitle: "Stiamo rilasciando nuove funzionalità e miglioramenti in continuazione. Questa pagina mostra i punti salienti, ma puoi cliccare su \"Scopri di più\" per vedere le note di rilascio approfondite."
           learn_more: "Scopri di più..."
-          experimental: "Sperimentale"
-          only_experiments: "Mostra solo le funzionalità sperimentali"
-          experiment_enabled: "Hai attivato la funzionalità sperimentale."
-          experiment_disabled: "Hai disattivato la funzionalità sperimentale."
-          experiment_tooltip:
-            title_enabled: "Disattiva la funzionalità sperimentale"
-            content_enabled: "Modificando questa impostazione, la funzionalità verrà disabilitata per tutti gli utenti."
-          feature_tooltip:
-            content_enabled: "Modificando questa impostazione, la funzionalità verrà disabilitata per tutti gli utenti."
         last_checked: "Ultimo controllo"
         refresh_problems: "Aggiorna"
         no_problems: "Nessun problema rilevato."
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 654e17e2b0b20..ca81f84c25726 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -6,6 +6,12 @@
 
 ja:
   js:
+    blocks:
+      ghost:
+        status: "ステータス"
+        in_location: "場所:"
+        hidden: "非表示"
+        failed: "失敗しました"
     carousel:
       go_to_slide: "スライド %{index} に移動"
       previous: "前のスライド"
@@ -383,6 +389,8 @@ ja:
       pill: "提案"
       pm_title: "推奨メッセージ"
     admin_onboarding_banner:
+      start_posting:
+        back: "戻る"
       spread_the_word:
         action: "リンクをコピー"
         copied_to_clipboard: "リンクをクリップボードにコピーしました!"
@@ -5670,23 +5678,6 @@ ja:
           title: "新機能"
           subtitle: "新しい機能や改善機能は常にリリースされています。このページでは主な内容を説明していますが、'詳細' をクリックすると、さらに詳しく説明されたリリースノートをご覧いただけます。"
           learn_more: "もっと詳しく..."
-          experimental: "実験的"
-          only_experiments: "実験的機能のみを表示"
-          experiment_enabled: "実験的機能を有効にしました。"
-          experiment_disabled: "実験的機能を無効にしました。"
-          feature_enabled: "機能を有効にしました。"
-          feature_disabled: "機能を無効にしました。"
-          toggled_too_fast: "切り替え操作が速すぎます。数秒待ってから、もう一度お試しください。"
-          experiment_tooltip:
-            title_disabled: "この実験的機能を試す"
-            title_enabled: "実験的機能をオフにする"
-            content_disabled: "開発中の最新の機能をぜひお試しください！実験段階であるため、いつか削除される可能性があります。いつでもオプトアウトできます。<br/><br/>これを変更すると、すべてのユーザーに対して機能が有効になります。"
-            content_enabled: "これを変更すると、すべてのユーザーに対して機能が無効になります。"
-          feature_tooltip:
-            title_disabled: "この機能を試す"
-            title_enabled: "機能をオフにする"
-            content_disabled: "この新機能をぜひお試しください！いつでもオプトアウトできます。<br/><br/>これを変更すると、すべてのユーザーに対して機能が有効になります。"
-            content_enabled: "これを変更すると、すべてのユーザーに対して機能が無効になります。"
         last_checked: "最終チェック"
         refresh_problems: "更新"
         no_problems: "問題は見つかりませんでした。"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index ab8de9d624c26..04885a4072a64 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -6,6 +6,11 @@
 
 ko:
   js:
+    blocks:
+      ghost:
+        status: "상태"
+        hidden: "숨김"
+        failed: "실패"
     number:
       format:
         separator: "."
@@ -274,6 +279,8 @@ ko:
       pill: "추천"
       pm_title: "제안된 메시지"
     admin_onboarding_banner:
+      start_posting:
+        back: "뒤로"
       spread_the_word:
         action: "링크 복사"
     about:
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 960b249f600cb..175daddf3954e 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -6,6 +6,12 @@
 
 lt:
   js:
+    blocks:
+      ghost:
+        status: "Statusas"
+        in_location: "į"
+        hidden: "paslėptas"
+        failed: "nepavyko"
     carousel:
       go_to_slide: "Eiti į skaidrę %{index}"
       previous: "Ankstesnė skaidrė"
@@ -343,6 +349,8 @@ lt:
       pill: "Siūloma"
       pm_title: "Rekomenduojamos žinutės"
     admin_onboarding_banner:
+      start_posting:
+        back: "Atgal"
       spread_the_word:
         action: "Nukopijuoti nuorodą"
         copied_to_clipboard: "Nuoroda nukopijuota į iškarpinę!"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 7c182b9af050b..41e9fa802abe4 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -6,6 +6,11 @@
 
 lv:
   js:
+    blocks:
+      ghost:
+        status: "Statuss"
+        hidden: "paslēpts"
+        failed: "neizdevies"
     number:
       format:
         separator: ","
@@ -254,6 +259,9 @@ lv:
       pill: "Saistītās ziņas"
     suggested_topics:
       pm_title: "Ieteiktās ziņas"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Atpakaļ"
     about:
       simple_title: "Par"
       title: "Par %{title}"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 14b218676ab8c..5b732bc9ea50f 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -6,6 +6,12 @@
 
 nb_NO:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "i"
+        hidden: "skjult"
+        failed: "feilet"
     number:
       format:
         separator: "."
@@ -291,6 +297,9 @@ nb_NO:
       title: "Nye og uleste emner"
       pill: "Foreslåtte"
       pm_title: "Anbefalte meldinger"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Forrige"
     about:
       edit: "Endre denne siden"
       simple_title: "Om"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 4b41aae643992..0b8131de278e7 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -6,6 +6,12 @@
 
 nl:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "in"
+        hidden: "verborgen"
+        failed: "mislukt"
     carousel:
       go_to_slide: "Ga naar dia %{index}"
       previous: "Vorige dia"
@@ -418,6 +424,7 @@ nl:
         title: "Begin met posten"
         description: "Geef mensen iets om samen over te praten"
         action: "Ideeën voor ijsbrekers"
+        back: "Terug"
         icebreakers:
           fun_facts:
             title: "Wat zijn leuke weetjes over jou?"
@@ -5668,15 +5675,6 @@ nl:
           title: "Wat is er nieuw?"
           subtitle: "We brengen voortdurend nieuwe functies en verbeteringen uit. Deze pagina behandelt de belangrijkste punten, maar je kunt op 'Meer informatie' klikken om uitgebreide releaseopmerkingen te bekijken."
           learn_more: "Meer informatie..."
-          experimental: "Experimenteel"
-          only_experiments: "Alleen experimentele functies weergeven"
-          experiment_enabled: "Je hebt de experimentele functie ingeschakeld."
-          experiment_disabled: "Je hebt de experimentele functie uitgeschakeld."
-          experiment_tooltip:
-            title_enabled: "Schakel de experimentele functie uit"
-            content_enabled: "Wijziging hiervan schakelt de functie uit voor alle gebruikers."
-          feature_tooltip:
-            content_enabled: "Wijziging hiervan schakelt de functie uit voor alle gebruikers."
         last_checked: "Laatst gecontroleerd"
         refresh_problems: "Vernieuwen"
         no_problems: "Er zijn geen problemen gevonden."
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 8f098a42e5503..aafb2cb5d0a88 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -6,6 +6,22 @@
 
 pl_PL:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        conditions: "Warunki"
+        arguments: "Argumenty"
+        container_args: "Argumenty kontenera"
+        in_location: "w"
+        hidden: "ukryty"
+        not_registered: "niezarejestrowany"
+        no_visible_children: "brak widocznych podrzędnych"
+        failed: "nieudany"
+      ghost_reasons:
+        optional_missing_hint: "Ten opcjonalny blok nie jest renderowany, ponieważ nie jest zarejestrowany."
+        no_visible_children_hint: "Ten blok kontenera nie jest renderowany, ponieważ żaden z jego elementów podrzędnych nie jest widoczny."
+        condition_failed_hint: "Ten blok nie został wyrenderowany, ponieważ jego warunki nie zostały spełnione."
+        head_hidden_tail_hint: "Ten blok nie jest renderowany, ponieważ w kontenerze `head` najpierw został renderowany inny blok."
     carousel:
       go_to_slide: "Przejdź do slajdu %{index}"
       previous: "Poprzedni slajd"
@@ -379,12 +395,27 @@ pl_PL:
     broken_page_change_alert: "Procedura obsługi onPageChange zgłosiła błąd. Aby uzyskać więcej informacji, sprawdź narzędzia programistyczne przeglądarki."
     broken_plugin_alert: "Spowodowane przez wtyczkę '%{name}'"
     broken_transformer_alert: "Wystąpił błąd. Twoja witryna może nie działać prawidłowo."
+    broken_block_alert: "Wykryto błąd konfiguracji bloku. Szczegóły znajdziesz w konsoli przeglądarki."
+    broken_block_factory_alert: "Nie udało się załadować bloku. Niektóre elementy interfejsu użytkownika mogą nie wyświetlać się poprawnie."
     critical_deprecation:
       notice: "<b>[Uwaga administratora]</b> %{source} zawiera kod, który wymaga aktualizacji. (id:%{id})"
       learn_more_link: "(<a href='%{url}' target='_blank'><em>dowiedz się więcej</em></a>)"
       theme_source: "Motyw <a target='_blank' href='%{path}'>'%{name}'</a>"
       plugin_source: "Wtyczka „%{name}”"
       unknown_source: "Jeden z Twoich motywów lub wtyczek"
+    dev_tools:
+      drag_to_move: "Przeciągnij, aby przesunąć"
+      toggle_plugin_outlet_debug: "Przełącz debugowanie wyjścia wtyczki"
+      toggle_block_debug: "Przełącz debugowanie bloku"
+      block_debug:
+        outlet_boundaries: "Granice wyjścia"
+        visual_overlay: "Nakładka wizualna"
+        ghost_blocks: "Bloki duchów"
+        condition_debugging: "Debugowanie warunków"
+      toggle_safe_mode: "Przełącz tryb awaryjny"
+      toggle_verbose_localization: "Przełącz szczegółową lokalizację"
+      toggle_mobile_view: "Przełącz widok mobilny"
+      disable_dev_tools: "Wyłącz narzędzia programistyczne"
     s3:
       regions:
         ap_northeast_1: "Azja i Pacyfik (Tokio)"
@@ -493,6 +524,13 @@ pl_PL:
         title: "Rozpocznij publikowanie"
         description: "Daj ludziom temat do wspólnej rozmowy"
         action: "Pomysły na przełamanie lodów"
+        choose_option: "Jak chcesz zacząć?"
+        predefined_topics: "Szablony przełamujące lody"
+        predefined_topics_subtitle: "Daj nowym członkom temat do rozmów, wybierz szablon do edycji i stwórz swój własny."
+        predefined_topics_description: "Wybierz z kolekcji tematów do rozpoczęcia rozmowy, aby rozpocząć dyskusję"
+        use_predefined: "Przeglądaj szablony"
+        start_with_this: "Zacznij od tego"
+        back: "Wstecz"
         icebreakers:
           fun_facts:
             title: "Jakie są ciekawostki na Twój temat?"
@@ -3710,8 +3748,8 @@ pl_PL:
         clear_all: "Wyczyść wszystko"
         unlist_topics: "Zastrzeż tematy"
         relist_topics: "Odśwież listę tematów"
-        reset_bump_dates: "Zresetuj daty ważności"
-        defer: "Oznacz jako nieprzeczytane"
+        reset_bump_dates: "Zresetuj datę podbicia"
+        defer: "Oznacz jako nieprzeczytany"
         delete: "Usuń tematy"
         delete_topics_count:
           one: "Usuń temat"
@@ -3729,13 +3767,13 @@ pl_PL:
           many: "Czy na pewno chcesz usunąć %{count} wpisów?"
           other: "Czy na pewno chcesz usunąć %{count} wpisów?"
         dismiss: "Wyczyść"
-        dismiss_read: "Wyczyść nieprzeczytane"
+        dismiss_read: "Odrzuć wszystkie nieprzeczytane"
         dismiss_read_with_selected:
-          one: "Odrzuć %{count} nieprzeczytane"
+          one: "Odrzuć %{count} nieprzeczytany"
           few: "Odrzuć %{count} nieprzeczytane"
           many: "Odrzuć %{count} nieprzeczytanych"
           other: "Odrzuć %{count} nieprzeczytanych"
-        dismiss_button: "Wyczyść…"
+        dismiss_button: "Odrzuć…"
         dismiss_button_with_selected:
           one: "Odrzuć (%{count})…"
           few: "Odrzuć (%{count})…"
@@ -6624,23 +6662,6 @@ pl_PL:
           no_new_features_found: "Brak elementów w kanale lub wybrany filtr nie zwrócił żadnych wyników. Poprzednie ogłoszenia o nowych funkcjach można zobaczyć w <a href='%{url}' target='_blank'>społeczności Discourse Meta</a>."
           no_new_features_error: "Wystąpił błąd podczas ładowania kanału. Poprzednie ogłoszenia o nowych funkcjach można zobaczyć w <a href='%{url}' target='_blank'>społeczności Discourse Meta</a>."
           learn_more: "Dowiedz się więcej..."
-          experimental: "Eksperymentalne"
-          only_experiments: "Pokaż tylko funkcje eksperymentalne"
-          experiment_enabled: "Włączono funkcję eksperymentalną."
-          experiment_disabled: "Wyłączono funkcję eksperymentalną."
-          feature_enabled: "Włączyłeś tę funkcję."
-          feature_disabled: "Wyłączyłeś tę funkcję."
-          toggled_too_fast: "Przełączyłeś przełącznik zbyt szybko. Odczekaj kilka sekund przed ponowną próbą."
-          experiment_tooltip:
-            title_disabled: "Wypróbuj tę eksperymentalną funkcję"
-            title_enabled: "Wyłącz funkcję eksperymentalną"
-            content_disabled: "Wypróbuj naszą najnowszą, rozwijaną funkcję! Jest jeszcze w fazie eksperymentalnej, więc możemy ją usunąć w dowolnym momencie. Możesz zrezygnować, kiedy tylko chcesz.<br/><br/>Zmiana tej opcji spowoduje włączenie tej funkcji dla wszystkich użytkowników."
-            content_enabled: "Zmiana tej opcji spowoduje wyłączenie funkcji dla wszystkich użytkowników."
-          feature_tooltip:
-            title_disabled: "Wypróbuj tę funkcję"
-            title_enabled: "Wyłącz funkcję"
-            content_disabled: "Wypróbuj tę nową funkcję! Możesz z niej zrezygnować, kiedy tylko chcesz.<br/><br/>Zmiana tej opcji spowoduje włączenie tej funkcji dla wszystkich użytkowników."
-            content_enabled: "Zmiana tej opcji spowoduje wyłączenie funkcji dla wszystkich użytkowników."
         last_checked: "Ostatnio sprawdzana"
         refresh_problems: "Odśwież"
         no_problems: "Nie znaleziono problemów."
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 5d9afbc578746..e945109db4d53 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -6,6 +6,12 @@
 
 pt:
   js:
+    blocks:
+      ghost:
+        status: "Estado"
+        in_location: "em"
+        hidden: "escondido"
+        failed: "falhado"
     number:
       format:
         separator: "."
@@ -409,6 +415,8 @@ pt:
       pill: "Sugerido"
       pm_title: "Mensagens Sugeridas"
     admin_onboarding_banner:
+      start_posting:
+        back: "Anterior"
       spread_the_word:
         action: "Copiar hiperligação"
     about:
@@ -4745,18 +4753,6 @@ pt:
         new_features:
           title: "O que é novo?"
           learn_more: "Saiba mais..."
-          experimental: "Experimental"
-          only_experiments: "Mostrar apenas as funcionalidades experimentais"
-          experiment_enabled: "Ativou a funcionalidade experimental."
-          experiment_disabled: "Desativou a funcionalidade experimental."
-          feature_enabled: "Ativou a funcionalidade."
-          feature_disabled: "Desativou a funcionalidade."
-          experiment_tooltip:
-            title_disabled: "Teste esta funcionalidade experimental"
-            title_enabled: "Desativar a funcionalidade experimental"
-          feature_tooltip:
-            title_disabled: "Teste esta funcionalidade"
-            title_enabled: "Desativar funcionalidade"
         last_checked: "Última verificação"
         refresh_problems: "Atualizar"
         no_problems: "Nenhum problema encontrado."
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 074a94a55bc28..9387e5e865d5d 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -6,6 +6,12 @@
 
 pt_BR:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "em"
+        hidden: "oculto"
+        failed: "falha"
     number:
       format:
         separator: ","
@@ -403,6 +409,8 @@ pt_BR:
       pill: "Sugestões"
       pm_title: "Mensagens sugeridas"
     admin_onboarding_banner:
+      start_posting:
+        back: "Voltar"
       spread_the_word:
         action: "Copiar link"
         copied_to_clipboard: "Link copiado para área de transferência!"
@@ -5645,15 +5653,6 @@ pt_BR:
           title: "Novidades?"
           subtitle: "Estamos lançando recursos e melhorias inéditas o tempo todo. Esta página contém os principais. Clique em \"Saiba mais\" se quiser ver as notas da versão completas."
           learn_more: "Saiba mais..."
-          experimental: "Experimental"
-          only_experiments: "Exibir apenas recursos experimentais"
-          experiment_enabled: "Você ativou o recurso experimental."
-          experiment_disabled: "Você desativou o recurso experimental."
-          experiment_tooltip:
-            title_enabled: "Desativar este recurso experimental"
-            content_enabled: "Altere esta opção para desativar este recurso para todos(as) os(as) usuários(as)."
-          feature_tooltip:
-            content_enabled: "Altere esta opção para desativar este recurso para todos(as) os(as) usuários(as)."
         last_checked: "Última verificação"
         refresh_problems: "Atualizar"
         no_problems: "Nenhum problema foi encontrado."
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index e448fb5b6eea3..4380e5d7ae10b 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -6,6 +6,11 @@
 
 ro:
   js:
+    blocks:
+      ghost:
+        status: "Stare"
+        hidden: "ascuns"
+        failed: "eșuată"
     number:
       format:
         separator: "."
@@ -437,6 +442,8 @@ ro:
       pill: "Sugerate"
       pm_title: "Mesaje sugerate"
     admin_onboarding_banner:
+      start_posting:
+        back: "Înapoi"
       spread_the_word:
         action: "Copiază legătură"
     about:
@@ -4228,15 +4235,6 @@ ro:
           title: "Ce este nou?"
           subtitle: "Lansăm noi funcții și îmbunătățiri tot timpul. Această pagină le acoperă pe cele mai importante, dar poți da clic pe „Află mai multe” pentru a vedea notele extinse de lansare."
           learn_more: "Află mai multe..."
-          experimental: "Experimental"
-          only_experiments: "Afișează doar caracteristici experimentale"
-          experiment_enabled: "Ai activat funcționalitatea experimentală."
-          experiment_disabled: "Ai dezactivat funcționalitatea experimentală."
-          experiment_tooltip:
-            title_enabled: "Dezactivează funcționalitatea experimentală"
-            content_enabled: "Modificând aceasta va dezactiva funcționalitatea pentru toți utilizatorii."
-          feature_tooltip:
-            content_enabled: "Modificând aceasta va dezactiva funcționalitatea pentru toți utilizatorii."
         last_checked: "Ultima verificare"
         refresh_problems: "Reîmprospătează"
         no_problems: "Nu a apărut nicio problemă."
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 64e2592cee2df..4c6dd2559a30d 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -6,6 +6,12 @@
 
 ru:
   js:
+    blocks:
+      ghost:
+        status: "Статус"
+        in_location: "в"
+        hidden: "скрыто"
+        failed: "не удалась"
     number:
       format:
         separator: ","
@@ -474,6 +480,8 @@ ru:
       pill: "Похожие"
       pm_title: "Похожие сообщения"
     admin_onboarding_banner:
+      start_posting:
+        back: "Назад"
       spread_the_word:
         action: "Копировать ссылку"
         copied_to_clipboard: "Ссылка скопирована в буфер обмена!"
@@ -6181,23 +6189,6 @@ ru:
           title: "Что нового?"
           subtitle: "Мы регулярно выпускаем обновления с новыми функциями и улучшениями. На этой странице перечислены ключевые моменты, а полный список доступен по ссылке «Подробнее»."
           learn_more: "Подробнее…"
-          experimental: "Экспериментальная функция"
-          only_experiments: "Показывать только экспериментальные функции"
-          experiment_enabled: "Вы включили экспериментальную функцию."
-          experiment_disabled: "Вы отключили экспериментальную функцию."
-          feature_enabled: "Вы включили эту функцию."
-          feature_disabled: "Вы отключили эту функцию."
-          toggled_too_fast: "Вы слишком быстро переключили экспериментальную функцию. Подождите несколько секунд, прежде чем повторить попытку."
-          experiment_tooltip:
-            title_disabled: "Попробуйте нашу экспериментальную функцию"
-            title_enabled: "Отключение экспериментальной функции"
-            content_disabled: "Оцените нашу новую функцию на стадии разработки! Пока она экспериментальная, поэтому мы можем удалить ее в любой момент. Вы можете отключить функцию, когда захотите.<br/><br/>Изменение этого параметра включит функцию для всех пользователей."
-            content_enabled: "Изменение этого параметра отключит функцию для всех пользователей."
-          feature_tooltip:
-            title_disabled: "Попробуйте эту функцию"
-            title_enabled: "Отключить функцию"
-            content_disabled: "Попробуйте эту новую функцию! Вы можете отказаться от неё в любой момент.<br/><br/>Изменение этого параметра включит функцию для всех пользователей."
-            content_enabled: "Изменение этого параметра отключит функцию для всех пользователей."
         last_checked: "Последняя проверка"
         refresh_problems: "Обновить"
         no_problems: "Проблем не обнаружено."
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index bfd930a2f2170..888481bdc8d68 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -6,6 +6,12 @@
 
 sk:
   js:
+    blocks:
+      ghost:
+        status: "Stav"
+        in_location: "v"
+        hidden: "skryté"
+        failed: "nepodarilo sa"
     number:
       format:
         separator: ","
@@ -365,6 +371,8 @@ sk:
       pill: "Odporúčané"
       pm_title: "Odporúčané správy"
     admin_onboarding_banner:
+      start_posting:
+        back: "Späť"
       spread_the_word:
         action: "Kopírovať odkaz"
         copied_to_clipboard: "Odkaz bol skopírovaný do schránky!"
@@ -6010,15 +6018,6 @@ sk:
           title: "Čo je nové?"
           subtitle: "Neustále vydávame nové funkcie a vylepšenia. Táto stránka obsahuje najdôležitejšie informácie, ale kliknutím na \"Ďalšie informácie\" si môžete pozrieť rozsiahle poznámky k vydaniu."
           learn_more: "Zistiť viac..."
-          experimental: "Experimentálne"
-          only_experiments: "Zobraziť len experimentálne funkcie"
-          experiment_enabled: "Povolili ste experimentálnu funkciu."
-          experiment_disabled: "Experimentálnu funkciu ste zakázali."
-          experiment_tooltip:
-            title_enabled: "Vypnutie experimentálnej funkcie"
-            content_enabled: "Zmenou tejto funkcie zakážete túto funkciu pre všetkých používateľov."
-          feature_tooltip:
-            content_enabled: "Zmenou tejto funkcie zakážete túto funkciu pre všetkých používateľov."
         last_checked: "Naposledy overené"
         refresh_problems: "Obnoviť"
         no_problems: "Nenašli sa žiadne problémy."
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index d9d1f7abecedf..a7ac57161b3aa 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -6,6 +6,11 @@
 
 sl:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        hidden: "skrito"
+        failed: "spodletelo"
     number:
       format:
         separator: ","
@@ -300,6 +305,8 @@ sl:
       title: "Nove in neprebrane teme"
       pm_title: "Predlagana sporočila"
     admin_onboarding_banner:
+      start_posting:
+        back: "Nazaj"
       spread_the_word:
         copied_to_clipboard: "Povezava je bila kopirana v odložišče!"
     about:
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 21654ced949ea..681226b2c6330 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -6,6 +6,12 @@
 
 sq:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "në"
+        hidden: "fshehur"
+        failed: "dështoi"
     number:
       format:
         separator: "."
@@ -296,6 +302,8 @@ sq:
       pill: "Sugjeruar"
       pm_title: "Mesazhet e sugjeruara"
     admin_onboarding_banner:
+      start_posting:
+        back: "Kthehu mbrapa"
       spread_the_word:
         action: "Kopjoni lidhjen"
         copied_to_clipboard: "Linku u kopjua në memo!"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 8ddf702709142..3b08b812fcc79 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -6,6 +6,12 @@
 
 sr:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "u"
+        hidden: "sakriveno"
+        failed: "neuspešno"
     number:
       format:
         separator: ","
@@ -323,6 +329,9 @@ sr:
       title: "Novi i Nepročitane teme"
       pill: "Predloženo"
       pm_title: "Predložene poruke"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Nazad"
     about:
       edit: "Izmeni ovu stranu"
       simple_title: "O nama"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 818a4bffd54c0..14cee055a6f77 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -6,6 +6,12 @@
 
 sv:
   js:
+    blocks:
+      ghost:
+        status: "Status"
+        in_location: "i"
+        hidden: "dold"
+        failed: "misslyckad"
     number:
       format:
         separator: "."
@@ -295,6 +301,8 @@ sv:
       pill: "Föreslagna"
       pm_title: "Föreslagna meddelanden"
     admin_onboarding_banner:
+      start_posting:
+        back: "Tillbaka"
       spread_the_word:
         copied_to_clipboard: "Länken har kopierats till urklipp!"
     about:
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index d478354bdc27f..f2619aa7e3b6b 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -6,6 +6,10 @@
 
 sw:
   js:
+    blocks:
+      ghost:
+        hidden: "imefichwa"
+        failed: "kushindwa"
     number:
       format:
         separator: "."
@@ -206,6 +210,9 @@ sw:
       other: "Herufi %{count}"
     suggested_topics:
       pm_title: "Ujumbe Uliopendekezwa"
+    admin_onboarding_banner:
+      start_posting:
+        back: "Iliyopita"
     about:
       edit: "Hariri ukurasa huu"
       simple_title: "Kuhusu "
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index bc972a7c269ea..ec2117ac69b4a 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -6,6 +6,11 @@
 
 te:
   js:
+    blocks:
+      ghost:
+        status: "స్థితి"
+        in_location: "లో"
+        failed: "విఫలం"
     number:
       format:
         separator: "."
@@ -289,6 +294,9 @@ te:
       title: "కొత్త & చదవని విషయాలు"
       pill: "సూచించినవి"
       pm_title: "సూచించిన సందేశాలు"
+    admin_onboarding_banner:
+      start_posting:
+        back: "వెనుకకు"
     about:
       edit: "ఈ పేజీని సవరించండి"
       simple_title: "మా సంఘం గురించి"
diff --git a/config/locales/client.th.yml b/config/locales/client.th.yml
index fcd3185fbd566..31e922b29a9ed 100644
--- a/config/locales/client.th.yml
+++ b/config/locales/client.th.yml
@@ -6,6 +6,11 @@
 
 th:
   js:
+    blocks:
+      ghost:
+        status: "สถานะ"
+        hidden: "ถูกซ่อน"
+        failed: "ล้มเหลว"
     number:
       format:
         separator: "."
@@ -233,6 +238,9 @@ th:
       pill: "ข้อความที่เกี่ยวข้อง"
     suggested_topics:
       pm_title: "ข้อความแนะนำ"
+    admin_onboarding_banner:
+      start_posting:
+        back: "กลับ"
     about:
       simple_title: "เกี่ยวกับ"
       title: "เกี่ยวกับ %{title}"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 5cc3e854c09e6..5c9699d794413 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -6,6 +6,12 @@
 
 tr_TR:
   js:
+    blocks:
+      ghost:
+        status: "Durum"
+        in_location: "içinde"
+        hidden: "gizli"
+        failed: "başarısız"
     number:
       format:
         separator: "."
@@ -401,6 +407,8 @@ tr_TR:
       pill: "Önerilen"
       pm_title: "Önerilen Mesajlar"
     admin_onboarding_banner:
+      start_posting:
+        back: "Geri"
       spread_the_word:
         action: "Bağlantıyı kopyala"
         copied_to_clipboard: "Bağlantı panoya kopyalandı!"
@@ -5602,15 +5610,6 @@ tr_TR:
           title: "Yenilikler"
           subtitle: "Sürekli olarak yeni özellikler ve geliştirmeler yayınlıyoruz. Bu sayfa önemli noktaları kapsıyor, ancak kapsamlı sürüm notlarını görmek için \"Daha fazla bilgi edinin\" seçeneğine tıklayabilirsiniz."
           learn_more: "Daha fazla bilgi edinin..."
-          experimental: "Deneysel"
-          only_experiments: "Yalnızca deneysel özellikleri göster"
-          experiment_enabled: "Deneysel özelliği etkinleştirdiniz."
-          experiment_disabled: "Deneysel özelliği devre dışı bıraktınız."
-          experiment_tooltip:
-            title_enabled: "Deneysel özelliği kapat"
-            content_enabled: "Bunu değiştirmek özelliği tüm kullanıcılar için devre dışı bırakır."
-          feature_tooltip:
-            content_enabled: "Bunu değiştirmek özelliği tüm kullanıcılar için devre dışı bırakır."
         last_checked: "Son kontrol"
         refresh_problems: "Yenile"
         no_problems: "Hiçbir sorun bulunamadı."
diff --git a/config/locales/client.ug.yml b/config/locales/client.ug.yml
index 82f749da480d7..1463002adc5c1 100644
--- a/config/locales/client.ug.yml
+++ b/config/locales/client.ug.yml
@@ -6,6 +6,12 @@
 
 ug:
   js:
+    blocks:
+      ghost:
+        status: "ھالەت"
+        in_location: "دا"
+        hidden: "يوشۇرۇن"
+        failed: "مەغلۇب بولدى"
     carousel:
       go_to_slide: "%{index}-سىيرىلمىغا يۆتكەل"
       previous: "ئالدىنقى سىيرىلما"
@@ -415,6 +421,8 @@ ug:
       pill: "تەۋسىيە"
       pm_title: "تەۋسىيە ئۇچۇر"
     admin_onboarding_banner:
+      start_posting:
+        back: "كەينى"
       spread_the_word:
         action: "ئۇلانما كۆچۈر"
         copied_to_clipboard: "ئۇلانما چاپلاش تاختىسىغا كۆچۈرۈلدى!"
@@ -5863,19 +5871,6 @@ ug:
           title: "يېڭىلىق?"
           subtitle: "بىز ھەمىشە يېڭى ئىقتىدار ۋە ياخشىلاشنى تارقىتىمىز. بۇ بەتتە مۇھىم مەزمۇن يورۇتۇلغان ئەمما سىز «مول بىلىم» نى چېكىپ تەپسىلىي تارقىتىش چۈشەندۈرۈشىنى كۆرەلەيسىز."
           learn_more: "مول بىلىم…"
-          experimental: "تەجرىبە"
-          only_experiments: "پەقەت تەجرىبە ئىقتىدارلىرىنىلا كۆرسىتىدۇ"
-          experiment_enabled: "تەجرىبە ئىقتىدارىنى قوزغاتتىڭىز."
-          experiment_disabled: "تەجرىبە ئىقتىدارىنى چەكلىدىڭىز."
-          feature_enabled: "ئىقتىدارنى قوزغاتتىڭىز."
-          feature_disabled: "ئىقتىدارنى چەكلىدىڭىز."
-          experiment_tooltip:
-            title_enabled: "تەجرىبە ئىقتىدارىنى تاقايدۇ"
-            content_enabled: "بۇ ئۆزگەرتىلسە ھەممە ئىشلەتكۈچىنىڭ مەزكۇر ئىقتىدارى چەكلىنىدۇ."
-          feature_tooltip:
-            title_disabled: "بۇ ئىقتىدارنى سىناڭ"
-            title_enabled: "ئىقتىدارنى تاقايدۇ"
-            content_enabled: "بۇ ئۆزگەرتىلسە ھەممە ئىشلەتكۈچىنىڭ مەزكۇر ئىقتىدارى چەكلىنىدۇ."
         last_checked: "ئاخىرقى تەكشۈرۈلگەن ۋاقىت"
         refresh_problems: "يېڭىلا"
         no_problems: "ھېچقانداق مەسىلە بايقالمىدى."
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index ef9279da5cf31..8fdf6983cd493 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -6,6 +6,12 @@
 
 uk:
   js:
+    blocks:
+      ghost:
+        status: "Статус"
+        in_location: "в"
+        hidden: "приховано"
+        failed: "помилка"
     carousel:
       go_to_slide: "Перейти до слайда %{index}"
       previous: "Попередній слайд"
@@ -492,6 +498,7 @@ uk:
         title: "Розпочати публікацію"
         description: "Дайте людям щось, про що можна поговорити разом"
         action: "Ідеї-криголами"
+        back: "Назад"
         icebreakers:
           fun_facts:
             title: "Які цікаві факти про вас?"
@@ -6623,23 +6630,6 @@ uk:
           no_new_features_found: "У стрічці немає елементів, або вибраний вами фільтр не повернув результатів. Ви можете переглянути попередні анонси нових функцій у <a href='%{url}' target='_blank'>спільноті Discourse Meta</a>."
           no_new_features_error: "Сталася помилка під час завантаження стрічки. Ви можете переглянути попередні анонси нових функцій у <a href='%{url}' target='_blank'>спільноті Discourse Meta</a>."
           learn_more: "Дізнатися більше…"
-          experimental: "Експериментальний"
-          only_experiments: "Показувати лише експериментальні функції"
-          experiment_enabled: "Ви увімкнули експериментальну функцію."
-          experiment_disabled: "Ви вимкнули експериментальну функцію."
-          feature_enabled: "Ви увімкнули функцію."
-          feature_disabled: "Ви вимкнули цю функцію."
-          toggled_too_fast: "Ви переключили перемикач занадто швидко. Будь ласка, зачекайте кілька секунд, перш ніж спробувати знову."
-          experiment_tooltip:
-            title_disabled: "Спробуйте цю експериментальну функцію"
-            title_enabled: "Вимкнути експериментальну функцію"
-            content_disabled: "Спробуйте нашу найновішу функцію, яка знаходиться в розробці! Вона все ще перебуває на стадії експериментального тестування, тому ми можемо видалити її будь-коли. Ви можете відмовитися від її використання будь-коли.<br/><br/>Зміна цього налаштування ввімкне функцію для всіх користувачів."
-            content_enabled: "Зміна цього відключить функцію для всіх користувачів."
-          feature_tooltip:
-            title_disabled: "Спробувати цю функцію"
-            title_enabled: "Вимкнути функцію"
-            content_disabled: "Спробуйте цю нову функцію! Ви можете відмовитися від неї будь-коли.<br/><br/>Зміна цього параметра ввімкне функцію для всіх користувачів."
-            content_enabled: "Зміна цього відключить функцію для всіх користувачів."
         last_checked: "Остання перевірка"
         refresh_problems: "Оновити"
         no_problems: "Не виявлено жодних проблем."
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index c00af417ecf07..45713de325863 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -6,6 +6,12 @@
 
 ur:
   js:
+    blocks:
+      ghost:
+        status: "سٹیٹس"
+        in_location: "میں"
+        hidden: "مخفی"
+        failed: "ناکامی"
     carousel:
       go_to_slide: "سلائیڈ %{index}پر جائیں"
       previous: "گزشتہ سلائیڈ"
@@ -415,6 +421,8 @@ ur:
       pill: "تجویز کردہ"
       pm_title: "تجویز کردہ پیغامات"
     admin_onboarding_banner:
+      start_posting:
+        back: "واپس"
       spread_the_word:
         action: "رابطہ کاپی کریں"
         copied_to_clipboard: "رابطہ کلپ بورڈ پر کاپی ہوا!"
@@ -5772,23 +5780,6 @@ ur:
           title: "نیا کیا ہے؟"
           subtitle: "ہم وقتاً فوقتاً نئی خصوصیات اور بہتریاں جاری کر رہے ہیں۔ یہ صفحہ نمایاں نکات کا احاطہ کرتا ہے، لیکن آپ 'مزید جانیں' پر کلک کر کے اجرا کی تفصیلات دیکھ سکتے ہیں"
           learn_more: "مزید جانیں..."
-          experimental: "تجرباتی"
-          only_experiments: "صرف تجرباتی خصوصیات دکھائیں"
-          experiment_enabled: "آپ نے تجرباتی خصوصیت کو فعال کر دیا۔"
-          experiment_disabled: "آپ نے تجرباتی خصوصیت کو غیر فعال کر دیا۔"
-          feature_enabled: "آپ نے یہ خصوصیت فعال کر دی ہے"
-          feature_disabled: "آپ نے یہ خصوصیت غیر فعال کر دی ہے"
-          toggled_too_fast: "آپ نے سوئچ بہت تیزی سے تبدیل کیا ہے۔ براہِ کرم دوبارہ کوشش کرنے سے پہلے چند سیکنڈ انتظار کریں"
-          experiment_tooltip:
-            title_disabled: "اس تجرباتی خصوصیت کو آزمائیں"
-            title_enabled: "تجرباتی خصوصیت کو بند کریں"
-            content_disabled: "ہمارا نیا تیار کردہ فیچرآزمائیں! یہ ابھی تجرباتی مرحلے میں ہے، اس لیے ہم اسے کسی بھی وقت ہٹا سکتے ہیں۔ آپ جب چاہیں اس سے باہر نکل سکتے ہیں۔<br/><br/>اس کو تبدیل کرنے سے یہ فیچر تمام صارفین کے لیے فعال ہو جائے گا۔"
-            content_enabled: "اسے تبدیل کرنے سے یہ فیچر تمام صارفین کے لیے غیر فعال ہو جائے گا۔"
-          feature_tooltip:
-            title_disabled: "اس خصوصیت کو آزمائیں"
-            title_enabled: "خصوصیت کو بند کریں"
-            content_disabled: "اس نئی خصوصیت کو آزما کر دیکھیں! آپ جب چاہیں اسے غیر فعال کر سکتے ہیں۔ <br/><br/> اس کو تبدیل کرنے سے یہ خصوصیت تمام صارفین کے لیے فعال ہو جائے گی"
-            content_enabled: "اس کو تبدیل کرنے سے یہ خصوصیت تمام صارفین کے لیے غیر فعال ہو جائے گی"
         last_checked: "آخری دفعہ چیک کیا گیا"
         refresh_problems: "رِیفریش"
         no_problems: "کوئی مسائل نہیں پائے گئے۔"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 1b65f91d73d10..48d59a5713089 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -6,6 +6,12 @@
 
 vi:
   js:
+    blocks:
+      ghost:
+        status: "Trạng thái"
+        in_location: "trong"
+        hidden: "ẩn"
+        failed: "thất bại"
     carousel:
       go_to_slide: "Đến slide %{index}"
       previous: "Slide trước"
@@ -383,6 +389,8 @@ vi:
       pill: "Đề xuất"
       pm_title: "Tin nhắn gợi ý"
     admin_onboarding_banner:
+      start_posting:
+        back: "Quay lại"
       spread_the_word:
         action: "Sao chép link"
     about:
@@ -5682,23 +5690,6 @@ vi:
           subtitle: "Chúng tôi liên tục phát hành các tính năng và cải tiến mới. Trang này nêu bật những điểm chính, nhưng bạn có thể nhấn vào 'Tìm hiểu thêm' để xem ghi chú phát hành chi tiết."
           no_new_features_error: "Đã xảy ra lỗi khi tải nguồn cấp dữ liệu. Bạn có thể xem các thông báo tính năng mới trước đó trên <a href='%{url}' target='_blank'>cộng đồng Discourse Meta</a>."
           learn_more: "Tìm hiểu thêm..."
-          experimental: "Thí nghiệm"
-          only_experiments: "Chỉ hiển thị các tính năng thử nghiệm"
-          experiment_enabled: "Bạn đã kích hoạt tính năng thử nghiệm."
-          experiment_disabled: "Bạn đã tắt tính năng thử nghiệm."
-          feature_enabled: "Bạn đã kích hoạt tính năng."
-          feature_disabled: "Bạn đã tắt tính năng."
-          toggled_too_fast: "Bạn đã chuyển đổi quá nhanh. Vui lòng đợi vài giây trước khi thử lại."
-          experiment_tooltip:
-            title_disabled: "Thử tính năng thử nghiệm này"
-            title_enabled: "Tắt tính năng thử nghiệm"
-            content_disabled: "Hãy dùng thử tính năng mới nhất mà chúng tôi đang phát triển! Tính năng này vẫn đang trong giai đoạn thử nghiệm, vì vậy chúng tôi có thể loại bỏ nó bất cứ lúc nào. Bạn có thể hủy kích hoạt bất cứ khi nào bạn muốn.<br/><br/>Thay đổi tùy chọn này sẽ kích hoạt tính năng cho tất cả thành viên."
-            content_enabled: "Việc thay đổi này sẽ vô hiệu hóa tính năng đối với tất cả thành viên."
-          feature_tooltip:
-            title_disabled: "Thử tính năng này"
-            title_enabled: "Tắt tính năng"
-            content_disabled: "Hãy thử tính năng mới này! Bạn có thể tắt bất cứ lúc nào bạn muốn.<br/><br/>Thay đổi tùy chọn này sẽ kích hoạt tính năng cho tất cả thành viên."
-            content_enabled: "Việc thay đổi này sẽ vô hiệu hóa tính năng đối với tất cả thành viên."
         last_checked: "Kiểm tra lần cuối"
         refresh_problems: "Làm mới"
         no_problems: "Không phát hiện vấn đề"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 619991582e5ad..56632e9c7a84e 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -6,6 +6,13 @@
 
 zh_CN:
   js:
+    blocks:
+      ghost:
+        status: "状态"
+        in_location: "位置："
+        hidden: "已隐藏"
+        not_registered: "未注册"
+        failed: "失败"
     carousel:
       go_to_slide: "转到幻灯片 %{index}"
       previous: "上一张幻灯片"
@@ -396,6 +403,7 @@ zh_CN:
         title: "开始发帖"
         description: "给人们一些共同谈论的话题"
         action: "破冰创意"
+        back: "返回"
         icebreakers:
           fun_facts:
             title: "关于你，有哪些有趣的小事？"
@@ -5748,23 +5756,6 @@ zh_CN:
           subtitle: "我们一直在发布新功能和改进。本页涵盖了重点内容，但您也可以点击“了解详情”查看详细的版本说明。"
           no_new_features_error: "加载最新功能列表时出现错误。您可以在<a href='%{url}' target='_blank'>Discourse Meta 社区</a>查看以前的新功能公告。"
           learn_more: "了解详情…"
-          experimental: "实验性"
-          only_experiments: "只显示实验性功能"
-          experiment_enabled: "您已启用实验性功能。"
-          experiment_disabled: "您已禁用实验性功能。"
-          feature_enabled: "您已启用该功能。"
-          feature_disabled: "您已禁用该功能。"
-          toggled_too_fast: "您切换开关的频率过快。请稍等几秒钟后再试。"
-          experiment_tooltip:
-            title_disabled: "试用这个实验性功能"
-            title_enabled: "关闭实验性功能"
-            content_disabled: "试试我们正在开发的最新功能吧！它仍处于试验阶段，因此我们可能随时将其移除。您可以随时选择退出。<br/><br/>更改此项将为所有用户启用该功能。"
-            content_enabled: "更改此项将为所有用户禁用该功能。"
-          feature_tooltip:
-            title_disabled: "试用此功能"
-            title_enabled: "关闭功能"
-            content_disabled: "试试这个新功能吧！您可以随时选择退出。<br/><br/>更改此项将为所有用户启用该功能。"
-            content_enabled: "更改此项将为所有用户禁用该功能。"
         last_checked: "上次检查"
         refresh_problems: "刷新"
         no_problems: "找不到问题。"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index ffcf309cd18ee..e587f6b4e1e23 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -6,6 +6,11 @@
 
 zh_TW:
   js:
+    blocks:
+      ghost:
+        status: "狀態"
+        in_location: "在"
+        failed: "失敗"
     number:
       format:
         separator: "."
@@ -367,6 +372,8 @@ zh_TW:
       pill: "建議"
       pm_title: "推薦訊息"
     admin_onboarding_banner:
+      start_posting:
+        back: "上一步"
       spread_the_word:
         action: "複製連結"
     about:
@@ -4974,15 +4981,6 @@ zh_TW:
           title: "有什麼最新消息？"
           subtitle: "我們一直在發布新功能和改進。此頁面涵蓋了重點，但您可以單擊「了解更多」以查看詳細的版本說明。"
           learn_more: "了解更多..."
-          experimental: "實驗性"
-          only_experiments: "僅顯示實驗性功能"
-          experiment_enabled: "您已啟用實驗性功能。"
-          experiment_disabled: "您已停用實驗性功能。"
-          experiment_tooltip:
-            title_enabled: "關閉實驗性功能"
-            content_enabled: "更改此項將為所有使用者禁用該功能。"
-          feature_tooltip:
-            content_enabled: "更改此項將為所有使用者禁用該功能。"
         last_checked: "上次檢查的時間"
         refresh_problems: "重新整理"
         no_problems: "未發現任何問題。"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 51c6060a65d3b..a9d9d1d4cd228 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -19,7 +19,7 @@ de:
       calendar_ics: "%Y%m%dT%H%M%SZ"
   date:
     month_names:
-    - null
+    -
     - Januar
     - Februar
     - März
@@ -1711,6 +1711,8 @@ de:
     max_oneboxes_per_post: "Lege die maximale Anzahl von Oneboxes fest, die in einem Beitrag enthalten sein können. Oneboxes bieten eine Vorschau der verlinkten Inhalte im Beitrag."
     facebook_app_access_token: "Ein Token, das aus deiner Facebook-App-ID und deinem Geheimnis generiert wird. Wird verwendet, um Instagram-Oneboxes zu generieren."
     github_onebox_access_tokens: "Eine Zuordnung einer GitHub-Organisation oder eines GitHub-Benutzers zu einem GitHub-Zugriffs-Token, das verwendet wird, um GitHub-Oneboxes für private Repos, Commits, Pull Requests, Issues und Dateiinhalte zu erzeugen. Ohne dieses Token werden nur öffentliche GitHub-URLs in eine Onebox umgewandelt."
+    reddit_onebox_client_id: "Reddit-API-OAuth-Client-ID, die für authentifizierte Reddit-Oneboxes verwendet wird. Erstelle eine App vom Typ „script“ unter reddit.com/prefs/apps, um Anmeldedaten zu erhalten."
+    reddit_onebox_client_secret: "Reddit-API-OAuth-Client-Secret, das für authentifizierte Reddit-Oneboxes verwendet wird. Zu finden unter der App vom Typ „script“ die auf reddit.com/prefs/apps erstellt wurde."
     logo: "Das Logo oben links auf deiner Website. Verwende ein breites rechteckiges Bild mit einer Höhe von 120 Pixeln und einem Seitenverhältnis von mindestens 3:1. Wenn leer, wird die Website-Überschrift angezeigt."
     logo_small: "Kleine Logo-Grafik oben links auf der Website, die beim Herunterscrollen angezeigt wird. Verwende ein quadratisches Bild (120 × 120). Falls leer, wird ein „Home“-Zeichen angezeigt."
     digest_logo: "Das alternative Logo oben in den E-Mail-Zusammenfassungen deiner Website. Verwende ein breites rechteckiges Bild. Verwende kein SVG-Bild. Wenn leer, wird das Bild aus der `logo`-Einstellung verwendet."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 29550e2b501bf..f1abe827159d7 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -300,6 +300,7 @@ pl_PL:
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>:%{message}"
+    diff_too_complex: "Różnica jest zbyt złożona, aby obliczyć ją bezpiecznie. Spróbuj wprowadzić mniejsze zmiany."
     messages:
       invalid_locale: "%{invalid_locale} to nieprawidłowe ustawienia regionalne"
       too_long_validation:
@@ -1865,6 +1866,8 @@ pl_PL:
     max_oneboxes_per_post: "Ustaw maksymalną liczbę oneboxów, które można umieścić w jednym poście. Oneboxy zapewniają podgląd powiązanej treści bezpośrednio w poście."
     facebook_app_access_token: "Token wygenerowany z Twojego identyfikatora aplikacji Facebook i sekret. Używany do generowania osadzonych oneboxów z serwisu Instagram."
     github_onebox_access_tokens: "Mapowanie organizacji lub użytkownika GitHub na token dostępu GitHub, który jest używany do generowania oneboxów GitHub dla prywatnych repozytoriów, commitów, pull requestów, zgłoszeń i zawartości plików. Bez tego tylko publiczne adresy URL GitHub będą miały onebox."
+    reddit_onebox_client_id: "Identyfikator klienta OAuth API Reddit używany do uwierzytelniania skrzynek Reddit. Utwórz aplikację typu „skrypt” na stronie reddit.com/prefs/apps, aby uzyskać dane uwierzytelniające."
+    reddit_onebox_client_secret: "Klucz klienta OAuth API Reddit używany do uwierzytelniania skrzynek OneBox w Reddit. Znajduje się w aplikacji typu „skrypt” utworzonej na stronie reddit.com/prefs/apps."
     logo: "Obraz logo w lewym górnym rogu witryny. Użyj szerokiego prostokątnego obrazu o wysokości 120 i współczynniku kształtu większym niż 3: 1. Jeśli pole pozostanie puste, wyświetlony zostanie tekst tytułu witryny."
     logo_small: "Mały obraz logo w lewym górnym rogu witryny, widoczny podczas przewijania w dół. Użyj kwadratowego obrazu 120 × 120. Jeśli pole pozostanie puste, wyświetlony zostanie glif domowy."
     digest_logo: "Alternatywne logo użyte w górnej części podsumowania e-mail witryny. Użyj szerokiego obrazu prostokąta. Nie używaj obrazu SVG. Jeśli pole pozostanie puste, zostanie użyty obraz z ustawienia „logo”."
diff --git a/plugins/chat/config/locales/client.de.yml b/plugins/chat/config/locales/client.de.yml
index 6715f47c9c57a..2a043a8124241 100644
--- a/plugins/chat/config/locales/client.de.yml
+++ b/plugins/chat/config/locales/client.de.yml
@@ -100,6 +100,8 @@ de:
         unstar_channel: "Sternchen von Kanal entfernen"
         close_channel: "Kanal schließen"
         open_channel: "Kanal öffnen"
+        open_channel_disabled_archived: "Archivierte Kanäle können nicht wieder geöffnet werden."
+        open_channel_disabled_read_only: "Schreibgeschützte Kanäle können nicht wieder geöffnet werden."
         archive_channel: "Kanal archivieren"
         delete_channel: "Kanal löschen"
         join_channel: "Kanal beitreten"
diff --git a/plugins/chat/config/locales/client.pl_PL.yml b/plugins/chat/config/locales/client.pl_PL.yml
index 2a2e9e6cb1353..afcd67df7706f 100644
--- a/plugins/chat/config/locales/client.pl_PL.yml
+++ b/plugins/chat/config/locales/client.pl_PL.yml
@@ -106,6 +106,8 @@ pl_PL:
         unstar_channel: "Usuń wyróżnienie kanału"
         close_channel: "Zamknij kanał"
         open_channel: "Otwórz kanał"
+        open_channel_disabled_archived: "Zarchiwizowanych kanałów nie można ponownie otworzyć."
+        open_channel_disabled_read_only: "Kanałów przeznaczonych tylko do odczytu nie można ponownie otworzyć."
         archive_channel: "Archiwizuj kanał"
         delete_channel: "Usuń kanał"
         join_channel: "Dołącz do kanału"
diff --git a/plugins/chat/config/locales/client.zh_CN.yml b/plugins/chat/config/locales/client.zh_CN.yml
index bfcdea8265bf7..0d67c6ba7b651 100644
--- a/plugins/chat/config/locales/client.zh_CN.yml
+++ b/plugins/chat/config/locales/client.zh_CN.yml
@@ -86,6 +86,8 @@ zh_CN:
         unstar_channel: "取消收藏频道"
         close_channel: "关闭频道"
         open_channel: "打开频道"
+        open_channel_disabled_archived: "无法重新打开已存档的频道。"
+        open_channel_disabled_read_only: "无法重新打开只读频道。"
         archive_channel: "归档频道"
         delete_channel: "删除频道"
         join_channel: "加入频道"
diff --git a/plugins/discourse-ai/config/locales/client.ar.yml b/plugins/discourse-ai/config/locales/client.ar.yml
index 403082936b82a..73a5d86a2e0a3 100644
--- a/plugins/discourse-ai/config/locales/client.ar.yml
+++ b/plugins/discourse-ai/config/locales/client.ar.yml
@@ -384,8 +384,6 @@ ar:
           enable_translations: "تمكين الترجمات الآلية"
         stats:
           title: "إحصائيات الترجمة"
-          complete_language_detection_description: "تم اكتشاف لغة جميع المنشورات المؤهلة والبالغ عددها %{total}."
-          incomplete_language_detection_description: "تم اكتشاف لغة %{done} من المنشورات المؤهلة والبالغ عددها %{total}."
           backfill_disabled: "تم تعطيل ميزة الترجمة الرجعية، ولن تتم ترجمة سوى المنشورات الجديدة."
           backfill_message: "تم تكوين <a href='%{settingsUrl}'>إعدادات الترجمة الرجعية</a> بحيث تتم ترجمة جميع المنشورات التي نُشرت بعد %{date} — من المتوقع أن يستغرق ذلك %{eta}."
           eta_minutes:
diff --git a/plugins/discourse-ai/config/locales/client.de.yml b/plugins/discourse-ai/config/locales/client.de.yml
index 38ea30067e48d..d9005c69826ff 100644
--- a/plugins/discourse-ai/config/locales/client.de.yml
+++ b/plugins/discourse-ai/config/locales/client.de.yml
@@ -374,8 +374,6 @@ de:
           enable_translations: "Automatische Übersetzungen aktivieren"
         stats:
           title: "Übersetzungsstatistiken"
-          complete_language_detection_description: "Alle %{total} geeigneten Beiträge wurden auf ihre Sprache hin überprüft."
-          incomplete_language_detection_description: "%{done} von %{total} geeigneten Beiträgen wurden auf ihre Sprache hin überprüft."
           backfill_disabled: "Rückwirkende Übersetzung ist deaktiviert; nur neue Beiträge werden übersetzt."
           backfill_message: "<a href='%{settingsUrl}'>Die Einstellungen für die rückwirkende Übersetzung</a> sind so konfiguriert, dass alle Beiträge nach %{date} übersetzt werden – dies wird voraussichtlich %{eta} dauern."
           eta_minutes:
diff --git a/plugins/discourse-ai/config/locales/client.he.yml b/plugins/discourse-ai/config/locales/client.he.yml
index c7ad07ccc18e0..3f6c2bc9c8ed0 100644
--- a/plugins/discourse-ai/config/locales/client.he.yml
+++ b/plugins/discourse-ai/config/locales/client.he.yml
@@ -337,8 +337,6 @@ he:
           enable_translations: "הפעלת תרגומים אוטומטיים"
         stats:
           title: "סטטיסטיקת תרגום"
-          complete_language_detection_description: "השפה של כל %{total} הפוסטים הזכאים זוהתה."
-          incomplete_language_detection_description: "השפה של %{done} מתוך %{total} פוסטים זכאים זוהתה."
           backfill_disabled: "מילוי לאחור מושבת, רק פוסטים חדשים יתורגמו."
           eta_minutes:
             one: "דקה"
diff --git a/plugins/discourse-ai/config/locales/client.ja.yml b/plugins/discourse-ai/config/locales/client.ja.yml
index b2abf21a56350..3b3224112d5bf 100644
--- a/plugins/discourse-ai/config/locales/client.ja.yml
+++ b/plugins/discourse-ai/config/locales/client.ja.yml
@@ -364,8 +364,6 @@ ja:
           enable_translations: "自動翻訳を有効にする"
         stats:
           title: "翻訳の統計"
-          complete_language_detection_description: "全 %{total} 件の対象投稿の言語が検出されました。"
-          incomplete_language_detection_description: "全 %{total} 件中 %{done} 件の対象投稿の言語が検出されました。"
           backfill_disabled: "バックフィルは無効です。新しい投稿のみが翻訳されます。"
           backfill_message: "%{date} 以降のすべての投稿を翻訳するように<a href='%{settingsUrl}'>バックフィル設定</a>が構成されています。これには %{eta} かかることが予測されます。"
           eta_minutes:
diff --git a/plugins/discourse-ai/config/locales/client.pl_PL.yml b/plugins/discourse-ai/config/locales/client.pl_PL.yml
index 8b6a7b162c80d..ccb340ad9f978 100644
--- a/plugins/discourse-ai/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-ai/config/locales/client.pl_PL.yml
@@ -382,8 +382,6 @@ pl_PL:
           enable_translations: "Włącz automatyczne tłumaczenia"
         stats:
           title: "Statystyki tłumaczeń"
-          complete_language_detection_description: "Wszystkie %{total} kwalifikujące się posty mają wykryty język."
-          incomplete_language_detection_description: "%{done} z %{total} kwalifikujących się postów ma wykryty język."
           backfill_disabled: "Uzupełnianie jest wyłączone, tłumaczone będą tylko nowe wpisy."
           backfill_message: "<a href='%{settingsUrl}'>Ustawienia uzupełniania</a> są skonfigurowane tak, aby tłumaczyć wszystkie posty po %{date} — szacuje się, że zajmie to %{eta}."
           eta_minutes:
diff --git a/plugins/discourse-ai/config/locales/client.ro.yml b/plugins/discourse-ai/config/locales/client.ro.yml
index a8b3ff657fa65..a48f73e20879d 100644
--- a/plugins/discourse-ai/config/locales/client.ro.yml
+++ b/plugins/discourse-ai/config/locales/client.ro.yml
@@ -97,8 +97,6 @@ ro:
           enable_translations: "Activează traducerile automate"
         stats:
           title: "Statistici traducere"
-          complete_language_detection_description: "Toate cele %{total} postări eligibile au limba lor detectată."
-          incomplete_language_detection_description: "%{done} din %{total} postări eligibile au găsit limba lor detectată."
           backfill_disabled: "Completarea este dezactivată, doar postările noi vor fi traduse."
           eta_minutes:
             one: "un minut"
diff --git a/plugins/discourse-ai/config/locales/client.uk.yml b/plugins/discourse-ai/config/locales/client.uk.yml
index ee20641e9616b..a826af8c00620 100644
--- a/plugins/discourse-ai/config/locales/client.uk.yml
+++ b/plugins/discourse-ai/config/locales/client.uk.yml
@@ -382,8 +382,6 @@ uk:
           enable_translations: "Увімкнути автоматичний переклад"
         stats:
           title: "Статистика перекладів"
-          complete_language_detection_description: "Усі повідомленнях, що відповідають вимогам %{total} мають можливість використовувати свою мову."
-          incomplete_language_detection_description: "%{done} з %{total} дописів, які відповідають вимогам, визначено їхню мову."
           backfill_disabled: "Автозаповнення вимкнено, перекладатимуться лише нові публікації."
           backfill_message: "<a href='%{settingsUrl}'>Налаштування заповнення</a> налаштовано на переклад усіх публікацій після %{date} — це, за оцінками, займе %{eta}."
           eta_minutes:
diff --git a/plugins/discourse-ai/config/locales/client.zh_CN.yml b/plugins/discourse-ai/config/locales/client.zh_CN.yml
index 396941e6a870e..7a1e739e55769 100644
--- a/plugins/discourse-ai/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-ai/config/locales/client.zh_CN.yml
@@ -370,8 +370,6 @@ zh_CN:
           enable_translations: "启用自动翻译"
         stats:
           title: "翻译统计"
-          complete_language_detection_description: "所有符合条件的 %{total} 个帖子均已检测到其语言。"
-          incomplete_language_detection_description: "%{total} 个符合条件的帖子中的 %{done} 个已检测到其语言。"
           backfill_disabled: "回填功能已禁用，仅翻译新帖子。"
           backfill_message: "<a href='%{settingsUrl}'>回填设置</a>配置为翻译 %{date} 后的所有帖子 – 预计需要 %{eta}。"
           eta_minutes:

From 535c57cb7a5bd71899fc19ea9ae94e27fb23bd15 Mon Sep 17 00:00:00 2001
From: chapoi <101828855+chapoi@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:37:43 +0100
Subject: [PATCH 097/168] UX: allow horizontal overflow on mobile (#38058)

On mobile, we prevent the horizontal overflow from working, making it
hard to detect there are hidden items.

Example with user nav:

<img width="784" height="470" alt="CleanShot 2026-02-25 at 14 28 16@2x"
src="https://github.com/user-attachments/assets/46136cc7-1e57-42ce-900a-d6c1bad52250"
/>

I'm not sure why it was restricted in the first place: it seems like a
better solution on mobile as well.


https://meta.discourse.org/t/admin-button-on-user-page-is-obscured-on-mobile/315330
---
 .../app/components/horizontal-overflow-nav.gjs      | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/frontend/discourse/app/components/horizontal-overflow-nav.gjs b/frontend/discourse/app/components/horizontal-overflow-nav.gjs
index 276b5bf1f45b7..0916841a4e703 100644
--- a/frontend/discourse/app/components/horizontal-overflow-nav.gjs
+++ b/frontend/discourse/app/components/horizontal-overflow-nav.gjs
@@ -3,15 +3,12 @@ import { tracked } from "@glimmer/tracking";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
-import { service } from "@ember/service";
 import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
 import { bind } from "discourse/lib/decorators";
 import onResize from "discourse/modifiers/on-resize";
 
 export default class HorizontalOverflowNav extends Component {
-  @service site;
-
   @tracked hasScroll;
   @tracked hideRightScroll = false;
   @tracked hideLeftScroll = true;
@@ -30,10 +27,6 @@ export default class HorizontalOverflowNav extends Component {
 
   @bind
   onResize(entries) {
-    if (this.site.mobileView) {
-      return;
-    }
-
     const element = entries[0].target;
     this.watchScroll(element);
     this.hasScroll = element.scrollWidth > element.offsetWidth;
@@ -46,10 +39,6 @@ export default class HorizontalOverflowNav extends Component {
 
   @bind
   onScroll(event) {
-    if (this.site.mobileView) {
-      return;
-    }
-
     this.watchScroll(event.target);
   }
 
@@ -78,7 +67,7 @@ export default class HorizontalOverflowNav extends Component {
 
   @bind
   scrollDrag(event) {
-    if (this.site.mobileView || !this.hasScroll) {
+    if (!this.hasScroll) {
       return;
     }
 

From e46946151cc123fb1f25f3b551fd842a105ef838 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Thu, 26 Feb 2026 10:47:48 +0100
Subject: [PATCH 098/168] FIX: Correctly position user cards (#38072)

(best viewed with white-space disabled)

This partially reverts c333888

* removed unnecessary `schedule("afterRender")` - that was already
delayed within `next()`
* made `DMenuInstance` accept object as `autoUpdate` option to allow
configuring floating-ui; this also replaces the separate
`updateOnScroll` option
* used `layoutShift: false` on user cards so the one that's triggered
via chat avatar doesn't move around on scroll
* added type check for `maxWidth` option to fix "unsetpx" bug
---
 .../app/components/card-contents-base.js      | 81 +++++++++----------
 .../float-kit/components/d-float-body.gjs     | 13 ++-
 frontend/discourse/float-kit/lib/constants.js |  3 +-
 .../float-kit/modifiers/apply-floating-ui.js  | 11 ++-
 .../discourse/components/chat-user-avatar.gjs |  1 -
 .../ai-post-helper-trigger.gjs                |  2 +-
 6 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/frontend/discourse/app/components/card-contents-base.js b/frontend/discourse/app/components/card-contents-base.js
index 3f9f4fe08d212..bbe322a810421 100644
--- a/frontend/discourse/app/components/card-contents-base.js
+++ b/frontend/discourse/app/components/card-contents-base.js
@@ -1,7 +1,7 @@
 /* eslint-disable ember/no-classic-components, ember/require-tagless-components */
 import Component from "@ember/component";
 import { alias, match } from "@ember/object/computed";
-import { next, schedule, throttle } from "@ember/runloop";
+import { next, throttle } from "@ember/runloop";
 import { service } from "@ember/service";
 import { bind } from "discourse/lib/decorators";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
@@ -194,52 +194,45 @@ export default class CardContentsBase extends Component {
     return this._show(target.innerText.replace(/^@/, ""), target, event);
   }
 
-  get autoUpdateCard() {
-    return this.cardTarget.dataset["autoUpdateCard"] === "true";
-  }
-
-  _positionCard(target) {
-    schedule("afterRender", async () => {
-      if (this.site.desktopView) {
-        this._menuInstance = await this.menu.show(target, {
-          content: this.element,
-          autoUpdate: this.autoUpdateCard,
-          hide: this.autoUpdateCard,
-          identifier: "usercard",
-          padding: {
-            top: 10 + AVATAR_OVERFLOW_SIZE + headerOffset(),
-            right: 10,
-            bottom: 10,
-            left: 10,
-          },
-          maxWidth: "unset",
-        });
-      } else {
-        this._menuInstance = await this.menu.show(target, {
-          content: this.element,
-          strategy: "fixed",
-          identifier: "usercard",
-          computePosition: (content) => {
-            content.style.left = "10px";
-            content.style.right = "10px";
-            content.style.top = 10 + AVATAR_OVERFLOW_SIZE + "px";
-          },
-        });
-      }
+  async _positionCard(target) {
+    if (this.site.desktopView) {
+      this._menuInstance = await this.menu.show(target, {
+        content: this.element,
+        autoUpdate: { ancestorScroll: false, layoutShift: false },
+        identifier: "usercard",
+        padding: {
+          top: 10 + AVATAR_OVERFLOW_SIZE + headerOffset(),
+          right: 10,
+          bottom: 10,
+          left: 10,
+        },
+        maxWidth: "unset",
+      });
+    } else {
+      this._menuInstance = await this.menu.show(target, {
+        content: this.element,
+        strategy: "fixed",
+        identifier: "usercard",
+        computePosition: (content) => {
+          content.style.left = "10px";
+          content.style.right = "10px";
+          content.style.top = 10 + AVATAR_OVERFLOW_SIZE + "px";
+        },
+      });
+    }
 
-      this.element.classList.toggle("docked-card", this.isDocked);
+    this.element.classList.toggle("docked-card", this.isDocked);
 
-      // After the card is shown, focus on the first link
-      //
-      // note: we DO NOT use afterRender here cause _positionCard may
-      // run afterwards, if we allowed this to happen the usercard
-      // may be offscreen and we may scroll all the way to it on focus
+    // After the card is shown, focus on the first link
+    //
+    // note: we DO NOT use afterRender here cause _positionCard may
+    // run afterwards, if we allowed this to happen the usercard
+    // may be offscreen and we may scroll all the way to it on focus
 
-      discourseLater(() => {
-        this.element.setAttribute("tabindex", "-1");
-        this.element.focus();
-      }, 350);
-    });
+    discourseLater(() => {
+      this.element.setAttribute("tabindex", "-1");
+      this.element.focus();
+    }, 350);
   }
 
   @bind
diff --git a/frontend/discourse/float-kit/components/d-float-body.gjs b/frontend/discourse/float-kit/components/d-float-body.gjs
index 4381f73d22b42..4a789b6bcadd1 100644
--- a/frontend/discourse/float-kit/components/d-float-body.gjs
+++ b/frontend/discourse/float-kit/components/d-float-body.gjs
@@ -1,5 +1,5 @@
 import Component from "@glimmer/component";
-import { concat, fn, hash } from "@ember/helper";
+import { fn, hash } from "@ember/helper";
 import { htmlSafe } from "@ember/template";
 import { modifier as modifierFn } from "ember-modifier";
 import DFloatPortal from "discourse/float-kit/components/d-float-portal";
@@ -62,6 +62,15 @@ export default class DFloatBody extends Component {
     return this.args.instance.options;
   }
 
+  get style() {
+    const maxWidth =
+      typeof this.options.maxWidth === "number"
+        ? `${this.options.maxWidth}px`
+        : this.options.maxWidth;
+
+    return htmlSafe(`max-width: ${maxWidth}`);
+  }
+
   <template>
     {{~! strip whitespace ~}}<DFloatPortal
       @inline={{@inline}}
@@ -94,7 +103,7 @@ export default class DFloatBody extends Component {
           (modifier FloatKitCloseOnEscape @instance.close)
         )}}
         {{(if this.supportsCloseOnScroll (modifier this.closeOnScroll))}}
-        style={{htmlSafe (concat "max-width: " this.options.maxWidth "px")}}
+        style={{this.style}}
         ...attributes
       >
         <div class={{@innerClass}}>
diff --git a/frontend/discourse/float-kit/lib/constants.js b/frontend/discourse/float-kit/lib/constants.js
index 814cfeab22ccf..d89bce55c899e 100644
--- a/frontend/discourse/float-kit/lib/constants.js
+++ b/frontend/discourse/float-kit/lib/constants.js
@@ -46,7 +46,6 @@ export const TOOLTIP = {
     onClose: null,
     onShow: null,
     onRegisterApi: null,
-    updateOnScroll: true,
     portalOutletElement: null,
   },
   portalOutletId: "d-tooltip-portal-outlet",
@@ -86,7 +85,6 @@ export const MENU = {
     triggerClass: null,
     contentClass: null,
     class: null,
-    updateOnScroll: true,
     matchTriggerMinWidth: false,
     matchTriggerWidth: false,
     portalOutletElement: null,
@@ -99,6 +97,7 @@ import DDefaultToast from "discourse/float-kit/components/d-default-toast";
 export const TOAST = {
   options: {
     autoClose: true,
+    autoUpdate: { ancestorScroll: false },
     duration: "short",
     component: DDefaultToast,
     showProgressBar: false,
diff --git a/frontend/discourse/float-kit/modifiers/apply-floating-ui.js b/frontend/discourse/float-kit/modifiers/apply-floating-ui.js
index ccc1cc3232fc3..99c881f4f8c91 100644
--- a/frontend/discourse/float-kit/modifiers/apply-floating-ui.js
+++ b/frontend/discourse/float-kit/modifiers/apply-floating-ui.js
@@ -16,9 +16,14 @@ export default class FloatKitApplyFloatingUi extends Modifier {
     this.options = options ?? {};
 
     if (this.options.autoUpdate) {
-      this.cleanup = autoUpdate(trigger, element, this.update, {
-        ancestorScroll: options.updateOnScroll,
-      });
+      this.cleanup = autoUpdate(
+        trigger,
+        element,
+        this.update,
+        typeof this.options.autoUpdate === "object"
+          ? this.options.autoUpdate
+          : {}
+      );
     } else {
       this.update();
     }
diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjs
index 8e776f454837b..6238201985843 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjs
@@ -57,7 +57,6 @@ export default class ChatUserAvatar extends Component {
           class="chat-user-avatar__container"
           href={{this.userPath}}
           data-user-card={{@user.username}}
-          data-auto-update-card={{this.isFullPageActive}}
         >
           {{this.avatar}}
         </a>
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
index 2aa689a816fb1..0d5bd4281f610 100644
--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
@@ -125,7 +125,7 @@ export default class AiPostHelperTrigger extends Component {
       data: this.menuData,
       placement: "top-start",
       fallbackPlacements: ["bottom-start"],
-      updateOnScroll: false,
+      autoUpdate: { ancestorScroll: false },
       onClose: () => {
         this.removeHighlightedText();
       },

From 9d144cac4b71013b6b2f0c407ad5e4f0d8dffb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <loic@discourse.org>
Date: Thu, 26 Feb 2026 11:10:55 +0100
Subject: [PATCH 099/168] DEV: Bump `latest` branch version on security fixes
 (#37774)

When security fixes are staged for the main branch via the
`stage_security_fixes` task, the development version is now
automatically incremented (e.g. `2026.2.0-latest` to
`2026.2.0-latest.1`). This ensures each security fix batch gets its own
tagged version, allowing docker_manager to detect that installations on
`latest` need a critical update.

To support this, a new `ReleaseUtils::Version` value object encapsulates
version parsing, comparison, and manipulation logic that was previously
done through ad-hoc string splitting and `Gem::Version` comparisons in
release.rake. It understands Discourse's versioning scheme
(major.minor.patch-pre.revision) and provides methods like
`#next_revision`, `#same_development_cycle?`, and
`#next_development_cycle`.

All existing rake tasks have been refactored to use `Version` objects,
the unused `parse_current_version` helper and
`prepare_next_version_branch` task have been removed, and the release
specs have been rewritten following RSpec style guide conventions.
---
 config/initializers/000-zeitwerk.rb    |   1 +
 lib/release_utils/version.rb           |  93 ++++
 lib/tasks/release.rake                 | 145 ++---
 spec/lib/release_utils/version_spec.rb | 375 +++++++++++++
 spec/tasks/release_spec.rb             | 710 +++++++++++++------------
 5 files changed, 887 insertions(+), 437 deletions(-)
 create mode 100644 lib/release_utils/version.rb
 create mode 100644 spec/lib/release_utils/version_spec.rb

diff --git a/config/initializers/000-zeitwerk.rb b/config/initializers/000-zeitwerk.rb
index 50470d4126b10..a4855a1743b26 100644
--- a/config/initializers/000-zeitwerk.rb
+++ b/config/initializers/000-zeitwerk.rb
@@ -53,6 +53,7 @@ def self.inflect(overrides)
   "lib/generators",
   "lib/freedom_patches",
   "lib/i18n/backend",
+  "lib/release_utils",
   "lib/unicorn_logstash_patch.rb",
   "lib/pitchfork_logstash_patch.rb",
 )
diff --git a/lib/release_utils/version.rb b/lib/release_utils/version.rb
new file mode 100644
index 0000000000000..2c279e6407eba
--- /dev/null
+++ b/lib/release_utils/version.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module ReleaseUtils
+  class Version
+    include Comparable
+
+    PRE_RELEASE = "latest"
+
+    attr_reader :major, :minor, :patch, :pre, :revision
+
+    protected attr_reader :gem_version
+
+    def initialize(version_string)
+      @gem_version = Gem::Version.new(version_string)
+
+      segments = gem_version.segments
+      @major = segments[0]
+      @minor = segments[1] || 1
+      @patch = segments[2] || 0
+
+      @pre, @revision = segments.drop(3).drop_while { it == "pre" } if gem_version.prerelease?
+
+      freeze
+    end
+
+    class << self
+      def current
+        version_string = File.read("lib/version.rb")[/STRING = "(.*)"/, 1]
+        raise "Unable to parse current version from lib/version.rb" unless version_string
+        new(version_string)
+      end
+
+      def next
+        target = new("#{Time.current.strftime("%Y.%-m")}.0-#{PRE_RELEASE}")
+        return target if target > current
+        current.next_development_cycle
+      end
+    end
+
+    def <=>(other)
+      other = self.class.new(other) if other.is_a?(String)
+      return unless other.is_a?(self.class)
+      gem_version <=> other.gem_version
+    end
+
+    def same_development_cycle?(other)
+      development? && other.development? && without_revision == other.without_revision
+    end
+
+    def same_series?(other)
+      series == other.series
+    end
+
+    def development?
+      pre == PRE_RELEASE
+    end
+
+    def series
+      "#{major}.#{minor}"
+    end
+
+    def branch_name
+      "release/#{series}"
+    end
+
+    def tag_name
+      "v#{self}"
+    end
+
+    def without_revision
+      return self unless revision
+      self.class.new("#{major}.#{minor}.#{patch}-#{pre}")
+    end
+
+    def next_development_cycle
+      carry, new_minor = minor.divmod(12)
+      self.class.new("#{major + carry}.#{new_minor + 1}.0-#{PRE_RELEASE}")
+    end
+
+    def next_revision
+      raise "next_revision can only be called on development versions" unless development?
+      self.class.new("#{major}.#{minor}.#{patch}-#{pre}.#{revision.to_i + 1}")
+    end
+
+    def to_s
+      "#{major}.#{minor}.#{patch}#{"-#{pre}" if pre}#{".#{revision}" if revision}"
+    end
+
+    def inspect
+      "#<#{self.class} #{self}>"
+    end
+  end
+end
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index be9f2b6971971..58495a8c08c70 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "tty-prompt"
+require_relative "../release_utils/version"
 
 module ReleaseUtils
   PRIMARY_RELEASE_TAG = "release"
@@ -39,13 +40,6 @@ module ReleaseUtils
     File.read("lib/version.rb")
   end
 
-  def self.parse_current_version
-    version = read_version_rb[/STRING = "(.*)"/, 1]
-    raise "Unable to parse current version" if version.nil?
-    puts "Parsed current version: #{version.inspect}"
-    version
-  end
-
   def self.write_version(version)
     File.write("lib/version.rb", read_version_rb.sub(/STRING = ".*"/, "STRING = \"#{version}\""))
   end
@@ -112,9 +106,13 @@ module ReleaseUtils
   end
 
   def self.confirm(msg)
+    return true if test_mode?
+    TTY::Prompt.new.yes?(msg)
+  end
+
+  def self.confirm_or_abort(msg)
     return if test_mode?
-    prompt = TTY::Prompt.new
-    raise "Aborted" unless prompt.yes?(msg)
+    raise "Aborted" unless confirm(msg)
   end
 
   def self.merge_pr(base:, branch:)
@@ -124,7 +122,7 @@ module ReleaseUtils
     end
 
     loop do
-      confirm "Ready to merge #{branch}?"
+      confirm_or_abort "Ready to merge #{branch}?"
 
       if test_mode?
         git "push", "origin", "#{branch}:#{base}"
@@ -183,43 +181,38 @@ namespace :release do
   task "maybe_cut_branch", [:check_ref] do |t, args|
     check_ref = args[:check_ref]
 
-    new_branch_name = nil
     new_version = nil
     previous_version = nil
 
     ReleaseUtils.with_clean_worktree("main") do
       ReleaseUtils.git("checkout", check_ref.to_s)
-      new_version = ReleaseUtils.parse_current_version
+      new_version = ReleaseUtils::Version.current
 
       ReleaseUtils.git("checkout", "#{check_ref}^1")
-      previous_version = ReleaseUtils.parse_current_version
+      previous_version = ReleaseUtils::Version.current
     end
 
-    next "version has not changed" if new_version == previous_version
+    raise "Unexpected previous version" if !previous_version.development?
+    raise "Unexpected new version" if !new_version.development?
 
-    raise "Unexpected previous version" if !previous_version.ends_with? "-latest"
-    raise "Unexpected new version" if !new_version.ends_with? "-latest"
-    if Gem::Version.new(new_version) < Gem::Version.new(previous_version)
-      raise "New version is smaller than old version"
-    end
+    next "version has not changed" if new_version.same_development_cycle?(previous_version)
 
-    parts = previous_version.split(".")
-    new_branch_name = "release/#{parts[0]}.#{parts[1]}"
+    raise "New version is smaller than old version" if new_version < previous_version
 
-    ReleaseUtils.git("branch", new_branch_name, "#{check_ref}^1")
-    puts "Created new branch #{new_branch_name}"
+    ReleaseUtils.git("branch", previous_version.branch_name, "#{check_ref}^1")
+    puts "Created new branch #{previous_version.branch_name}"
 
     File.write(
       ENV["GITHUB_OUTPUT"] || "/dev/null",
-      "new_branch_name=#{new_branch_name}\n",
+      "new_branch_name=#{previous_version.branch_name}\n",
       mode: "a",
     )
 
     if ReleaseUtils.dry_run?
-      puts "[DRY RUN] Skipping pushing branch #{new_branch_name} to origin"
+      puts "[DRY RUN] Skipping pushing branch #{previous_version.branch_name} to origin"
     else
-      ReleaseUtils.git("push", "--set-upstream", "origin", new_branch_name)
-      puts "Pushed branch #{new_branch_name} to origin"
+      ReleaseUtils.git("push", "--set-upstream", "origin", previous_version.branch_name)
+      puts "Pushed branch #{previous_version.branch_name} to origin"
     end
 
     puts "Done!"
@@ -242,21 +235,20 @@ namespace :release do
           next
         end
 
-        ReleaseUtils.parse_current_version
+        ReleaseUtils::Version.current
       end
+    next unless current_version
 
-    tag_name = "v#{current_version}"
-
-    if ReleaseUtils.ref_exists?(tag_name)
-      puts "Tag #{tag_name} already exists, skipping"
+    if ReleaseUtils.ref_exists?(current_version.tag_name)
+      puts "Tag #{current_version.tag_name} already exists, skipping"
     else
-      puts "Tagging release #{tag_name}"
-      ReleaseUtils.git "tag", "-a", tag_name, "-m", "version #{current_version}"
+      puts "Tagging release #{current_version.tag_name}"
+      ReleaseUtils.git "tag", "-a", current_version.tag_name, "-m", "version #{current_version}"
 
       if ReleaseUtils.dry_run?
         puts "[DRY RUN] Skipping pushing tag to origin"
       else
-        ReleaseUtils.git "push", "origin", "refs/tags/#{tag_name}"
+        ReleaseUtils.git "push", "origin", "refs/tags/#{current_version.tag_name}"
       end
     end
 
@@ -270,14 +262,12 @@ namespace :release do
     current_version =
       ReleaseUtils.with_clean_worktree("main") do
         ReleaseUtils.git "checkout", check_ref.to_s
-        ReleaseUtils.parse_current_version
+        ReleaseUtils::Version.current
       end
 
-    released_versions = ReleaseUtils.released_versions
-    current_minor = current_version.split(".").first(2).join(".") + ".0"
-    current_minor_version = Gem::Version.new(current_minor)
+    released_versions = ReleaseUtils.released_versions.map(&ReleaseUtils::Version.method(:new))
 
-    if released_versions.empty? || current_minor_version >= released_versions.last
+    if released_versions.empty? || current_version >= released_versions.last
       ReleaseUtils::RELEASE_TAGS.each do |synonym_tag|
         message =
           if synonym_tag == ReleaseUtils::PRIMARY_RELEASE_TAG
@@ -300,8 +290,8 @@ namespace :release do
     end
 
     # Update ESR tags if this version is in the latest released ESR series
-    released_esrs = ReleaseUtils.released_esrs
-    if released_esrs.any? && current_minor_version == released_esrs.last
+    released_esrs = ReleaseUtils.released_esrs.map(&ReleaseUtils::Version.method(:new))
+    if released_esrs.any? && current_version.same_series?(released_esrs.last)
       ReleaseUtils::ESR_TAGS.each do |synonym_tag|
         message =
           if synonym_tag == ReleaseUtils::PRIMARY_ESR_TAG
@@ -333,29 +323,15 @@ namespace :release do
       ReleaseUtils.git "branch", "-D", pr_branch_name if ReleaseUtils.ref_exists?(pr_branch_name)
       ReleaseUtils.git "checkout", "-b", pr_branch_name
 
-      current_version = ReleaseUtils.parse_current_version
-
-      target_version_number = "#{Time.now.strftime("%Y.%-m")}.0-latest"
+      current_version = ReleaseUtils::Version.current
+      target_version = ReleaseUtils::Version.next
 
-      if Gem::Version.new(target_version_number) <= Gem::Version.new(current_version)
-        puts "Target version #{current_version} is already >= #{target_version_number}. Incrementing instead."
-        major, minor, patch_and_pre = current_version.split(".")
-        minor = (minor.to_i + 1).to_s
-
-        if minor.to_i > 12 && Time.now.month == 12
-          major = (major.to_i + 1).to_s
-          minor = "1"
-        end
-
-        target_version_number = "#{major}.#{minor}.#{patch_and_pre}"
-      end
-
-      ReleaseUtils.write_version(target_version_number)
-      ReleaseUtils.update_versions_json(target_version_number.split(".").first(2).join("."))
+      ReleaseUtils.write_version(target_version)
+      ReleaseUtils.update_versions_json(target_version.series)
       ReleaseUtils.git "add", "lib/version.rb", "versions.json"
       ReleaseUtils.git "commit",
                        "-m",
-                       "DEV: Begin development of v#{target_version_number}\n\nMerging this will trigger the creation of a `release/#{current_version.sub(".0-latest", "")}` branch on the preceding commit."
+                       "DEV: Begin development of v#{target_version}\n\nMerging this will trigger the creation of a `#{current_version.branch_name}` branch on the preceding commit."
     end
 
     if ReleaseUtils.dry_run?
@@ -367,41 +343,6 @@ namespace :release do
     end
   end
 
-  desc "Prepare version bump"
-  task "prepare_next_version_branch", [:branch] do |t, args|
-    branch = args[:branch]
-
-    raise "Expected branch to start with 'release/'" if !branch.starts_with?("release/")
-
-    pr_branch_name = "version-bump/#{args[:branch]}"
-
-    ReleaseUtils.with_clean_worktree(branch) do
-      ReleaseUtils.git "branch", "-D", pr_branch_name if ReleaseUtils.ref_exists?(pr_branch_name)
-      ReleaseUtils.git "checkout", "-b", pr_branch_name
-
-      current_version = ReleaseUtils.parse_current_version
-      target_version_number =
-        if current_version.end_with?("-latest")
-          current_version.sub("-latest", "")
-        else
-          parts = current_version.split(".")
-          "#{parts[0]}.#{parts[1]}.#{parts[2].to_i + 1}"
-        end
-
-      ReleaseUtils.write_version(target_version_number)
-      ReleaseUtils.git "add", "lib/version.rb"
-      ReleaseUtils.git "commit",
-                       "-m",
-                       "DEV: Bump version on `#{branch}` to `v#{target_version_number}`"
-    end
-
-    ReleaseUtils.git "push", "-f", "--set-upstream", "origin", pr_branch_name
-
-    ReleaseUtils.make_pr(base: branch, branch: pr_branch_name)
-
-    puts "Done! Branch #{pr_branch_name} has been pushed to origin and a pull request has been created."
-  end
-
   desc <<~DESC
     Stage security fixes from private-mirror PRs into a single branch for review/merge.
     Fetches open PRs from private-mirror and presents an interactive selection.
@@ -476,10 +417,20 @@ namespace :release do
         ReleaseUtils.git "cherry-pick", "#{first_commit_on_branch}^..#{ref}"
       end
 
+      if base == "main" &&
+           ReleaseUtils.confirm(
+             "Bump the `latest` branch revision to #{ReleaseUtils::Version.current.next_revision}? This should only be done for security-fix merges which are not part of a regular monthly release.",
+           )
+        new_version = ReleaseUtils::Version.current.next_revision
+        ReleaseUtils.write_version(new_version)
+        ReleaseUtils.git "add", "lib/version.rb"
+        ReleaseUtils.git "commit", "-m", "DEV: Bump development branch to v#{new_version}"
+      end
+
       puts "Finished merging commits into a locally-staged #{branch} branch. Git log is:"
       puts ReleaseUtils.git("log", "origin/#{base}..#{branch}")
 
-      ReleaseUtils.confirm "Check the log above. Ready to push this branch to the origin and create a PR?"
+      ReleaseUtils.confirm_or_abort "Check the log above. Ready to push this branch to the origin and create a PR?"
       ReleaseUtils.git("push", "-f", "--set-upstream", "origin", branch)
 
       ReleaseUtils.make_pr(
diff --git a/spec/lib/release_utils/version_spec.rb b/spec/lib/release_utils/version_spec.rb
new file mode 100644
index 0000000000000..5cd8be75b097c
--- /dev/null
+++ b/spec/lib/release_utils/version_spec.rb
@@ -0,0 +1,375 @@
+# frozen_string_literal: true
+
+require "release_utils/version"
+
+RSpec.describe ReleaseUtils::Version do
+  describe ".new" do
+    subject(:version) { described_class.new(version_string) }
+
+    context "with a release version" do
+      let(:version_string) { "2025.10.1" }
+
+      it do
+        is_expected.to have_attributes(major: 2025, minor: 10, patch: 1, pre: nil, revision: nil)
+      end
+    end
+
+    context "with a development version" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it do
+        is_expected.to have_attributes(
+          major: 2025,
+          minor: 10,
+          patch: 0,
+          pre: "latest",
+          revision: nil,
+        )
+      end
+    end
+
+    context "with a development version with revision" do
+      let(:version_string) { "2025.10.0-latest.3" }
+
+      it do
+        is_expected.to have_attributes(major: 2025, minor: 10, patch: 0, pre: "latest", revision: 3)
+      end
+    end
+
+    context "with a malformed version string" do
+      let(:version_string) { "not-a-version" }
+
+      it { expect { version }.to raise_error(ArgumentError) }
+    end
+
+    it "freezes the instance" do
+      expect(described_class.new("2025.10.0")).to be_frozen
+    end
+  end
+
+  describe ".current" do
+    subject(:version) { described_class.current }
+
+    before { allow(File).to receive(:read).with("lib/version.rb").and_return(version_rb) }
+
+    context "with a valid version file" do
+      let(:version_rb) { "STRING = \"2025.10.0-latest\"" }
+      let(:expected_version) { described_class.new("2025.10.0-latest") }
+
+      it { is_expected.to eq expected_version }
+    end
+
+    context "with no version string" do
+      let(:version_rb) { "no version here" }
+
+      it { expect { version }.to raise_error(RuntimeError, /Unable to parse/) }
+    end
+  end
+
+  describe ".next" do
+    subject(:next_version) { described_class.next }
+
+    before do
+      allow(File).to receive(:read).with("lib/version.rb").and_return(
+        "STRING = \"#{current_version}\"",
+      )
+    end
+
+    context "when current version is older than the target month" do
+      let(:current_version) { "2025.1.0-latest" }
+
+      it "jumps to the current month" do
+        freeze_time "2025-09-15" do
+          expect(next_version).to eq("2025.9.0-latest")
+        end
+      end
+    end
+
+    context "when current version matches the target month" do
+      let(:current_version) { "2025.10.0-latest" }
+
+      it "increments to the next month" do
+        freeze_time "2025-10-15" do
+          expect(next_version).to eq("2025.11.0-latest")
+        end
+      end
+    end
+
+    context "when current version is ahead of the target month" do
+      let(:current_version) { "2025.11.0-latest" }
+
+      it "increments to the next month" do
+        freeze_time "2025-10-15" do
+          expect(next_version).to eq("2025.12.0-latest")
+        end
+      end
+    end
+
+    context "when current version has a revision" do
+      let(:current_version) { "2025.10.0-latest.2" }
+
+      it "increments to the next month without revision" do
+        freeze_time "2025-10-15" do
+          expect(next_version).to eq("2025.11.0-latest")
+        end
+      end
+    end
+
+    context "when incrementing past December" do
+      let(:current_version) { "2025.12.0-latest" }
+
+      it "rolls over to next year" do
+        freeze_time "2025-12-15" do
+          expect(next_version).to eq("2026.1.0-latest")
+        end
+      end
+    end
+  end
+
+  describe "#to_s" do
+    subject(:version_string) { described_class.new(input).to_s }
+
+    context "with a release version" do
+      let(:input) { "2025.10.1" }
+
+      it { is_expected.to eq("2025.10.1") }
+    end
+
+    context "with a development version" do
+      let(:input) { "2025.10.0-latest" }
+
+      it { is_expected.to eq("2025.10.0-latest") }
+    end
+
+    context "with a development version with revision" do
+      let(:input) { "2025.10.0-latest.2" }
+
+      it { is_expected.to eq("2025.10.0-latest.2") }
+    end
+  end
+
+  describe "#<=>" do
+    subject(:version) { described_class.new(version_string) }
+
+    context "with release versions" do
+      let(:version_string) { "2025.10.1" }
+
+      it { is_expected.to be > described_class.new("2025.10.0") }
+      it { is_expected.to be < described_class.new("2025.11.0") }
+      it { is_expected.to eq described_class.new("2025.10.1") }
+    end
+
+    context "with a development version" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it { is_expected.to be < described_class.new("2025.10.0") }
+    end
+
+    context "with development version revisions" do
+      let(:version_string) { "2025.10.0-latest.2" }
+
+      it { is_expected.to be > described_class.new("2025.10.0-latest.1") }
+      it { is_expected.to be > described_class.new("2025.10.0-latest") }
+    end
+
+    context "with a string argument" do
+      let(:version_string) { "2025.10.0" }
+
+      it { is_expected.to be > "2025.9.0" }
+    end
+
+    context "with an incompatible type" do
+      let(:version_string) { "2025.10.0" }
+
+      it { expect(version <=> 42).to be_nil }
+    end
+  end
+
+  describe "#development?" do
+    subject(:version) { described_class.new(version_string) }
+
+    context "with a development version" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it { is_expected.to be_development }
+    end
+
+    context "with a development version with revision" do
+      let(:version_string) { "2025.10.0-latest.1" }
+
+      it { is_expected.to be_development }
+    end
+
+    context "with a release version" do
+      let(:version_string) { "2025.10.0" }
+
+      it { is_expected.not_to be_development }
+    end
+  end
+
+  describe "#same_development_cycle?" do
+    subject(:version) { described_class.new(version_string) }
+
+    RSpec::Matchers.alias_matcher :share_development_cycle_with, :be_same_development_cycle
+
+    context "with two development versions in the same cycle" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it { is_expected.to share_development_cycle_with(described_class.new("2025.10.0-latest")) }
+    end
+
+    context "with development versions differing only in revision" do
+      let(:version_string) { "2025.10.0-latest.1" }
+
+      it { is_expected.to share_development_cycle_with(described_class.new("2025.10.0-latest.2")) }
+    end
+
+    context "with development versions in different cycles" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it do
+        is_expected.not_to share_development_cycle_with(described_class.new("2025.11.0-latest"))
+      end
+    end
+
+    context "when one version is a release" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it { is_expected.not_to share_development_cycle_with(described_class.new("2025.10.0")) }
+    end
+
+    context "when both versions are releases" do
+      let(:version_string) { "2025.10.0" }
+
+      it { is_expected.not_to share_development_cycle_with(described_class.new("2025.10.0")) }
+    end
+  end
+
+  describe "#same_series?" do
+    subject(:version) { described_class.new(version_string) }
+
+    RSpec::Matchers.alias_matcher :share_series_with, :be_same_series
+
+    context "with versions in the same series" do
+      let(:version_string) { "2025.10.0" }
+
+      it { is_expected.to share_series_with(described_class.new("2025.10.1")) }
+    end
+
+    context "with a release and development version in the same series" do
+      let(:version_string) { "2025.10.0" }
+
+      it { is_expected.to share_series_with(described_class.new("2025.10.0-latest")) }
+    end
+
+    context "with versions in different series" do
+      let(:version_string) { "2025.10.0" }
+
+      it { is_expected.not_to share_series_with(described_class.new("2025.11.0")) }
+    end
+  end
+
+  describe "#series" do
+    subject(:series) { described_class.new(version_string).series }
+
+    context "with a release version" do
+      let(:version_string) { "2025.10.3" }
+
+      it { is_expected.to eq("2025.10") }
+    end
+
+    context "with a development version with revision" do
+      let(:version_string) { "2025.10.0-latest.2" }
+
+      it { is_expected.to eq("2025.10") }
+    end
+  end
+
+  describe "#branch_name" do
+    subject(:branch_name) { described_class.new("2025.10.0-latest").branch_name }
+
+    it { is_expected.to eq("release/2025.10") }
+  end
+
+  describe "#tag_name" do
+    subject(:tag_name) { described_class.new(version_string).tag_name }
+
+    context "with a release version" do
+      let(:version_string) { "2025.10.0" }
+
+      it { is_expected.to eq("v2025.10.0") }
+    end
+
+    context "with a development version" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it { is_expected.to eq("v2025.10.0-latest") }
+    end
+
+    context "with a development version with revision" do
+      let(:version_string) { "2025.10.0-latest.2" }
+
+      it { is_expected.to eq("v2025.10.0-latest.2") }
+    end
+  end
+
+  describe "#without_revision" do
+    subject(:without_revision) { version.without_revision }
+
+    context "with a development version with revision" do
+      let(:version) { described_class.new("2025.10.0-latest.2") }
+
+      it { is_expected.to eq("2025.10.0-latest") }
+    end
+
+    context "with a development version without revision" do
+      let(:version) { described_class.new("2025.10.0-latest") }
+
+      it { is_expected.to equal(version) }
+    end
+
+    context "with a release version" do
+      let(:version) { described_class.new("2025.10.0") }
+
+      it { is_expected.to equal(version) }
+    end
+  end
+
+  describe "#next_development_cycle" do
+    subject(:next_version) { described_class.new(version_string).next_development_cycle }
+
+    context "with a standard development version" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it { is_expected.to eq("2025.11.0-latest") }
+    end
+
+    context "with December (year rollover)" do
+      let(:version_string) { "2025.12.0-latest" }
+
+      it { is_expected.to eq("2026.1.0-latest") }
+    end
+
+    context "with a development version with revision" do
+      let(:version_string) { "2025.10.0-latest.2" }
+
+      it { is_expected.to eq("2025.11.0-latest") }
+    end
+  end
+
+  describe "#next_revision" do
+    subject(:next_version) { described_class.new(version_string).next_revision }
+
+    context "with a plain development version" do
+      let(:version_string) { "2025.10.0-latest" }
+
+      it { is_expected.to eq("2025.10.0-latest.1") }
+    end
+
+    context "with an existing revision" do
+      let(:version_string) { "2025.10.0-latest.2" }
+
+      it { is_expected.to eq("2025.10.0-latest.3") }
+    end
+  end
+end
diff --git a/spec/tasks/release_spec.rb b/spec/tasks/release_spec.rb
index b073f840b266a..68c7cb6547518 100644
--- a/spec/tasks/release_spec.rb
+++ b/spec/tasks/release_spec.rb
@@ -1,27 +1,35 @@
 # frozen_string_literal: true
 
-def run(*args)
-  out, err, status = Open3.capture3(*args)
-  raise "Command failed: #{args.inspect}\n#{out}\n#{err}" unless status.success?
-  out
-end
-
-def fake_version_rb(version)
-  File.read("#{Rails.root}/lib/version.rb").sub(/STRING = ".*"/, "STRING = \"#{version}\"")
-end
-
 RSpec.describe "tasks/version_bump" do
   let(:tmpdir) { Dir.mktmpdir }
   let(:origin_path) { "#{tmpdir}/origin-repo" }
   let(:local_path) { "#{tmpdir}/local-repo" }
+  let(:git_tags) { git("tag").lines.map(&:strip) }
+
+  def git(*args)
+    out, err, status = Open3.capture3("git", *args)
+    raise "Command failed: git #{args.inspect}\n#{out}\n#{err}" unless status.success?
+    out
+  end
+
+  def fake_version_rb(version)
+    File.read("#{Rails.root}/lib/version.rb").sub(/STRING = ".*"/, "STRING = \"#{version}\"")
+  end
+
+  def commit_version(version)
+    File.write("lib/version.rb", fake_version_rb(version))
+    git "add", "."
+    git "commit", "-m", "version #{version}"
+    git("rev-parse", "HEAD").strip
+  end
 
   def update_versions_json(overrides)
     Dir.chdir(origin_path) do
-      run "git", "checkout", "main"
+      git "checkout", "main"
       current = JSON.parse(File.read("versions.json"))
       File.write("versions.json", JSON.pretty_generate(current.merge(overrides)))
-      run "git", "add", "versions.json"
-      run "git", "commit", "-m", "Update versions.json"
+      git "add", "versions.json"
+      git "commit", "-m", "Update versions.json"
     end
   end
 
@@ -37,216 +45,161 @@ def update_versions_json(overrides)
 
       File.write(".gitignore", "tmp\n")
       File.write("lib/version.rb", fake_version_rb("2025.12.0-latest"))
-      File.write(
-        "versions.json",
-        JSON.pretty_generate(
-          {
-            "2025.1" => {
-              "released" => true,
-              "esr" => true,
-            },
-            "2025.2" => {
-              "released" => true,
-              "esr" => false,
-            },
-            "2025.3" => {
-              "released" => true,
-              "esr" => false,
-            },
-            "2025.4" => {
-              "released" => true,
-              "esr" => false,
-            },
-            "2025.5" => {
-              "released" => true,
-              "esr" => false,
-            },
-            "2025.6" => {
-              "released" => true,
-              "esr" => false,
-            },
-            "2025.7" => {
-              "released" => false,
-              "esr" => true,
-            },
-            "2025.8" => {
-              "released" => false,
-              "esr" => false,
-            },
-            "2025.9" => {
-              "released" => false,
-              "esr" => false,
-            },
-            "2025.10" => {
-              "released" => false,
-              "esr" => false,
-            },
-            "2025.11" => {
-              "released" => false,
-              "esr" => false,
-            },
-            "2025.12" => {
-              "released" => false,
-              "esr" => false,
-            },
-          },
-        ),
-      )
+      versions =
+        (1..12).each_with_object({}) do |month, hash|
+          hash["2025.#{month}"] = { "released" => month <= 6, "esr" => [1, 7].include?(month) }
+        end
+      File.write("versions.json", JSON.pretty_generate(versions))
 
-      run "git", "init"
-      run "git", "checkout", "-b", "main"
-      run "git", "add", "."
-      run "git", "commit", "-m", "Initial commit"
+      git "init"
+      git "checkout", "-b", "main"
+      git "add", "."
+      git "commit", "-m", "Initial commit"
 
-      run "git", "checkout", "-b", "stable"
+      git "checkout", "-b", "stable"
       File.write("#{origin_path}/lib/version.rb", fake_version_rb("3.1.2"))
-      run "git", "add", "."
-      run "git", "commit", "-m", "Previous stable version bump"
+      git "add", "."
+      git "commit", "-m", "Previous stable version bump"
 
-      run "git", "checkout", "main"
-      run "git", "config", "receive.denyCurrentBranch", "ignore"
+      git "checkout", "main"
+      git "config", "receive.denyCurrentBranch", "ignore"
     end
 
-    run "git", "clone", "-b", "main", origin_path, local_path
+    git "clone", "-b", "main", origin_path, local_path
   end
 
   after do
     FileUtils.remove_entry(tmpdir)
-    ENV.delete("RUNNING_VERSION_BUMP_IN_RSPEC_TESTS")
+    ENV.delete("RUNNING_RELEASE_IN_RSPEC_TESTS")
   end
 
   describe "release:maybe_tag_release" do
-    it "does not tag if commit is not on a release/* branch" do
-      Dir.chdir(local_path) do
-        run "git", "switch", "-c", "some-other-branch"
-        File.write("lib/version.rb", fake_version_rb("2025.6.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.6.0"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
-        # Not on a release/* branch, should not tag
-        capture_stdout { invoke_rake_task("release:maybe_tag_release", commit_hash) }
-        # Should not tag, so v2025.6.0 should not exist
-        expect(run("git", "tag").lines.map(&:strip)).not_to include("v2025.6.0")
-      end
+    subject(:run_task) do
+      capture_stdout { invoke_rake_task("release:maybe_tag_release", commit_hash) }
     end
 
-    it "tags a release if tag does not exist" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.3.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.3.0"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
-        run "git", "branch", "release/2025.3"
-        output = capture_stdout { invoke_rake_task("release:maybe_tag_release", commit_hash) }
-        expect(output).to include("Tagging release v2025.3.0")
-        expect(run("git", "tag").lines.map(&:strip)).to include("v2025.3.0")
+    let(:commit_hash) { commit_version(version) }
+
+    context "when commit is not on a release branch" do
+      let(:version) { "2025.6.0" }
+
+      it "does not create a tag" do
+        Dir.chdir(local_path) do
+          git "switch", "-c", "some-other-branch"
+
+          expect { run_task }.not_to change { git_tags }
+        end
       end
     end
 
-    it "tags first commit of a pre-release cycle" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.4.0-latest"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "bump to 2025.4.0-latest"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
-        output = capture_stdout { invoke_rake_task("release:maybe_tag_release", commit_hash) }
-        expect(output).to include("Tagging release v2025.4.0-latest")
-        expect(run("git", "tag").lines.map(&:strip)).to include("v2025.4.0-latest")
+    context "when tag does not exist" do
+      let(:version) { "2025.3.0" }
+      let!(:commit_hash) { Dir.chdir(local_path) { commit_version(version) } }
+
+      it "creates the tag" do
+        Dir.chdir(local_path) do
+          git "branch", "release/2025.3"
+
+          expect(run_task).to include("Tagging release v2025.3.0")
+          expect(git_tags).to include("v2025.3.0")
+        end
       end
     end
 
-    it "skips tagging if tag already exists" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.5.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.5.0"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
-        run "git", "branch", "release/2025.5"
-        # Create tag manually
-        run "git", "tag", "-a", "v2025.5.0", "-m", "version 2025.5.0"
-        output = capture_stdout { invoke_rake_task("release:maybe_tag_release", commit_hash) }
-        expect(output).to include("Tag v2025.5.0 already exists, skipping")
+    context "when version is a pre-release" do
+      let(:version) { "2025.4.0-latest" }
+
+      it "tags the pre-release version" do
+        Dir.chdir(local_path) do
+          expect(run_task).to include("Tagging release v2025.4.0-latest")
+          expect(git_tags).to include("v2025.4.0-latest")
+        end
       end
     end
-  end
-
-  describe "release:update_release_tags" do
-    it "creates release alias tags when version matches latest release" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.6.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.6.0"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
 
-        capture_stdout { invoke_rake_task("release:update_release_tags", commit_hash) }
+    context "when version is a security patchlevel" do
+      let(:version) { "2025.4.0-latest.1" }
 
-        tags = run("git", "tag").lines.map(&:strip)
-        ReleaseUtils::RELEASE_TAGS.each { |tag| expect(tags).to include(tag) }
+      it "tags the patchlevel version" do
+        Dir.chdir(local_path) do
+          expect(run_task).to include("Tagging release v2025.4.0-latest.1")
+          expect(git_tags).to include("v2025.4.0-latest.1")
+        end
       end
     end
 
-    it "skips release tags when version is older than latest release" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.1.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "old release"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
+    context "when tag already exists" do
+      let(:version) { "2025.5.0" }
+      let!(:commit_hash) { Dir.chdir(local_path) { commit_version(version) } }
 
-        output = capture_stdout { invoke_rake_task("release:update_release_tags", commit_hash) }
+      it "skips tagging" do
+        Dir.chdir(local_path) do
+          git "branch", "release/2025.5"
+          git "tag", "-a", "v2025.5.0", "-m", "version 2025.5.0"
 
-        expect(output).to include("older than latest release")
-        tags = run("git", "tag").lines.map(&:strip)
-        ReleaseUtils::RELEASE_TAGS.each { |tag| expect(tags).not_to include(tag) }
+          expect { run_task }.not_to change { git_tags }
+        end
       end
     end
+  end
 
-    it "ignores unreleased versions when determining latest release" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.6.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.6.0"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
+  describe "release:update_release_tags" do
+    subject(:run_task) do
+      capture_stdout { invoke_rake_task("release:update_release_tags", commit_hash) }
+    end
 
-        capture_stdout { invoke_rake_task("release:update_release_tags", commit_hash) }
+    let(:commit_hash) { commit_version(version) }
 
-        tags = run("git", "tag").lines.map(&:strip)
-        ReleaseUtils::RELEASE_TAGS.each { |tag| expect(tags).to include(tag) }
+    context "when version is newer than latest release" do
+      let(:version) { "2025.6.0" }
+
+      it "creates release alias tags" do
+        Dir.chdir(local_path) do
+          run_task
+          expect(git_tags).to contain_exactly(*ReleaseUtils::RELEASE_TAGS)
+        end
       end
     end
 
-    it "does not create ESR tags for non-ESR releases" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.6.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.6.0"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
-
-        capture_stdout { invoke_rake_task("release:update_release_tags", commit_hash) }
+    context "when version is older than latest release" do
+      let(:version) { "2025.1.0" }
 
-        tags = run("git", "tag").lines.map(&:strip)
-        ReleaseUtils::ESR_TAGS.each { |tag| expect(tags).not_to include(tag) }
+      it "skips release tags" do
+        Dir.chdir(local_path) do
+          expect(run_task).to include("older than latest release")
+          expect(git_tags).not_to include(*ReleaseUtils::RELEASE_TAGS)
+        end
       end
     end
 
-    it "creates ESR alias tags when version is in the latest released ESR series" do
-      Dir.chdir(local_path) do
-        update_versions_json({ "2025.7" => { "released" => true, "esr" => true } })
+    context "when version is a non-ESR release" do
+      let(:version) { "2025.6.0" }
 
-        File.write("lib/version.rb", fake_version_rb("2025.7.1"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.7.1"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
+      it "does not create ESR tags" do
+        Dir.chdir(local_path) do
+          run_task
+          expect(git_tags).not_to include(*ReleaseUtils::ESR_TAGS)
+        end
+      end
+    end
 
-        capture_stdout { invoke_rake_task("release:update_release_tags", commit_hash) }
+    context "when version is in the latest released ESR series" do
+      let(:version) { "2025.7.1" }
 
-        tags = run("git", "tag").lines.map(&:strip)
-        ReleaseUtils::RELEASE_TAGS.each { |tag| expect(tags).to include(tag) }
-        ReleaseUtils::ESR_TAGS.each { |tag| expect(tags).to include(tag) }
+      before { update_versions_json({ "2025.7" => { "released" => true, "esr" => true } }) }
+
+      it "creates both release and ESR alias tags" do
+        Dir.chdir(local_path) do
+          run_task
+          expect(git_tags).to include(*ReleaseUtils::RELEASE_TAGS, *ReleaseUtils::ESR_TAGS)
+        end
       end
     end
 
-    it "does not add ESR tags to non-ESR releases newer than the latest ESR" do
-      Dir.chdir(local_path) do
+    context "when version is newer than the latest ESR but not an ESR itself" do
+      let(:version) { "2025.8.0" }
+
+      before do
         update_versions_json(
           {
             "2025.7" => {
@@ -259,119 +212,222 @@ def update_versions_json(overrides)
             },
           },
         )
+      end
 
-        File.write("lib/version.rb", fake_version_rb("2025.8.0"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "release 2025.8.0"
-        commit_hash = run("git", "rev-parse", "HEAD").strip
-
-        capture_stdout { invoke_rake_task("release:update_release_tags", commit_hash) }
-
-        tags = run("git", "tag").lines.map(&:strip)
-        ReleaseUtils::RELEASE_TAGS.each { |tag| expect(tags).to include(tag) }
-        ReleaseUtils::ESR_TAGS.each { |tag| expect(tags).not_to include(tag) }
+      it "creates release tags but not ESR tags" do
+        Dir.chdir(local_path) do
+          run_task
+          expect(git_tags).to contain_exactly(*ReleaseUtils::RELEASE_TAGS)
+        end
       end
     end
   end
 
-  it "can create a new release branch" do
-    latest_hash, previous_hash = nil
+  describe "release:maybe_cut_branch" do
+    subject(:run_task) do
+      capture_stdout { invoke_rake_task("release:maybe_cut_branch", latest_hash) }
+    end
+
+    context "when development cycle changes" do
+      let!(:previous_hash) { Dir.chdir(local_path) { commit_version(previous_version) } }
+      let!(:latest_hash) { Dir.chdir(local_path) { commit_version(current_version) } }
+
+      def branch_tip(branch)
+        Dir.chdir(origin_path) do
+          git "checkout", branch
+          git("rev-parse", "HEAD").strip
+        end
+      end
+
+      context "when going from one minor to another" do
+        let(:previous_version) { "2025.1.0-latest" }
+        let(:current_version) { "2025.2.0-latest" }
 
-    Dir.chdir(local_path) do
-      File.write("lib/version.rb", fake_version_rb("2025.1.0-latest"))
-      run "git", "add", "."
-      run "git", "commit", "-m", "developing 2025.1"
+        it "creates a release branch at the previous commit" do
+          Dir.chdir(local_path) { run_task }
 
-      previous_hash = run("git", "rev-parse", "HEAD").strip
+          expect(branch_tip("release/2025.1")).to eq(previous_hash)
+        end
+      end
 
-      File.write("lib/version.rb", fake_version_rb("2025.2.0-latest"))
-      run "git", "add", "."
-      run "git", "commit", "-m", "begin development of 2025.2-latest"
+      context "when going from a patchlevel to a new minor" do
+        let(:previous_version) { "2025.11.0-latest.2" }
+        let(:current_version) { "2025.12.0-latest" }
 
-      latest_hash = run("git", "rev-parse", "HEAD").strip
+        it "creates a release branch at the previous commit" do
+          Dir.chdir(local_path) { run_task }
 
-      output = capture_stdout { invoke_rake_task("release:maybe_cut_branch", latest_hash) }
-      expect(output).to include("Created new branch")
+          expect(branch_tip("release/2025.11")).to eq(previous_hash)
+        end
+      end
     end
 
-    Dir.chdir(origin_path) do
-      run "git", "checkout", "release/2025.1"
-      branch_tip = run("git", "rev-parse", "HEAD").strip
-      expect(branch_tip).to eq(previous_hash)
+    context "when development cycle stays the same" do
+      def origin_branches
+        Dir.chdir(origin_path) { git("branch").lines.map(&:strip) }
+      end
+
+      context "when bumping from latest to latest.1" do
+        let!(:latest_hash) { Dir.chdir(local_path) { commit_version("2025.12.0-latest.1") } }
+
+        it "does not create a branch" do
+          Dir.chdir(local_path) { expect { run_task }.not_to change { origin_branches } }
+        end
+      end
+
+      context "when bumping from latest.1 to latest.2" do
+        let!(:intermediate_hash) { Dir.chdir(local_path) { commit_version("2025.12.0-latest.1") } }
+        let!(:latest_hash) { Dir.chdir(local_path) { commit_version("2025.12.0-latest.2") } }
+
+        it "does not create a branch" do
+          Dir.chdir(local_path) { expect { run_task }.not_to change { origin_branches } }
+        end
+      end
     end
   end
 
   describe "release:prepare_next_version" do
-    it "bumps version to current month format when current version is older" do
+    subject(:run_task) do
       Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2024.1.0-latest"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "old version"
-        run "git", "push", "origin", "main"
-
-        freeze_time Time.utc(2025, 9, 15) do
+        freeze_time(frozen_time) do
           capture_stdout { invoke_rake_task("release:prepare_next_version") }
         end
       end
+    end
+
+    let(:bumped_version) do
+      on_version_bump_branch { File.read("lib/version.rb")[/STRING = "(.*)"/, 1] }
+    end
 
+    def on_version_bump_branch
       Dir.chdir(origin_path) do
-        run "git", "reset", "--hard"
-        run "git", "checkout", "version-bump/main"
-        version_rb_content = File.read("lib/version.rb")
-        expect(version_rb_content).to include('STRING = "2025.9.0-latest"')
+        git "reset", "--hard"
+        git "checkout", "version-bump/main"
+        yield
       end
     end
 
-    it "increments minor version when current version is already >= target month version" do
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.10.0-latest"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "current month version"
-        run "git", "push", "origin", "main"
-
-        freeze_time Time.utc(2025, 10, 15) do
-          output = capture_stdout { invoke_rake_task("release:prepare_next_version") }
-          expect(output).to include("is already >= 2025.10.0-latest. Incrementing instead.")
+    context "with a custom version on main" do
+      before do
+        Dir.chdir(local_path) do
+          commit_version(initial_version)
+          git "push", "origin", "main"
         end
       end
 
-      Dir.chdir(origin_path) do
-        run "git", "reset", "--hard"
-        run "git", "checkout", "version-bump/main"
-        version_rb_content = File.read("lib/version.rb")
-        expect(version_rb_content).to include('STRING = "2025.11.0-latest"')
+      context "when current version is older than target month" do
+        let(:frozen_time) { "2025-09-15" }
+        let(:initial_version) { "2024.1.0-latest" }
+
+        it "bumps to the current month" do
+          run_task
+          expect(bumped_version).to eq("2025.9.0-latest")
+        end
       end
-    end
 
-    it "rolls over to next year when incrementing past December" do
-      Dir.chdir(local_path) do
-        freeze_time Time.utc(2025, 12, 15) do
-          capture_stdout { invoke_rake_task("release:prepare_next_version") }
+      context "when current version matches target month" do
+        let(:frozen_time) { "2025-10-15" }
+        let(:initial_version) { "2025.10.0-latest" }
+
+        it "increments to next month" do
+          run_task
+          expect(bumped_version).to eq("2025.11.0-latest")
         end
       end
 
-      Dir.chdir(origin_path) do
-        run "git", "reset", "--hard"
-        run "git", "checkout", "version-bump/main"
-        version_rb_content = File.read("lib/version.rb")
-        expect(version_rb_content).to include('STRING = "2026.1.0-latest"')
+      context "when current version has a security patchlevel" do
+        let(:frozen_time) { "2025-10-15" }
+        let(:initial_version) { "2025.10.0-latest.2" }
+
+        it "increments to next month and drops patchlevel" do
+          run_task
+          expect(bumped_version).to eq("2025.11.0-latest")
+        end
       end
-    end
 
-    it "updates versions.json with new version info" do
-      Dir.chdir(local_path) do
-        freeze_time Time.utc(2025, 12, 28) do
-          capture_stdout { invoke_rake_task("release:prepare_next_version") }
+      context "when PR creation succeeds" do
+        let(:frozen_time) { "2025-10-15" }
+        let(:initial_version) { "2025.5.0-latest" }
+        let(:commit_message) { on_version_bump_branch { git("log", "-1", "--pretty=%B").strip } }
+
+        before do
+          allow(ReleaseUtils).to receive(:gh).with("pr", "create", any_args).and_return(true)
+          run_task
+        end
+
+        it "includes the version bump description" do
+          expect(commit_message).to include("Begin development of v2025.10.0-latest")
+          expect(commit_message).to include(
+            "Merging this will trigger the creation of a `release/2025.5` branch on the preceding commit.",
+          )
+        end
+
+        it "creates a PR" do
+          commit_message
+
+          expect(ReleaseUtils).to have_received(:gh).with(
+            "pr",
+            "create",
+            "--base",
+            "main",
+            "--head",
+            "version-bump/main",
+            "--title",
+            "DEV: Begin development of v2025.10.0-latest",
+            "--body",
+            a_string_including(
+              "Merging this will trigger the creation of a `release/2025.5` branch",
+            ),
+            "--label",
+            ReleaseUtils::PR_LABEL,
+          )
         end
       end
 
-      Dir.chdir(origin_path) do
-        run "git", "reset", "--hard"
-        run "git", "checkout", "version-bump/main"
-        version_rb_content = File.read("lib/version.rb")
-        expect(version_rb_content).to include('STRING = "2026.1.0-latest"')
+      context "when PR creation fails" do
+        let(:frozen_time) { "2025-10-15" }
+        let(:initial_version) { "2025.5.0-latest" }
+
+        before do
+          allow(ReleaseUtils).to receive(:gh).with("pr", "create", any_args).and_return(false)
+          allow(ReleaseUtils).to receive(:gh).with("pr", "edit", any_args).and_return(true)
+        end
 
-        versions_json = JSON.parse(File.read("versions.json"))
+        it "falls back to editing the PR" do
+          run_task
+
+          expect(ReleaseUtils).to have_received(:gh).with(
+            "pr",
+            "edit",
+            "version-bump/main",
+            "--title",
+            "DEV: Begin development of v2025.10.0-latest",
+            "--body",
+            a_string_including(
+              "Merging this will trigger the creation of a `release/2025.5` branch",
+            ),
+            "--add-label",
+            ReleaseUtils::PR_LABEL,
+          )
+        end
+      end
+    end
+
+    context "when incrementing past December" do
+      let(:frozen_time) { "2025-12-15" }
+
+      it "rolls over to next year" do
+        run_task
+        expect(bumped_version).to eq("2026.1.0-latest")
+      end
+    end
+
+    context "when updating versions.json" do
+      let(:frozen_time) { "2025-12-28" }
+      let(:versions_json) { on_version_bump_branch { JSON.parse(File.read("versions.json")) } }
+
+      it "adds new version entry" do
+        run_task
         expect(versions_json["2026.1"]).to eq(
           {
             "developmentStartDate" => "2025-12-28",
@@ -382,113 +438,87 @@ def update_versions_json(overrides)
             "supported" => true,
           },
         )
-        expect(versions_json["2025.12"]["released"]).to eq(true)
-        expect(versions_json["2025.12"]["releaseDate"]).to eq("2025-12-28")
-      end
-    end
-
-    it "creates version-bump/main branch with proper commit message and PR" do
-      allow(ReleaseUtils).to receive(:gh).with("pr", "create", any_args).and_return(true)
-
-      Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.5.0-latest"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "previous version"
-        run "git", "push", "origin", "main"
-
-        freeze_time Time.utc(2025, 10, 15) do
-          capture_stdout { invoke_rake_task("release:prepare_next_version") }
-        end
       end
 
-      Dir.chdir(origin_path) do
-        run "git", "reset", "--hard"
-        run "git", "checkout", "version-bump/main"
-        current_branch = run("git", "branch", "--show-current").strip
-        expect(current_branch).to eq("version-bump/main")
-
-        commit_message = run("git", "log", "-1", "--pretty=%B").strip
-        expect(commit_message).to include("Begin development of v2025.10.0-latest")
-        expect(commit_message).to include(
-          "Merging this will trigger the creation of a `release/2025.5` branch on the preceding commit.",
+      it "marks previous version as released" do
+        run_task
+        expect(versions_json["2025.12"]).to include(
+          "released" => true,
+          "releaseDate" => "2025-12-28",
         )
       end
-
-      expect(ReleaseUtils).to have_received(:gh).with(
-        "pr",
-        "create",
-        "--base",
-        "main",
-        "--head",
-        "version-bump/main",
-        "--title",
-        "DEV: Begin development of v2025.10.0-latest",
-        "--body",
-        a_string_including("Merging this will trigger the creation of a `release/2025.5` branch"),
-        "--label",
-        ReleaseUtils::PR_LABEL,
-      )
     end
+  end
 
-    it "falls back to editing PR if create fails" do
-      allow(ReleaseUtils).to receive(:gh).with("pr", "create", any_args).and_return(false)
-      allow(ReleaseUtils).to receive(:gh).with("pr", "edit", any_args).and_return(true)
-
+  describe "release:stage_security_fixes" do
+    subject(:run_task) do
       Dir.chdir(local_path) do
-        File.write("lib/version.rb", fake_version_rb("2025.5.0-latest"))
-        run "git", "add", "."
-        run "git", "commit", "-m", "previous version"
-        run "git", "push", "origin", "main"
-
-        freeze_time Time.utc(2025, 10, 15) do
-          capture_stdout { invoke_rake_task("release:prepare_next_version") }
-        end
+        capture_stdout { invoke_rake_task("release:stage_security_fixes", "main") }
       end
+    end
 
-      expect(ReleaseUtils).to have_received(:gh).with(
-        "pr",
-        "edit",
-        "version-bump/main",
-        "--title",
-        "DEV: Begin development of v2025.10.0-latest",
-        "--body",
-        a_string_including("Merging this will trigger the creation of a `release/2025.5` branch"),
-        "--add-label",
-        ReleaseUtils::PR_LABEL,
-      )
+    let(:origin_main_commits) do
+      Dir.chdir(origin_path) { git("log", "--pretty=%s", "main").lines.map(&:strip) }
     end
-  end
 
-  describe "release:stage_security_fixes" do
-    it "stages a PR of multiple security fixes" do
-      Dir.chdir(origin_path) do
-        run "git", "checkout", "-b", "security-fix-one"
+    def origin_file(path)
+      Dir.chdir(origin_path) { git("show", "main:#{path}") }
+    end
 
+    before do
+      ENV["SECURITY_FIX_REFS"] = "origin/security-fix-one,origin/security-fix-two"
+      Dir.chdir(origin_path) do
+        git "checkout", "-b", "security-fix-one"
         File.write("firstfile.txt", "contents")
-        run "git", "add", "firstfile.txt"
-        run "git", "-c", "commit.gpgsign=false", "commit", "-m", "security fix one, commit one"
+        git "add", "firstfile.txt"
+        git "-c", "commit.gpgsign=false", "commit", "-m", "security fix one, commit one"
         File.write("secondfile.txt", "contents")
-        run "git", "add", "secondfile.txt"
-        run "git", "-c", "commit.gpgsign=false", "commit", "-m", "security fix one, commit two"
-
-        run "git", "checkout", "main"
-        run "git", "checkout", "-b", "security-fix-two"
+        git "add", "secondfile.txt"
+        git "-c", "commit.gpgsign=false", "commit", "-m", "security fix one, commit two"
+        git "checkout", "main"
+        git "checkout", "-b", "security-fix-two"
         File.write("somefile.txt", "contents")
-        run "git", "add", "somefile.txt"
-        run "git", "-c", "commit.gpgsign=false", "commit", "-m", "security fix two"
+        git "add", "somefile.txt"
+        git "-c", "commit.gpgsign=false", "commit", "-m", "security fix two"
       end
+    end
 
-      Dir.chdir(local_path) do
-        capture_stdout do
-          ENV["SECURITY_FIX_REFS"] = "origin/security-fix-one,origin/security-fix-two"
-          invoke_rake_task("release:stage_security_fixes", "main")
-        ensure
-          ENV.delete("SECURITY_FIX_REFS")
-        end
+    after { ENV.delete("SECURITY_FIX_REFS") }
+
+    context "when accepting the version bump" do
+      before { run_task }
+
+      it "cherry-picks all security fix commits in order" do
+        expect(origin_main_commits).to eq(
+          [
+            "DEV: Bump development branch to v2025.12.0-latest.1",
+            "security fix two",
+            "security fix one, commit two",
+            "security fix one, commit one",
+            "Initial commit",
+          ],
+        )
       end
 
-      Dir.chdir(origin_path) do
-        expect(run("git", "log", "--pretty=%s", "main").lines.map(&:strip)).to eq(
+      it "includes files from all security fixes" do
+        expect(origin_file("firstfile.txt")).to eq("contents")
+        expect(origin_file("secondfile.txt")).to eq("contents")
+        expect(origin_file("somefile.txt")).to eq("contents")
+      end
+
+      it "bumps the development version" do
+        expect(origin_file("lib/version.rb")).to include('STRING = "2025.12.0-latest.1"')
+      end
+    end
+
+    context "when declining the version bump" do
+      before do
+        allow(ReleaseUtils).to receive(:confirm).and_return(false)
+        run_task
+      end
+
+      it "cherry-picks security fix commits without a version bump" do
+        expect(origin_main_commits).to eq(
           [
             "security fix two",
             "security fix one, commit two",
@@ -496,10 +526,10 @@ def update_versions_json(overrides)
             "Initial commit",
           ],
         )
+      end
 
-        expect(run("git", "show", "main:somefile.txt")).to eq("contents")
-        expect(run("git", "show", "main:firstfile.txt")).to eq("contents")
-        expect(run("git", "show", "main:secondfile.txt")).to eq("contents")
+      it "does not modify the version" do
+        expect(origin_file("lib/version.rb")).to include('STRING = "2025.12.0-latest"')
       end
     end
   end

From 01a421e144c8ee727ffaa6c1c7cb11ad818e3d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 26 Feb 2026 11:32:03 +0100
Subject: [PATCH 100/168] DEV: Add context option to addKeyboardShortcut for
 scoped bindings (#38077)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ItsATrap's _bindSingle splices out existing callbacks when rebinding the
same key combo. This means plugins that register shortcuts for keys
already bound by Discourse (e.g. j/k/h/l) permanently replace the
default handlers — even when the plugin's own guard returns early on
non-matching routes. This was introduced by
https://github.com/discourse/discourse-kanban/pull/3 which registered
vim-style navigation shortcuts that broke j/k site-wide.

Add a `context` option to `addShortcut` that accepts either a CSS
selector string or a function. Before rebinding, the wrapper captures
the previous ItsATrap callback from `_directMap`. At runtime, if the
context matches (element exists in DOM / function returns truthy), the
new handler fires; otherwise the previous handler fires instead. This
naturally supports chaining — multiple plugins binding the same key each
capture the previous wrapped callback, forming a fallback chain.
---
 .../app/services/keyboard-shortcuts.js        |  32 ++++-
 .../tests/unit/lib/keyboard-shortcuts-test.js | 131 ++++++++++++++++++
 2 files changed, 162 insertions(+), 1 deletion(-)

diff --git a/frontend/discourse/app/services/keyboard-shortcuts.js b/frontend/discourse/app/services/keyboard-shortcuts.js
index 3a708fb9df772..7c0bcf70bd850 100644
--- a/frontend/discourse/app/services/keyboard-shortcuts.js
+++ b/frontend/discourse/app/services/keyboard-shortcuts.js
@@ -270,11 +270,41 @@ export default class KeyboardShortcutLib extends Service {
    *
    * - click      - allows to provide a selector on which a click event
    *                will be triggered, eg: { click: ".topic.last .title" }
+   * - context    - a CSS selector string or function that scopes the shortcut.
+   *                When provided, the shortcut only fires if the context matches
+   *                (element exists in DOM / function returns truthy). Otherwise,
+   *                the previously-bound handler for this key fires instead.
    **/
   addShortcut(shortcut, callback, opts = {}) {
     // we trim but leave whitespace between characters, as shortcuts
     // like `z z` are valid for ItsATrap
-    this.bindKey(shortcut.trim(), { handler: callback, ...opts });
+    shortcut = shortcut.trim();
+
+    if (opts.context) {
+      const contextTest =
+        typeof opts.context === "function"
+          ? opts.context
+          : () => document.querySelector(opts.context) !== null;
+
+      const dm = this.keyTrapper._directMap;
+      const previousCallback =
+        dm[shortcut + ":undefined"] ||
+        dm[shortcut + ":keypress"] ||
+        dm[shortcut + ":keydown"] ||
+        dm[shortcut + ":keyup"];
+
+      const originalCallback = callback;
+      callback = function (...args) {
+        if (contextTest()) {
+          return originalCallback(...args);
+        }
+        if (previousCallback) {
+          return previousCallback(...args);
+        }
+      };
+    }
+
+    this.bindKey(shortcut, { handler: callback, ...opts });
     if (opts.help) {
       addExtraKeyboardShortcutHelp(opts.help);
     }
diff --git a/frontend/discourse/tests/unit/lib/keyboard-shortcuts-test.js b/frontend/discourse/tests/unit/lib/keyboard-shortcuts-test.js
index 425d52f97dace..49ebde832f90d 100644
--- a/frontend/discourse/tests/unit/lib/keyboard-shortcuts-test.js
+++ b/frontend/discourse/tests/unit/lib/keyboard-shortcuts-test.js
@@ -36,4 +36,135 @@ module("Unit | Utility | keyboard-shortcuts", function (hooks) {
     keyboardShortcuts.prevSection();
     assert.true(spy.calledWith(-1), "_changeSection is called with -1");
   });
+
+  module("addShortcut context option", function () {
+    test("fires new handler when CSS selector context matches", function (assert) {
+      const ks = this.owner.lookup("service:keyboard-shortcuts");
+      let handlerACalled = false;
+      let handlerBCalled = false;
+
+      ks.addShortcut("x", () => (handlerACalled = true), { anonymous: true });
+
+      const el = document.createElement("div");
+      el.classList.add("test-context-target");
+      document.body.appendChild(el);
+
+      try {
+        ks.addShortcut("x", () => (handlerBCalled = true), {
+          anonymous: true,
+          context: ".test-context-target",
+        });
+
+        // Simulate keypress via ItsATrap
+        ks.keyTrapper.trigger("x");
+
+        assert.true(handlerBCalled, "new handler fires when context matches");
+        assert.false(handlerACalled, "previous handler does not fire");
+      } finally {
+        el.remove();
+      }
+    });
+
+    test("falls back to previous handler when context does not match", function (assert) {
+      const ks = this.owner.lookup("service:keyboard-shortcuts");
+      let handlerACalled = false;
+      let handlerBCalled = false;
+
+      ks.addShortcut("y", () => (handlerACalled = true), { anonymous: true });
+      ks.addShortcut("y", () => (handlerBCalled = true), {
+        anonymous: true,
+        context: ".nonexistent-element",
+      });
+
+      ks.keyTrapper.trigger("y");
+
+      assert.true(handlerACalled, "previous handler fires as fallback");
+      assert.false(handlerBCalled, "new handler does not fire");
+    });
+
+    test("no error when no previous binding exists and context does not match", function (assert) {
+      const ks = this.owner.lookup("service:keyboard-shortcuts");
+      let called = false;
+
+      ks.addShortcut("q w", () => (called = true), {
+        anonymous: true,
+        context: ".nonexistent-element",
+      });
+
+      ks.keyTrapper.trigger("q w");
+
+      assert.false(called, "handler does not fire");
+    });
+
+    test("function context is evaluated", function (assert) {
+      const ks = this.owner.lookup("service:keyboard-shortcuts");
+      let contextActive = false;
+      let handlerACalled = false;
+      let handlerBCalled = false;
+
+      ks.addShortcut("z", () => (handlerACalled = true), { anonymous: true });
+      ks.addShortcut("z", () => (handlerBCalled = true), {
+        anonymous: true,
+        context: () => contextActive,
+      });
+
+      ks.keyTrapper.trigger("z");
+      assert.true(handlerACalled, "fallback fires when function returns false");
+      assert.false(handlerBCalled);
+
+      handlerACalled = false;
+      contextActive = true;
+      ks.keyTrapper.trigger("z");
+      assert.true(
+        handlerBCalled,
+        "new handler fires when function returns true"
+      );
+      assert.false(handlerACalled);
+    });
+
+    test("chained context bindings fall back correctly", function (assert) {
+      const ks = this.owner.lookup("service:keyboard-shortcuts");
+      const calls = [];
+
+      ks.addShortcut("w", () => calls.push("original"), { anonymous: true });
+      ks.addShortcut("w", () => calls.push("plugin-a"), {
+        anonymous: true,
+        context: ".plugin-a-active",
+      });
+      ks.addShortcut("w", () => calls.push("plugin-b"), {
+        anonymous: true,
+        context: ".plugin-b-active",
+      });
+
+      // Neither context matches — should fall through to original
+      ks.keyTrapper.trigger("w");
+      assert.deepEqual(calls, ["original"]);
+
+      calls.length = 0;
+      const elA = document.createElement("div");
+      elA.classList.add("plugin-a-active");
+      document.body.appendChild(elA);
+
+      try {
+        // plugin-b context doesn't match, falls to plugin-a which matches
+        ks.keyTrapper.trigger("w");
+        assert.deepEqual(calls, ["plugin-a"]);
+      } finally {
+        elA.remove();
+      }
+
+      calls.length = 0;
+      const elB = document.createElement("div");
+      elB.classList.add("plugin-b-active");
+      document.body.appendChild(elB);
+
+      try {
+        // plugin-b context matches
+        ks.keyTrapper.trigger("w");
+        assert.deepEqual(calls, ["plugin-b"]);
+      } finally {
+        elB.remove();
+      }
+    });
+  });
 });

From e12c91cb0411fa611d5ab6040fa0eb03f6dba5ee Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 17 Feb 2026 14:47:08 +0100
Subject: [PATCH 101/168] SECURITY: Validate destination topic when moving
 posts

The `move_posts` action only checked `can_move_posts?` on the source topic but never validated write permissions on the destination topic. This allowed TL4 users and category group moderators to move posts into topics in categories where they lack posting privileges (e.g., read-only categories or categories with group-restricted write access).

The merge_topic action already correctly called `ensure_can_create_post_on_topic!` on the destination. This applies the same check to move_posts when a destination_topic_id is provided.
---
 app/controllers/topics_controller.rb    |  5 +++
 spec/requests/topics_controller_spec.rb | 49 +++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 1829cd9bcb3a8..e9b09016e5b85 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -958,6 +958,11 @@ def move_posts
       end
     end
 
+    if params[:destination_topic_id].present?
+      destination_topic = Topic.find_by(id: params[:destination_topic_id])
+      guardian.ensure_can_create_post_on_topic!(destination_topic)
+    end
+
     hijack do
       destination_topic = move_posts_to_destination(topic)
       render_topic_changes(destination_topic)
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 350f0e1e0f4e2..ce6420985386d 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -451,6 +451,55 @@
       end
     end
 
+    describe "moving to an existing topic in a read-only category as TL4" do
+      fab!(:readonly_category) do
+        Fabricate(:category).tap do |c|
+          c.set_permissions(everyone: :readonly, staff: :full)
+          c.save!
+        end
+      end
+      fab!(:source_topic, :topic)
+      fab!(:source_post) { Fabricate(:post, topic: source_topic, user: trust_level_4) }
+      fab!(:dest_topic_in_readonly) { Fabricate(:topic, category: readonly_category) }
+
+      before { sign_in(trust_level_4) }
+
+      it "is forbidden" do
+        post "/t/#{source_topic.id}/move-posts.json",
+             params: {
+               post_ids: [source_post.id],
+               destination_topic_id: dest_topic_in_readonly.id,
+             }
+
+        expect(response).to be_forbidden
+      end
+    end
+
+    describe "moving to an existing topic in a category with restricted write permissions as TL4" do
+      fab!(:group)
+      fab!(:restricted_write_category) do
+        Fabricate(:category).tap do |c|
+          c.set_permissions(group => :full, :everyone => :readonly)
+          c.save!
+        end
+      end
+      fab!(:source_topic, :topic)
+      fab!(:source_post) { Fabricate(:post, topic: source_topic, user: trust_level_4) }
+      fab!(:dest_topic_restricted) { Fabricate(:topic, category: restricted_write_category) }
+
+      before { sign_in(trust_level_4) }
+
+      it "is forbidden" do
+        post "/t/#{source_topic.id}/move-posts.json",
+             params: {
+               post_ids: [source_post.id],
+               destination_topic_id: dest_topic_restricted.id,
+             }
+
+        expect(response).to be_forbidden
+      end
+    end
+
     describe "moving chronologically to an existing topic" do
       before { sign_in(moderator) }
 

From 33aec61281b74d06550590fab4d37a5f33f1b6e0 Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Mon, 16 Feb 2026 11:12:27 +0400
Subject: [PATCH 102/168] SECURITY: prevent moderators from exporting user Chat
 DMs

---
 lib/guardian.rb                                        |  5 ++++-
 plugins/chat/spec/lib/chat/guardian_extensions_spec.rb | 10 ++++++++++
 .../chat/spec/requests/admin/export_controller_spec.rb |  7 +++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/guardian.rb b/lib/guardian.rb
index dae2fea17a6c5..99b4a12742043 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -489,7 +489,10 @@ def can_export_entity?(entity, entity_id = nil)
     return false if anonymous?
     return true if is_admin?
     return can_see_emails? if entity == "screened_email"
-    return entity != "user_list" if is_moderator? && (entity != "user_archive" || entity_id.nil?)
+
+    if is_moderator? && (entity != "user_archive" || entity_id.nil?)
+      return %w[staff_action screened_ip screened_url report user_archive].include?(entity)
+    end
 
     # Regular users can only export their archives
     return false unless entity == "user_archive"
diff --git a/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
index 21aff8ca1a778..55d95a8f8aa68 100644
--- a/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
+++ b/plugins/chat/spec/lib/chat/guardian_extensions_spec.rb
@@ -1003,4 +1003,14 @@
       end
     end
   end
+
+  describe "#can_export_entity?" do
+    fab!(:moderator)
+
+    it "only allows admins to export chat_message" do
+      expect(Guardian.new(user).can_export_entity?("chat_message")).to eq(false)
+      expect(Guardian.new(moderator).can_export_entity?("chat_message")).to eq(false)
+      expect(staff_guardian.can_export_entity?("chat_message")).to eq(true)
+    end
+  end
 end
diff --git a/plugins/chat/spec/requests/admin/export_controller_spec.rb b/plugins/chat/spec/requests/admin/export_controller_spec.rb
index 8dd0d9392f9c9..223ccc7b1cbb9 100644
--- a/plugins/chat/spec/requests/admin/export_controller_spec.rb
+++ b/plugins/chat/spec/requests/admin/export_controller_spec.rb
@@ -34,5 +34,12 @@
       post "/chat/admin/export/messages"
       expect(response.status).to eq(403)
     end
+
+    it "moderators can't export chat messages via the general csv export endpoint" do
+      sign_in(moderator)
+      post "/export_csv/export_entity.json", params: { entity: "chat_message" }
+      expect(response).not_to be_successful
+      expect(Jobs::ExportCsvFile.jobs.size).to eq(0)
+    end
   end
 end

From b4499001d04b19093a1b71695baa9210aeacb9a9 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 17 Feb 2026 15:38:35 +0100
Subject: [PATCH 103/168] SECURITY: XSS when editing a malicious post

A user full name can be evaluated as raw HTML when the following settings are set:
- `display_name_on_posts` => true
- `prioritize_username_in_ux` => false

Editing a post of a malicious user would trigger and XSS. The fix is to escape the content.
---
 frontend/discourse/app/components/composer-action-title.gjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/discourse/app/components/composer-action-title.gjs b/frontend/discourse/app/components/composer-action-title.gjs
index 991ee90eff337..5e4434daea315 100644
--- a/frontend/discourse/app/components/composer-action-title.gjs
+++ b/frontend/discourse/app/components/composer-action-title.gjs
@@ -84,14 +84,14 @@ export default class ComposerActionTitle extends Component {
     let editTitle = `
       <a class="post-link" href="${postLink.href}">${postLink.anchor}</a>
       ${userAvatar}
-      <span class="username">${userLink.anchor}</span>
+      <span class="username">${escape(userLink.anchor)}</span>
     `;
 
     if (originalUser) {
       editTitle += `
         ${iconHTML("share", { class: "reply-to-glyph" })}
         ${originalUser.avatar}
-        <span class="original-username">${originalUser.username}</span>
+        <span class="original-username">${escape(originalUser.username)}</span>
       `;
     }
 

From 0a664f73f5e2b92edc7a7eb4a4eec36d6aba0835 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 17 Feb 2026 08:54:44 +0100
Subject: [PATCH 104/168] SECURITY: SQL injection in PM tag filtering

SQL injection in PM tag filtering (`list_private_messages_tag`) allows bypassing tag filter conditions, potentially disclosing unauthorized private message metadata.
---
 lib/topic_query/private_message_lists.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/topic_query/private_message_lists.rb b/lib/topic_query/private_message_lists.rb
index c07bdbb7a8cb6..57d94a25fb8b6 100644
--- a/lib/topic_query/private_message_lists.rb
+++ b/lib/topic_query/private_message_lists.rb
@@ -125,9 +125,8 @@ def list_private_messages_tag(user)
 
       list =
         list.joins(
-          "JOIN topic_tags tt ON tt.topic_id = topics.id
-                        JOIN tags t ON t.id = tt.tag_id AND t.name = '#{@options[:tags][0]}'",
-        )
+          "JOIN topic_tags tt ON tt.topic_id = topics.id JOIN tags t ON t.id = tt.tag_id",
+        ).where("t.name = ?", @options[:tags][0])
 
       create_list(:private_messages, {}, list)
     end

From 3cdb52b38b6394cf2474fb09e8ac13d055faba80 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 17 Feb 2026 16:22:20 +1000
Subject: [PATCH 105/168] SECURITY: Ensure guardian check when creating
 QueryGroupBookmark

Missing `validate_before_create` authorization in Data Explorer's
`QueryGroupBookmarkable` allows any logged-in user to create bookmarks
for query groups they don't have access to, enabling metadata disclosure
via bookmark reminder notifications.

Also make sure `validate_before_create` throws NotImplementedError in
BaseBookmarkable if not implemented, to prevent similar issues in the
future.
---
 app/services/base_bookmarkable.rb             |  2 +-
 .../query_group_bookmarkable.rb               |  6 ++++++
 .../query_group_bookmarkable_spec.rb          | 21 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/services/base_bookmarkable.rb b/app/services/base_bookmarkable.rb
index f68748c62b369..d232c46be1df1 100644
--- a/app/services/base_bookmarkable.rb
+++ b/app/services/base_bookmarkable.rb
@@ -182,7 +182,7 @@ def self.bookmark_metadata(bookmark, user)
   # @param [Guardian] guardian The guardian for the user which is creating the bookmark.
   # @param [Model] bookmarkable The ActiveRecord model which is acting as the bookmarkable for the new bookmark.
   def self.validate_before_create(guardian, bookmarkable)
-    # noop
+    raise NotImplementedError
   end
 
   ##
diff --git a/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rb b/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rb
index 37dde1a38bd43..7834bfcca618f 100644
--- a/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rb
+++ b/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rb
@@ -39,6 +39,12 @@ def self.search_query(bookmarks, query, ts_query, &bookmarkable_search)
       bookmarkable_search.call(bookmarks, "data_explorer_queries.name ILIKE ?")
     end
 
+    def self.validate_before_create(guardian, bookmarkable)
+      if bookmarkable.blank? || !can_see_bookmarkable?(guardian, bookmarkable)
+        raise Discourse::InvalidAccess
+      end
+    end
+
     def self.reminder_handler(bookmark)
       send_reminder_notification(
         bookmark,
diff --git a/plugins/discourse-data-explorer/spec/lib/data_explorer/query_group_bookmarkable_spec.rb b/plugins/discourse-data-explorer/spec/lib/data_explorer/query_group_bookmarkable_spec.rb
index 9399fced1b989..42776cd0b33e6 100644
--- a/plugins/discourse-data-explorer/spec/lib/data_explorer/query_group_bookmarkable_spec.rb
+++ b/plugins/discourse-data-explorer/spec/lib/data_explorer/query_group_bookmarkable_spec.rb
@@ -160,6 +160,27 @@
     end
   end
 
+  describe "#validate_before_create" do
+    it "raises InvalidAccess if the bookmarkable is blank" do
+      expect { registered_bookmarkable.validate_before_create(guardian, nil) }.to raise_error(
+        Discourse::InvalidAccess,
+      )
+    end
+
+    it "raises InvalidAccess if the user is not a member of the bookmarkable group" do
+      non_member_guardian = Guardian.new(Fabricate(:user))
+      expect {
+        registered_bookmarkable.validate_before_create(non_member_guardian, query_group4)
+      }.to raise_error(Discourse::InvalidAccess)
+    end
+
+    it "does not raise if the user is a member of the bookmarkable group" do
+      expect {
+        registered_bookmarkable.validate_before_create(guardian, query_group1)
+      }.not_to raise_error
+    end
+  end
+
   describe "#can_see?" do
     it "returns false if the user is not a member of the group from which they created the bookmark" do
       expect(registered_bookmarkable.can_see?(guardian, bookmark1)).to eq(true) # Query 1, Group 0

From 46c812b96ef8490e8f82b8c4d6ba5255ed83f7cc Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Tue, 17 Feb 2026 16:19:10 +1000
Subject: [PATCH 106/168] SECURITY: DM communication-preference bypass when
 adding members
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DM communication-preference bypass when adding members via
`Chat::AddUsersToChannel` — a user could add targets who have
blocked/ignored/muted them to an existing DM channel, bypassing
per-recipient PM restrictions that are enforced during DM channel
creation.
---
 .../api/channels_memberships_controller.rb    |  4 ++
 .../app/services/chat/add_users_to_channel.rb | 12 ++++
 .../chat/add_users_to_channel_spec.rb         | 57 +++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/plugins/chat/app/controllers/chat/api/channels_memberships_controller.rb b/plugins/chat/app/controllers/chat/api/channels_memberships_controller.rb
index fa9d90c5285e9..d8f34c9f38690 100644
--- a/plugins/chat/app/controllers/chat/api/channels_memberships_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channels_memberships_controller.rb
@@ -36,6 +36,10 @@ def create
       on_failed_policy(:can_add_users_to_channel) do
         render_json_error(I18n.t("chat.errors.users_cant_be_added_to_channel"))
       end
+      on_failed_policy(:actor_allows_dms) do
+        render_json_error(I18n.t("chat.errors.actor_disallowed_dms"))
+      end
+      on_failed_policy(:targets_allow_dms_from_user) { |policy| render_json_error(policy.reason) }
       on_failed_policy(:satisfies_dms_max_users_limit) do |policy|
         render_json_dump({ error: policy.reason }, status: 400)
       end
diff --git a/plugins/chat/app/services/chat/add_users_to_channel.rb b/plugins/chat/app/services/chat/add_users_to_channel.rb
index 12192c5dfce73..efbaba7a1816f 100644
--- a/plugins/chat/app/services/chat/add_users_to_channel.rb
+++ b/plugins/chat/app/services/chat/add_users_to_channel.rb
@@ -44,6 +44,10 @@ class AddUsersToChannel
       model :channel
       policy :can_add_users_to_channel
       model :target_users, optional: true
+      model :user_comm_screener
+      policy :actor_allows_dms
+      policy :targets_allow_dms_from_user,
+             class_name: Chat::DirectMessageChannel::Policy::CanCommunicateAllParties
       policy :satisfies_dms_max_users_limit,
              class_name: Chat::DirectMessageChannel::Policy::MaxUsersExcess
 
@@ -60,6 +64,14 @@ def fetch_channel(params:)
       ::Chat::Channel.includes(:chatable).find_by(id: params.channel_id)
     end
 
+    def fetch_user_comm_screener(target_users:, guardian:)
+      UserCommScreener.new(acting_user: guardian.user, target_user_ids: target_users.map(&:id))
+    end
+
+    def actor_allows_dms(user_comm_screener:)
+      !user_comm_screener.actor_disallowing_all_pms?
+    end
+
     def can_add_users_to_channel(guardian:, channel:)
       return false if !guardian.user.admin? && !channel.joined_by?(guardian.user)
 
diff --git a/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb b/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb
index 1ba68b2e56943..573680a3305be 100644
--- a/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb
+++ b/plugins/chat/spec/services/chat/add_users_to_channel_spec.rb
@@ -203,5 +203,62 @@
 
       it { is_expected.to fail_a_policy(:can_add_users_to_channel) }
     end
+
+    context "when the actor is not allowing anyone to message them" do
+      before do
+        channel.add(current_user)
+        current_user.user_option.update!(allow_private_messages: false)
+      end
+
+      it { is_expected.to fail_a_policy(:actor_allows_dms) }
+    end
+
+    context "when one of the target users is ignoring the current user" do
+      before do
+        channel.add(current_user)
+        IgnoredUser.create!(
+          user: users.first,
+          ignored_user: current_user,
+          expiring_at: 1.day.from_now,
+        )
+        params[:usernames] = [users.first.username]
+      end
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when one of the target users is muting the current user" do
+      before do
+        channel.add(current_user)
+        MutedUser.create!(user: users.first, muted_user: current_user)
+        params[:usernames] = [users.first.username]
+      end
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when the current user is ignoring one of the target users" do
+      before do
+        channel.add(current_user)
+        IgnoredUser.create!(
+          user: current_user,
+          ignored_user: users.first,
+          expiring_at: 1.day.from_now,
+        )
+        params[:usernames] = [users.first.username]
+      end
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
+
+    context "when the current user is muting one of the target users" do
+      before do
+        channel.add(current_user)
+        MutedUser.create!(user: current_user, muted_user: users.first)
+        params[:usernames] = [users.first.username]
+      end
+
+      it { is_expected.to fail_a_policy(:targets_allow_dms_from_user) }
+    end
   end
 end

From 37681092dadd7e58981a5a362e908165b0420eeb Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 17 Feb 2026 10:34:26 +0100
Subject: [PATCH 107/168] SECURITY: prevents whispers to leak in excerpts

posts_nearby was checking topic access but then returning all posts regardless of type, including whispers that should only be visible to whisperers. Use Post.secured(guardian) to properly filter post types based on user permissions.
---
 app/controllers/topics_controller.rb    |  1 +
 spec/requests/topics_controller_spec.rb | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index e9b09016e5b85..23e1e47daac85 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -303,6 +303,7 @@ def excerpts
 
     @posts =
       Post
+        .secured(guardian)
         .where(hidden: false, deleted_at: nil, topic_id: @topic.id)
         .where("posts.id in (?)", post_ids)
         .joins("LEFT JOIN users u on u.id = posts.user_id")
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index ce6420985386d..733b0b3260a50 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -5254,6 +5254,27 @@ def extract_post_stream
       expect(json[2]["action_code"]).to eq("autobumped")
       expect(json[2]["created_at"].present?).to eq(true)
     end
+
+    it "does not return whisper posts to non-staff users" do
+      SiteSetting.whispers_allowed_groups = "#{Group::AUTO_GROUPS[:staff]}"
+      first_post = create_post(raw: "This is the first post")
+      whisper_post =
+        create_post(
+          raw: "This is a secret whisper",
+          topic: first_post.topic,
+          post_type: Post.types[:whisper],
+        )
+
+      sign_in(user)
+
+      get "/t/#{first_post.topic_id}/excerpts.json",
+          params: {
+            post_ids: [first_post.id, whisper_post.id],
+          }
+
+      json = response.parsed_body
+      expect(json.map { |p| p["post_id"] }).to contain_exactly(first_post.id)
+    end
   end
 
   describe "#convert_topic" do

From 395e793092c6e23a8cca371a4c2cb130ead09555 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 16 Feb 2026 13:40:52 +0100
Subject: [PATCH 108/168] SECURITY: scope reviewable notes to user-visible
 reviewables

The ReviewableNotesController used an unscoped Reviewable.find which
allowed category group moderators to create/delete notes on any
reviewable, including those in categories they do not moderate.

Replace with Reviewable.viewable_by to properly scope the lookup.
---
 .../reviewable_notes_controller.rb            |  4 +-
 .../reviewable_notes_controller_spec.rb       | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/app/controllers/reviewable_notes_controller.rb b/app/controllers/reviewable_notes_controller.rb
index c2a9cf4168c9c..7bd21f463dfa5 100644
--- a/app/controllers/reviewable_notes_controller.rb
+++ b/app/controllers/reviewable_notes_controller.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class ReviewableNotesController < ApplicationController
-  before_action :find_reviewable
   before_action :ensure_can_see
+  before_action :find_reviewable
 
   def create
     note = @reviewable.reviewable_notes.build(note_params)
@@ -30,7 +30,7 @@ def destroy
   private
 
   def find_reviewable
-    @reviewable = Reviewable.find(params[:reviewable_id])
+    @reviewable = Reviewable.viewable_by(current_user, preload: false).find(params[:reviewable_id])
   end
 
   def note_params
diff --git a/spec/requests/reviewable_notes_controller_spec.rb b/spec/requests/reviewable_notes_controller_spec.rb
index 8cc7e1dec99d5..75410ca2d9ef7 100644
--- a/spec/requests/reviewable_notes_controller_spec.rb
+++ b/spec/requests/reviewable_notes_controller_spec.rb
@@ -91,6 +91,55 @@
       end
     end
 
+    context "when user is a category group moderator" do
+      fab!(:group)
+      fab!(:category_a, :category)
+      fab!(:category_b, :category)
+      fab!(:reviewable_in_a) do
+        Fabricate(
+          :reviewable_flagged_post,
+          category: category_a,
+          topic: Fabricate(:topic, category: category_a),
+        )
+      end
+      fab!(:reviewable_in_b) do
+        Fabricate(
+          :reviewable_flagged_post,
+          category: category_b,
+          topic: Fabricate(:topic, category: category_b),
+        )
+      end
+
+      before do
+        SiteSetting.enable_category_group_moderation = true
+        Fabricate(:category_moderation_group, category: category_a, group:)
+        group.add(user)
+        sign_in(user)
+      end
+
+      it "can create notes on reviewables in their moderated category" do
+        post "/review/#{reviewable_in_a.id}/notes.json",
+             params: {
+               reviewable_note: {
+                 content: "Note on my category",
+               },
+             }
+
+        expect(response.status).to eq(200)
+      end
+
+      it "cannot create notes on reviewables in other categories" do
+        post "/review/#{reviewable_in_b.id}/notes.json",
+             params: {
+               reviewable_note: {
+                 content: "Should not work",
+               },
+             }
+
+        expect(response.status).to eq(404)
+      end
+    end
+
     context "when user is not staff" do
       before { sign_in(user) }
 

From bc1993438452e5941cd85e7baabcfc594ef79ec7 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Sat, 14 Feb 2026 04:56:03 +0300
Subject: [PATCH 109/168] SECURITY: Add post visibility check to poll voters
 endpoint

The `/polls/voters.json` endpoint was missing authorization checks to
verify if users could access the post containing the poll. This allowed
unauthorized users (including anonymous users) to retrieve voter data
from polls in posts they don't have access to.
---
 .../discourse_poll/polls_controller.rb        | 12 ++++--
 .../spec/controllers/polls_controller_spec.rb | 38 +++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/plugins/poll/app/controllers/discourse_poll/polls_controller.rb b/plugins/poll/app/controllers/discourse_poll/polls_controller.rb
index 1a7a29135eb76..fdbf929f2be79 100644
--- a/plugins/poll/app/controllers/discourse_poll/polls_controller.rb
+++ b/plugins/poll/app/controllers/discourse_poll/polls_controller.rb
@@ -48,10 +48,16 @@ def voters
     poll_name = params.require(:poll_name)
     opts = params.permit(:limit, :page, :option_id)
 
-    raise Discourse::InvalidParameters.new(:post_id) if !Post.where(id: post_id).exists?
+    poll = Poll.includes(:post).find_by(post_id: post_id, name: poll_name)
 
-    poll = Poll.find_by(post_id: post_id, name: poll_name)
-    raise Discourse::InvalidParameters.new(:poll_name) if !poll&.can_see_voters?(current_user)
+    if !poll
+      raise Discourse::InvalidParameters.new(:post_id) if !Post.where(id: post_id).exists?
+      raise Discourse::InvalidParameters.new(:poll_name)
+    end
+
+    guardian.ensure_can_see!(poll.post)
+
+    raise Discourse::InvalidParameters.new(:poll_name) if !poll.can_see_voters?(current_user)
 
     render json: { voters: DiscoursePoll::Poll.serialized_voters(poll, opts) }
   end
diff --git a/plugins/poll/spec/controllers/polls_controller_spec.rb b/plugins/poll/spec/controllers/polls_controller_spec.rb
index dfa14025546c8..a23edaed567c8 100644
--- a/plugins/poll/spec/controllers/polls_controller_spec.rb
+++ b/plugins/poll/spec/controllers/polls_controller_spec.rb
@@ -494,5 +494,43 @@
 
       expect(json["voters"][first].size).to eq(1)
     end
+
+    context "with private category polls" do
+      fab!(:group)
+      fab!(:private_category) { Fabricate(:private_category, group: group) }
+      fab!(:private_topic) { Fabricate(:topic, category: private_category) }
+      fab!(:poll_creator) { Fabricate(:admin).tap { |u| group.add(u) } }
+      fab!(:private_poll) do
+        Fabricate(
+          :post,
+          topic: private_topic,
+          user: poll_creator,
+          raw: "[poll public=true]\n- A\n- B\n[/poll]",
+        )
+      end
+      fab!(:user_in_group) { Fabricate(:user).tap { |u| group.add(u) } }
+      fab!(:user_outside_group, :user)
+
+      before { DiscoursePoll::Poll.vote(user_in_group, private_poll.id, "poll", [first]) }
+
+      it "prevents users without permission from seeing voters" do
+        log_in_user(user_outside_group)
+
+        get :voters, params: { post_id: private_poll.id, poll_name: "poll" }, format: :json
+
+        expect(response.status).to eq(403)
+      end
+
+      it "allows users with permission to see voters" do
+        log_in_user(user_in_group)
+
+        get :voters, params: { post_id: private_poll.id, poll_name: "poll" }, format: :json
+
+        expect(response.status).to eq(200)
+        json = response.parsed_body
+        expect(json["voters"][first].size).to eq(1)
+        expect(json["voters"][first][0]["id"]).to eq(user_in_group.id)
+      end
+    end
   end
 end

From 2b38af5b2241fb9c7578967cb30607d3382d7e1e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 13 Feb 2026 16:37:26 +0100
Subject: [PATCH 110/168] SECURITY: Filter private user fields in directory
 items endpoint

The directory items endpoint accepted arbitrary user_field_ids without checking field visibility, allowing anonymous users to retrieve private user field values. Now non-staff users can only access public fields (show_on_profile or show_on_user_card), while staff retain access to all fields.
---
 app/controllers/directory_items_controller.rb |  9 ++-
 .../directory_items_controller_spec.rb        | 60 +++++++++++++++++--
 2 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/app/controllers/directory_items_controller.rb b/app/controllers/directory_items_controller.rb
index 8cc9ef58a4ad0..bf22f82eeb804 100644
--- a/app/controllers/directory_items_controller.rb
+++ b/app/controllers/directory_items_controller.rb
@@ -113,7 +113,14 @@ def index
     if params[:user_field_ids]
       serializer_opts[:user_custom_field_map] = {}
 
-      user_field_ids = params[:user_field_ids]&.split("|")&.map(&:to_i)
+      allowed_field_ids =
+        if guardian.is_staff?
+          UserField.pluck(:id)
+        else
+          UserField.public_fields.pluck(:id)
+        end
+
+      user_field_ids = params[:user_field_ids].split("|").map(&:to_i) & allowed_field_ids
       user_field_ids.each do |user_field_id|
         serializer_opts[:user_custom_field_map][
           "#{User::USER_FIELD_PREFIX}#{user_field_id}"
diff --git a/spec/requests/directory_items_controller_spec.rb b/spec/requests/directory_items_controller_spec.rb
index 4da71ed079a12..48566c288598c 100644
--- a/spec/requests/directory_items_controller_spec.rb
+++ b/spec/requests/directory_items_controller_spec.rb
@@ -219,8 +219,8 @@
 
     it "orders users by user fields" do
       group.add(walter_white)
-      field1 = Fabricate(:user_field, searchable: true)
-      field2 = Fabricate(:user_field, searchable: true)
+      field1 = Fabricate(:user_field, searchable: true, show_on_profile: true)
+      field2 = Fabricate(:user_field, searchable: true, show_on_profile: true)
 
       user_fields = [
         { user: walter_white, field: field1, value: "Yellow", order: 1 },
@@ -262,8 +262,8 @@
     end
 
     it "searches users by user field value" do
-      field1 = Fabricate(:user_field, searchable: true)
-      field2 = Fabricate(:user_field, searchable: true)
+      field1 = Fabricate(:user_field, searchable: true, show_on_profile: true)
+      field2 = Fabricate(:user_field, searchable: true, show_on_profile: true)
 
       user_fields = [
         { user: walter_white, field: field1, value: "Yellow", order: 1 },
@@ -304,7 +304,7 @@
     end
 
     it "filters users by user field value" do
-      field = Fabricate(:user_field, searchable: true)
+      field = Fabricate(:user_field, searchable: true, show_on_profile: true)
 
       users = Fabricate.times(30, :user)
       users.each do |user|
@@ -335,6 +335,54 @@
       expect(json["meta"]["total_rows_directory_items"]).to eq(30)
     end
 
+    it "does not expose private user fields to anonymous users" do
+      public_field = Fabricate(:user_field, show_on_profile: true)
+      private_field = Fabricate(:user_field, show_on_profile: false, show_on_user_card: false)
+
+      UserCustomField.create!(
+        user_id: evil_trout.id,
+        name: "user_field_#{public_field.id}",
+        value: "public_value",
+      )
+      UserCustomField.create!(
+        user_id: evil_trout.id,
+        name: "user_field_#{private_field.id}",
+        value: "secret_value",
+      )
+
+      get "/directory_items.json",
+          params: {
+            period: "all",
+            user_field_ids: "#{public_field.id}|#{private_field.id}",
+          }
+      expect(response.status).to eq(200)
+
+      json = response.parsed_body
+      et_entry = json["directory_items"].find { |i| i["user"]["username"] == "eviltrout" }
+      user_fields = et_entry["user"]["user_fields"]
+
+      expect(user_fields).to have_key(public_field.id.to_s)
+      expect(user_fields).not_to have_key(private_field.id.to_s)
+    end
+
+    it "exposes private user fields to staff" do
+      sign_in(Fabricate(:admin))
+      private_field = Fabricate(:user_field, show_on_profile: false, show_on_user_card: false)
+
+      UserCustomField.create!(
+        user_id: evil_trout.id,
+        name: "user_field_#{private_field.id}",
+        value: "secret_value",
+      )
+
+      get "/directory_items.json", params: { period: "all", user_field_ids: private_field.id.to_s }
+      expect(response.status).to eq(200)
+
+      json = response.parsed_body
+      et_entry = json["directory_items"].find { |i| i["user"]["username"] == "eviltrout" }
+      expect(et_entry["user"]["user_fields"]).to have_key(private_field.id.to_s)
+    end
+
     it "checks group permissions" do
       group.update!(visibility_level: Group.visibility_levels[:members])
 
@@ -362,7 +410,7 @@
 
   context "when searching by name" do
     it "searches users by custom field 'Music' ignoring the default 20 user limit" do
-      field = Fabricate(:user_field, searchable: true)
+      field = Fabricate(:user_field, searchable: true, show_on_profile: true)
       users = Fabricate.times(100, :user)
 
       users

From 751b77ee50985f67fa68aed16e652c423d46249e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 13 Feb 2026 12:23:04 +0100
Subject: [PATCH 111/168] SECURITY: missing post access check in discourse
 policy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Vulnerability in `DiscoursePolicy::PolicyController` — all actions load a post by `params[:post_id]` without checking whether the current user has permission to see that post, allowing interaction with policies on posts in private categories or PMs.

Group membership can limit the exploit but was still leaking information, and you could still have a policy group allowed to everyone in a private category.
---
 .../discourse_policy/policy_controller.rb     |  2 +
 .../spec/requests/policy_controller_spec.rb   | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb b/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
index 41140c8f47c63..3340a58129fad 100644
--- a/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
+++ b/plugins/discourse-policy/app/controllers/discourse_policy/policy_controller.rb
@@ -90,6 +90,8 @@ def set_post
 
     raise Discourse::NotFound if !@post
 
+    raise Discourse::NotFound if !guardian.can_see?(@post)
+
     return render_json_error(I18n.t("discourse_policy.errors.no_policy")) if !@post.post_policy
 
     @group_ids = @post.post_policy.groups.pluck(:id)
diff --git a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
index 559f962d21f37..1b542a7bb6a61 100644
--- a/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
+++ b/plugins/discourse-policy/spec/requests/policy_controller_spec.rb
@@ -112,6 +112,45 @@ def raw
     end
   end
 
+  describe "post visibility checks" do
+    fab!(:private_group, :group)
+    fab!(:private_category) { Fabricate(:private_category, group: private_group) }
+    fab!(:outsider, :user)
+    fab!(:private_topic) { Fabricate(:topic, category: private_category, user: moderator) }
+    fab!(:private_post) { Fabricate(:post, topic: private_topic, user: moderator) }
+    fab!(:private_policy) do
+      policy = Fabricate(:post_policy, post: private_post)
+      PostPolicyGroup.create!(post_policy_id: policy.id, group_id: group.id)
+      policy
+    end
+
+    before { group.add(outsider) }
+
+    it "returns 404 when user cannot see the post for accept" do
+      sign_in(outsider)
+      put "/policy/accept.json", params: { post_id: private_post.id }
+      expect(response.status).to eq(404)
+    end
+
+    it "returns 404 when user cannot see the post for unaccept" do
+      sign_in(outsider)
+      put "/policy/unaccept.json", params: { post_id: private_post.id }
+      expect(response.status).to eq(404)
+    end
+
+    it "returns 404 when user cannot see the post for accepted" do
+      sign_in(outsider)
+      get "/policy/accepted.json", params: { post_id: private_post.id }
+      expect(response.status).to eq(404)
+    end
+
+    it "returns 404 when user cannot see the post for not_accepted" do
+      sign_in(outsider)
+      get "/policy/not-accepted.json", params: { post_id: private_post.id }
+      expect(response.status).to eq(404)
+    end
+  end
+
   describe "group member visibility restrictions" do
     fab!(:owner, :user)
     let!(:post) do

From 0442741f8cbbfe43fad4b94ed47e2b8fae037948 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Feb 2026 15:02:36 +0100
Subject: [PATCH 112/168] SECURITY: authentication bypass vulnerability

When the patreon_webhook_secret site setting is blank, an attacker can forge valid webhook signatures by computing an HMAC-MD5 with an empty string as the key. Since the request body is known to the sender, the attacker can produce a matching signature and send arbitrary webhook payloads. This allows unauthorized creation, modification, or deletion of Patreon pledge data and triggering patron-to-group synchronization.

The `secure_compare` change handles a very theoretical timing attack.
---
 .../patreon/patreon_webhook_controller.rb     |  9 +++++++--
 .../patreon_webhook_controller_spec.rb        | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/plugins/discourse-patreon/app/controllers/patreon/patreon_webhook_controller.rb b/plugins/discourse-patreon/app/controllers/patreon/patreon_webhook_controller.rb
index e110e965c9b2c..ce477202efe7b 100644
--- a/plugins/discourse-patreon/app/controllers/patreon/patreon_webhook_controller.rb
+++ b/plugins/discourse-patreon/app/controllers/patreon/patreon_webhook_controller.rb
@@ -70,10 +70,15 @@ def unknown_trigger?
   private
 
   def valid_signature?
+    secret = SiteSetting.patreon_webhook_secret
+    return false if secret.blank?
+
     signature = request.headers["X-Patreon-Signature"]
     digest = OpenSSL::Digest.new("MD5")
 
-    signature ==
-      OpenSSL::HMAC.hexdigest(digest, SiteSetting.patreon_webhook_secret, request.raw_post)
+    ActiveSupport::SecurityUtils.secure_compare(
+      signature.to_s,
+      OpenSSL::HMAC.hexdigest(digest, secret, request.raw_post),
+    )
   end
 end
diff --git a/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb b/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb
index 096aba3bdcf44..681cbacfa9b26 100644
--- a/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb
+++ b/plugins/discourse-patreon/spec/requests/patreon_webhook_controller_spec.rb
@@ -45,6 +45,25 @@
         expect(response.status).to eq(403)
         expect(response.parsed_body["errors"]).to contain_exactly("Invalid signature")
       end
+
+      it "returns a 403 error when webhook secret is blank" do
+        SiteSetting.patreon_webhook_secret = ""
+        body = get_patreon_response("pledge.json")
+        digest = OpenSSL::Digest.new("MD5")
+        forged_signature = OpenSSL::HMAC.hexdigest(digest, "", body)
+
+        expect_not_enqueued_with(job: :patreon_sync_patrons_to_groups) do
+          post "/patreon/webhook",
+               params: body,
+               headers: {
+                 "X-Patreon-Event": "pledges:create",
+                 "X-Patreon-Signature": forged_signature,
+               }
+        end
+
+        expect(response.status).to eq(403)
+        expect(response.parsed_body["errors"]).to contain_exactly("Invalid signature")
+      end
     end
 
     describe "enqueue job" do

From b8e2c8a07af437b418f6703200c987f8749cb6e8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 12 Feb 2026 11:30:59 +0100
Subject: [PATCH 113/168] SECURITY: harden webooks endpoints

Ensures every endpoints now require a valid token. This commit is not deprecating mailpace and directly fixing it like other endpoints which have been deprecated for years now. This SECURITY issue is serious enough to warrant a direct fix.
---
 app/controllers/webhooks_controller.rb    |  30 ++--
 config/locales/server.en.yml              |   1 +
 config/site_settings.yml                  |   3 +
 spec/requests/webhooks_controller_spec.rb | 176 ++++++++++++++++++++--
 4 files changed, 185 insertions(+), 25 deletions(-)

diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb
index 763c31d07aa22..0b13d9a6d0aa0 100644
--- a/app/controllers/webhooks_controller.rb
+++ b/app/controllers/webhooks_controller.rb
@@ -22,9 +22,7 @@ def sendgrid
     if SiteSetting.sendgrid_verification_key.present?
       return signature_failure if !valid_sendgrid_signature?
     else
-      Rails.logger.warn(
-        "Received a Sendgrid webhook, but no verification key has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      return signature_failure
     end
 
     events = params["_json"] || [params]
@@ -55,9 +53,7 @@ def mailjet
     if SiteSetting.mailjet_webhook_token.present?
       return signature_failure if !valid_mailjet_token?
     else
-      Rails.logger.warn(
-        "Received a Mailjet webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      return signature_failure
     end
 
     events = params["_json"] || [params]
@@ -79,6 +75,12 @@ def mailjet
   def mailpace
     # see https://docs.mailpace.com/guide/webhooks#email-events
 
+    if SiteSetting.mailpace_webhook_token.present?
+      return signature_failure if !valid_mailpace_token?
+    else
+      return signature_failure
+    end
+
     message_id = Email::MessageIdService.message_id_clean(params["payload"]["message_id"])
     to_address = params["payload"]["to"]
     status = params["payload"]["status"]
@@ -97,9 +99,7 @@ def mandrill
     if SiteSetting.mandrill_authentication_key.present?
       return signature_failure if !valid_mandrill_signature?
     else
-      Rails.logger.warn(
-        "Received a Mandrill webhook, but no authentication key has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      return signature_failure
     end
 
     JSON
@@ -130,9 +130,7 @@ def postmark
     if SiteSetting.postmark_webhook_token.present?
       return signature_failure if !valid_postmark_token?
     else
-      Rails.logger.warn(
-        "Received a Postmark webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      return signature_failure
     end
 
     # see https://postmarkapp.com/developer/webhooks/bounce-webhook#bounce-webhook-data
@@ -155,9 +153,7 @@ def sparkpost
     if SiteSetting.sparkpost_webhook_token.present?
       return signature_failure if !valid_sparkpost_token?
     else
-      Rails.logger.warn(
-        "Received a Sparkpost webhook, but no token has been configured. This is unsafe behaviour and will be disallowed in the future.",
-      )
+      return signature_failure
     end
 
     events = params["_json"] || [params]
@@ -325,6 +321,10 @@ def valid_mandrill_signature?
     )
   end
 
+  def valid_mailpace_token?
+    ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.mailpace_webhook_token)
+  end
+
   def valid_postmark_token?
     return false if params[:t].blank?
     ActiveSupport::SecurityUtils.secure_compare(params[:t], SiteSetting.postmark_webhook_token)
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index a220b28524580..46d2c61e9944c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2343,6 +2343,7 @@ en:
     mailgun_api_key: "Mailgun Secret API key used to verify webhook messages."
     sendgrid_verification_key: "Sendgrid verification key used to verify webhook messages."
     mailjet_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Mandrill authentication key used to verify webhook messages."
     postmark_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token used to verify webhook payload. It must be passed as the 't' query parameter of the webhook, for example: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c85bd4877d8e3..6b4dc96523e8c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2010,6 +2010,9 @@ email:
   mailjet_webhook_token:
     default: ""
     secret: true
+  mailpace_webhook_token:
+    default: ""
+    secret: true
   mandrill_authentication_key:
     default: ""
     secret: true
diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb
index bd4a52ec0eee0..efab54e5f176b 100644
--- a/spec/requests/webhooks_controller_spec.rb
+++ b/spec/requests/webhooks_controller_spec.rb
@@ -110,7 +110,29 @@
     fab!(:user) { Fabricate(:user, email:) }
     fab!(:email_log) { Fabricate(:email_log, user:, message_id: message_id, to_address: email) }
 
-    it "works" do
+    it "returns an error when no verification key is configured" do
+      SiteSetting.sendgrid_verification_key = ""
+
+      post "/webhooks/sendgrid.json",
+           params: {
+             "_json" => [
+               {
+                 "email" => email,
+                 "smtp-id" => "<12345@il.com>",
+                 "event" => "bounce",
+                 "status" => "5.0.0",
+               },
+             ],
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
+
+    it "hard bounces" do
+      SiteSetting.sendgrid_verification_key = "test"
+      WebhooksController.any_instance.stubs(:valid_sendgrid_signature?).returns(true)
+
       post "/webhooks/sendgrid.json",
            params: {
              "_json" => [
@@ -132,6 +154,9 @@
     end
 
     it "sets the bounce error code to 5.1.2 when payload's `event` is `bounce`, `type` is `blocked` and `status` is blank" do
+      SiteSetting.sendgrid_verification_key = "test"
+      WebhooksController.any_instance.stubs(:valid_sendgrid_signature?).returns(true)
+
       post "/webhooks/sendgrid.json",
            params: {
              "_json" => [
@@ -229,7 +254,8 @@
   end
 
   describe "#mailjet" do
-    it "works" do
+    it "returns an error when no webhook token is configured" do
+      SiteSetting.mailjet_webhook_token = ""
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
@@ -241,6 +267,23 @@
              "CustomID" => message_id,
            }
 
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
+
+    it "hard bounces" do
+      SiteSetting.mailjet_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailjet.json?t=foo",
+           params: {
+             "event" => "bounce",
+             "email" => email,
+             "hard_bounce" => true,
+             "CustomID" => message_id,
+           }
+
       expect(response.status).to eq(200)
 
       email_log.reload
@@ -302,11 +345,12 @@
   end
 
   describe "#mailpace" do
-    it "works" do
+    it "hard bounces" do
+      SiteSetting.mailpace_webhook_token = "foo"
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post "/webhooks/mailpace.json",
+      post "/webhooks/mailpace.json?t=foo",
            params: {
              event: "email.bounced",
              payload: {
@@ -325,10 +369,11 @@
     end
 
     it "soft bounces" do
+      SiteSetting.mailpace_webhook_token = "foo"
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post "/webhooks/mailpace.json",
+      post "/webhooks/mailpace.json?t=foo",
            params: {
              event: "email.deferred",
              payload: {
@@ -345,14 +390,79 @@
       expect(email_log.bounce_error_code).to eq(nil) # mailpace doesn't give us this
       expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score)
     end
+
+    it "verifies webhook tokens" do
+      SiteSetting.mailpace_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailpace.json?t=foo",
+           params: {
+             event: "email.bounced",
+             payload: {
+               status: "bounced",
+               to: email,
+               message_id: "<#{message_id}>",
+             },
+           }
+
+      expect(response.status).to eq(200)
+      expect(email_log.reload.bounced).to eq(true)
+    end
+
+    it "returns error if token verification fails" do
+      SiteSetting.mailpace_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mailpace.json?t=bar",
+           params: {
+             event: "email.bounced",
+             payload: {
+               status: "bounced",
+               to: email,
+               message_id: "<#{message_id}>",
+             },
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
   end
 
   describe "#mandrill" do
+    it "returns an error when no authentication key is configured" do
+      SiteSetting.mandrill_authentication_key = ""
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/mandrill.json",
+           params: {
+             mandrill_events: [
+               {
+                 "event" => "hard_bounce",
+                 "msg" => {
+                   "email" => email,
+                   "diag" => "5.1.1",
+                   "metadata" => {
+                     "message_id" => message_id,
+                   },
+                 },
+               },
+             ].to_json,
+           }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
+
     let(:payload) do
       "mandrill_events=%5B%7B%22event%22%3A%22hard_bounce%22%2C%22msg%22%3A%7B%22email%22%3A%22em%40il.com%22%2C%22diag%22%3A%225.1.1%22%2C%22bounce_description%22%3A%22smtp%3B+550-5.1.1+The+email+account+that+you+tried+to+reach+does+not+exist.%22%2C%22metadata%22%3A%7B%22message_id%22%3A%2212345%40il.com%22%7D%7D%7D%5D"
     end
 
-    it "works" do
+    it "hard bounces" do
+      SiteSetting.mandrill_authentication_key = "test"
+      WebhooksController.any_instance.stubs(:valid_mandrill_signature?).returns(true)
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
@@ -432,7 +542,8 @@
   end
 
   describe "#postmark" do
-    it "works" do
+    it "returns an error when no webhook token is configured" do
+      SiteSetting.postmark_webhook_token = ""
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
@@ -442,6 +553,22 @@
              "MessageID" => message_id,
              "Email" => email,
            }
+
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
+
+    it "hard bounces" do
+      SiteSetting.postmark_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/postmark.json?t=foo",
+           params: {
+             "Type" => "HardBounce",
+             "MessageID" => message_id,
+             "Email" => email,
+           }
       expect(response.status).to eq(200)
 
       email_log.reload
@@ -451,10 +578,11 @@
     end
 
     it "soft bounces" do
+      SiteSetting.postmark_webhook_token = "foo"
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
-      post "/webhooks/postmark.json",
+      post "/webhooks/postmark.json?t=foo",
            params: {
              "Type" => "SoftBounce",
              "MessageID" => message_id,
@@ -518,7 +646,8 @@
   end
 
   describe "#sparkpost" do
-    it "works" do
+    it "returns an error when no webhook token is configured" do
+      SiteSetting.sparkpost_webhook_token = ""
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 
@@ -540,6 +669,33 @@
              ],
            }
 
+      expect(response.status).to eq(406)
+      expect(email_log.reload.bounced).to eq(false)
+    end
+
+    it "hard bounces" do
+      SiteSetting.sparkpost_webhook_token = "foo"
+      user = Fabricate(:user, email: email)
+      email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
+
+      post "/webhooks/sparkpost.json?t=foo",
+           params: {
+             "_json" => [
+               {
+                 "msys" => {
+                   "message_event" => {
+                     "bounce_class" => 10,
+                     "error_code" => "554",
+                     "rcpt_to" => email,
+                     "rcpt_meta" => {
+                       "message_id" => message_id,
+                     },
+                   },
+                 },
+               },
+             ],
+           }
+
       expect(response.status).to eq(200)
 
       email_log.reload
@@ -690,7 +846,7 @@
 
     before { Jobs.run_immediately! }
 
-    it "works" do
+    it "hard bounces" do
       user = Fabricate(:user, email: email)
       email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email)
 

From 846f1696ed62ccfd56f97e3fdc8ed1ebac798023 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Thu, 12 Feb 2026 02:17:16 +0100
Subject: [PATCH 114/168] SECURITY: Prevent TL4 users to post to staff-only
 categories through a topic timer

---
 app/controllers/topics_controller.rb    |  6 ++++++
 spec/requests/topics_controller_spec.rb | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 23e1e47daac85..a0c58c790307f 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -612,6 +612,12 @@ def timer
 
     guardian.ensure_can_delete!(topic) if TopicTimer.destructive_types.values.include?(status_type)
 
+    if status_type == TopicTimer.types[:publish_to_category] && params[:category_id].present?
+      category = Category.find_by(id: params[:category_id])
+      raise Discourse::NotFound if !category
+      raise Discourse::InvalidAccess if !guardian.can_create_topic_on_category?(category)
+    end
+
     options = { by_user: current_user, based_on_last_post: based_on_last_post }
 
     options.merge!(category_id: params[:category_id]) if params[:category_id].present?
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 733b0b3260a50..74b2e77348def 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -5677,6 +5677,25 @@ def extract_post_stream
         topic_timer = TopicTimer.last
         expect(topic_timer.status_type).to eq(TopicTimer.types[:delete_replies])
       end
+
+      it "raises an error when publishing to a staff-only category" do
+        user.update!(trust_level: TrustLevel[4])
+        sign_in(user)
+
+        staff_category = Fabricate(:category)
+        staff_category.set_permissions(staff: :full)
+        staff_category.save!
+
+        post "/t/#{topic.id}/timer.json",
+             params: {
+               time: 24,
+               status_type: "publish_to_category",
+               category_id: staff_category.id,
+             }
+
+        expect(response.status).to eq(403)
+        expect(response.parsed_body["error_type"]).to eq("invalid_access")
+      end
     end
   end
 

From 1d0fbf9ff3682356c0893573d2b366acfafb5c90 Mon Sep 17 00:00:00 2001
From: OsamaSayegh <asooomaasoooma90@gmail.com>
Date: Wed, 11 Feb 2026 07:20:56 +0300
Subject: [PATCH 115/168] SECURITY: Check visibility permissions for TL4
 changing topic status

---
 lib/guardian/topic_guardian.rb          |  1 +
 spec/lib/guardian_spec.rb               | 74 +++++++++++++++++++++++++
 spec/requests/topics_controller_spec.rb | 45 +++++++++++++++
 3 files changed, 120 insertions(+)

diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 0da59e0169488..1ad8655fe6152 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -339,6 +339,7 @@ def can_edit_tags?(topic)
   def can_perform_action_available_to_group_moderators?(topic)
     return false if anonymous? || topic.nil?
     return true if is_staff?
+    return false if !can_see_topic?(topic)
     return true if @user.has_trust_level?(TrustLevel[4])
 
     is_category_group_moderator?(topic.category)
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index c79ed690e8f1f..d70430724e89d 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -1379,6 +1379,30 @@
       Fabricate(:category_moderation_group, category: topic.category, group:)
       expect(Guardian.new(user).can_close_topic?(topic)).to eq(true)
     end
+
+    context "with TL4 users" do
+      it "returns true for visible topic" do
+        expect(Guardian.new(trust_level_4).can_close_topic?(topic)).to eq(true)
+      end
+
+      it "returns false for private category topic" do
+        private_category = Fabricate(:private_category, group: group)
+        private_topic = Fabricate(:topic, category: private_category)
+        expect(Guardian.new(trust_level_4).can_close_topic?(private_topic)).to eq(false)
+      end
+
+      it "returns false for private message" do
+        pm_topic = Fabricate(:private_message_topic)
+        expect(Guardian.new(trust_level_4).can_close_topic?(pm_topic)).to eq(false)
+      end
+
+      it "returns true with access to private category" do
+        group.add(trust_level_4)
+        private_category = Fabricate(:private_category, group: group)
+        private_topic = Fabricate(:topic, category: private_category)
+        expect(Guardian.new(trust_level_4).can_close_topic?(private_topic)).to eq(true)
+      end
+    end
   end
 
   describe "#can_archive_topic?" do
@@ -1400,6 +1424,56 @@
       Fabricate(:category_moderation_group, category: topic.category, group:)
       expect(Guardian.new(user).can_archive_topic?(topic)).to eq(true)
     end
+
+    context "with TL4 users" do
+      it "returns true for visible topic" do
+        expect(Guardian.new(trust_level_4).can_archive_topic?(topic)).to eq(true)
+      end
+
+      it "returns false for private category topic" do
+        private_category = Fabricate(:private_category, group: group)
+        private_topic = Fabricate(:topic, category: private_category)
+        expect(Guardian.new(trust_level_4).can_archive_topic?(private_topic)).to eq(false)
+      end
+
+      it "returns false for private message" do
+        pm_topic = Fabricate(:private_message_topic)
+        expect(Guardian.new(trust_level_4).can_archive_topic?(pm_topic)).to eq(false)
+      end
+
+      it "returns true with access to private category" do
+        group.add(trust_level_4)
+        private_category = Fabricate(:private_category, group: group)
+        private_topic = Fabricate(:topic, category: private_category)
+        expect(Guardian.new(trust_level_4).can_archive_topic?(private_topic)).to eq(true)
+      end
+    end
+  end
+
+  describe "#can_pin_unpin_topic?" do
+    context "with TL4 users" do
+      it "returns true for visible topic" do
+        expect(Guardian.new(trust_level_4).can_pin_unpin_topic?(topic)).to eq(true)
+      end
+
+      it "returns false for private category topic" do
+        private_category = Fabricate(:private_category, group: group)
+        private_topic = Fabricate(:topic, category: private_category)
+        expect(Guardian.new(trust_level_4).can_pin_unpin_topic?(private_topic)).to eq(false)
+      end
+
+      it "returns true with access to private category" do
+        group.add(trust_level_4)
+        private_category = Fabricate(:private_category, group: group)
+        private_topic = Fabricate(:topic, category: private_category)
+        expect(Guardian.new(trust_level_4).can_pin_unpin_topic?(private_topic)).to eq(true)
+      end
+
+      it "returns false for private message" do
+        pm_topic = Fabricate(:private_message_topic)
+        expect(Guardian.new(trust_level_4).can_pin_unpin_topic?(pm_topic)).to eq(false)
+      end
+    end
   end
 
   describe "#can_edit_staff_notes?" do
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 74b2e77348def..88a1e2e2b3644 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -1531,6 +1531,51 @@
       end
     end
 
+    describe "when logged in as TL4 user" do
+      before { sign_in(trust_level_4) }
+
+      it "allows TL4 to close visible topics" do
+        put "/t/#{topic.id}/status.json", params: { status: "closed", enabled: "true" }
+        expect(response.status).to eq(200)
+        expect(topic.reload.closed).to eq(true)
+      end
+
+      it "prevents TL4 from closing restricted category topics" do
+        staff_topic = Fabricate(:topic, category: staff_category)
+        put "/t/#{staff_topic.id}/status.json", params: { status: "closed", enabled: "true" }
+        expect(response.status).to eq(403)
+        expect(staff_topic.reload.closed).to eq(false)
+      end
+
+      it "prevents TL4 from closing private messages" do
+        pm = Fabricate(:private_message_topic)
+        put "/t/#{pm.id}/status.json", params: { status: "closed", enabled: "true" }
+        expect(response.status).to eq(403)
+        expect(pm.reload.closed).to eq(false)
+      end
+
+      it "prevents TL4 from archiving restricted topics" do
+        staff_topic = Fabricate(:topic, category: staff_category)
+        put "/t/#{staff_topic.id}/status.json", params: { status: "archived", enabled: "true" }
+        expect(response.status).to eq(403)
+        expect(staff_topic.reload.archived).to eq(false)
+      end
+
+      it "prevents TL4 from pinning restricted topics" do
+        staff_topic = Fabricate(:topic, category: staff_category)
+        put "/t/#{staff_topic.id}/status.json", params: { status: "pinned", enabled: "true" }
+        expect(response.status).to eq(403)
+        expect(staff_topic.reload.pinned_at).to eq(nil)
+      end
+
+      it "prevents TL4 from toggling visibility of restricted topics" do
+        staff_topic = Fabricate(:topic, category: staff_category)
+        put "/t/#{staff_topic.id}/status.json", params: { status: "visible", enabled: "false" }
+        expect(response.status).to eq(403)
+        expect(staff_topic.reload.visible).to eq(true)
+      end
+    end
+
     context "with API key" do
       let(:api_key) { Fabricate(:api_key, user: moderator, created_by: moderator) }
 

From 7d565fb932aa2b74fb0f8090b811a66a698ce036 Mon Sep 17 00:00:00 2001
From: Keegan George <kgeorge13@gmail.com>
Date: Tue, 10 Feb 2026 09:47:37 -0800
Subject: [PATCH 116/168] SECURITY: prevent regular users from promoting topics
 to banners

---
 lib/guardian/topic_guardian.rb          |  8 ++++++++
 lib/post_revisor.rb                     |  6 +++++-
 spec/lib/guardian_spec.rb               | 22 ++++++++++++++++++++++
 spec/lib/post_revisor_spec.rb           | 17 +++++++++++++++--
 spec/requests/topics_controller_spec.rb |  7 +++++++
 5 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/lib/guardian/topic_guardian.rb b/lib/guardian/topic_guardian.rb
index 1ad8655fe6152..5f4a9cce2f4fd 100644
--- a/lib/guardian/topic_guardian.rb
+++ b/lib/guardian/topic_guardian.rb
@@ -323,6 +323,14 @@ def can_banner_topic?(topic)
     topic && authenticated? && !topic.private_message? && is_staff?
   end
 
+  def can_change_archetype?(topic, new_archetype)
+    return true if new_archetype == topic.archetype
+    if new_archetype == Archetype.banner || topic.archetype == Archetype.banner
+      return can_banner_topic?(topic)
+    end
+    true
+  end
+
   def can_edit_tags?(topic)
     return false unless can_tag_topics?
     return false if topic.private_message? && !can_tag_pms?
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rb
index e1f02bba03e52..9d957f7f2aa5b 100644
--- a/lib/post_revisor.rb
+++ b/lib/post_revisor.rb
@@ -118,7 +118,11 @@ def self.track_and_revise(topic_changes, field, attribute)
   end
 
   track_topic_field(:archetype) do |topic_changes, attribute|
-    track_and_revise topic_changes, :archetype, attribute
+    if topic_changes.guardian.can_change_archetype?(topic_changes.topic, attribute)
+      track_and_revise topic_changes, :archetype, attribute
+    else
+      topic_changes.check_result(false)
+    end
   end
 
   track_topic_field(:category_id) do |tc, new_category_id, fields|
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index d70430724e89d..1f09ab5610336 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -505,6 +505,28 @@
         expect(Guardian.new(admin).can_banner_topic?(topic)).to be_truthy
       end
 
+      describe "#can_change_archetype?" do
+        fab!(:topic)
+
+        it "allows staff to change archetype to banner" do
+          expect(Guardian.new(admin).can_change_archetype?(topic, Archetype.banner)).to eq(true)
+          expect(Guardian.new(moderator).can_change_archetype?(topic, Archetype.banner)).to eq(true)
+        end
+
+        it "does not allow regular users to change archetype to banner" do
+          expect(Guardian.new(user).can_change_archetype?(topic, Archetype.banner)).to eq(false)
+        end
+
+        it "does not allow regular users to change archetype from banner" do
+          topic.update!(archetype: Archetype.banner)
+          expect(Guardian.new(user).can_change_archetype?(topic, Archetype.default)).to eq(false)
+        end
+
+        it "returns true when archetype is unchanged" do
+          expect(Guardian.new(user).can_change_archetype?(topic, topic.archetype)).to eq(true)
+        end
+      end
+
       it "respects category group moderator settings" do
         group_user = Fabricate(:group_user)
         user_gm = group_user.user
diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rb
index d6e70e28f093e..c6d0ef3455118 100644
--- a/spec/lib/post_revisor_spec.rb
+++ b/spec/lib/post_revisor_spec.rb
@@ -1070,11 +1070,11 @@
       expect(post_revisor.raw_changed?).to eq(false)
     end
 
-    it "revises and tracks changes of topic archetypes" do
+    it "revises and tracks changes of topic archetypes for staff" do
       new_archetype = Archetype.banner
       result =
         post_revisor.revise!(
-          post.user,
+          admin,
           { archetype: new_archetype },
           revised_at: post.updated_at + 10.minutes,
         )
@@ -1086,6 +1086,19 @@
       expect(post_revisor.raw_changed?).to eq(false)
     end
 
+    it "does not allow regular users to change topic archetype to banner" do
+      result =
+        post_revisor.revise!(
+          post.user,
+          { archetype: Archetype.banner },
+          revised_at: post.updated_at + 10.minutes,
+        )
+
+      expect(result).to eq(false)
+      post.reload
+      expect(post.topic.archetype).to eq(Archetype.default)
+    end
+
     it "revises and tracks changes of topic tags" do
       post_revisor.revise!(admin, tags: ["new-tag"])
       expect(post.post_revisions.last.modifications).to eq("tags" => [[], ["new-tag"]])
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 88a1e2e2b3644..58877a01c7734 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -2017,6 +2017,13 @@ def topic_user_post_timings_count(user, topic)
         end
       end
 
+      it "does not allow a regular user to change archetype to banner" do
+        put "/t/#{topic.id}.json", params: { archetype: Archetype.banner }
+
+        topic.reload
+        expect(topic.archetype).to eq(Archetype.default)
+      end
+
       describe "without permission" do
         it "raises an exception when the user doesn't have permission to update the topic" do
           topic.update!(archived: true)

From 43f80d7cc071bcfefc48e4a66816f19b129915b2 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jarek@cvx.dev>
Date: Tue, 10 Feb 2026 16:33:39 +0100
Subject: [PATCH 117/168] SECURITY: Check for no group assignments in
 data-explorer queries

---
 plugins/discourse-data-explorer/plugin.rb     |  2 +-
 .../spec/guardian_spec.rb                     | 24 +++++++++++++++++++
 .../spec/report_generator_spec.rb             |  3 +++
 .../spec/requests/query_controller_spec.rb    |  7 ++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-data-explorer/plugin.rb b/plugins/discourse-data-explorer/plugin.rb
index e249b413396b7..06f6794c9f594 100644
--- a/plugins/discourse-data-explorer/plugin.rb
+++ b/plugins/discourse-data-explorer/plugin.rb
@@ -50,7 +50,7 @@ module ::DiscourseDataExplorer
   add_to_class(:guardian, :user_can_access_query?) do |query|
     return false if !current_user
     return true if current_user.admin?
-    query.groups.blank? || query.groups.any? { |group| user_is_a_member_of_group?(group) }
+    query.groups.any? { |group| user_is_a_member_of_group?(group) }
   end
 
   add_to_class(:guardian, :group_and_user_can_access_query?) do |group, query|
diff --git a/plugins/discourse-data-explorer/spec/guardian_spec.rb b/plugins/discourse-data-explorer/spec/guardian_spec.rb
index 4b83323bec244..d06270dc46a78 100644
--- a/plugins/discourse-data-explorer/spec/guardian_spec.rb
+++ b/plugins/discourse-data-explorer/spec/guardian_spec.rb
@@ -35,6 +35,30 @@ def make_query(group_ids = [])
     end
   end
 
+  describe "#user_can_access_query?" do
+    it "is true when the user is an admin" do
+      expect(Guardian.new(admin).user_can_access_query?(make_query)).to eq(true)
+    end
+
+    it "is false when the query has no group assignments" do
+      expect(Guardian.new(user).user_can_access_query?(make_query)).to eq(false)
+    end
+
+    it "is true when the user is a member of a group assigned to the query" do
+      query = make_query(["#{group.id}"])
+      group.add(user)
+
+      expect(Guardian.new(user).user_can_access_query?(query)).to eq(true)
+    end
+
+    it "is false when the user is not a member of any group assigned to the query" do
+      other_group = Fabricate(:group)
+      query = make_query(["#{other_group.id}"])
+
+      expect(Guardian.new(user).user_can_access_query?(query)).to eq(false)
+    end
+  end
+
   describe "#group_and_user_can_access_query?" do
     it "is true if the user is an admin" do
       expect(Guardian.new(admin).group_and_user_can_access_query?(group, make_query)).to eq(true)
diff --git a/plugins/discourse-data-explorer/spec/report_generator_spec.rb b/plugins/discourse-data-explorer/spec/report_generator_spec.rb
index 2e0b5892849a8..3afde8ff43e06 100644
--- a/plugins/discourse-data-explorer/spec/report_generator_spec.rb
+++ b/plugins/discourse-data-explorer/spec/report_generator_spec.rb
@@ -29,6 +29,7 @@
     end
 
     it "returns a list of pms for authorised users" do
+      Fabricate(:query_group, query: query, group: group)
       SiteSetting.personal_message_enabled_groups = group.id
       DiscourseDataExplorer::ResultToMarkdown.expects(:convert).returns("le table")
       freeze_time
@@ -126,6 +127,7 @@
     end
 
     it "works with duplicate recipients" do
+      Fabricate(:query_group, query: query, group: group)
       DiscourseDataExplorer::ResultToMarkdown.expects(:convert).returns("le table")
       freeze_time
 
@@ -231,6 +233,7 @@
     end
 
     it "works with attached csv file" do
+      Fabricate(:query_group, query: query, group: group)
       SiteSetting.personal_message_enabled_groups = group.id
       DiscourseDataExplorer::ResultToMarkdown.expects(:convert).returns("le table")
       freeze_time
diff --git a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
index cb75514c1c647..9f977b6033759 100644
--- a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
+++ b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
@@ -710,6 +710,13 @@ def limited_request(query_id, headers = {})
         get "/data-explorer/queries/#{query.id}/run.json"
         expect(response.status).to eq(404)
       end
+
+      it "returns 404 when the query has no group assignments" do
+        query = make_query("SELECT 1 as value", {}, [])
+
+        get "/data-explorer/queries/#{query.id}/run.json"
+        expect(response.status).to eq(404)
+      end
     end
   end
 

From 896e810e1b296478bba91559a8fc89a9926f11fe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 26 Feb 2026 12:30:48 +0000
Subject: [PATCH 118/168] DEV: Begin development of v2026.3.0-latest (#38083)

Merging this will trigger the creation of a `release/2026.2` branch on
the preceding commit.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 lib/version.rb |  2 +-
 versions.json  | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/version.rb b/lib/version.rb
index d48d3684b474b..c4692a78bec5d 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
   unless defined?(::Discourse::VERSION)
     module VERSION #:nodoc:
       # Use the `version_bump:*` rake tasks to update this value
-      STRING = "2026.2.0-latest"
+      STRING = "2026.3.0-latest"
 
       PARTS = STRING.split(".")
       private_constant :PARTS
diff --git a/versions.json b/versions.json
index 735d4ecca075d..903ad2330d8ba 100644
--- a/versions.json
+++ b/versions.json
@@ -1,9 +1,17 @@
 {
+  "2026.3": {
+    "developmentStartDate": "2026-02-26",
+    "releaseDate": "2026-03",
+    "supportEndDate": "2026-05",
+    "released": false,
+    "esr": false,
+    "supported": true
+  },
   "2026.2": {
     "developmentStartDate": "2026-01-28",
-    "releaseDate": "2026-02",
+    "releaseDate": "2026-02-26",
     "supportEndDate": "2026-04",
-    "released": false,
+    "released": true,
     "esr": false,
     "supported": true
   },
@@ -18,10 +26,10 @@
   "2025.12": {
     "releaseDate": "2025-12-30",
     "developmentStartDate": "2025-11-25",
-    "supportEndDate": "2026-02",
+    "supportEndDate": "2026-02-26",
     "released": true,
     "esr": false,
-    "supported": true
+    "supported": false
   },
   "2025.11": {
     "releaseDate": "2025-11-25",

From 1d1d8336ff7b027c9ee750d8fab226dc69951662 Mon Sep 17 00:00:00 2001
From: Bannon Tanner <bannon@discourse.org>
Date: Thu, 26 Feb 2026 08:08:27 -0600
Subject: [PATCH 119/168] FIX: colspan issue with house-ad component (#38001)

Fixes a regression from the tagless component migration (6b000b00) that
broke `colspan` structure for topic-list-between ads

Set the attribute on the parent class that can attach to the `<td>`
element when it is used
---
 .../assets/javascripts/discourse/components/ad-component.js | 4 ++++
 .../assets/javascripts/discourse/components/ad-slot.gjs     | 1 +
 .../assets/javascripts/discourse/components/house-ad.gjs    | 6 +-----
 .../connectors/after-topic-list-item/discourse-adplugin.gjs | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.js b/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.js
index 0d8da5a717e63..3fee38f1b0326 100644
--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.js
+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-component.js
@@ -106,6 +106,10 @@ export default class AdComponent extends Component {
   didInsertElement() {
     super.didInsertElement?.(...arguments);
 
+    if (this.colspan && this.element) {
+      this.element.setAttribute("colspan", this.colspan);
+    }
+
     if (!this.get("showAd")) {
       return;
     }
diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-slot.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-slot.gjs
index 03a71a68c280b..89795ad822f6f 100644
--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-slot.gjs
+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/ad-slot.gjs
@@ -268,6 +268,7 @@ export default class AdSlot extends AdComponent {
           @postNumber={{this.postNumber}}
           @indexNumber={{this.indexNumber}}
           @tagName={{this.childTagName}}
+          @colspan={{this.colspan}}
         />
       {{/each}}
     {{/each}}
diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs
index 0427fd3a7eb48..6dc9718d87290 100644
--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs
+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs
@@ -193,11 +193,7 @@ export default class HouseAd extends AdComponent {
   }
 
   <template>
-    <div
-      colspan={{this.colspanAttribute}}
-      class={{concatClass "house-creative" this.adUnitClass}}
-      ...attributes
-    >
+    <div class={{concatClass "house-creative" this.adUnitClass}} ...attributes>
       {{#if this.showAd}}
         {{htmlSafe this.adHtml}}
       {{/if}}
diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.gjs
index 8cd64d1f85e4f..e85221ae6c5a2 100644
--- a/plugins/discourse-adplugin/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.gjs
+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/connectors/after-topic-list-item/discourse-adplugin.gjs
@@ -25,6 +25,7 @@ export default class DiscourseAdplugin extends Component {
         @category={{this.category.slug}}
         @indexNumber={{this.index}}
         @childTagName="td"
+        @colspan="5"
       />
     </tr>
   </template>

From 1fc6960066fd4ca67dd04ddbcac3776366682de9 Mon Sep 17 00:00:00 2001
From: Martin Brennan <martin@discourse.org>
Date: Fri, 27 Feb 2026 01:32:16 +1000
Subject: [PATCH 120/168] FEATURE: Filter upcoming changes list by multiple
 names (#38051)

We need to be able to filter the upcoming change list by
multiple site setting names at once so we can link from
notifications and from elsewhere and filter the list to
only those changes.

This commit adds a ?changeFilterNames=name_x,name_y query
parameter for this purpose. The AdminFilterControls component
has been updated to handle commas in the filter input, and a
"Reset filter" button is now shown even when there are results for
easier clearing:

<img width="1132" height="608" alt="image"
src="https://github.com/user-attachments/assets/13834cc5-3b00-485a-9958-33de38adc1c8"
/>

---------

Co-authored-by: awesomerobot <kris.aubuchon@discourse.org>
---
 config/locales/client.en.yml                  |  2 +-
 .../admin-config-areas/upcoming-changes.gjs   | 17 ++++++++--
 .../components/admin-filter-controls.gjs      | 33 +++++++++++++++----
 .../admin-config/upcoming-changes.js          | 17 ++++++++++
 .../routes/admin-config/upcoming-changes.js   |  4 +++
 .../admin-config/upcoming-changes.gjs         |  6 +++-
 .../components/admin-filter-controls-test.gjs | 27 +++++++++++++++
 spec/system/admin_filter_controls_spec.rb     | 14 +++++---
 .../components/admin_filter_controls.rb       | 18 ++++++++--
 9 files changed, 120 insertions(+), 18 deletions(-)
 create mode 100644 frontend/discourse/admin/controllers/admin-config/upcoming-changes.js

diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d76b77452881b..ad2b4a717951a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -5929,7 +5929,7 @@ en:
     # This is a text input placeholder, keep the translation short
     type_to_filter: "Type to filter…"
     settings: "Settings"
-    reset_filter: "Reset"
+    reset_filter: "Reset filter"
     toggle_filters: "Toggle dropdown filters"
 
     admin:
diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs
index ed895c7420b89..8d8b32db8afb4 100644
--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-changes.gjs
@@ -2,13 +2,17 @@ import Component from "@glimmer/component";
 import { cached } from "@glimmer/tracking";
 import { array } from "@ember/helper";
 import { action } from "@ember/object";
+import { service } from "@ember/service";
 import { TrackedObject } from "@ember-compat/tracked-built-ins";
 import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";
 import UpcomingChangeItem from "discourse/admin/components/admin-config-areas/upcoming-change-item";
 import AdminFilterControls from "discourse/admin/components/admin-filter-controls";
+import { AUTO_GROUPS } from "discourse/lib/constants";
 import { i18n } from "discourse-i18n";
 
 export default class AdminConfigAreasUpcomingChanges extends Component {
+  @service site;
+
   @cached
   get upcomingChanges() {
     return this.args.upcomingChanges.map((change) => {
@@ -17,6 +21,10 @@ export default class AdminConfigAreasUpcomingChanges extends Component {
     });
   }
 
+  get staffGroupName() {
+    return this.site.groupsById[AUTO_GROUPS.staff.id].name;
+  }
+
   get dropdownOptions() {
     return {
       status: [
@@ -118,7 +126,9 @@ export default class AdminConfigAreasUpcomingChanges extends Component {
             change.upcoming_change.enabled_for === "everyone",
         },
         {
-          label: i18n("admin.upcoming_changes.filter.enabled_for_staff"),
+          label: i18n("admin.upcoming_changes.filter.enabled_for_staff", {
+            staffGroupName: this.staffGroupName,
+          }),
           value: "enabled_for_staff",
           filterFn: (change) => change.upcoming_change.enabled_for === "staff",
         },
@@ -152,6 +162,7 @@ export default class AdminConfigAreasUpcomingChanges extends Component {
         "humanized_name"
         "description"
         "plugin_identifier"
+        "setting"
       }}
       @dropdownOptions={{this.dropdownOptions}}
       @inputPlaceholder={{i18n
@@ -160,6 +171,8 @@ export default class AdminConfigAreasUpcomingChanges extends Component {
       @noResultsMessage={{i18n
         "admin.upcoming_changes.filter.search_placeholder"
       }}
+      @initialTextFilter={{@changeNamesFilter}}
+      @onResetFilters={{@onClearChangeNamesFilter}}
     >
       <:content as |upcomingChanges|>
         <table class="d-table upcoming-changes-table">
@@ -177,7 +190,7 @@ export default class AdminConfigAreasUpcomingChanges extends Component {
             {{#each upcomingChanges as |change|}}
               <UpcomingChangeItem
                 @change={{change}}
-                @enabledForChanged={{this.enabledForChanged}}
+                @enabledForChanged={{@enabledForChanged}}
               />
             {{/each}}
           </tbody>
diff --git a/frontend/discourse/admin/components/admin-filter-controls.gjs b/frontend/discourse/admin/components/admin-filter-controls.gjs
index e9ee29bbe5639..fcb76db6af76f 100644
--- a/frontend/discourse/admin/components/admin-filter-controls.gjs
+++ b/frontend/discourse/admin/components/admin-filter-controls.gjs
@@ -34,6 +34,7 @@ import { and, not } from "discourse/truth-helpers";
  * @param {Function} [onDropdownFilterChange] - Callback for dropdown changes (enables server-side mode).
  *                                              For multiple dropdowns: receives (key, value)
  * @param {Function} [onResetFilters] - Callback for reset action (server-side mode)
+ * @param {String} [initialTextFilter] - Initial value to seed the text filter input on mount
  */
 
 export default class AdminFilterControls extends Component {
@@ -122,13 +123,18 @@ export default class AdminFilterControls extends Component {
     }
 
     if (this.textFilter.length > 0) {
-      const term = this.textFilter.toLowerCase();
-      filtered = filtered.filter((item) => {
-        return this.searchableProps.some((key) => {
-          const value = this.getNestedValue(item, key);
-          return value && value.toString().toLowerCase().includes(term);
-        });
-      });
+      const terms = this.textFilter
+        .split(",")
+        .map((t) => t.trim().toLowerCase())
+        .filter(Boolean);
+      filtered = filtered.filter((item) =>
+        terms.some((term) =>
+          this.searchableProps.some((key) => {
+            const value = this.getNestedValue(item, key);
+            return value && value.toString().toLowerCase().includes(term);
+          })
+        )
+      );
     }
 
     if (this.hasMultipleDropdowns) {
@@ -176,6 +182,10 @@ export default class AdminFilterControls extends Component {
 
   @action
   setupComponent() {
+    if (this.args.initialTextFilter) {
+      this.textFilter = this.args.initialTextFilter.replace(/,\s*/g, ", ");
+    }
+
     if (this.hasMultipleDropdowns) {
       Object.keys(this.dropdownOptions).forEach((key) => {
         this.dropdownFilters[key] = this.defaultValue(key);
@@ -249,6 +259,15 @@ export default class AdminFilterControls extends Component {
             @icons={{hash left="magnifying-glass"}}
           />
 
+          {{#if (and this.hasActiveFilters (not @loading))}}
+            <DButton
+              @icon="arrow-rotate-left"
+              @label="reset_filter"
+              @action={{this.resetFilters}}
+              class="btn-default admin-filter-controls__reset"
+            />
+          {{/if}}
+
           {{#if this.hasMultipleDropdowns}}
             <DButton
               class="btn-transparent admin-filter-controls__toggle-filters"
diff --git a/frontend/discourse/admin/controllers/admin-config/upcoming-changes.js b/frontend/discourse/admin/controllers/admin-config/upcoming-changes.js
new file mode 100644
index 0000000000000..ec5f1de48cb93
--- /dev/null
+++ b/frontend/discourse/admin/controllers/admin-config/upcoming-changes.js
@@ -0,0 +1,17 @@
+import { tracked } from "@glimmer/tracking";
+import Controller from "@ember/controller";
+import { action } from "@ember/object";
+
+export default class extends Controller {
+  @tracked changeNamesFilter = "";
+  queryParams = [
+    {
+      changeNamesFilter: { replace: true },
+    },
+  ];
+
+  @action
+  clearChangeNamesFilter() {
+    this.changeNamesFilter = "";
+  }
+}
diff --git a/frontend/discourse/admin/routes/admin-config/upcoming-changes.js b/frontend/discourse/admin/routes/admin-config/upcoming-changes.js
index 564412d94822d..b7b7a675e23b2 100644
--- a/frontend/discourse/admin/routes/admin-config/upcoming-changes.js
+++ b/frontend/discourse/admin/routes/admin-config/upcoming-changes.js
@@ -6,6 +6,10 @@ import { i18n } from "discourse-i18n";
 export default class AdminConfigUpcomingChangesRoute extends DiscourseRoute {
   @service currentUser;
 
+  queryParams = {
+    changeNamesFilter: { replace: true },
+  };
+
   titleToken() {
     return i18n("admin.config.upcoming_changes.title");
   }
diff --git a/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjs b/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjs
index 801d5a871e025..c10aef3e817cf 100644
--- a/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjs
+++ b/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjs
@@ -22,6 +22,10 @@ export default <template>
   </DPageHeader>
 
   <div class="admin-config-page__main-area">
-    <AdminConfigAreasUpcomingChanges @upcomingChanges={{@controller.model}} />
+    <AdminConfigAreasUpcomingChanges
+      @upcomingChanges={{@controller.model}}
+      @changeNamesFilter={{@controller.changeNamesFilter}}
+      @onClearChangeNamesFilter={{@controller.clearChangeNamesFilter}}
+    />
   </div>
 </template>
diff --git a/frontend/discourse/tests/integration/components/admin-filter-controls-test.gjs b/frontend/discourse/tests/integration/components/admin-filter-controls-test.gjs
index 8c6e0066c5876..77e1c26f98a1c 100644
--- a/frontend/discourse/tests/integration/components/admin-filter-controls-test.gjs
+++ b/frontend/discourse/tests/integration/components/admin-filter-controls-test.gjs
@@ -272,6 +272,33 @@ module("Integration | Component | AdminFilterControls", function (hooks) {
     assert.dom(".filter-input").hasValue("", "clears text input");
   });
 
+  test("shows reset button next to filter input when there are active filters that find results", async function (assert) {
+    this.set("data", SAMPLE_DATA);
+    this.set("searchableProps", ["name"]);
+
+    await render(
+      <template>
+        <AdminFilterControls
+          @array={{this.data}}
+          @searchableProps={{this.searchableProps}}
+        >
+          <:content as |filteredData|>
+            <div class="results">
+              {{#each filteredData as |item|}}
+                <div class="item" data-id={{item.id}}>{{item.name}}</div>
+              {{/each}}
+            </div>
+          </:content>
+        </AdminFilterControls>
+      </template>
+    );
+
+    await fillIn(".filter-input", "first");
+    assert
+      .dom(".admin-filter-controls__inputs .admin-filter-controls__reset")
+      .exists("shows reset button");
+  });
+
   test("respects minItemsForFilter parameter", async function (assert) {
     this.set("data", [SAMPLE_DATA[0]]);
 
diff --git a/spec/system/admin_filter_controls_spec.rb b/spec/system/admin_filter_controls_spec.rb
index 65d6bfd0553b7..9168affe71fbc 100644
--- a/spec/system/admin_filter_controls_spec.rb
+++ b/spec/system/admin_filter_controls_spec.rb
@@ -59,23 +59,29 @@
 
       expect(page).to have_css(".admin-filter-controls")
 
+      expect(filter_controls).to have_no_no_results_reset_button
       filter_controls.type_in_search("xyznonexistent")
       expect(page).to have_css(".admin-plugins-list__row", count: 0)
-      expect(filter_controls).to have_reset_button
+      expect(filter_controls).to have_no_results_reset_button
 
-      filter_controls.click_reset_button
+      filter_controls.click_no_results_reset_button
       expect(filter_controls.search_input_value).to eq("")
       expect(page).to have_css(".admin-plugins-list__row", count: 2)
     end
 
-    it "does not show reset button when there are results" do
+    it "also shows reset button when there are results and active filters" do
       page.visit("/admin/plugins")
 
       expect(page).to have_css(".admin-filter-controls")
 
+      expect(filter_controls).to have_no_reset_button
       filter_controls.type_in_search("poll")
       expect(page).to have_css(".admin-plugins-list__row", count: 1)
-      expect(filter_controls).to have_no_reset_button
+      expect(filter_controls).to have_reset_button
+
+      filter_controls.click_reset_button
+      expect(filter_controls.search_input_value).to eq("")
+      expect(page).to have_css(".admin-plugins-list__row", count: 2)
     end
   end
 
diff --git a/spec/system/page_objects/components/admin_filter_controls.rb b/spec/system/page_objects/components/admin_filter_controls.rb
index 07c4076986fcc..73f15737e9bb8 100644
--- a/spec/system/page_objects/components/admin_filter_controls.rb
+++ b/spec/system/page_objects/components/admin_filter_controls.rb
@@ -36,16 +36,28 @@ def toggle_dropdown_filters
         component.find(".admin-filter-controls__toggle-filters").click
       end
 
+      def has_no_results_reset_button?
+        page.has_css?(".admin-filter-controls__no-results .admin-filter-controls__reset")
+      end
+
       def has_reset_button?
-        page.has_css?(".admin-filter-controls__reset")
+        page.has_css?(".admin-filter-controls__inputs .admin-filter-controls__reset")
       end
 
       def click_reset_button
-        page.find(".admin-filter-controls__reset").click
+        page.find(".admin-filter-controls__inputs .admin-filter-controls__reset").click
+      end
+
+      def click_no_results_reset_button
+        page.find(".admin-filter-controls__no-results .admin-filter-controls__reset").click
+      end
+
+      def has_no_no_results_reset_button?
+        page.has_no_css?(".admin-filter-controls__no-results .admin-filter-controls__reset")
       end
 
       def has_no_reset_button?
-        component.has_no_css?(".admin-filter-controls__reset")
+        component.has_no_css?(".admin-filter-controls__inputs .admin-filter-controls__reset")
       end
 
       def has_no_results_message?

From 7d42b006a8234809bbd04b2d5753644ec6ec53cb Mon Sep 17 00:00:00 2001
From: Jordan Vidrine <30537603+jordanvidrine@users.noreply.github.com>
Date: Thu, 26 Feb 2026 10:01:48 -0600
Subject: [PATCH 121/168] UX: Bug fixes (#38088)

---
 .../stylesheets/common/base/uc-modernize-foundation-theme.scss  | 2 +-
 frontend/discourse/admin/components/admin-flag-item.gjs         | 2 +-
 frontend/discourse/admin/components/api-key-item.gjs            | 2 +-
 .../discourse/app/components/bulk-select-topics-dropdown.gjs    | 2 +-
 frontend/discourse/app/components/post-language-selector.gjs    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scss b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scss
index 4007f315a184b..9044f159ac464 100644
--- a/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scss
+++ b/app/assets/stylesheets/common/base/uc-modernize-foundation-theme.scss
@@ -72,7 +72,7 @@
   }
 
   .btn.no-text.btn-icon {
-    &:not(.user-menu-tab, .user-menu-tab-active) {
+    &:not(.user-menu-tab, .user-menu-tab-active, .dropdown-select-box-header) {
       width: var(--button-height);
     }
   }
diff --git a/frontend/discourse/admin/components/admin-flag-item.gjs b/frontend/discourse/admin/components/admin-flag-item.gjs
index f882d71f17bcc..bf608d22fc4b3 100644
--- a/frontend/discourse/admin/components/admin-flag-item.gjs
+++ b/frontend/discourse/admin/components/admin-flag-item.gjs
@@ -178,7 +178,7 @@ export default class AdminFlagItem extends Component {
               @title={{i18n "admin.config_areas.flags.more_options.title"}}
               @icon="ellipsis-vertical"
               @onRegisterApi={{this.onRegisterApi}}
-              @class="btn-default"
+              @triggerClass="btn-default"
             >
               <:content>
                 <DropdownMenu as |dropdown|>
diff --git a/frontend/discourse/admin/components/api-key-item.gjs b/frontend/discourse/admin/components/api-key-item.gjs
index f847c32ed6827..663ac138b6a53 100644
--- a/frontend/discourse/admin/components/api-key-item.gjs
+++ b/frontend/discourse/admin/components/api-key-item.gjs
@@ -127,7 +127,7 @@ export default class ApiKeyItem extends Component {
             @title={{i18n "admin.config_areas.user_fields.more_options.title"}}
             @icon="ellipsis-vertical"
             @onRegisterApi={{this.onRegisterApi}}
-            @class="btn-default"
+            @triggerClass="btn-default"
           >
             <:content>
               <DropdownMenu as |dropdown|>
diff --git a/frontend/discourse/app/components/bulk-select-topics-dropdown.gjs b/frontend/discourse/app/components/bulk-select-topics-dropdown.gjs
index ea25152bcce72..351bcc2f30c97 100644
--- a/frontend/discourse/app/components/bulk-select-topics-dropdown.gjs
+++ b/frontend/discourse/app/components/bulk-select-topics-dropdown.gjs
@@ -317,7 +317,7 @@ export default class BulkSelectTopicsDropdown extends Component {
       @autofocus={{true}}
       @identifier="bulk-select-topics-dropdown"
       @onRegisterApi={{this.onRegisterApi}}
-      @class="btn-default"
+      @triggerClass="btn-default"
     >
       <:trigger>
         <span class="d-button-label">
diff --git a/frontend/discourse/app/components/post-language-selector.gjs b/frontend/discourse/app/components/post-language-selector.gjs
index 1ccaf38b3cd92..c1e4e72fe162e 100644
--- a/frontend/discourse/app/components/post-language-selector.gjs
+++ b/frontend/discourse/app/components/post-language-selector.gjs
@@ -47,7 +47,7 @@ export default class PostLanguageSelector extends Component {
       @label={{this.selectedLanguage}}
       @modalForMobile={{true}}
       @onRegisterApi={{this.onRegisterApi}}
-      @class="btn-transparent post-language-selector"
+      @triggerClass="btn-transparent"
     >
       <:content>
         <DropdownMenu as |dropdown|>

From e2dcaf5b01daeb217a3e95492f5ae8880b286486 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 26 Feb 2026 11:40:58 -0500
Subject: [PATCH 122/168] UX: wider inputs, centered form, and footer controls
 for simplified category creation (#37964)

This is scoped to the upcoming change: simplified category creation.

This centers our category creation form and allows it to be a little
wider with a new formkit variable

`--form-kit-max-input: 75ch;`

This makes inputs and other related elements `75ch` wide, which is
maximum recommended line length for readability.

The form has also been updated to use a sticky footer that indicates
changes and provides an more readily available way to save.

I've also converted plugin additions to formkit and made setting changes
there reactive.

<img width="500" alt="image"
src="https://github.com/user-attachments/assets/255b5333-457b-4dfd-a92b-631f847def5b"
/><img width="500" alt="image"
src="https://github.com/user-attachments/assets/c48ddd5d-f54d-4a99-b459-90af0b29c8cf"
/>

---------

Co-authored-by: Martin Brennan <martin@discourse.org>
---
 ...lified-category-setup-edit-categories.scss | 116 +++++++++++++---
 .../stylesheets/common/base/upload.scss       |   6 +-
 .../common/form-kit/_conditional-display.scss |   2 +-
 .../common/form-kit/_container.scss           |   5 +
 .../stylesheets/common/form-kit/_field.scss   |   5 +
 .../common/form-kit/_form-kit.scss            |   5 +
 .../common/form-kit/_variables.scss           |   1 +
 config/locales/client.en.yml                  |   4 +
 .../admin/components/changes-banner.gjs       |   2 +-
 .../edit-category-localizations.gjs           |  12 +-
 .../components/upsert-category/appearance.gjs |  16 +--
 .../components/upsert-category/general.gjs    |  35 +++--
 .../components/upsert-category/security.gjs   |  34 ++---
 .../components/upsert-category/settings.gjs   | 109 ++++++---------
 .../admin/components/upsert-category/tags.gjs | 125 ++++++++----------
 .../admin/controllers/edit-category/tabs.js   |  49 ++++++-
 .../admin/templates/edit-category/tabs.gjs    |  84 +++++++++---
 .../app/form-kit/components/fk/collection.gjs |  34 ++---
 .../app/form-kit/components/fk/form.gjs       |   4 +
 .../app/form-kit/lib/fk-form-data.js          |  14 +-
 .../components/form-kit/collection-test.gjs   |  16 +++
 .../components/form-kit/form-test.gjs         |  26 ++++
 .../assign-settings-upsert.gjs                |  38 ++++++
 .../assign-settings.gjs                       |   4 +
 .../solved-settings-upsert.gjs                |  51 +++++++
 .../solved-settings.gjs                       |   4 +
 .../simplified_category_settings_spec.rb      |  35 +++++
 .../feature-voting-settings-upsert.gjs        |  37 ++++++
 .../feature-voting-settings.gjs               |  35 +++--
 spec/system/page_objects/pages/category.rb    |  11 +-
 .../simplified_category_creation_spec.rb      |   2 +-
 31 files changed, 645 insertions(+), 276 deletions(-)
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs
 create mode 100644 plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs
 create mode 100644 plugins/discourse-solved/spec/system/simplified_category_settings_spec.rb
 create mode 100644 plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjs

diff --git a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
index 76e08a7282b50..db40725be9756 100644
--- a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
+++ b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
@@ -1,16 +1,86 @@
 @use "lib/viewport";
 
 .uc-enable-simplified-category-creation {
-  .select-kit.multi-select.group-chooser {
-    width: var(--form-kit-large-input);
+  .edit-category-tab-security {
+    .alert {
+      --permission-table-max-width: var(--form-kit-max-input);
+    }
+  }
 
-    @include viewport.until(sm) {
-      width: 100%;
+  .form-kit__container-content {
+    width: 100%;
+  }
+
+  .edit-category-tab:not(.edit-category-tab-general) {
+    .form-kit__container-optional {
+      display: none;
     }
   }
 
+  .category-permissions-table {
+    --permission-table-max-width: var(--form-kit-max-input);
+    width: 100%;
+  }
+
   div.edit-category {
     display: block;
+    max-width: 75ch;
+    width: 100%;
+    margin: 0 auto;
+
+    .form-kit {
+      padding-bottom: 6em; // space for save footer
+    }
+
+    .form-kit__field-toggle {
+      flex-direction: column;
+      width: 100%;
+      gap: 0.5em;
+      align-items: start;
+
+      .form-kit__container-content {
+        align-items: flex-start;
+      }
+    }
+
+    .form-kit__conditional-display-content {
+      // prevent content shift when changing style options
+      min-height: 2.8em;
+
+      &:has(.badge-category__wrapper) {
+        justify-content: center;
+      }
+    }
+
+    .--radio-cards {
+      width: var(--form-kit-max-input);
+
+      .form-kit__container-title {
+        max-width: var(--form-kit-max-input);
+        width: 100%;
+      }
+
+      .form-kit__conditional-display-content {
+        .form-kit__container {
+          flex-direction: column;
+        }
+      }
+    }
+
+    .select-kit.multi-select.group-chooser {
+      max-width: var(--form-kit-max-input);
+      width: 100%;
+    }
+
+    .edit-category-tab-settings label,
+    .edit-category-tab-tags label,
+    .edit-category-tab-settings input[type="text"],
+    .edit-category-tab-settings .select-kit,
+    .edit-category-tab-tags input[type="text"],
+    .edit-category-tab-tags .select-kit {
+      width: 100%;
+      max-width: var(--form-kit-max-input);
+    }
 
     .add-required-tag-group {
       align-self: start;
@@ -69,12 +139,6 @@
     }
   }
 
-  .edit-category-tab-security {
-    .form-kit__container-content {
-      width: 100%;
-    }
-  }
-
   .edit-category-title-text {
     display: flex;
     flex-direction: column;
@@ -98,11 +162,9 @@
     }
   }
 
-  .category-permissions-table {
-    width: 100%;
-  }
-
   .form-kit__errors-summary {
+    width: 100%;
+    max-width: var(--form-kit-max-input);
     margin-top: var(--space-4);
 
     + .form-kit__section.edit-category-content {
@@ -111,11 +173,6 @@
   }
 
   .form-kit__conditional-display {
-    .badge-category__wrapper {
-      min-height: 2.6em;
-      top: var(--space-1);
-    }
-
     .form-kit__container-content:has(.is-disabled) {
       // select-kit has pointer-events disabled, so we need to style the parent
       cursor: not-allowed;
@@ -126,4 +183,25 @@
     padding: 0;
     margin-bottom: var(--space-4);
   }
+
+  .edit-category-tab-localizations {
+    .btn-default {
+      align-self: start;
+    }
+  }
+
+  #main-outlet:has(.edit-category) + .powered-by-discourse {
+    display: none; // hide for now due to alignment
+  }
+
+  .admin-changes-banner {
+    max-width: var(--form-kit-max-input);
+    flex-direction: row-reverse;
+    align-items: center;
+
+    .controls {
+      flex-direction: row-reverse;
+      margin-right: auto;
+    }
+  }
 }
diff --git a/app/assets/stylesheets/common/base/upload.scss b/app/assets/stylesheets/common/base/upload.scss
index 2b1d6a41c4bad..bfbcd05969d19 100644
--- a/app/assets/stylesheets/common/base/upload.scss
+++ b/app/assets/stylesheets/common/base/upload.scss
@@ -12,12 +12,16 @@
     position: relative;
     max-width: 400px;
     width: 100%;
-    height: 80px;
+    height: 125px;
     box-sizing: border-box;
     border-radius: var(--d-input-border-radius);
     background-origin: content-box;
     background-clip: content-box;
 
+    &:has(.lightbox) {
+      height: 85px; // ~125px with controls visible to match above height
+    }
+
     &:focus,
     &:focus-within {
       border-color: var(--tertiary);
diff --git a/app/assets/stylesheets/common/form-kit/_conditional-display.scss b/app/assets/stylesheets/common/form-kit/_conditional-display.scss
index 8aca24a9b3610..0160c3b23d60a 100644
--- a/app/assets/stylesheets/common/form-kit/_conditional-display.scss
+++ b/app/assets/stylesheets/common/form-kit/_conditional-display.scss
@@ -13,7 +13,7 @@
 }
 
 .--radio-cards {
-  width: var(--form-kit-large-input);
+  width: var(--form-kit-max-input);
 
   @include viewport.until(sm) {
     width: 100%;
diff --git a/app/assets/stylesheets/common/form-kit/_container.scss b/app/assets/stylesheets/common/form-kit/_container.scss
index 0d4004763da26..c45bd06dc9aa5 100644
--- a/app/assets/stylesheets/common/form-kit/_container.scss
+++ b/app/assets/stylesheets/common/form-kit/_container.scss
@@ -59,6 +59,11 @@
       width: var(--form-kit-large-input);
     }
 
+    &.--max {
+      max-width: var(--form-kit-max-input);
+      width: 100%;
+    }
+
     &.--full {
       width: 100% !important;
     }
diff --git a/app/assets/stylesheets/common/form-kit/_field.scss b/app/assets/stylesheets/common/form-kit/_field.scss
index 58484bcdda0a3..670b6f3cc6c9d 100644
--- a/app/assets/stylesheets/common/form-kit/_field.scss
+++ b/app/assets/stylesheets/common/form-kit/_field.scss
@@ -64,6 +64,11 @@
       width: var(--form-kit-large-input);
     }
 
+    &.--max {
+      max-width: var(--form-kit-max-input);
+      width: 100%;
+    }
+
     &.--full {
       width: 100% !important;
     }
diff --git a/app/assets/stylesheets/common/form-kit/_form-kit.scss b/app/assets/stylesheets/common/form-kit/_form-kit.scss
index 05b02fe40af77..ce91b8d087e95 100644
--- a/app/assets/stylesheets/common/form-kit/_form-kit.scss
+++ b/app/assets/stylesheets/common/form-kit/_form-kit.scss
@@ -3,4 +3,9 @@
   flex-direction: column;
   gap: 1.5em;
   align-items: flex-start;
+
+  .alert {
+    // we space elements with gap, so don't need the margin
+    margin-bottom: 0;
+  }
 }
diff --git a/app/assets/stylesheets/common/form-kit/_variables.scss b/app/assets/stylesheets/common/form-kit/_variables.scss
index 5ebf928587385..08dbe6f70dc98 100644
--- a/app/assets/stylesheets/common/form-kit/_variables.scss
+++ b/app/assets/stylesheets/common/form-kit/_variables.scss
@@ -1,6 +1,7 @@
 :root {
   --form-kit-gutter-x: 1rem;
   --form-kit-gutter-y: 1rem;
+  --form-kit-max-input: 75ch;
   --form-kit-large-input: 325px;
   --form-kit-medium-input: 200px;
   --form-kit-small-input: 75px;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ad2b4a717951a..563acd0179d08 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4662,11 +4662,15 @@ en:
         delete: "Delete"
         add: "Add required tag group"
         placeholder: "Select tag group…"
+        min_count: "Tag count"
+        tag_group: "Tag group"
       topic_featured_link_allowed: "Allow featured links in this category"
       delete: "Delete category"
       create: "New category"
       create_long: "Create a new category"
+      create_category: "Create category"
       save: "Save category"
+      unsaved_changes: "You have unsaved changes"
       slug: "Category slug"
       parent: "Parent category"
       slug_placeholder: "(Optional) dashed-words for url"
diff --git a/frontend/discourse/admin/components/changes-banner.gjs b/frontend/discourse/admin/components/changes-banner.gjs
index 35657107050ea..8ae8a91cd389e 100644
--- a/frontend/discourse/admin/components/changes-banner.gjs
+++ b/frontend/discourse/admin/components/changes-banner.gjs
@@ -43,7 +43,7 @@ export default class ChangesBanner extends Component {
         }}</span>
       <div class="controls">
         <DButton
-          class="btn-secondary btn-small"
+          class="btn-default btn-secondary btn-small"
           @action={{@discard}}
           @disabled={{this.isSaving}}
           @translatedLabel={{@discardLabel}}
diff --git a/frontend/discourse/admin/components/edit-category-localizations.gjs b/frontend/discourse/admin/components/edit-category-localizations.gjs
index dc089cc1d89b3..df890b0307130 100644
--- a/frontend/discourse/admin/components/edit-category-localizations.gjs
+++ b/frontend/discourse/admin/components/edit-category-localizations.gjs
@@ -33,16 +33,6 @@ export default class EditCategoryLocalizations extends buildCategoryPanel(
     {{/if}}
 
     <@form.Collection @name="localizations" as |collection index|>
-      <collection.Field
-        @name="category_id"
-        @title="category_id"
-        @showTitle={{false}}
-        @disabled={{true}}
-        as |field|
-      >
-        <field.Input @value={{this.category.id}} @type="hidden" />
-      </collection.Field>
-
       <@form.Row as |row|>
         <row.Col @size={{2}}>
           <collection.Field
@@ -99,7 +89,7 @@ export default class EditCategoryLocalizations extends buildCategoryPanel(
     </@form.Collection>
 
     <@form.Button
-      class="add-localization"
+      class="btn-default add-localization"
       @icon="plus"
       @label="category.localization.add"
       @action={{fn
diff --git a/frontend/discourse/admin/components/upsert-category/appearance.gjs b/frontend/discourse/admin/components/upsert-category/appearance.gjs
index e40315f2cc82c..f06be41947d6f 100644
--- a/frontend/discourse/admin/components/upsert-category/appearance.gjs
+++ b/frontend/discourse/admin/components/upsert-category/appearance.gjs
@@ -210,7 +210,7 @@ export default class UpsertCategoryAppearance extends Component {
       <@form.Field
         @name="text_color"
         @title={{i18n "category.foreground_color"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Color @colors={{CATEGORY_TEXT_COLORS}} />
@@ -219,7 +219,7 @@ export default class UpsertCategoryAppearance extends Component {
       <@form.Field
         @name="default_view"
         @title={{i18n "category.default_view"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Custom>
@@ -237,7 +237,7 @@ export default class UpsertCategoryAppearance extends Component {
       <@form.Field
         @name="default_top_period"
         @title={{i18n "category.default_top_period"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Custom>
@@ -255,7 +255,7 @@ export default class UpsertCategoryAppearance extends Component {
       <@form.Field
         @name="sort_order"
         @title={{i18n "category.sort_order"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Custom>
@@ -284,7 +284,7 @@ export default class UpsertCategoryAppearance extends Component {
       <@form.Field
         @name="default_list_filter"
         @title={{i18n "category.default_list_filter"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Custom>
@@ -303,7 +303,7 @@ export default class UpsertCategoryAppearance extends Component {
         <@form.Field
           @name="show_subcategory_list"
           @title={{i18n "category.show_subcategory_list"}}
-          @format="large"
+          @format="max"
           as |field|
         >
           <field.Checkbox />
@@ -313,7 +313,7 @@ export default class UpsertCategoryAppearance extends Component {
           <@form.Field
             @name="subcategory_list_style"
             @title={{i18n "category.subcategory_list_style"}}
-            @format="large"
+            @format="max"
             as |field|
           >
             <field.Custom>
@@ -332,7 +332,7 @@ export default class UpsertCategoryAppearance extends Component {
       <@form.Field
         @name="read_only_banner"
         @title={{i18n "category.read_only_banner"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Input @maxlength="255" />
diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjs
index c6fe4fecab274..d2db4bec9df27 100644
--- a/frontend/discourse/admin/components/upsert-category/general.gjs
+++ b/frontend/discourse/admin/components/upsert-category/general.gjs
@@ -1,5 +1,4 @@
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { concat, hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
@@ -26,8 +25,6 @@ export default class UpsertCategoryGeneral extends Component {
   @service site;
   @service siteSettings;
 
-  @tracked categoryVisibilityState = null;
-
   uncategorizedSiteSettingLink = getURL(
     "/admin/site_settings/category/all_results?filter=allow_uncategorized_topics"
   );
@@ -147,9 +144,9 @@ export default class UpsertCategoryGeneral extends Component {
   }
 
   get categoryVisibility() {
-    const state = this.categoryVisibilityState;
-    if (state && state.categoryId === this.args.category.id) {
-      return state.value;
+    const visibility = this.args.transientData?.visibility;
+    if (visibility) {
+      return visibility;
     }
 
     if (this.isParentRestricted) {
@@ -196,16 +193,14 @@ export default class UpsertCategoryGeneral extends Component {
       }));
     }
 
-    this.categoryVisibilityState = {
-      categoryId: this.args.category.id,
-      value,
-    };
+    this.args.form.set("visibility", value);
 
     if (value === "public") {
       this.#setFormPermissions([this.#everyoneFullPermission]);
     } else if (value === "group_restricted") {
       if (this.#previousPermissions?.length) {
         this.#setFormPermissions(this.#previousPermissions);
+        this.#previousPermissions = null;
       } else {
         this.#setFormPermissions([]);
       }
@@ -215,7 +210,7 @@ export default class UpsertCategoryGeneral extends Component {
   @action
   async onParentCategoryChange(parentCategoryId) {
     if (!parentCategoryId) {
-      this.categoryVisibilityState = null;
+      this.args.form.set("visibility", null);
       this.#setFormPermissions([this.#everyoneFullPermission]);
       return;
     }
@@ -231,7 +226,7 @@ export default class UpsertCategoryGeneral extends Component {
         );
 
         if (!hasEveryone) {
-          this.categoryVisibilityState = null;
+          this.args.form.set("visibility", null);
 
           const newPermissions = parentCategory.permissions.map((p) => ({
             group_name: p.group_name,
@@ -347,7 +342,7 @@ export default class UpsertCategoryGeneral extends Component {
         <@form.Field
           @name="name"
           @title={{i18n "category.name"}}
-          @format="large"
+          @format="max"
           @validation="required"
           as |field|
         >
@@ -363,7 +358,7 @@ export default class UpsertCategoryGeneral extends Component {
       <@form.Field
         @name="color"
         @title={{i18n "category.background_color"}}
-        @format="large"
+        @format="max"
         @validation="required"
         @onSet={{this.onBackgroundColorSet}}
         as |field|
@@ -380,7 +375,7 @@ export default class UpsertCategoryGeneral extends Component {
       <@form.Field
         @name="style_type"
         @title={{i18n "category.style"}}
-        @format="large"
+        @format="max"
         as |styleField|
       >
         <styleField.Custom>
@@ -407,7 +402,7 @@ export default class UpsertCategoryGeneral extends Component {
                   @name="icon"
                   @title={{i18n "category.icon"}}
                   @showTitle={{false}}
-                  @format="large"
+                  @format="max"
                   @validate={{this.validateIcon}}
                   as |field|
                 >
@@ -437,7 +432,7 @@ export default class UpsertCategoryGeneral extends Component {
                   @name="emoji"
                   @title={{i18n "category.emoji"}}
                   @showTitle={{false}}
-                  @format="large"
+                  @format="max"
                   @validate={{this.validateEmoji}}
                   as |field|
                 >
@@ -472,7 +467,7 @@ export default class UpsertCategoryGeneral extends Component {
         <@form.Field
           @name="parent_category_id"
           @title={{i18n "category.subcategory_of"}}
-          @format="large"
+          @format="max"
           @onSet={{this.onParentCategorySet}}
           as |field|
         >
@@ -499,7 +494,7 @@ export default class UpsertCategoryGeneral extends Component {
       <@form.Container
         @title={{i18n "category.visibility.title"}}
         class="--radio-cards"
-        @format="large"
+        @format="max"
       >
         <@form.ConditionalContent
           @activeName={{this.categoryVisibility}}
@@ -534,7 +529,7 @@ export default class UpsertCategoryGeneral extends Component {
             <Content @name="group_restricted">
               <@form.Container
                 @title={{i18n "category.visibility.which_groups_can_access"}}
-                @format="large"
+                @format="max"
               >
                 <GroupChooser
                   @content={{this.availableAccessGroups}}
diff --git a/frontend/discourse/admin/components/upsert-category/security.gjs b/frontend/discourse/admin/components/upsert-category/security.gjs
index 269397c7d5582..c08dc4a75a3b6 100644
--- a/frontend/discourse/admin/components/upsert-category/security.gjs
+++ b/frontend/discourse/admin/components/upsert-category/security.gjs
@@ -160,6 +160,7 @@ export default class UpsertCategorySecurity extends Component {
         (if (eq @selectedTab "security") "active")
       }}
     >
+
       {{#if @category.is_special}}
         {{#if @category.isUncategorizedCategory}}
           <@form.Alert @type="warning">
@@ -172,6 +173,23 @@ export default class UpsertCategorySecurity extends Component {
         {{/if}}
       {{/if}}
 
+      {{#if this.allParentGroupsUsed}}
+        <@form.Alert @type="warning">
+          {{i18n "category.permissions.all_parent_groups_used"}}
+        </@form.Alert>
+      {{/if}}
+
+      <@form.Alert @type="warning">
+        {{#if this.everyonePermission}}
+          {{i18n
+            this.everyoneAccessMessageKey
+            everyone_group=this.everyonePermission.group_name
+          }}
+        {{else}}
+          {{i18n "category.permissions.specific_groups_have_access"}}
+        {{/if}}
+      </@form.Alert>
+
       {{#unless @category.is_special}}
         <@form.Container>
           <div class="category-permissions-table">
@@ -231,22 +249,6 @@ export default class UpsertCategorySecurity extends Component {
             {{/if}}
           </div>
 
-          {{#if this.allParentGroupsUsed}}
-            <@form.Alert @type="warning">
-              {{i18n "category.permissions.all_parent_groups_used"}}
-            </@form.Alert>
-          {{/if}}
-
-          <@form.Alert @type="warning">
-            {{#if this.everyonePermission}}
-              {{i18n
-                this.everyoneAccessMessageKey
-                everyone_group=this.everyonePermission.group_name
-              }}
-            {{else}}
-              {{i18n "category.permissions.specific_groups_have_access"}}
-            {{/if}}
-          </@form.Alert>
         </@form.Container>
       {{/unless}}
 
diff --git a/frontend/discourse/admin/components/upsert-category/settings.gjs b/frontend/discourse/admin/components/upsert-category/settings.gjs
index 56814809de898..8306907df7656 100644
--- a/frontend/discourse/admin/components/upsert-category/settings.gjs
+++ b/frontend/discourse/admin/components/upsert-category/settings.gjs
@@ -64,18 +64,6 @@ export default class UpsertCategorySettings extends Component {
     return this.args.transientData?.category_setting;
   }
 
-  get requireTopicApproval() {
-    return this.categorySetting?.require_topic_approval;
-  }
-
-  get requireReplyApproval() {
-    return this.categorySetting?.require_reply_approval;
-  }
-
-  get autoCloseBasedOnLastPost() {
-    return this.args.transientData?.auto_close_based_on_last_post;
-  }
-
   get numAutoBumpDaily() {
     return this.categorySetting?.num_auto_bump_daily;
   }
@@ -108,21 +96,6 @@ export default class UpsertCategorySettings extends Component {
     this.args.form.set("moderating_group_ids", groupIds);
   }
 
-  @action
-  onRequireTopicApprovalChange(event) {
-    this.#updateCategorySetting("require_topic_approval", event.target.checked);
-  }
-
-  @action
-  onRequireReplyApprovalChange(event) {
-    this.#updateCategorySetting("require_reply_approval", event.target.checked);
-  }
-
-  @action
-  onAutoCloseBasedOnLastPostChange(event) {
-    this.args.form.set("auto_close_based_on_last_post", event.target.checked);
-  }
-
   @action
   onNumAutoBumpDailyChange(value) {
     this.#updateCategorySetting("num_auto_bump_daily", value);
@@ -144,7 +117,7 @@ export default class UpsertCategorySettings extends Component {
       <@form.Field
         @name="slug"
         @title={{i18n "category.slug"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Input
@@ -157,7 +130,7 @@ export default class UpsertCategorySettings extends Component {
         <@form.Field
           @name="position"
           @title={{i18n "category.position"}}
-          @format="large"
+          @format="max"
           as |field|
         >
           <field.Input type="number" min="0" />
@@ -171,7 +144,7 @@ export default class UpsertCategorySettings extends Component {
           (i18n "category.subcategory_num_featured_topics")
           (i18n "category.num_featured_topics")
         }}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Input type="number" min="1" />
@@ -180,7 +153,7 @@ export default class UpsertCategorySettings extends Component {
       <@form.Field
         @name="search_priority"
         @title={{i18n "category.search_priority.label"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Custom>
@@ -199,7 +172,7 @@ export default class UpsertCategorySettings extends Component {
         <@form.Field
           @name="allow_badges"
           @title={{i18n "category.allow_badges_label"}}
-          @format="large"
+          @format="max"
           as |field|
         >
           <field.Checkbox />
@@ -210,7 +183,7 @@ export default class UpsertCategorySettings extends Component {
         <@form.Field
           @name="topic_featured_link_allowed"
           @title={{i18n "category.topic_featured_link_allowed"}}
-          @format="large"
+          @format="max"
           as |field|
         >
           <field.Checkbox />
@@ -220,7 +193,7 @@ export default class UpsertCategorySettings extends Component {
       <@form.Field
         @name="navigate_to_first_post_after_read"
         @title={{i18n "category.navigate_to_first_post_after_read"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Checkbox />
@@ -229,7 +202,7 @@ export default class UpsertCategorySettings extends Component {
       <@form.Field
         @name="all_topics_wiki"
         @title={{i18n "category.all_topics_wiki"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Checkbox />
@@ -238,7 +211,7 @@ export default class UpsertCategorySettings extends Component {
       <@form.Field
         @name="allow_unlimited_owner_edits_on_first_post"
         @title={{i18n "category.allow_unlimited_owner_edits_on_first_post"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Checkbox />
@@ -255,27 +228,23 @@ export default class UpsertCategorySettings extends Component {
           </@form.Container>
         {{/if}}
 
-        <@form.Container>
-          <label class="checkbox-label">
-            <input
-              type="checkbox"
-              checked={{this.requireTopicApproval}}
-              {{on "change" this.onRequireTopicApprovalChange}}
-            />
-            {{i18n "category.require_topic_approval"}}
-          </label>
-        </@form.Container>
+        <@form.Object @name="category_setting" as |object|>
+          <object.Field
+            @name="require_topic_approval"
+            @title={{i18n "category.require_topic_approval"}}
+            as |field|
+          >
+            <field.Checkbox />
+          </object.Field>
 
-        <@form.Container>
-          <label class="checkbox-label">
-            <input
-              type="checkbox"
-              checked={{this.requireReplyApproval}}
-              {{on "change" this.onRequireReplyApprovalChange}}
-            />
-            {{i18n "category.require_reply_approval"}}
-          </label>
-        </@form.Container>
+          <object.Field
+            @name="require_reply_approval"
+            @title={{i18n "category.require_reply_approval"}}
+            as |field|
+          >
+            <field.Checkbox />
+          </object.Field>
+        </@form.Object>
 
         <@form.Container @title={{i18n "category.default_slow_mode"}}>
           <RelativeTimePicker
@@ -292,16 +261,16 @@ export default class UpsertCategorySettings extends Component {
             @hiddenIntervals={{this.hiddenRelativeIntervals}}
             @onChange={{this.onAutoCloseDurationChange}}
           />
-          <label class="checkbox-label">
-            <input
-              type="checkbox"
-              checked={{this.autoCloseBasedOnLastPost}}
-              {{on "change" this.onAutoCloseBasedOnLastPostChange}}
-            />
-            {{i18n "topic.auto_close.based_on_last_post"}}
-          </label>
         </@form.Container>
 
+        <@form.Field
+          @name="auto_close_based_on_last_post"
+          @title={{i18n "topic.auto_close.based_on_last_post"}}
+          as |field|
+        >
+          <field.Checkbox />
+        </@form.Field>
+
         <@form.Container @title={{i18n "category.num_auto_bump_daily"}}>
           <input
             {{on "input" (withEventValue this.onNumAutoBumpDailyChange)}}
@@ -328,7 +297,7 @@ export default class UpsertCategorySettings extends Component {
           <@form.Field
             @name="email_in"
             @title={{i18n "category.email_in"}}
-            @format="large"
+            @format="max"
             as |field|
           >
             <field.Input @maxlength="255" />
@@ -337,7 +306,7 @@ export default class UpsertCategorySettings extends Component {
           <@form.Field
             @name="email_in_allow_strangers"
             @title={{i18n "category.email_in_allow_strangers"}}
-            @format="large"
+            @format="max"
             as |field|
           >
             <field.Checkbox />
@@ -346,7 +315,7 @@ export default class UpsertCategorySettings extends Component {
           <@form.Field
             @name="mailinglist_mirror"
             @title={{i18n "category.mailinglist_mirror"}}
-            @format="large"
+            @format="max"
             as |field|
           >
             <field.Checkbox />
@@ -373,7 +342,11 @@ export default class UpsertCategorySettings extends Component {
 
       <PluginOutlet
         @name="category-custom-settings"
-        @outletArgs={{lazyHash category=@category form=@form}}
+        @outletArgs={{lazyHash
+          category=@category
+          form=@form
+          transientData=@transientData
+        }}
       />
     </@form.Section>
   </template>
diff --git a/frontend/discourse/admin/components/upsert-category/tags.gjs b/frontend/discourse/admin/components/upsert-category/tags.gjs
index a0939bde6d42c..26d29feec9bef 100644
--- a/frontend/discourse/admin/components/upsert-category/tags.gjs
+++ b/frontend/discourse/admin/components/upsert-category/tags.gjs
@@ -1,11 +1,8 @@
 import Component from "@glimmer/component";
 import { array, fn, hash } from "@ember/helper";
-import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { LinkTo } from "@ember/routing";
-import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
-import withEventValue from "discourse/helpers/with-event-value";
 import TagGroupChooser from "discourse/select-kit/components/tag-group-chooser";
 import { eq } from "discourse/truth-helpers";
 import { i18n } from "discourse-i18n";
@@ -19,10 +16,6 @@ export default class UpsertCategoryTags extends Component {
     return this.args.transientData?.allowed_tag_groups;
   }
 
-  get requiredTagGroups() {
-    return this.args.transientData?.required_tag_groups ?? [];
-  }
-
   get disableAllowGlobalTags() {
     const allowedTagsEmpty = !this.allowedTags || this.allowedTags.length === 0;
     const allowedTagGroupsEmpty =
@@ -36,36 +29,8 @@ export default class UpsertCategoryTags extends Component {
   }
 
   @action
-  onTagGroupChange(rtgIndex, valueArray) {
-    // A little strange, but we're using a multi-select component
-    // to select a single tag group. This action takes the array
-    // and extracts the first value in it.
-    const newRequiredTagGroups = this.requiredTagGroups.map((rtg, idx) =>
-      idx === rtgIndex ? { ...rtg, name: valueArray[0] } : rtg
-    );
-    this.args.form.set("required_tag_groups", newRequiredTagGroups);
-  }
-
-  @action
-  onMinCountChange(rtgIndex, value) {
-    const newRequiredTagGroups = this.requiredTagGroups.map((rtg, idx) =>
-      idx === rtgIndex ? { ...rtg, min_count: value } : rtg
-    );
-    this.args.form.set("required_tag_groups", newRequiredTagGroups);
-  }
-
-  @action
-  addRequiredTagGroup() {
-    const newRequiredTagGroups = [...this.requiredTagGroups, { min_count: 1 }];
-    this.args.form.set("required_tag_groups", newRequiredTagGroups);
-  }
-
-  @action
-  deleteRequiredTagGroup(rtgIndex) {
-    const newRequiredTagGroups = this.requiredTagGroups.filter(
-      (_, idx) => idx !== rtgIndex
-    );
-    this.args.form.set("required_tag_groups", newRequiredTagGroups);
+  onTagGroupFieldChange(field, valueArray) {
+    field.set(valueArray[0]);
   }
 
   <template>
@@ -79,7 +44,7 @@ export default class UpsertCategoryTags extends Component {
       <@form.Field
         @name="minimum_required_tags"
         @title={{i18n "category.minimum_required_tags"}}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.Input type="number" min="0" id="category-minimum-tags" />
@@ -92,7 +57,7 @@ export default class UpsertCategoryTags extends Component {
           (i18n "category.tags_allowed_tags" categoryName=@category.name)
           (i18n "category.tags_allowed_tags_new_category")
         }}
-        @format="large"
+        @format="max"
         as |field|
       >
         <field.TagChooser
@@ -125,7 +90,7 @@ export default class UpsertCategoryTags extends Component {
       <@form.Field
         @name="allow_global_tags"
         @title={{i18n "category.allow_global_tags_label"}}
-        @format="large"
+        @format="max"
         @disabled={{this.disableAllowGlobalTags}}
         as |field|
       >
@@ -137,35 +102,59 @@ export default class UpsertCategoryTags extends Component {
       </@form.Alert>
 
       <@form.Section @title={{i18n "category.required_tag_group.description"}}>
-        {{#each this.requiredTagGroups as |rtg index|}}
-          <div class="required-tag-group-row">
-            <input
-              type="number"
-              min="1"
-              value={{rtg.min_count}}
-              {{on "input" (withEventValue (fn this.onMinCountChange index))}}
-            />
-            <TagGroupChooser
-              @tagGroups={{if rtg.name (array rtg.name) (array)}}
-              @onChange={{fn this.onTagGroupChange index}}
-              @options={{hash
-                maximum=1
-                filterPlaceholder="category.required_tag_group.placeholder"
-              }}
-            />
-            <DButton
-              @label="category.required_tag_group.delete"
-              @action={{fn this.deleteRequiredTagGroup index}}
-              @icon="trash-can"
-              class="delete-required-tag-group"
-            />
-          </div>
-        {{/each}}
-        <DButton
-          @label="category.required_tag_group.add"
-          @action={{this.addRequiredTagGroup}}
-          @icon="plus"
+        <@form.Collection @name="required_tag_groups" as |collection index|>
+          <@form.Row as |row|>
+            <row.Col @size={{2}}>
+              <collection.Field
+                @name="min_count"
+                @title={{i18n "category.required_tag_group.min_count"}}
+                @validation="required"
+                as |field|
+              >
+                <field.Input @type="number" min="1" />
+              </collection.Field>
+            </row.Col>
+
+            <row.Col @size={{9}}>
+              <collection.Field
+                @name="name"
+                @title={{i18n "category.required_tag_group.tag_group"}}
+                @validation="required"
+                as |field|
+              >
+                <field.Custom>
+                  <TagGroupChooser
+                    @tagGroups={{if field.value (array field.value) (array)}}
+                    @onChange={{fn this.onTagGroupFieldChange field}}
+                    @options={{hash
+                      maximum=1
+                      filterPlaceholder="category.required_tag_group.placeholder"
+                    }}
+                  />
+                </field.Custom>
+              </collection.Field>
+            </row.Col>
+
+            <row.Col @size={{1}}>
+              <@form.Button
+                class="btn-danger delete-required-tag-group"
+                @icon="trash-can"
+                @title="category.required_tag_group.delete"
+                @action={{fn collection.remove index}}
+              />
+            </row.Col>
+          </@form.Row>
+        </@form.Collection>
+
+        <@form.Button
           class="btn-default add-required-tag-group"
+          @icon="plus"
+          @label="category.required_tag_group.add"
+          @action={{fn
+            @form.addItemToCollection
+            "required_tag_groups"
+            (hash min_count=1)
+          }}
         />
       </@form.Section>
     </@form.Section>
diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.js
index a88a6617ae4a6..57467aad6ed08 100644
--- a/frontend/discourse/admin/controllers/edit-category/tabs.js
+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js
@@ -44,18 +44,30 @@ const FIELD_LIST = [
   "subcategory_list_style",
   "read_only_banner",
   "email_in",
+  "email_in_enabled",
   "email_in_allow_strangers",
   "mailinglist_mirror",
   "allowed_tag_groups",
   "allowed_tags",
 ];
 
+// Additional fields managed through FormKit in the simplified creation flow.
+// The legacy edit-category components manage these directly on the model.
+const SIMPLIFIED_FIELD_LIST = [
+  ...FIELD_LIST,
+  "required_tag_groups",
+  "minimum_required_tags",
+  "allow_global_tags",
+  "default_slow_mode_seconds",
+];
+
 const SHOW_ADVANCED_TABS_KEY = "category_edit_show_advanced_tabs";
 
 export default class EditCategoryTabsController extends Controller {
   @service currentUser;
   @service dialog;
   @service site;
+  @service siteSettings;
   @service router;
   @service keyValueStore;
   @service toasts;
@@ -65,6 +77,7 @@ export default class EditCategoryTabsController extends Controller {
   showAdvancedTabs =
     this.keyValueStore.getItem(SHOW_ADVANCED_TABS_KEY) === "true";
   @tracked selectedTab = "general";
+  @tracked formApi = null;
   @trackedArray panels = [];
   saving = false;
   deleting = false;
@@ -78,12 +91,25 @@ export default class EditCategoryTabsController extends Controller {
   @and("showTooltip", "model.cannot_delete_reason") showDeleteReason;
 
   get formData() {
-    const data = getProperties(this.model, ...FIELD_LIST);
+    const simplified = this.siteSettings.enable_simplified_category_creation;
+    const data = getProperties(
+      this.model,
+      ...(simplified ? SIMPLIFIED_FIELD_LIST : FIELD_LIST)
+    );
 
-    if (!this.model.styleType) {
+    if (simplified && !this.model.styleType) {
       data.style_type = "icon";
     }
 
+    if (simplified) {
+      data.required_tag_groups = Array.from(
+        data.required_tag_groups ?? [],
+        (rtg) => ({ ...rtg })
+      );
+      data.category_setting = { ...(this.model.category_setting ?? {}) };
+      data.custom_fields = { ...(this.model.custom_fields ?? {}) };
+    }
+
     return data;
   }
 
@@ -103,7 +129,7 @@ export default class EditCategoryTabsController extends Controller {
     if (saving) {
       return "saving";
     }
-    return id ? "category.save" : "category.create";
+    return id ? "category.save" : "category.create_category";
   }
 
   get baseTitle() {
@@ -116,6 +142,15 @@ export default class EditCategoryTabsController extends Controller {
     return i18n("category.create");
   }
 
+  get isFormDirty() {
+    return this.formApi?.isDirty ?? false;
+  }
+
+  @action
+  onRegisterFormApi(api) {
+    this.formApi = api;
+  }
+
   @action
   setSelectedTab(tab) {
     this.selectedTab = tab;
@@ -124,6 +159,10 @@ export default class EditCategoryTabsController extends Controller {
 
   @action
   validateForm(data, { addError }) {
+    if (!this.siteSettings.enable_simplified_category_creation) {
+      return;
+    }
+
     if (this.selectedTab === "general") {
       return;
     }
@@ -193,7 +232,9 @@ export default class EditCategoryTabsController extends Controller {
       return;
     }
 
-    this.model.setProperties(data);
+    // eslint-disable-next-line no-unused-vars
+    const { visibility, ...categoryData } = data;
+    this.model.setProperties(categoryData);
 
     // If permissions is empty or not set, ensure it's an empty array (public category)
     if (!this.model.permissions || this.model.permissions.length === 0) {
diff --git a/frontend/discourse/admin/templates/edit-category/tabs.gjs b/frontend/discourse/admin/templates/edit-category/tabs.gjs
index f156ed64aa878..68e6c7ee72525 100644
--- a/frontend/discourse/admin/templates/edit-category/tabs.gjs
+++ b/frontend/discourse/admin/templates/edit-category/tabs.gjs
@@ -1,5 +1,6 @@
 import { concat } from "@ember/helper";
 import { htmlSafe } from "@ember/template";
+import ChangesBanner from "discourse/admin/components/changes-banner";
 import EditCategoryGeneral from "discourse/admin/components/edit-category-general";
 import EditCategoryImages from "discourse/admin/components/edit-category-images";
 import EditCategoryLocalizations from "discourse/admin/components/edit-category-localizations";
@@ -16,6 +17,8 @@ import EditCategoryTabsHorizontal from "discourse/admin/templates/edit-category/
 import EditCategoryTabsVertical from "discourse/admin/templates/edit-category/tabs-vertical";
 import Form from "discourse/components/form";
 import { registeredEditCategoryTabs } from "discourse/lib/edit-category-tabs";
+import { or } from "discourse/truth-helpers";
+import { i18n } from "discourse-i18n";
 
 const TAB_COMPONENTS = {
   general: EditCategoryGeneral,
@@ -67,6 +70,7 @@ export default <template>
       @onDirtyCheck={{@controller.isLeavingForm}}
       @onSubmit={{@controller.saveCategory}}
       @validate={{@controller.validateForm}}
+      @onRegisterApi={{@controller.onRegisterFormApi}}
       as |form transientData|
     >
       <form.Section
@@ -116,27 +120,67 @@ export default <template>
         </form.Alert>
       {{/if}}
 
-      <form.Actions class="edit-category-footer">
-        <form.Submit @label={{@controller.saveLabel}} id="save-category" />
-
-        {{#if @controller.model.can_delete}}
-          <form.Button
-            @disabled={{@controller.deleteDisabled}}
-            @action={{@controller.deleteCategory}}
-            @icon="trash-can"
-            @label="category.delete"
-            class="btn-danger"
-          />
-        {{else if @controller.model.id}}
-          <form.Button
-            @disabled={{@controller.deleteDisabled}}
-            @action={{@controller.toggleDeleteTooltip}}
-            @icon="circle-question"
-            @label="category.delete"
-            class="btn-default"
-          />
+      {{#if @controller.siteSettings.enable_simplified_category_creation}}
+        {{#if (or @controller.model.can_delete @controller.model.id)}}
+          <form.Actions class="edit-category-footer">
+            {{#if @controller.model.can_delete}}
+              <form.Button
+                @disabled={{@controller.deleteDisabled}}
+                @action={{@controller.deleteCategory}}
+                @icon="trash-can"
+                @label="category.delete"
+                class="btn-danger"
+              />
+            {{else}}
+              <form.Button
+                @disabled={{@controller.deleteDisabled}}
+                @action={{@controller.toggleDeleteTooltip}}
+                @icon="circle-question"
+                @label="category.delete"
+                class="btn-default"
+              />
+            {{/if}}
+          </form.Actions>
         {{/if}}
-      </form.Actions>
+      {{else}}
+        <form.Actions class="edit-category-footer">
+          <form.Submit @label={{@controller.saveLabel}} id="save-category" />
+
+          {{#if @controller.model.can_delete}}
+            <form.Button
+              @disabled={{@controller.deleteDisabled}}
+              @action={{@controller.deleteCategory}}
+              @icon="trash-can"
+              @label="category.delete"
+              class="btn-danger"
+            />
+          {{else if @controller.model.id}}
+            <form.Button
+              @disabled={{@controller.deleteDisabled}}
+              @action={{@controller.toggleDeleteTooltip}}
+              @icon="circle-question"
+              @label="category.delete"
+              class="btn-default"
+            />
+          {{/if}}
+        </form.Actions>
+      {{/if}}
     </Form>
+
+    {{#if @controller.siteSettings.enable_simplified_category_creation}}
+      {{#if @controller.isFormDirty}}
+        <ChangesBanner
+          @bannerLabel={{i18n "category.unsaved_changes"}}
+          @saveLabel={{if
+            @controller.model.id
+            (i18n "category.save")
+            (i18n "category.create_category")
+          }}
+          @discardLabel={{i18n "form_kit.reset"}}
+          @save={{@controller.formApi.submit}}
+          @discard={{@controller.formApi.reset}}
+        />
+      {{/if}}
+    {{/if}}
   </div>
 </template>
diff --git a/frontend/discourse/app/form-kit/components/fk/collection.gjs b/frontend/discourse/app/form-kit/components/fk/collection.gjs
index a5498b7f69109..bdfaa5162069b 100644
--- a/frontend/discourse/app/form-kit/components/fk/collection.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/collection.gjs
@@ -61,21 +61,23 @@ export default class FKCollection extends Component {
   }
 
   <template>
-    {{#let (element this.tagName) as |Wrapper|}}
-      <Wrapper class="form-kit__collection">
-        {{#each this.collectionData key="identifier" as |data index|}}
-          {{yield
-            (hash
-              Field=(this.componentFor FKField index)
-              Object=(this.componentFor FKObject index)
-              Collection=(this.componentFor FKCollection index)
-              remove=this.remove
-            )
-            index
-            data.item
-          }}
-        {{/each}}
-      </Wrapper>
-    {{/let}}
+    {{#if this.collectionData.length}}
+      {{#let (element this.tagName) as |Wrapper|}}
+        <Wrapper class="form-kit__collection">
+          {{#each this.collectionData key="identifier" as |data index|}}
+            {{yield
+              (hash
+                Field=(this.componentFor FKField index)
+                Object=(this.componentFor FKObject index)
+                Collection=(this.componentFor FKCollection index)
+                remove=this.remove
+              )
+              index
+              data.item
+            }}
+          {{/each}}
+        </Wrapper>
+      {{/let}}
+    {{/if}}
   </template>
 }
diff --git a/frontend/discourse/app/form-kit/components/fk/form.gjs b/frontend/discourse/app/form-kit/components/fk/form.gjs
index a655f2850c758..855afa8146c7d 100644
--- a/frontend/discourse/app/form-kit/components/fk/form.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/form.gjs
@@ -42,6 +42,7 @@ class FKForm extends Component {
   constructor() {
     super(...arguments);
 
+    const instance = this;
     this.args.onRegisterApi?.({
       set: this.set,
       setProperties: this.setProperties,
@@ -51,6 +52,9 @@ class FKForm extends Component {
       addError: this.addError,
       removeError: this.removeError,
       removeErrors: this.removeErrors,
+      get isDirty() {
+        return instance.formData.isDirty;
+      },
     });
 
     this.router.on("routeWillChange", this.checkIsDirty);
diff --git a/frontend/discourse/app/form-kit/lib/fk-form-data.js b/frontend/discourse/app/form-kit/lib/fk-form-data.js
index dde9381a0301b..09020d009da99 100644
--- a/frontend/discourse/app/form-kit/lib/fk-form-data.js
+++ b/frontend/discourse/app/form-kit/lib/fk-form-data.js
@@ -30,13 +30,13 @@ export default class FKFormData {
    * The patches to be applied.
    * @type {Array}
    */
-  patches = [];
+  @tracked patches = [];
 
   /**
    * The inverse patches to be applied, useful for rollback.
    * @type {Array}
    */
-  inversePatches = [];
+  @tracked inversePatches = [];
 
   /**
    * Creates an instance of Changeset.
@@ -113,9 +113,9 @@ export default class FKFormData {
    */
   async rollback() {
     while (this.inversePatches.length > 0) {
-      this.draftData = applyPatches(this.draftData, [
-        this.inversePatches.pop(),
-      ]);
+      const patch = this.inversePatches[this.inversePatches.length - 1];
+      this.draftData = applyPatches(this.draftData, [patch]);
+      this.inversePatches = this.inversePatches.slice(0, -1);
     }
 
     this.resetPatches();
@@ -191,8 +191,8 @@ export default class FKFormData {
         target[parts[0]] = value;
       },
       (patches, inversePatches) => {
-        this.patches.push(...patches);
-        this.inversePatches.push(...inversePatches);
+        this.patches = [...this.patches, ...patches];
+        this.inversePatches = [...this.inversePatches, ...inversePatches];
       }
     );
   }
diff --git a/frontend/discourse/tests/integration/components/form-kit/collection-test.gjs b/frontend/discourse/tests/integration/components/form-kit/collection-test.gjs
index 9a997b982be21..7a819aa39abef 100644
--- a/frontend/discourse/tests/integration/components/form-kit/collection-test.gjs
+++ b/frontend/discourse/tests/integration/components/form-kit/collection-test.gjs
@@ -176,6 +176,22 @@ module("Integration | Component | FormKit | Collection", function (hooks) {
     assert.form().field("one.0.two.0.three.0.foo").hasValue("2");
   });
 
+  test("renders nothing when collection is empty", async function (assert) {
+    await render(
+      <template>
+        <Form @data={{hash foo=(array)}} as |form|>
+          <form.Collection @name="foo" @tagName="ul" as |collection|>
+            <collection.Field @title="Bar" as |field|>
+              <field.Input />
+            </collection.Field>
+          </form.Collection>
+        </Form>
+      </template>
+    );
+
+    assert.dom("ul.form-kit__collection").doesNotExist();
+  });
+
   test("emptying a collection field", async function (assert) {
     const onSubmit = (data) => {
       assert.deepEqual(
diff --git a/frontend/discourse/tests/integration/components/form-kit/form-test.gjs b/frontend/discourse/tests/integration/components/form-kit/form-test.gjs
index b5a1f6495439c..d06bbb1ff6dba 100644
--- a/frontend/discourse/tests/integration/components/form-kit/form-test.gjs
+++ b/frontend/discourse/tests/integration/components/form-kit/form-test.gjs
@@ -179,6 +179,32 @@ module("Integration | Component | FormKit | Form", function (hooks) {
     }, 0);
   });
 
+  test("@onRegisterApi - isDirty", async function (assert) {
+    let formApi;
+    const model = { foo: 1 };
+    const registerApi = (api) => (formApi = api);
+
+    await render(
+      <template>
+        <Form @data={{model}} @onRegisterApi={{registerApi}} as |form|>
+          <form.Field @name="foo" @title="Foo" as |field|>
+            <field.Input />
+          </form.Field>
+        </Form>
+      </template>
+    );
+
+    assert.false(formApi.isDirty, "form is not dirty initially");
+
+    await formKit().field("foo").fillIn("2");
+
+    assert.true(formApi.isDirty, "form is dirty after a change");
+
+    await formApi.reset();
+
+    assert.false(formApi.isDirty, "form is not dirty after reset");
+  });
+
   test("@data", async function (assert) {
     await render(
       <template>
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs
new file mode 100644
index 0000000000000..348353108b03d
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings-upsert.gjs
@@ -0,0 +1,38 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { i18n } from "discourse-i18n";
+
+export default class AssignSettingsUpsert extends Component {
+  static shouldRender(args, context) {
+    return context.siteSettings.enable_simplified_category_creation;
+  }
+
+  get enableUnassignedFilter() {
+    const value =
+      this.args.outletArgs.transientData?.custom_fields
+        ?.enable_unassigned_filter;
+    return value?.toString() === "true";
+  }
+
+  @action
+  async onToggleUnassignedFilter(_, { set, name }) {
+    await set(name, this.enableUnassignedFilter ? "false" : "true");
+  }
+
+  <template>
+    {{#let @outletArgs.form as |form|}}
+      <form.Section @title={{i18n "discourse_assign.assign.title"}}>
+        <form.Object @name="custom_fields" as |customFields|>
+          <customFields.Field
+            @name="enable_unassigned_filter"
+            @title={{i18n "discourse_assign.add_unassigned_filter"}}
+            @onSet={{this.onToggleUnassignedFilter}}
+            as |field|
+          >
+            <field.Checkbox checked={{this.enableUnassignedFilter}} />
+          </customFields.Field>
+        </form.Object>
+      </form.Section>
+    {{/let}}
+  </template>
+}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.gjs
index d7f42f3f6a710..001818d388c2a 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/category-custom-settings/assign-settings.gjs
@@ -7,6 +7,10 @@ import { i18n } from "discourse-i18n";
 
 @tagName("")
 export default class AssignSettings extends Component {
+  static shouldRender(args, context) {
+    return !context.siteSettings.enable_simplified_category_creation;
+  }
+
   @action
   onChangeSetting(event) {
     this.set(
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs
new file mode 100644
index 0000000000000..dabba0231b77b
--- /dev/null
+++ b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings-upsert.gjs
@@ -0,0 +1,51 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import { i18n } from "discourse-i18n";
+
+export default class SolvedSettingsUpsert extends Component {
+  static shouldRender(args, context) {
+    return context.siteSettings.enable_simplified_category_creation;
+  }
+
+  @service siteSettings;
+
+  get enableAcceptedAnswers() {
+    const value =
+      this.args.outletArgs.transientData?.custom_fields
+        ?.enable_accepted_answers;
+    return value?.toString() === "true";
+  }
+
+  @action
+  async onToggleAcceptedAnswers(_, { set, name }) {
+    await set(name, this.enableAcceptedAnswers ? "false" : "true");
+  }
+
+  <template>
+    {{#let @outletArgs.form as |form|}}
+      <form.Section @title={{i18n "solved.title"}}>
+        <form.Object @name="custom_fields" as |customFields|>
+          {{#unless this.siteSettings.allow_solved_on_all_topics}}
+            <customFields.Field
+              @name="enable_accepted_answers"
+              @title={{i18n "solved.allow_accepted_answers"}}
+              @onSet={{this.onToggleAcceptedAnswers}}
+              as |field|
+            >
+              <field.Checkbox checked={{this.enableAcceptedAnswers}} />
+            </customFields.Field>
+          {{/unless}}
+
+          <customFields.Field
+            @name="solved_topics_auto_close_hours"
+            @title={{i18n "solved.solved_topics_auto_close_hours"}}
+            as |field|
+          >
+            <field.Input @type="number" min="0" />
+          </customFields.Field>
+        </form.Object>
+      </form.Section>
+    {{/let}}
+  </template>
+}
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.gjs b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.gjs
index 775f197e6522f..9196d31f9856e 100644
--- a/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.gjs
+++ b/plugins/discourse-solved/assets/javascripts/discourse/connectors/category-custom-settings/solved-settings.gjs
@@ -7,6 +7,10 @@ import withEventValue from "discourse/helpers/with-event-value";
 import { i18n } from "discourse-i18n";
 
 export default class SolvedSettings extends Component {
+  static shouldRender(args, context) {
+    return !context.siteSettings.enable_simplified_category_creation;
+  }
+
   @service siteSettings;
 
   @tracked
diff --git a/plugins/discourse-solved/spec/system/simplified_category_settings_spec.rb b/plugins/discourse-solved/spec/system/simplified_category_settings_spec.rb
new file mode 100644
index 0000000000000..e132837493067
--- /dev/null
+++ b/plugins/discourse-solved/spec/system/simplified_category_settings_spec.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+describe "Solved - Simplified Category Settings", type: :system do
+  fab!(:admin)
+  fab!(:category)
+
+  let(:category_page) { PageObjects::Pages::Category.new }
+  let(:form) { PageObjects::Components::FormKit.new(".form-kit") }
+
+  before do
+    SiteSetting.enable_simplified_category_creation = true
+    SiteSetting.solved_enabled = true
+    sign_in(admin)
+  end
+
+  describe "enable_accepted_answers" do
+    it "saves 'true' when enabling accepted answers" do
+      category_page.visit_settings(category)
+      form.field("custom_fields.enable_accepted_answers").toggle
+      category_page.save_settings
+
+      expect(category.reload.custom_fields["enable_accepted_answers"]).to eq("true")
+    end
+
+    it "saves 'false' when disabling accepted answers" do
+      category.upsert_custom_fields("enable_accepted_answers" => "true")
+
+      category_page.visit_settings(category)
+      form.field("custom_fields.enable_accepted_answers").toggle
+      category_page.save_settings
+
+      expect(category.reload.custom_fields["enable_accepted_answers"]).to eq("false")
+    end
+  end
+end
diff --git a/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjs b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjs
new file mode 100644
index 0000000000000..8b528c63237e6
--- /dev/null
+++ b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings-upsert.gjs
@@ -0,0 +1,37 @@
+import Component from "@glimmer/component";
+import { action } from "@ember/object";
+import { i18n } from "discourse-i18n";
+
+export default class FeatureVotingSettingsUpsert extends Component {
+  static shouldRender(args, context) {
+    return context.siteSettings.enable_simplified_category_creation;
+  }
+
+  get enableTopicVoting() {
+    const value =
+      this.args.outletArgs.transientData?.custom_fields?.enable_topic_voting;
+    return value?.toString() === "true";
+  }
+
+  @action
+  async onToggleTopicVoting(_, { set, name }) {
+    await set(name, this.enableTopicVoting ? "false" : "true");
+  }
+
+  <template>
+    {{#let @outletArgs.form as |form|}}
+      <form.Section @title={{i18n "topic_voting.title"}}>
+        <form.Object @name="custom_fields" as |customFields|>
+          <customFields.Field
+            @name="enable_topic_voting"
+            @title={{i18n "topic_voting.allow_topic_voting"}}
+            @onSet={{this.onToggleTopicVoting}}
+            as |field|
+          >
+            <field.Checkbox checked={{this.enableTopicVoting}} />
+          </customFields.Field>
+        </form.Object>
+      </form.Section>
+    {{/let}}
+  </template>
+}
diff --git a/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings.gjs b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings.gjs
index 13cf7963f711e..4644f133563c0 100644
--- a/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings.gjs
+++ b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/category-custom-settings/feature-voting-settings.gjs
@@ -1,17 +1,24 @@
+import Component from "@glimmer/component";
 import { Input } from "@ember/component";
 import { i18n } from "discourse-i18n";
 
-<template>
-  <section class="field">
-    <h3>{{i18n "topic_voting.title"}}</h3>
-    <div class="enable-topic-voting">
-      <label class="checkbox-label">
-        <Input
-          @type="checkbox"
-          @checked={{@outletArgs.category.custom_fields.enable_topic_voting}}
-        />
-        {{i18n "topic_voting.allow_topic_voting"}}
-      </label>
-    </div>
-  </section>
-</template>
+export default class FeatureVotingSettings extends Component {
+  static shouldRender(args, context) {
+    return !context.siteSettings.enable_simplified_category_creation;
+  }
+
+  <template>
+    <section class="field">
+      <h3>{{i18n "topic_voting.title"}}</h3>
+      <div class="enable-topic-voting">
+        <label class="checkbox-label">
+          <Input
+            @type="checkbox"
+            @checked={{@outletArgs.category.custom_fields.enable_topic_voting}}
+          />
+          {{i18n "topic_voting.allow_topic_voting"}}
+        </label>
+      </div>
+    </section>
+  </template>
+}
diff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rb
index fd06bbe7a9e99..2c6e362cd9012 100644
--- a/spec/system/page_objects/pages/category.rb
+++ b/spec/system/page_objects/pages/category.rb
@@ -64,7 +64,11 @@ def back_to_category
       end
 
       def save_settings
-        find("#save-category").click
+        if page.has_css?(".admin-changes-banner", wait: 0)
+          find(".admin-changes-banner .btn-primary").click
+        else
+          find("#save-category").click
+        end
         self
       end
 
@@ -106,6 +110,11 @@ def toggle_checkbox(label_text)
         self
       end
 
+      def toggle_form_container(title)
+        find(".form-kit__container", text: title).find("label.d-toggle-switch__label").click
+        self
+      end
+
       def select_form_template(template_name)
         find(".select-category-template").click
         find(".select-kit-collection .select-kit-row", text: template_name).click
diff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rb
index 6cfb0e22f4dc0..534ee805ee4fc 100644
--- a/spec/system/simplified_category_creation_spec.rb
+++ b/spec/system/simplified_category_creation_spec.rb
@@ -167,7 +167,7 @@
     it "enables topic approval requirement" do
       category_page.visit_settings(category)
 
-      category_page.toggle_checkbox(I18n.t("js.category.require_topic_approval"))
+      form.field("category_setting.require_topic_approval").toggle
       category_page.save_settings
 
       expect(category.reload.require_topic_approval?).to eq(true)

From 58564c50cca31aac30bfeaee2274ea3e35053a8b Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 26 Feb 2026 12:09:19 -0500
Subject: [PATCH 123/168] FIX: update spec class for post language selector
 (#38089)

---
 spec/system/page_objects/components/composer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index b299d3c41729d..865fb74013746 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -8,7 +8,7 @@ class Composer < PageObjects::Components::Base
       HASHTAG_MENU = ".autocomplete.hashtag-autocomplete"
       MENTION_MENU = ".autocomplete.ac-user"
       RICH_EDITOR = ".d-editor-input.ProseMirror"
-      POST_LANGUAGE_SELECTOR = ".post-language-selector"
+      POST_LANGUAGE_SELECTOR = ".post-language-selector-trigger"
 
       def initialize(composer_id = COMPOSER_ID)
         @composer_id = composer_id

From a577da7cba0a950eeab96367e6a9d41217e9f5ec Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Thu, 26 Feb 2026 12:46:27 -0500
Subject: [PATCH 124/168] DEV: follow-up localization spec fix (#38090)

Follow-up to follow-up 58564c5, there was a related spec that was
failing, this fixes it
---
 spec/system/page_objects/components/composer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/page_objects/components/composer.rb b/spec/system/page_objects/components/composer.rb
index 865fb74013746..543ccfcbadf7a 100644
--- a/spec/system/page_objects/components/composer.rb
+++ b/spec/system/page_objects/components/composer.rb
@@ -155,7 +155,7 @@ def locale
 
       def set_locale(locale)
         Components::DMenu.new(POST_LANGUAGE_SELECTOR).expand
-        find("#{POST_LANGUAGE_SELECTOR} button", text: locale).click
+        within("#d-menu-portals", visible: false) { find("button", text: locale).click }
       end
 
       def switch_category(category_name)

From 14b6a028c4e213f3f0f2dccfd271de4856216fb4 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Thu, 26 Feb 2026 15:05:04 -0300
Subject: [PATCH 125/168] DEV: Bump discourse_ai-tokenizers to 0.4.1 (#38091)

Bumps discourse_ai-tokenizers from 0.4 to 0.4.1 for a fix for
tiktoken-rs stack overflow crash that aborts the Ruby process when
encoding large inputs
(https://github.com/discourse/discourse_ai-tokenizers/pull/9)
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7e40c6ced7aaf..c22b114304154 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
     discourse-seed-fu (2.3.12)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    discourse_ai-tokenizers (0.4)
+    discourse_ai-tokenizers (0.4.1)
       activesupport (>= 6.0)
       tiktoken_ruby (~> 0.0.15)
       tokenizers (~> 0.6.3)
@@ -978,7 +978,7 @@ CHECKSUMS
   discourse-emojis (1.0.44) sha256=63425a32379fb471d58f5eac9a1e931fc5a94efb7d327f71f1580af4dfe4edb3
   discourse-fonts (0.0.19) sha256=78d4ddd671615908303a675427039d8d787c935e6deae184c6e143c18c6e0033
   discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4
-  discourse_ai-tokenizers (0.4) sha256=54d7ddcc5479f3bb3057b90f4a85106b4602a07336b51d372c1a1dd8f08104c5
+  discourse_ai-tokenizers (0.4.1) sha256=54ea2224c9dba6e3da96f7f1fe1ae269566df5975568e4919dddae8a55f41610
   discourse_dev_assets (0.0.6) sha256=4dfe7946927aa3d61a4ba89b5aef39d6daaeb70e35d7125dc481806a5c0aea4e
   discourse_math_bundle (1.0.1) sha256=c7d82fa65c9680cab2f77daeba32c1b89e500faccd2269e050ab27d5e1bc8337
   docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e

From b38b13ecf10c69664bb4c8ca0a5785c4f1c76f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Saquetim?=
 <1108771+megothss@users.noreply.github.com>
Date: Thu, 26 Feb 2026 15:21:44 -0300
Subject: [PATCH 126/168] FIX: Restore plugin data attributes on script tags
 lost in #37763 (#38039)

- Restores `data-discourse-plugin`, `data-preinstalled`, and
`data-official` attributes on plugin `<script>` tags that were lost when
#37763 moved script tag generation from ember-cli to Rails
- Fixes `discourse-test-load-dynamic-js.js` where `script.dataset =
element.dataset` was a silent no-op (dataset is a readonly property),
preventing data attributes from being copied to dynamically created
script elements
- Without these attributes, `setup-tests.js` treats all test runs as
core tests and always enables `configureRaiseOnDeprecation()`, causing
private plugin tests to fail on deprecation warnings they should be
exempt from

---------

Co-authored-by: David Taylor <david@taylorhq.com>
---
 app/helpers/application_helper.rb             | 12 +++--
 app/views/layouts/_plugin_js.html.erb         |  6 ++-
 frontend/discourse-plugins/index.js           | 18 -------
 .../scripts/discourse-test-load-dynamic-js.js |  4 +-
 lib/discourse.rb                              |  4 ++
 lib/plugin/instance.rb                        |  5 ++
 spec/helpers/application_helper_spec.rb       | 48 +++++++++++++++++++
 spec/lib/plugin/instance_spec.rb              | 16 +++++++
 spec/rails_helper.rb                          | 13 ++---
 9 files changed, 96 insertions(+), 30 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a6f72dc3624f5..491a51531365d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -130,7 +130,7 @@ def script_asset_path(script)
     path
   end
 
-  def preload_script(script)
+  def preload_script(script, attrs: {})
     scripts = []
 
     if chunks = EmberCli.script_chunks[script]
@@ -142,20 +142,24 @@ def preload_script(script)
     scripts
       .map do |name|
         path = script_asset_path(name)
-        preload_script_url(path, entrypoint: script)
+        preload_script_url(path, entrypoint: script, attrs: attrs)
       end
       .join("\n")
       .html_safe
   end
 
-  def preload_script_url(url, entrypoint: nil, type_module: false)
+  def preload_script_url(url, entrypoint: nil, type_module: false, attrs: {})
     entrypoint_attribute = entrypoint ? "data-discourse-entrypoint=\"#{entrypoint}\"" : ""
     nonce_attribute = "nonce=\"#{csp_nonce_placeholder}\""
 
+    extra_attrs =
+      attrs.map { |k, v| "#{ERB::Util.html_escape(k)}=\"#{ERB::Util.html_escape(v)}\"" }.join(" ")
+    extra_attrs = " #{extra_attrs}" if extra_attrs.present?
+
     add_resource_preload_list(url, "script")
 
     <<~HTML.html_safe
-      <script #{type_module ? 'type="module"' : "defer"} src="#{url}" #{entrypoint_attribute} #{nonce_attribute}></script>
+      <script #{type_module ? 'type="module"' : "defer"} src="#{url}" #{entrypoint_attribute}#{extra_attrs} #{nonce_attribute}></script>
     HTML
   end
 
diff --git a/app/views/layouts/_plugin_js.html.erb b/app/views/layouts/_plugin_js.html.erb
index ffd4e2c036c2e..f4829cce89703 100644
--- a/app/views/layouts/_plugin_js.html.erb
+++ b/app/views/layouts/_plugin_js.html.erb
@@ -2,6 +2,10 @@
 
 <%- Discourse.find_plugin_js_assets(opts).tap do |plugin_assets| %>
   <%- plugin_assets.each do |asset| %>
-    <%= preload_script asset[:name] %>
+    <%= preload_script asset[:name], attrs: {
+          "data-discourse-plugin": asset[:plugin].metadata.name,
+          "data-official": asset[:plugin].metadata.official?,
+          "data-preinstalled": asset[:plugin].preinstalled?,
+        } %>
   <%- end %>
 <%- end %>
diff --git a/frontend/discourse-plugins/index.js b/frontend/discourse-plugins/index.js
index 4b39f90ea4474..c81d16ae03bce 100644
--- a/frontend/discourse-plugins/index.js
+++ b/frontend/discourse-plugins/index.js
@@ -123,14 +123,6 @@ module.exports = {
           fs.existsSync(path.resolve(root, dirent.name, "plugin.rb"))
       );
 
-    // Load official plugins list
-    const officialPluginsPath = path.resolve(
-      "../../config/official_plugins.json"
-    );
-    const officialPlugins = JSON.parse(
-      fs.readFileSync(officialPluginsPath, "utf8")
-    );
-
     return pluginDirectories.map((directory) => {
       const directoryName = directory.name;
       const pluginName = parsePluginName(
@@ -157,14 +149,6 @@ module.exports = {
       const hasTests = fs.existsSync(testDirectory);
       const hasConfig = fs.existsSync(configDirectory);
 
-      // Check if plugin is official
-      const isOfficial = officialPlugins.includes(pluginName);
-
-      // Check if plugin is preinstalled (bundled in discourse git repo)
-      const isPreinstalled = !fs.existsSync(
-        path.resolve(root, directoryName, ".git")
-      );
-
       return {
         pluginName,
         directoryName,
@@ -176,8 +160,6 @@ module.exports = {
         hasAdminJs,
         hasTests,
         hasConfig,
-        isOfficial,
-        isPreinstalled,
       };
     });
   },
diff --git a/frontend/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js b/frontend/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
index 08ee1fe39f73b..abb1c296dfec6 100644
--- a/frontend/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
+++ b/frontend/discourse/public/assets/scripts/discourse-test-load-dynamic-js.js
@@ -38,7 +38,9 @@ const target = params.get("target") || "core";
     } else if (element.tagName === "SCRIPT") {
       const script = document.createElement("script");
       script.src = element.src;
-      script.dataset = element.dataset;
+      for (const [key, value] of Object.entries(element.dataset)) {
+        script.dataset[key] = value;
+      }
       script.defer = element.defer;
       script.async = false; // Weirdly, this is true by default when programmatically creating script tags
       outputNode.append(script);
diff --git a/lib/discourse.rb b/lib/discourse.rb
index 733ea7c9af9c6..b1d9d643ecc7c 100644
--- a/lib/discourse.rb
+++ b/lib/discourse.rb
@@ -394,6 +394,10 @@ def self.unofficial_plugins
     plugins.find_all { |p| !p.metadata.official? }
   end
 
+  def self.preinstalled_plugins
+    plugins.find_all(&:preinstalled?)
+  end
+
   def self.find_plugins(args)
     plugins.select do |plugin|
       next if args[:include_official] == false && plugin.metadata.official?
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 963fcbe044d42..967d65dda1e2e 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -619,6 +619,11 @@ def commit_url
     "#{git_repo.url}/commit/#{commit_hash}"
   end
 
+  def preinstalled?
+    return @preinstalled if defined?(@preinstalled)
+    @preinstalled = !File.exist?(File.join(directory, ".git"))
+  end
+
   def git_repo
     @git_repo ||= GitRepo.new(directory, name)
   end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 99989b042410a..d1e1b0a15da0c 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -116,6 +116,54 @@ def script_tag(url, entrypoint, nonce)
         )
       end
     end
+
+    it "includes extra attrs when provided" do
+      result =
+        helper.preload_script(
+          "plugins/my-plugin",
+          attrs: {
+            "data-discourse-plugin": "my-plugin",
+            "data-preinstalled": "true",
+            "data-official": "true",
+          },
+        )
+      expect(result).to include('data-discourse-plugin="my-plugin"')
+      expect(result).to include('data-preinstalled="true"')
+      expect(result).to include('data-official="true"')
+    end
+
+    it "does not include extra attrs when none are provided" do
+      result = helper.preload_script("start-discourse")
+      expect(result).not_to include("data-discourse-plugin")
+      expect(result).not_to include("data-preinstalled")
+      expect(result).not_to include("data-official")
+    end
+
+    it "escapes attr values" do
+      result =
+        helper.preload_script(
+          "plugins/test",
+          attrs: {
+            "data-discourse-plugin": "<script>xss</script>",
+          },
+        )
+      expect(result).not_to include("<script>xss</script>")
+      expect(result).to include("&lt;script&gt;xss&lt;/script&gt;")
+    end
+
+    it "renders preinstalled and official as false for non-preinstalled plugins" do
+      result =
+        helper.preload_script(
+          "plugins/my-plugin",
+          attrs: {
+            "data-discourse-plugin": "my-plugin",
+            "data-preinstalled": "false",
+            "data-official": "false",
+          },
+        )
+      expect(result).to include('data-preinstalled="false"')
+      expect(result).to include('data-official="false"')
+    end
   end
 
   describe "add_resource_preload_list" do
diff --git a/spec/lib/plugin/instance_spec.rb b/spec/lib/plugin/instance_spec.rb
index 94872f87af04a..e1261242d947e 100644
--- a/spec/lib/plugin/instance_spec.rb
+++ b/spec/lib/plugin/instance_spec.rb
@@ -162,6 +162,22 @@
         expect(plugin.discourse_owned?).to eq(false)
       end
     end
+
+    describe ".preinstalled?" do
+      it "returns true when the plugin directory has no .git directory" do
+        plugin = Plugin::Instance.find_all("#{Rails.root}/spec/fixtures/plugins")[3]
+        expect(plugin.preinstalled?).to eq(true)
+      end
+
+      it "returns false when the plugin directory has a .git directory" do
+        Dir.mktmpdir do |tmpdir|
+          FileUtils.mkdir_p(File.join(tmpdir, ".git"))
+          File.write(File.join(tmpdir, "plugin.rb"), "# name: test-plugin\n# about: test")
+          plugin = Plugin::Instance.new(nil, File.join(tmpdir, "plugin.rb"))
+          expect(plugin.preinstalled?).to eq(false)
+        end
+      end
+    end
   end
 
   describe "enabling/disabling" do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 532d14aec04c1..9dc483e556977 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -497,10 +497,13 @@ def synchronize(seconds = nil, errors: nil)
             should_set_raise_on_deprecation =
               if extension_match
                 type_dir, extension_name = extension_match.captures
-                extension_root = Rails.root.join(type_dir, extension_name)
 
-                # Preinstalled plugins/themes don't have a .git directory
-                !extension_root.join(".git").exist?
+                if type_dir == "plugins"
+                  Discourse.preinstalled_plugins.any? { |p| p.directory_name == extension_name }
+                else
+                  # Preinstalled themes don't have a .git directory
+                  !Rails.root.join(type_dir, extension_name, ".git").exist?
+                end
               else
                 # Not a plugin or theme spec
                 true
@@ -1201,9 +1204,7 @@ def plugin_from_fixtures(plugin_name)
   FileUtils.mkdir(tmp_plugins_dir) if !Dir.exist?(tmp_plugins_dir)
   FileUtils.cp_r("#{Rails.root}/spec/fixtures/plugins/#{plugin_name}", tmp_plugins_dir)
 
-  plugin = Plugin::Instance.new
-  plugin.path = File.join(tmp_plugins_dir, plugin_name, "plugin.rb")
-  plugin
+  Plugin::Instance.parse_from_source(File.join(tmp_plugins_dir, plugin_name, "plugin.rb"))
 end
 
 def concurrency_safe_tmp_dir

From 11fac4c6bca19ac0f96f175f626e781ff55aee79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Saquetim?=
 <1108771+megothss@users.noreply.github.com>
Date: Thu, 26 Feb 2026 15:22:01 -0300
Subject: [PATCH 127/168] DEV: Bridge `@trackedArray` content mutations to
 `@computed` dependencies (#38071)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`@computed` properties that depend on `@trackedArray` properties (e.g.,
`@computed('items')`, `@discourseComputed('items.[]')`) don't invalidate
when the array's contents are mutated in place via `push`, `splice`,
`pop`, etc. They only invalidate when the property reference itself
changes (`this.items = newArray`).

This happens because `@computed` and `TrackedArray` use two different
reactivity systems that aren't bridged. `ComputedProperty.get()` wraps
its getter in `untrack()`, so autotracking signals from `TrackedArray`
are completely ignored. Cache invalidation relies exclusively on classic
tag chains (`tagForProperty`), which only see reference changes.

## Core fix: `@trackedArray` decorator

The `@trackedArray` decorator in `tracked-tools.js` now bridges
`TrackedArray` content mutations to the classic computed property tag
system using `tagFor`, `track`, and `updateTag` from
`@glimmer/validator`. On each property access, the getter captures the
`TrackedArray`'s collection tag (via `value.length`, which triggers the
Proxy's `getValue(collection)`) and updates `tagFor(obj, key)` so that
any `@computed` watching this key sees the content change.

The value is read outside `track()` to avoid a self-referential tag
cycle — since `get.call(this)` consumes the property's own tag,
capturing that inside `track()` and then calling `updateTag` on the same
tag would create a cycle.

## Fixes for `new TrackedArray()` on POJOs

The core fix only covers properties decorated with `@trackedArray`.
Three cases where `new TrackedArray()` is assigned to plain objects or
controller models (from routes) needed individual fixes:

- **`UserActivityBookmarksController`** — replaced
`@equal("model.bookmarks.length", 0)` with a `@dependentKeyCompat`
getter that consumes the `TrackedArray`'s collection tag via `.length`
- **`AdminUserBadgesController`** — replaced `@sort("model",
"badgeSortOrder")` with a `@dependentKeyCompat` getter using the new
`arraySortedByProperties` utility
- **`TagInfo` component** — added a `@dependentKeyCompat` `synonyms`
getter to bridge `TrackedArray` content changes, used as a dependency in
`@discourseComputed("synonyms")` for `nothingToShow`. The classic
dependent keys for `tagInfo.tag_group_names` and `tagInfo.categories`
are preserved so those continue to track through classic chain
resolution.

## New utility: `arraySortedByProperties`

Added `arraySortedByProperties(array, sortDefinitions)` to
`array-tools.js` as a functional replacement for the `@sort` computed
macro. Accepts Ember-style sort definition strings (e.g.,
`["granted_at:desc"]`), supports dot-notation paths, and returns a new
sorted array without mutating the original.

## Testing

- Three new tests for `@trackedArray` + `@computed` compatibility:
content mutations via `push`/`splice` invalidate `@computed`, `.[]`
dependent keys work, and `null` values are handled
- Eight new tests for `arraySortedByProperties`: ascending/descending
sorting, multi-property with mixed directions, dot-notation paths,
non-array input, immutability, empty sort definitions, and default
direction
---
 .../admin/controllers/admin-user/badges.js    | 13 ++-
 frontend/discourse/admin/models/theme.js      | 11 ++-
 .../discourse/app/components/tag-info.gjs     | 31 +++++--
 .../controllers/user-activity/bookmarks.js    |  9 +-
 frontend/discourse/app/lib/array-tools.js     | 28 ++++++
 frontend/discourse/app/lib/tracked-tools.js   | 37 +++++++-
 .../tests/unit/lib/array-tools-test.js        | 93 +++++++++++++++++++
 .../tests/unit/lib/tracked-tools-test.gjs     | 87 +++++++++++++++++
 8 files changed, 288 insertions(+), 21 deletions(-)

diff --git a/frontend/discourse/admin/controllers/admin-user/badges.js b/frontend/discourse/admin/controllers/admin-user/badges.js
index c3489407e3032..09abe3d39c7a1 100644
--- a/frontend/discourse/admin/controllers/admin-user/badges.js
+++ b/frontend/discourse/admin/controllers/admin-user/badges.js
@@ -2,13 +2,16 @@ import { tracked } from "@glimmer/tracking";
 import Controller, { inject as controller } from "@ember/controller";
 import { action } from "@ember/object";
 import { dependentKeyCompat } from "@ember/object/compat";
-import { alias, empty, sort } from "@ember/object/computed";
+import { alias, empty } from "@ember/object/computed";
 import { next } from "@ember/runloop";
 import { service } from "@ember/service";
 import { compare } from "@ember/utils";
 import AdminUser from "discourse/admin/models/admin-user";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import { removeValueFromArray } from "discourse/lib/array-tools";
+import {
+  arraySortedByProperties,
+  removeValueFromArray,
+} from "discourse/lib/array-tools";
 import { grantableBadges } from "discourse/lib/grant-badge-utils";
 import { trackedArray } from "discourse/lib/tracked-tools";
 import UserBadge from "discourse/models/user-badge";
@@ -24,11 +27,15 @@ export default class AdminUserBadgesController extends Controller {
   @trackedArray expandedBadges = [];
 
   @alias("adminUser.model") user;
-  @sort("model", "badgeSortOrder") sortedBadges;
   @empty("availableBadges") noAvailableBadges;
 
   badgeSortOrder = ["granted_at:desc"];
 
+  @dependentKeyCompat
+  get sortedBadges() {
+    return arraySortedByProperties(this.model, this.badgeSortOrder);
+  }
+
   @dependentKeyCompat
   get allBadges() {
     return this.badges;
diff --git a/frontend/discourse/admin/models/theme.js b/frontend/discourse/admin/models/theme.js
index 90474528e7815..fa73d82b23a98 100644
--- a/frontend/discourse/admin/models/theme.js
+++ b/frontend/discourse/admin/models/theme.js
@@ -212,12 +212,15 @@ class Theme extends RestModel {
 
   setField(target, name, value, upload_id, type_id) {
     this.set("changed", true);
+
+    // Normalize JS field target/name consistently with getField()
+    if (target === "common" && name === "js") {
+      target = "extra_js";
+      name = JS_FILENAME;
+    }
+
     let themeFields = this.themeFields;
     let field = { name, target, value, upload_id, type_id };
-    if (field.name === "js" && target === "common") {
-      field.target = "extra_js";
-      field.name = JS_FILENAME;
-    }
 
     // slow path for uploads and so on
     if (type_id && type_id > 1) {
diff --git a/frontend/discourse/app/components/tag-info.gjs b/frontend/discourse/app/components/tag-info.gjs
index aad85a905444c..9f628741ada4a 100644
--- a/frontend/discourse/app/components/tag-info.gjs
+++ b/frontend/discourse/app/components/tag-info.gjs
@@ -1,8 +1,10 @@
 /* eslint-disable ember/no-classic-components */
+import { tracked } from "@glimmer/tracking";
 import Component, { Textarea } from "@ember/component";
 import { array, fn } from "@ember/helper";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
+import { dependentKeyCompat } from "@ember/object/compat";
 import { and, reads } from "@ember/object/computed";
 import { LinkTo } from "@ember/routing";
 import { service } from "@ember/service";
@@ -32,8 +34,9 @@ export default class TagInfo extends Component {
   @service router;
   @service siteSettings;
 
+  @tracked tagInfo = null;
+
   loading = false;
-  tagInfo = null;
   newSynonyms = null;
   showEditControls = false;
   editing = false;
@@ -63,10 +66,22 @@ export default class TagInfo extends Component {
     });
   }
 
+  // Bridge TrackedArray content changes to the classic tag system. `@tracked tagInfo` lets the getter invalidate when
+  // tagInfo is reassigned (reload). Consuming `synonyms.length` captures the TrackedArray's collection tag so the
+  // getter also invalidates on in-place mutations (push/splice/remove).
+  @dependentKeyCompat
+  get synonyms() {
+    const synonyms = this.tagInfo?.synonyms;
+    if (synonyms) {
+      synonyms.length;
+    }
+    return synonyms;
+  }
+
   @discourseComputed(
     "tagInfo.tag_group_names",
     "tagInfo.categories",
-    "tagInfo.synonyms"
+    "synonyms"
   )
   nothingToShow(tagGroupNames, categories, synonyms) {
     return isEmpty(tagGroupNames) && isEmpty(categories) && isEmpty(synonyms);
@@ -132,7 +147,7 @@ export default class TagInfo extends Component {
     ajax(`/tag/${id}/synonyms/${synonym.id}.json`, {
       type: "DELETE",
     })
-      .then(() => removeValueFromArray(this.tagInfo.synonyms, synonym))
+      .then(() => removeValueFromArray(this.synonyms, synonym))
       .catch(popupAjaxError);
   }
 
@@ -147,7 +162,7 @@ export default class TagInfo extends Component {
       didConfirm: () => {
         return tag
           .destroyRecord()
-          .then(() => removeValueFromArray(this.tagInfo.synonyms, tag))
+          .then(() => removeValueFromArray(this.synonyms, tag))
           .catch(popupAjaxError);
       },
     });
@@ -201,11 +216,11 @@ export default class TagInfo extends Component {
         ? i18n("tagging.delete_confirm_no_topics")
         : i18n("tagging.delete_confirm", { count: numTopics });
 
-    if (this.tagInfo.synonyms.length > 0) {
+    if (this.synonyms?.length > 0) {
       confirmText +=
         " " +
         i18n("tagging.delete_confirm_synonyms", {
-          count: this.tagInfo.synonyms.length,
+          count: this.synonyms.length,
         });
     }
 
@@ -357,7 +372,7 @@ export default class TagInfo extends Component {
             {{/if}}
           {{/if~}}
         </div>
-        {{#if this.tagInfo.synonyms}}
+        {{#if this.synonyms}}
           <div class="synonyms-list">
             <h3>{{i18n "tagging.synonyms"}}</h3>
             <div>{{htmlSafe
@@ -366,7 +381,7 @@ export default class TagInfo extends Component {
                 )
               }}</div>
             <div class="tag-list">
-              {{#each this.tagInfo.synonyms as |tag|}}
+              {{#each this.synonyms as |tag|}}
                 <div class="tag-box">
                   {{discourseTag tag.name pmOnly=tag.pmOnly tagName="div"}}
                   {{#if this.editSynonymsMode}}
diff --git a/frontend/discourse/app/controllers/user-activity/bookmarks.js b/frontend/discourse/app/controllers/user-activity/bookmarks.js
index b8576de880f32..00b9fb25b2fb0 100644
--- a/frontend/discourse/app/controllers/user-activity/bookmarks.js
+++ b/frontend/discourse/app/controllers/user-activity/bookmarks.js
@@ -1,6 +1,7 @@
 import Controller, { inject as controller } from "@ember/controller";
 import EmberObject, { action, computed } from "@ember/object";
-import { equal, notEmpty } from "@ember/object/computed";
+import { dependentKeyCompat } from "@ember/object/compat";
+import { notEmpty } from "@ember/object/computed";
 import { service } from "@ember/service";
 import { htmlSafe } from "@ember/template";
 import { Promise } from "rsvp";
@@ -26,7 +27,11 @@ export default class UserActivityBookmarksController extends Controller {
   bulkSelectHelper = new BulkSelectHelper(this);
 
   @notEmpty("q") inSearchMode;
-  @equal("model.bookmarks.length", 0) noContent;
+
+  @dependentKeyCompat
+  get noContent() {
+    return this.model?.bookmarks?.length === 0;
+  }
 
   @computed("q")
   get searchTerm() {
diff --git a/frontend/discourse/app/lib/array-tools.js b/frontend/discourse/app/lib/array-tools.js
index 9181b86c8ea24..3da92612c1b19 100644
--- a/frontend/discourse/app/lib/array-tools.js
+++ b/frontend/discourse/app/lib/array-tools.js
@@ -1,4 +1,5 @@
 import { get } from "@ember/object";
+import { compare } from "@ember/utils";
 import { TrackedArray } from "@ember-compat/tracked-built-ins";
 
 /**
@@ -161,3 +162,30 @@ export function uniqueItemsFromArray(array, selector) {
 
   return array instanceof TrackedArray ? new TrackedArray(items) : items;
 }
+
+/**
+ * Returns a sorted copy of an array using Ember-style sort definitions.
+ *
+ * Each definition is a string `"property"` or `"property:direction"` where
+ * direction is `"asc"` (default) or `"desc"`. Dot-notation paths are supported
+ * (e.g., `"badge.badge_type_id"`).
+ *
+ * @param {Array} array - The array to sort. Returns `[]` if not an array.
+ * @param {string[]} sortDefinitions - Sort definition strings.
+ * @returns {Array} A new sorted array.
+ */
+export function arraySortedByProperties(array, sortDefinitions) {
+  if (!Array.isArray(array)) {
+    return [];
+  }
+  return array.toSorted((a, b) => {
+    for (const s of sortDefinitions ?? []) {
+      const [prop, dir = "asc"] = s.split(":");
+      const result = compare(get(a, prop), get(b, prop));
+      if (result !== 0) {
+        return dir === "desc" ? -result : result;
+      }
+    }
+    return 0;
+  });
+}
diff --git a/frontend/discourse/app/lib/tracked-tools.js b/frontend/discourse/app/lib/tracked-tools.js
index fc5285ba4b5b0..d8794f4441f15 100644
--- a/frontend/discourse/app/lib/tracked-tools.js
+++ b/frontend/discourse/app/lib/tracked-tools.js
@@ -1,4 +1,5 @@
 import { tracked } from "@glimmer/tracking";
+import { tagFor, track, updateTag } from "@glimmer/validator";
 import { meta as metaFor, peekMeta } from "@ember/-internals/meta";
 import { TrackedDescriptor } from "@ember/-internals/metal";
 import { next } from "@ember/runloop";
@@ -239,19 +240,47 @@ export function trackedArray(target, key, desc) {
     set.call(this, ensureTrackedArray(value, key));
   }
 
+  // Bridge TrackedArray content changes to the classic computed property tag
+  // system. Without this, @computed('prop') only invalidates on reference
+  // changes (this.prop = newArray), not on content mutations like push().
+  //
+  // This manually implements the same bridging that @dependentKeyCompat does
+  // (we can't use @dependentKeyCompat directly because it rejects properties
+  // that are already @tracked). The getter captures the TrackedArray's
+  // collection tag via track(), then updates tagFor(obj, key) so that
+  // @computed properties watching this key see content changes.
+  function trackedArrayGetter() {
+    // Read the value outside track() to avoid a tag cycle. get.call(this)
+    // consumes the property's own tag (tagFor(this, key)) via the tracked
+    // storage. If we captured that inside track() and then called updateTag
+    // on the same tag, it would create a self-referential cycle.
+    const value = get.call(this);
+
+    if (value != null) {
+      // Only capture the TrackedArray's collection tag. TrackedArray's Proxy
+      // get trap for 'length' calls getValue(collection), registering the
+      // collection storage as an autotracking dependency. All mutations
+      // (push, pop, splice, etc.) dirty this same storage via
+      // setValue(collection, null).
+      const propertyTag = tagFor(this, key);
+      const collectionTag = track(() => value.length);
+      updateTag(propertyTag, collectionTag);
+    }
+
+    return value;
+  }
+
   // When using EmberObject.create(...), Ember accesses the tracked properties directly
   // through internal references, bypassing the getter/setter defined in this decorator.
   // To work around this, we are using Ember lower level APIs to override the stored references.
   // https://github.com/emberjs/ember.js/blob/d4f7c5c4075bc5b04736e0e965468bdbe6da135c/packages/%40ember/-internals/metal/lib/tracked.ts#L185
   metaFor(target).writeDescriptors(
     key,
-    new TrackedDescriptor(get, trackedArraySetter)
+    new TrackedDescriptor(trackedArrayGetter, trackedArraySetter)
   );
 
   return {
-    get() {
-      return get.call(this);
-    },
+    get: trackedArrayGetter,
     set: trackedArraySetter,
     enumerable: true,
     configurable: true,
diff --git a/frontend/discourse/tests/unit/lib/array-tools-test.js b/frontend/discourse/tests/unit/lib/array-tools-test.js
index da37562459060..90687f2ff0c71 100644
--- a/frontend/discourse/tests/unit/lib/array-tools-test.js
+++ b/frontend/discourse/tests/unit/lib/array-tools-test.js
@@ -3,6 +3,7 @@ import { module, test } from "qunit";
 import {
   addUniqueValuesToArray,
   addUniqueValueToArray,
+  arraySortedByProperties,
   removeValueFromArray,
   removeValuesFromArray,
   uniqueItemsFromArray,
@@ -430,6 +431,98 @@ module("Unit | Lib | array-tools", function () {
     });
   });
 
+  module("arraySortedByProperties()", function () {
+    test("sorts by a single ascending property", function (assert) {
+      const input = [{ name: "Charlie" }, { name: "Alice" }, { name: "Bob" }];
+      const result = arraySortedByProperties(input, ["name"]);
+
+      assert.deepEqual(
+        result.map((o) => o.name),
+        ["Alice", "Bob", "Charlie"]
+      );
+    });
+
+    test("sorts by a single descending property", function (assert) {
+      const input = [{ age: 10 }, { age: 30 }, { age: 20 }];
+      const result = arraySortedByProperties(input, ["age:desc"]);
+
+      assert.deepEqual(
+        result.map((o) => o.age),
+        [30, 20, 10]
+      );
+    });
+
+    test("sorts by multiple properties with mixed directions", function (assert) {
+      const input = [
+        { group: "B", score: 3 },
+        { group: "A", score: 1 },
+        { group: "A", score: 2 },
+        { group: "B", score: 1 },
+      ];
+      const result = arraySortedByProperties(input, [
+        "group:asc",
+        "score:desc",
+      ]);
+
+      assert.deepEqual(
+        result.map((o) => `${o.group}${o.score}`),
+        ["A2", "A1", "B3", "B1"]
+      );
+    });
+
+    test("supports dot-notation paths", function (assert) {
+      const input = [
+        { badge: { type_id: 3 } },
+        { badge: { type_id: 1 } },
+        { badge: { type_id: 2 } },
+      ];
+      const result = arraySortedByProperties(input, ["badge.type_id"]);
+
+      assert.deepEqual(
+        result.map((o) => o.badge.type_id),
+        [1, 2, 3]
+      );
+    });
+
+    test("returns empty array for non-array input", function (assert) {
+      assert.deepEqual(arraySortedByProperties(null, ["name"]), []);
+      assert.deepEqual(arraySortedByProperties(undefined, ["name"]), []);
+      assert.deepEqual(arraySortedByProperties("string", ["name"]), []);
+    });
+
+    test("does not mutate the original array", function (assert) {
+      const input = [{ v: 3 }, { v: 1 }, { v: 2 }];
+      const snapshot = input.map((o) => o.v);
+      arraySortedByProperties(input, ["v"]);
+
+      assert.deepEqual(
+        input.map((o) => o.v),
+        snapshot
+      );
+    });
+
+    test("handles empty sort definitions", function (assert) {
+      const input = [{ v: 3 }, { v: 1 }];
+      const result = arraySortedByProperties(input, []);
+
+      assert.deepEqual(
+        result.map((o) => o.v),
+        [3, 1],
+        "order is preserved when no sort definitions provided"
+      );
+    });
+
+    test("defaults to ascending when no direction specified", function (assert) {
+      const input = [{ v: 2 }, { v: 1 }, { v: 3 }];
+      const result = arraySortedByProperties(input, ["v"]);
+
+      assert.deepEqual(
+        result.map((o) => o.v),
+        [1, 2, 3]
+      );
+    });
+  });
+
   module("uniqueItemsFromArray()", function () {
     test("throws when input is not an array", function (assert) {
       assert.throws(
diff --git a/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs b/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs
index 9ffacf7492a33..a867136ab1a91 100644
--- a/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs
+++ b/frontend/discourse/tests/unit/lib/tracked-tools-test.gjs
@@ -1,4 +1,5 @@
 import { cached, tracked } from "@glimmer/tracking";
+import { computed } from "@ember/object";
 import { run } from "@ember/runloop";
 import { settled } from "@ember/test-helpers";
 import { TrackedArray } from "@ember-compat/tracked-built-ins";
@@ -315,6 +316,92 @@ module("Unit | tracked-tools", function () {
         "array contains correct items"
       );
     });
+
+    test("invalidates @computed when TrackedArray contents are mutated", function (assert) {
+      class TestClass {
+        computeCount = 0;
+        @trackedArray items = ["a"];
+
+        @computed("items")
+        get itemCount() {
+          this.computeCount++;
+          return this.items?.length ?? 0;
+        }
+      }
+
+      const instance = new TestClass();
+      assert.strictEqual(instance.itemCount, 1, "initial count is correct");
+      assert.strictEqual(instance.computeCount, 1, "computed evaluated once");
+
+      // In-place mutation via push
+      instance.items.push("b");
+      assert.strictEqual(
+        instance.itemCount,
+        2,
+        "computed invalidated after push"
+      );
+      assert.strictEqual(instance.computeCount, 2, "computed re-evaluated");
+
+      // In-place mutation via splice
+      instance.items.splice(0, 1);
+      assert.strictEqual(
+        instance.itemCount,
+        1,
+        "computed invalidated after splice"
+      );
+      assert.strictEqual(instance.computeCount, 3, "computed re-evaluated");
+
+      // Reference change still works
+      instance.items = ["x", "y", "z"];
+      assert.strictEqual(
+        instance.itemCount,
+        3,
+        "computed invalidated after reference change"
+      );
+      assert.strictEqual(instance.computeCount, 4, "computed re-evaluated");
+    });
+
+    test("invalidates @computed with .[] dependent key on mutations", function (assert) {
+      class TestClass {
+        computeCount = 0;
+        @trackedArray items = [];
+
+        @computed("items.[]")
+        get itemCount() {
+          this.computeCount++;
+          return this.items?.length ?? 0;
+        }
+      }
+
+      const instance = new TestClass();
+      assert.strictEqual(instance.itemCount, 0, "initial count is correct");
+      assert.strictEqual(instance.computeCount, 1, "computed evaluated once");
+
+      instance.items.push("a");
+      assert.strictEqual(
+        instance.itemCount,
+        1,
+        "computed invalidated after push"
+      );
+      assert.strictEqual(instance.computeCount, 2, "computed re-evaluated");
+    });
+
+    test("@computed works with null @trackedArray value", function (assert) {
+      class TestClass {
+        @trackedArray items = null;
+
+        @computed("items")
+        get hasItems() {
+          return this.items != null && this.items.length > 0;
+        }
+      }
+
+      const instance = new TestClass();
+      assert.false(instance.hasItems, "no items when null");
+
+      instance.items = ["a"];
+      assert.true(instance.hasItems, "has items after setting array");
+    });
   });
 
   module("enumerateTrackedKeys", function () {

From 255c1dfaf32faa6045c2518cb33e438582aec125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 26 Feb 2026 21:04:07 +0100
Subject: [PATCH 128/168] FIX: Preserve display name in quotes when using the
 rich text editor (#38078)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When `display_name_on_posts` is enabled and `prioritize_username_in_ux`
is disabled, quoting a post in markdown mode correctly attributes the
quote to the user's full name (e.g. `[quote="Robin Ward, post:1,
topic:2, username:eviltrout"]`). However, the rich text editor lost the
display name during the markdown→ProseMirror→markdown round-trip,
falling back to just the username.

The ProseMirror quote node only stored `username` in its attributes.
When BBCode with a `username:` param was parsed, the display name was
discarded. On serialization, only the username survived.

This commit:
- Adds a `displayName` attribute to the ProseMirror quote node spec
- Emits `data-display-name` on the markdown-it aside token so the
ProseMirror parser can pick it up
- Updates the serializer to output the display name and `username:`
param when present
- Fixes a latent issue where `displayName` remained as an array instead
of being joined into a string when the name contains no commas

https://meta.discourse.org/t/397049/12
---
 .../src/features/quotes.js                    | 13 +++++----
 .../static/prosemirror/extensions/quote.js    | 28 +++++++++++++------
 .../prosemirror-editor/quote-test.js          | 10 +++++++
 lib/quote_rewriter.rb                         |  4 +++
 spec/jobs/change_display_name_spec.rb         |  2 +-
 spec/lib/pretty_text_spec.rb                  |  2 +-
 spec/lib/quote_rewriter_spec.rb               |  2 +-
 spec/services/username_changer_spec.rb        |  2 +-
 8 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/frontend/discourse-markdown-it/src/features/quotes.js b/frontend/discourse-markdown-it/src/features/quotes.js
index 11bd3a777979b..6b867d55bcb72 100644
--- a/frontend/discourse-markdown-it/src/features/quotes.js
+++ b/frontend/discourse-markdown-it/src/features/quotes.js
@@ -42,12 +42,9 @@ const rule = {
         if (split[i].startsWith("username:")) {
           // return users name by selecting all values from the first index to the post
           // this protects us from when a user has a `,` in their name
-          displayName = split.slice(0, split.indexOf(`post:${postNumber}`));
-
-          // preserve `,` in a users name if they exist
-          if (displayName.length > 1) {
-            displayName = displayName.join(", ");
-          }
+          displayName = split
+            .slice(0, split.indexOf(`post:${postNumber}`))
+            .join(", ");
 
           // strip key of 'username:' and return username
           username = split[i].slice(9);
@@ -94,6 +91,10 @@ const rule = {
       token.attrs.push(["data-username", username]);
     }
 
+    if (displayName && displayName !== username) {
+      token.attrs.push(["data-display-name", displayName]);
+    }
+
     if (postNumber) {
       token.attrs.push(["data-post", postNumber]);
     }
diff --git a/frontend/discourse/app/static/prosemirror/extensions/quote.js b/frontend/discourse/app/static/prosemirror/extensions/quote.js
index fa79db0188b38..5968006463a9f 100644
--- a/frontend/discourse/app/static/prosemirror/extensions/quote.js
+++ b/frontend/discourse/app/static/prosemirror/extensions/quote.js
@@ -14,6 +14,7 @@ const extension = {
       defining: true,
       attrs: {
         username: { default: null },
+        displayName: { default: null },
         postNumber: { default: null },
         topicId: { default: null },
         full: { default: null },
@@ -25,6 +26,7 @@ const extension = {
           getAttrs(dom) {
             return {
               username: dom.getAttribute("data-username"),
+              displayName: dom.getAttribute("data-display-name"),
               postNumber: dom.getAttribute("data-post"),
               topicId: dom.getAttribute("data-topic"),
               full: dom.getAttribute("data-full"),
@@ -33,17 +35,24 @@ const extension = {
         },
       ],
       toDOM(node) {
-        const { username, postNumber, topicId, full } = node.attrs;
+        const { username, displayName, postNumber, topicId, full } = node.attrs;
         const attrs = { class: "quote" };
         attrs["data-username"] = username;
         attrs["data-post"] = postNumber;
         attrs["data-topic"] = topicId;
         attrs["data-full"] = full ? "true" : "false";
+        if (displayName) {
+          attrs["data-display-name"] = displayName;
+        }
 
         const domSpec = ["aside", attrs];
 
         if (username) {
-          domSpec.push(["div", { class: "title" }, `${username}:`]);
+          domSpec.push([
+            "div",
+            { class: "title" },
+            `${displayName || username}:`,
+          ]);
         }
 
         domSpec.push(["blockquote", 0]);
@@ -67,6 +76,7 @@ const extension = {
       if (token.tag === "aside") {
         state.openNode(state.schema.nodes.quote, {
           username: token.attrGet("data-username"),
+          displayName: token.attrGet("data-display-name"),
           postNumber: token.attrGet("data-post"),
           topicId: token.attrGet("data-topic"),
           full: token.attrGet("data-full"),
@@ -94,12 +104,14 @@ const extension = {
 
   serializeNode: {
     quote(state, node) {
-      const postNumber = node.attrs.postNumber
-        ? `, post:${node.attrs.postNumber}`
-        : "";
-      const topicId = node.attrs.topicId ? `, topic:${node.attrs.topicId}` : "";
-      const quoteValue = node.attrs.username
-        ? `="${node.attrs.username}${postNumber}${topicId}"`
+      const { username, displayName, postNumber, topicId } = node.attrs;
+      const postNumberParam = postNumber ? `, post:${postNumber}` : "";
+      const topicIdParam = topicId ? `, topic:${topicId}` : "";
+      const usernameParam =
+        displayName && username ? `, username:${username}` : "";
+      const name = displayName || username;
+      const quoteValue = name
+        ? `="${name}${postNumberParam}${topicIdParam}${usernameParam}"`
         : "";
 
       state.write(`[quote${quoteValue}]\n`);
diff --git a/frontend/discourse/tests/integration/components/prosemirror-editor/quote-test.js b/frontend/discourse/tests/integration/components/prosemirror-editor/quote-test.js
index 16cb61bdf291d..ce7e57b1726c1 100644
--- a/frontend/discourse/tests/integration/components/prosemirror-editor/quote-test.js
+++ b/frontend/discourse/tests/integration/components/prosemirror-editor/quote-test.js
@@ -28,6 +28,16 @@ module(
         `<aside class="quote" data-username="User" data-post="123" data-topic="456" data-full="false"><div class="title">User:</div><blockquote><p>Full quote example.</p></blockquote></aside>`,
         `[quote="User, post:123, topic:456"]\nFull quote example.\n\n[/quote]\n\n`,
       ],
+      "quote with display name and username": [
+        `[quote="Full Name, post:123, topic:456, username:user123"]\nQuoted with display name.\n\n[/quote]`,
+        `<aside class="quote" data-username="user123" data-post="123" data-topic="456" data-full="false" data-display-name="Full Name"><div class="title">Full Name:</div><blockquote><p>Quoted with display name.</p></blockquote></aside>`,
+        `[quote="Full Name, post:123, topic:456, username:user123"]\nQuoted with display name.\n\n[/quote]\n\n`,
+      ],
+      "quote with display name containing comma": [
+        `[quote="Last, First, post:123, topic:456, username:user123"]\nComma name.\n\n[/quote]`,
+        `<aside class="quote" data-username="user123" data-post="123" data-topic="456" data-full="false" data-display-name="Last, First"><div class="title">Last, First:</div><blockquote><p>Comma name.</p></blockquote></aside>`,
+        `[quote="Last, First, post:123, topic:456, username:user123"]\nComma name.\n\n[/quote]\n\n`,
+      ],
     }).forEach(([name, [markdown, html, expectedMarkdown]]) => {
       test(name, async function (assert) {
         this.siteSettings.rich_editor = true;
diff --git a/lib/quote_rewriter.rb b/lib/quote_rewriter.rb
index 5a45d580d6bad..2ce819407bed7 100644
--- a/lib/quote_rewriter.rb
+++ b/lib/quote_rewriter.rb
@@ -62,6 +62,10 @@ def rewrite_cooked_display_name(cooked, old_display_name, new_display_name)
       .each do |aside|
         next unless div = aside.at_css("div.title")
 
+        if aside["data-display-name"] == old_display_name
+          aside["data-display-name"] = new_display_name
+        end
+
         div.children.each do |child|
           if child.text?
             content = child.content
diff --git a/spec/jobs/change_display_name_spec.rb b/spec/jobs/change_display_name_spec.rb
index 75a286ce8f2b5..42520925d168c 100644
--- a/spec/jobs/change_display_name_spec.rb
+++ b/spec/jobs/change_display_name_spec.rb
@@ -42,7 +42,7 @@
       it "rewrites the cooked quote display name" do
         expect { described_class.new.execute(args) }.to change { post.reload.cooked }.to(
           match_html(<<~HTML.strip),
-          <aside class="quote no-group" data-username="#{username}" data-post="1" data-topic="#{quoted_post.topic.id}">
+          <aside class="quote no-group" data-username="#{username}" data-display-name="#{new_display_name}" data-post="1" data-topic="#{quoted_post.topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt="" width="24" height="24" src="#{avatar_url}" class="avatar"> #{new_display_name}:</div>
diff --git a/spec/lib/pretty_text_spec.rb b/spec/lib/pretty_text_spec.rb
index 9267d84f29722..3c6138e1bae34 100644
--- a/spec/lib/pretty_text_spec.rb
+++ b/spec/lib/pretty_text_spec.rb
@@ -31,7 +31,7 @@ def cook(*args)
       it "correctly extracts usernames from the new quote format" do
         topic = Fabricate(:topic, title: "this is a test topic :slight_smile:")
         expected = <<~HTML
-          <aside class="quote no-group" data-username="codinghorror" data-post="2" data-topic="#{topic.id}">
+          <aside class="quote no-group" data-username="codinghorror" data-display-name="Jeff" data-post="2" data-topic="#{topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
           <a href="http://test.localhost/t/this-is-a-test-topic/#{topic.id}/2">This is a test topic <img width="20" height="20" src="/images/emoji/twitter/slight_smile.png?v=#{Emoji::EMOJI_VERSION}" title="slight_smile" loading="lazy" alt="slight_smile" class="emoji"></a></div>
diff --git a/spec/lib/quote_rewriter_spec.rb b/spec/lib/quote_rewriter_spec.rb
index 3025b494735c2..1e2c489129319 100644
--- a/spec/lib/quote_rewriter_spec.rb
+++ b/spec/lib/quote_rewriter_spec.rb
@@ -116,7 +116,7 @@
         expect(
           quote_rewriter.rewrite_cooked_display_name(doc, "Jeff", "Mr. Atwood").to_html,
         ).to match_html(<<~HTML.strip)
-          <aside class="quote no-group" data-username="codinghorror" data-post="1" data-topic="#{quoted_post.topic.id}">
+          <aside class="quote no-group" data-username="codinghorror" data-display-name="Mr. Atwood" data-post="1" data-topic="#{quoted_post.topic.id}">
           <div class="title">
           <div class="quote-controls"></div>
           <img alt="" width="24" height="24" src="#{avatar_url}" class="avatar"> Mr. Atwood:</div>
diff --git a/spec/services/username_changer_spec.rb b/spec/services/username_changer_spec.rb
index 338ddaf745fc8..51705f777e8d1 100644
--- a/spec/services/username_changer_spec.rb
+++ b/spec/services/username_changer_spec.rb
@@ -517,7 +517,7 @@ def create_post_and_change_username(args = {}, &block)
 
           expect(post.cooked).to match_html(<<~HTML)
             <p>Lorem ipsum</p>
-            <aside class="quote no-group" data-username="bar" data-post="1" data-topic="#{quoted_post.topic.id}">
+            <aside class="quote no-group" data-username="bar" data-display-name="Foo Bar" data-post="1" data-topic="#{quoted_post.topic.id}">
             <div class="title">
             <div class="quote-controls"></div>
             <img alt="" width="24" height="24" src="//test.localhost/letter_avatar_proxy/v4/letter/b/b77776/48.png" class="avatar"> Foo Bar:</div>

From 1db85f38ec4ee7476fe4d9ac8acc6b13f04a7509 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 26 Feb 2026 21:17:39 +0100
Subject: [PATCH 129/168] =?UTF-8?q?Revert=20"FIX:=20Add=20server-side=20tr?=
 =?UTF-8?q?ust=20level=20check=20for=20delete=20all=20posts=20(=E2=80=A6?=
 =?UTF-8?q?=20(#38094)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…#37773)"

This reverts commit 31f518557791a0d602e632473c9ceeb9aea0534f.
---
 lib/guardian/post_guardian.rb                |  2 +-
 spec/lib/guardian/post_guardian_spec.rb      | 10 ----------
 spec/requests/admin/users_controller_spec.rb |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index 553206d40f915..aa47fcfbdb0f2 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -133,7 +133,7 @@ def can_see_post_actors?(topic, post_action_type_id)
   end
 
   def can_delete_all_posts?(user)
-    is_staff? && user && !user.admin? && user.trust_level < TrustLevel[2] &&
+    is_staff? && user && !user.admin? &&
       (
         is_admin? ||
           (
diff --git a/spec/lib/guardian/post_guardian_spec.rb b/spec/lib/guardian/post_guardian_spec.rb
index 24779dc1a4ee2..92c1dbdc6a71d 100644
--- a/spec/lib/guardian/post_guardian_spec.rb
+++ b/spec/lib/guardian/post_guardian_spec.rb
@@ -903,16 +903,6 @@
         expect(Guardian.new(actor).can_delete_all_posts?(u)).to be_truthy
       end
     end
-
-    it "is false if user is at or above trust level 2" do
-      tl2_user = Fabricate(:user, trust_level: TrustLevel[2], created_at: 1.day.ago)
-      expect(Guardian.new(admin).can_delete_all_posts?(tl2_user)).to be_falsey
-    end
-
-    it "is true if user is below trust level 2" do
-      tl1_user = Fabricate(:user, trust_level: TrustLevel[1], created_at: 1.day.ago)
-      expect(Guardian.new(admin).can_delete_all_posts?(tl1_user)).to be_truthy
-    end
   end
 
   describe "#can_delete_post_action?" do
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 9b5774902c09c..4dd277f7ba3b0 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -683,7 +683,7 @@
         expect(response.parsed_body["can_be_merged"]).to eq(true)
         expect(response.parsed_body["can_be_deleted"]).to eq(true)
         expect(response.parsed_body["can_be_anonymized"]).to eq(true)
-        expect(response.parsed_body["can_delete_all_posts"]).to eq(false)
+        expect(response.parsed_body["can_delete_all_posts"]).to eq(true)
       end
     end
 

From 03ad8f019169f7ec56f3596b095a171610aeb2cc Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 26 Feb 2026 22:05:47 +0100
Subject: [PATCH 130/168] FIX: enforce the presence of webhook secret (#38097)

We don't consider it security as we have the possibility to do so, but
we consider it's better to enforce it now and don't let any user have a
blank webhook secret.
---
 .../controllers/discourse_subscriptions/hooks_controller.rb | 2 ++
 .../spec/requests/hooks_controller_spec.rb                  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/hooks_controller.rb b/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/hooks_controller.rb
index 3b36d4d5183b4..3025e26030b36 100644
--- a/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/hooks_controller.rb
+++ b/plugins/discourse-subscriptions/app/controllers/discourse_subscriptions/hooks_controller.rb
@@ -20,6 +20,8 @@ def create
         sig_header = request.env["HTTP_STRIPE_SIGNATURE"]
         webhook_secret = SiteSetting.discourse_subscriptions_webhook_secret
 
+        return head :forbidden if webhook_secret.blank?
+
         event = ::Stripe::Webhook.construct_event(payload, sig_header, webhook_secret)
       rescue JSON::ParserError => e
         return render_json_error e.message
diff --git a/plugins/discourse-subscriptions/spec/requests/hooks_controller_spec.rb b/plugins/discourse-subscriptions/spec/requests/hooks_controller_spec.rb
index 93b42df09608b..da21da58e4218 100644
--- a/plugins/discourse-subscriptions/spec/requests/hooks_controller_spec.rb
+++ b/plugins/discourse-subscriptions/spec/requests/hooks_controller_spec.rb
@@ -6,6 +6,12 @@
     SiteSetting.discourse_subscriptions_enabled = true
   end
 
+  it "rejects webhooks when webhook secret is blank" do
+    SiteSetting.discourse_subscriptions_webhook_secret = ""
+    post "/s/hooks.json", params: "{}", headers: { HTTP_STRIPE_SIGNATURE: "t=1,v1=abc" }
+    expect(response.status).to eq 403
+  end
+
   it "constructs a webhook event" do
     payload = "we-want-a-shrubbery"
     headers = { HTTP_STRIPE_SIGNATURE: "stripe-webhook-signature" }

From 9681c6d3fb632d1d843c4cf302643a639614cb55 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 26 Feb 2026 22:06:00 +0100
Subject: [PATCH 131/168] FIX: ensures deleted thread is not accessible via API
 (#38098)

We don't consider this a security issue as this is technically info that
was accessible before being deleted.

This commit adds the check in the service and ensures the service and
controller are properly tested.
---
 .../chat/api/channel_threads_controller.rb     |  1 +
 .../chat/app/services/chat/lookup_thread.rb    |  6 ++++++
 .../api/channel_threads_controller_spec.rb     | 18 ++++++++++++++++++
 .../spec/services/chat/lookup_thread_spec.rb   | 12 ++++++++++++
 4 files changed, 37 insertions(+)

diff --git a/plugins/chat/app/controllers/chat/api/channel_threads_controller.rb b/plugins/chat/app/controllers/chat/api/channel_threads_controller.rb
index a90fec4c545eb..016134bfe7669 100644
--- a/plugins/chat/app/controllers/chat/api/channel_threads_controller.rb
+++ b/plugins/chat/app/controllers/chat/api/channel_threads_controller.rb
@@ -44,6 +44,7 @@ def show
       end
       on_failed_policy(:invalid_access) { raise Discourse::InvalidAccess }
       on_failed_policy(:threading_enabled_for_channel) { raise Discourse::NotFound }
+      on_failed_policy(:original_message_not_deleted) { raise Discourse::NotFound }
       on_model_not_found(:thread) { raise Discourse::NotFound }
       on_failure { render(json: failed_json, status: :unprocessable_entity) }
       on_failed_contract do |contract|
diff --git a/plugins/chat/app/services/chat/lookup_thread.rb b/plugins/chat/app/services/chat/lookup_thread.rb
index 01b9c6eeaf462..26851a6be56ef 100644
--- a/plugins/chat/app/services/chat/lookup_thread.rb
+++ b/plugins/chat/app/services/chat/lookup_thread.rb
@@ -27,6 +27,7 @@ class LookupThread
     model :thread
     policy :invalid_access
     policy :threading_enabled_for_channel
+    policy :original_message_not_deleted
     model :membership, optional: true
     model :participants, optional: true
 
@@ -48,6 +49,11 @@ def threading_enabled_for_channel(thread:)
       thread.channel.threading_enabled || thread.force
     end
 
+    def original_message_not_deleted(thread:, guardian:)
+      thread.original_message.deleted_at.blank? ||
+        guardian.can_moderate_chat?(thread.channel.chatable)
+    end
+
     def fetch_membership(thread:, guardian:)
       thread.membership_for(guardian.user)
     end
diff --git a/plugins/chat/spec/requests/chat/api/channel_threads_controller_spec.rb b/plugins/chat/spec/requests/chat/api/channel_threads_controller_spec.rb
index ac43e6d426665..cb5ceb68ff8dc 100644
--- a/plugins/chat/spec/requests/chat/api/channel_threads_controller_spec.rb
+++ b/plugins/chat/spec/requests/chat/api/channel_threads_controller_spec.rb
@@ -41,6 +41,24 @@
         expect(response.parsed_body["thread"]["id"]).to eq(thread.id)
       end
 
+      context "when the thread original message is deleted" do
+        before { thread.original_message.trash! }
+
+        it "returns 404" do
+          get "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}"
+          expect(response.status).to eq(404)
+        end
+
+        context "when the current user is a moderator" do
+          before { current_user.update!(moderator: true) }
+
+          it "returns 200" do
+            get "/chat/api/channels/#{thread.channel_id}/threads/#{thread.id}"
+            expect(response.status).to eq(200)
+          end
+        end
+      end
+
       context "when the channel_id does not match the thread id" do
         fab!(:other_channel, :chat_channel)
 
diff --git a/plugins/chat/spec/services/chat/lookup_thread_spec.rb b/plugins/chat/spec/services/chat/lookup_thread_spec.rb
index afb09d6ec3b14..0f0b7b17e88f6 100644
--- a/plugins/chat/spec/services/chat/lookup_thread_spec.rb
+++ b/plugins/chat/spec/services/chat/lookup_thread_spec.rb
@@ -51,6 +51,18 @@
       it { is_expected.to fail_a_policy(:invalid_access) }
     end
 
+    context "when the original message is deleted" do
+      before { thread.original_message.trash! }
+
+      it { is_expected.to fail_a_policy(:original_message_not_deleted) }
+
+      context "when user is a moderator" do
+        before { current_user.update!(moderator: true) }
+
+        it { is_expected.to run_successfully }
+      end
+    end
+
     context "when threading is not enabled for the channel" do
       before { channel.update!(threading_enabled: false) }
 

From 12bb42e7d242662444f01f8eb5d13a6c6149e413 Mon Sep 17 00:00:00 2001
From: Renato Atilio <renato@discourse.org>
Date: Thu, 26 Feb 2026 19:04:19 -0300
Subject: [PATCH 132/168] DEV: avoid importing from the /static/ boundary from
 the composer service (#38092)

This is not a big deal _per se_ because the required module doesn't
import any ProseMirror or `/static/` dependencies, but it would make it
easy to miss it being included in the bundle if a dependency was added
there.

This PR extracts wrap-utils from the `/static/` boundary so it can't
import ProseMirror dependencies anymore and loads the wrap modal
asynchronously.
---
 .../prosemirror => }/components/wrap-attributes-modal.gjs  | 5 ++++-
 .../app/{static/prosemirror => }/lib/wrap-utils.js         | 0
 frontend/discourse/app/services/composer.js                | 4 ++--
 .../app/static/prosemirror/components/wrap-node-view.gjs   | 7 +++++--
 .../discourse/app/static/prosemirror/extensions/wrap.js    | 5 ++++-
 5 files changed, 15 insertions(+), 6 deletions(-)
 rename frontend/discourse/app/{static/prosemirror => }/components/wrap-attributes-modal.gjs (98%)
 rename frontend/discourse/app/{static/prosemirror => }/lib/wrap-utils.js (100%)

diff --git a/frontend/discourse/app/static/prosemirror/components/wrap-attributes-modal.gjs b/frontend/discourse/app/components/wrap-attributes-modal.gjs
similarity index 98%
rename from frontend/discourse/app/static/prosemirror/components/wrap-attributes-modal.gjs
rename to frontend/discourse/app/components/wrap-attributes-modal.gjs
index 33abdfa879dbe..bee3e698fe14a 100644
--- a/frontend/discourse/app/static/prosemirror/components/wrap-attributes-modal.gjs
+++ b/frontend/discourse/app/components/wrap-attributes-modal.gjs
@@ -5,8 +5,11 @@ import { action } from "@ember/object";
 import DButton from "discourse/components/d-button";
 import DModal from "discourse/components/d-modal";
 import Form from "discourse/components/form";
+import {
+  parseAttributesString,
+  serializeFromForm,
+} from "discourse/lib/wrap-utils";
 import { i18n } from "discourse-i18n";
-import { parseAttributesString, serializeFromForm } from "../lib/wrap-utils";
 
 /**
  * @typedef WrapAttributesModalArgs
diff --git a/frontend/discourse/app/static/prosemirror/lib/wrap-utils.js b/frontend/discourse/app/lib/wrap-utils.js
similarity index 100%
rename from frontend/discourse/app/static/prosemirror/lib/wrap-utils.js
rename to frontend/discourse/app/lib/wrap-utils.js
diff --git a/frontend/discourse/app/services/composer.js b/frontend/discourse/app/services/composer.js
index 65823de552155..fda8ace574f9e 100644
--- a/frontend/discourse/app/services/composer.js
+++ b/frontend/discourse/app/services/composer.js
@@ -12,6 +12,7 @@ import DiscardDraftModal from "discourse/components/modal/discard-draft";
 import PostEnqueuedModal from "discourse/components/modal/post-enqueued";
 import SpreadsheetEditor from "discourse/components/modal/spreadsheet-editor";
 import TopicReplyChoiceDialog from "discourse/components/topic-reply-choice-dialog";
+import WrapAttributesModal from "discourse/components/wrap-attributes-modal";
 import {
   cannotPostAgain,
   durationTextFromSeconds,
@@ -38,6 +39,7 @@ import {
 } from "discourse/lib/uploads";
 import DiscourseURL from "discourse/lib/url";
 import { escapeExpression } from "discourse/lib/utilities";
+import { parseAttributesString } from "discourse/lib/wrap-utils";
 import Category from "discourse/models/category";
 import Composer, {
   CREATE_TOPIC,
@@ -49,8 +51,6 @@ import Composer, {
 import Draft from "discourse/models/draft";
 import PostLocalization from "discourse/models/post-localization";
 import TopicLocalization from "discourse/models/topic-localization";
-import WrapAttributesModal from "discourse/static/prosemirror/components/wrap-attributes-modal";
-import { parseAttributesString } from "discourse/static/prosemirror/lib/wrap-utils";
 import { i18n } from "discourse-i18n";
 
 async function loadDraft(store, opts = {}) {
diff --git a/frontend/discourse/app/static/prosemirror/components/wrap-node-view.gjs b/frontend/discourse/app/static/prosemirror/components/wrap-node-view.gjs
index d69c99a35bc61..a25eb0a83fa4a 100644
--- a/frontend/discourse/app/static/prosemirror/components/wrap-node-view.gjs
+++ b/frontend/discourse/app/static/prosemirror/components/wrap-node-view.gjs
@@ -3,8 +3,11 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { service } from "@ember/service";
 import { NodeSelection } from "prosemirror-state";
-import { parseAttributesString, serializeAttributes } from "../lib/wrap-utils";
-import WrapAttributesModal from "./wrap-attributes-modal";
+import WrapAttributesModal from "discourse/components/wrap-attributes-modal";
+import {
+  parseAttributesString,
+  serializeAttributes,
+} from "discourse/lib/wrap-utils";
 
 export default class WrapNodeView extends Component {
   @service modal;
diff --git a/frontend/discourse/app/static/prosemirror/extensions/wrap.js b/frontend/discourse/app/static/prosemirror/extensions/wrap.js
index 629872ddc2db1..be9a83680780a 100644
--- a/frontend/discourse/app/static/prosemirror/extensions/wrap.js
+++ b/frontend/discourse/app/static/prosemirror/extensions/wrap.js
@@ -1,7 +1,10 @@
 import { camelCaseToDash } from "discourse/lib/case-converter";
+import {
+  parseAttributesString,
+  serializeAttributes,
+} from "discourse/lib/wrap-utils";
 import { i18n } from "discourse-i18n";
 import WrapNodeView from "../components/wrap-node-view";
-import { parseAttributesString, serializeAttributes } from "../lib/wrap-utils";
 
 const toDataAttrs = (data) => {
   if (!data) {

From 691622181af8e1513f7caa33ce21948cc96b2028 Mon Sep 17 00:00:00 2001
From: Renato Atilio <renato@discourse.org>
Date: Thu, 26 Feb 2026 19:24:00 -0300
Subject: [PATCH 133/168] DEV: fix rich editor check flaky (#38100)

Follows the same pattern of other places that `send_keys` repeatedly.
---
 plugins/checklist/spec/system/rich_editor_extension_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/checklist/spec/system/rich_editor_extension_spec.rb b/plugins/checklist/spec/system/rich_editor_extension_spec.rb
index 2b5f4171e246b..0b79b59ea2510 100644
--- a/plugins/checklist/spec/system/rich_editor_extension_spec.rb
+++ b/plugins/checklist/spec/system/rich_editor_extension_spec.rb
@@ -99,6 +99,7 @@ def click_checklist_toolbar_option
       expect(checklist).to have_items(count: 2)
 
       rich.send_keys(:home)
+      wait_for_timeout
       rich.send_keys(:backspace)
 
       expect(checklist).to have_checkboxes(count: 1)
@@ -132,6 +133,7 @@ def click_checklist_toolbar_option
       expect(checklist).to have_items(count: 1)
 
       rich.send_keys(:home)
+      wait_for_timeout
       rich.send_keys(:backspace)
 
       expect(checklist).to have_no_checkboxes

From c652b1379e16f81090d622736f0479f275e4aca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 27 Feb 2026 04:20:17 +0100
Subject: [PATCH 134/168] FEATURE: add category type configuration system
 (#37929)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, setting up a category for a specific use case (e.g. Q&A /
support) requires manually toggling multiple site settings and category
options. This is error-prone and not discoverable for admins.

Introduce a category type system that streamlines category creation by
letting admins pick a type (Discussion, Support, etc.) which
automatically applies sensible defaults.

Core framework:
- `Categories::Types::Base` — base class that defines a type's icon,
  configuration schema (site settings + category settings), and hooks
  for `enable_plugin`, `configure_site_settings`, `configure_category`
- `Categories::TypeRegistry` — singleton registry where core and plugins
  register their types, with ownership tracking to prevent conflicts
- `Categories::Configure` — service object that orchestrates type
  configuration in a transaction: enables the plugin, applies site
  settings, configures the category, and logs a staff action

Frontend:
- Type chooser modal shown when creating a new category (gated behind
`enable_simplified_category_creation` (UC) and
`enable_category_type_setup` site setting)
- `CategoryTypeChooser` service manages modal → route state transfer
- Plugin tabs registered with `primary: true` appear alongside General
  even when advanced settings are collapsed
- Dynamic page title reflects the selected type

Solved plugin integration:
- Registers a "Support" type that enables solved, sets filter/notify
  defaults, and configures accepted answers + auto-close on the category
- Adds a primary "Support" tab with FormKit fields driven by the type's
  configuration schema

Ref - t/174387
Ref - t/174388

---------

Co-authored-by: Martin Brennan <martin@discourse.org>
---
 .../stylesheets/common/modal/_index.scss      |  1 +
 .../common/modal/choose-category-type.scss    | 63 ++++++++++++
 app/controllers/categories_controller.rb      | 11 +++
 app/services/categories/configure.rb          | 75 +++++++++++++++
 app/services/categories/type_registry.rb      | 52 ++++++++++
 app/services/categories/types/base.rb         | 85 +++++++++++++++++
 app/services/categories/types/discussion.rb   |  8 ++
 config/initializers/012-category_types.rb     |  5 +
 config/locales/client.en.yml                  |  4 +
 config/locales/server.en.yml                  |  6 ++
 config/routes.rb                              |  1 +
 config/site_settings.yml                      |  4 +
 .../admin/controllers/edit-category/tabs.js   | 22 ++++-
 .../discourse/admin/routes/new-category.js    | 12 +++
 .../edit-category/tabs-horizontal.gjs         | 60 ++++++++++--
 .../app/components/discovery/navigation.gjs   |  5 +-
 .../components/modal/choose-category-type.gjs | 84 ++++++++++++++++
 .../sidebar/user/categories-section.gjs       |  9 +-
 frontend/discourse/app/lib/plugin-api.gjs     |  1 +
 frontend/discourse/app/models/category.js     |  3 +
 .../app/services/category-type-chooser.js     | 43 +++++++++
 lib/plugin/instance.rb                        |  4 +
 .../initializers/chat-category-tab.js         |  4 +-
 .../models/discourse_solved/category_type.rb  | 47 +++++++++
 .../components/upsert-category-support.gjs    | 62 ++++++++++++
 .../initializers/solved-category-type-tab.js  | 23 +++++
 .../config/locales/server.en.yml              | 11 +++
 plugins/discourse-solved/plugin.rb            |  2 +
 .../discourse_solved/category_type_spec.rb    | 82 ++++++++++++++++
 spec/services/categories/configure_spec.rb    | 89 +++++++++++++++++
 .../services/categories/type_registry_spec.rb | 72 ++++++++++++++
 spec/services/categories/types/base_spec.rb   | 95 +++++++++++++++++++
 32 files changed, 1027 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/stylesheets/common/modal/choose-category-type.scss
 create mode 100644 app/services/categories/configure.rb
 create mode 100644 app/services/categories/type_registry.rb
 create mode 100644 app/services/categories/types/base.rb
 create mode 100644 app/services/categories/types/discussion.rb
 create mode 100644 config/initializers/012-category_types.rb
 create mode 100644 frontend/discourse/app/components/modal/choose-category-type.gjs
 create mode 100644 frontend/discourse/app/services/category-type-chooser.js
 create mode 100644 plugins/discourse-solved/app/models/discourse_solved/category_type.rb
 create mode 100644 plugins/discourse-solved/assets/javascripts/discourse/components/upsert-category-support.gjs
 create mode 100644 plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-type-tab.js
 create mode 100644 plugins/discourse-solved/spec/models/discourse_solved/category_type_spec.rb
 create mode 100644 spec/services/categories/configure_spec.rb
 create mode 100644 spec/services/categories/type_registry_spec.rb
 create mode 100644 spec/services/categories/types/base_spec.rb

diff --git a/app/assets/stylesheets/common/modal/_index.scss b/app/assets/stylesheets/common/modal/_index.scss
index fef1f68dc9916..f962016c5135c 100644
--- a/app/assets/stylesheets/common/modal/_index.scss
+++ b/app/assets/stylesheets/common/modal/_index.scss
@@ -1,2 +1,3 @@
+@import "choose-category-type";
 @import "modal-overrides";
 @import "user-status";
diff --git a/app/assets/stylesheets/common/modal/choose-category-type.scss b/app/assets/stylesheets/common/modal/choose-category-type.scss
new file mode 100644
index 0000000000000..4545723d1e737
--- /dev/null
+++ b/app/assets/stylesheets/common/modal/choose-category-type.scss
@@ -0,0 +1,63 @@
+.choose-category-type-modal {
+  &__grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 0.75em;
+  }
+
+  &__card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 0.5em;
+    padding: 1.25em 1em;
+    border: 1px solid var(--primary-low);
+    border-radius: var(--d-border-radius);
+    background: var(--secondary);
+    cursor: pointer;
+    transition: border-color 0.15s;
+    text-align: center;
+
+    &:hover,
+    &:focus-visible {
+      border-color: var(--tertiary);
+      outline: none;
+    }
+
+    &.--unavailable {
+      opacity: 0.5;
+      cursor: not-allowed;
+
+      &:hover,
+      &:focus-visible {
+        border-color: var(--primary-low);
+      }
+    }
+  }
+
+  &__card-icon {
+    font-size: var(--font-up-3);
+    color: var(--tertiary);
+
+    .--unavailable & {
+      color: var(--primary-medium);
+    }
+  }
+
+  &__card-name {
+    font-weight: 700;
+  }
+
+  &__card-description {
+    font-size: var(--font-down-1);
+    color: var(--primary-medium);
+  }
+
+  &__card-badge {
+    font-size: var(--font-down-2);
+    color: var(--primary-medium);
+    background: var(--primary-very-low);
+    padding: 0.15em 0.5em;
+    border-radius: var(--d-border-radius);
+  }
+}
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 67aa2de875e0b..5b0f72859bb9d 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -127,6 +127,11 @@ def reorder
     render json: success_json
   end
 
+  def types
+    guardian.ensure_can_create_category!
+    render json: { types: Categories::TypeRegistry.list }
+  end
+
   def show
     guardian.ensure_can_see!(@category)
 
@@ -141,6 +146,7 @@ def show
   def create
     guardian.ensure_can_create!(Category)
     position = category_params.delete(:position)
+    category_type = params[:category_type]
 
     if category_params[:description].present? &&
          category_params[:description].size > MAX_DESCRIPTION_PARAM_LENGTH
@@ -166,6 +172,11 @@ def create
     if @category.save
       @category.move_to(position.to_i) if position
 
+      if category_type.present? &&
+           UpcomingChanges.enabled_for_user?(:enable_simplified_category_creation, current_user)
+        Categories::Configure.call(guardian:, params: { category_id: @category.id, category_type: })
+      end
+
       Scheduler::Defer.later "Log staff action create category" do
         @staff_action_logger.log_category_creation(@category)
       end
diff --git a/app/services/categories/configure.rb b/app/services/categories/configure.rb
new file mode 100644
index 0000000000000..79aea64fb0533
--- /dev/null
+++ b/app/services/categories/configure.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Categories
+  class Configure
+    include Service::Base
+
+    params do
+      attribute :category_id, :integer
+      attribute :category_type, :string
+      attribute :configuration_values
+
+      validates :category_id, presence: true
+      validates :category_type, presence: true
+      validate :category_type_is_valid
+
+      def category_type_is_valid
+        return if category_type.blank?
+        return if Categories::TypeRegistry.valid?(category_type)
+
+        errors.add(:category_type, :invalid)
+      end
+    end
+
+    model :category
+    model :type_class
+    policy :can_modify_category
+
+    transaction do
+      step :enable_plugin
+      step :configure_site_settings
+      step :configure_category
+    end
+
+    step :log_action
+
+    private
+
+    def fetch_category(params:)
+      Category.find_by(id: params.category_id)
+    end
+
+    def can_modify_category(guardian:, category:)
+      guardian.can_edit_category?(category)
+    end
+
+    def fetch_type_class(params:)
+      Categories::TypeRegistry.get(params.category_type)
+    end
+
+    def enable_plugin(type_class:)
+      type_class.enable_plugin
+    end
+
+    def configure_site_settings(type_class:, category:, params:)
+      type_class.configure_site_settings(
+        category,
+        configuration_values: params.configuration_values || {},
+      )
+    end
+
+    def configure_category(type_class:, category:, params:)
+      type_class.configure_category(
+        category,
+        configuration_values: params.configuration_values || {},
+      )
+    end
+
+    def log_action(guardian:, category:, params:)
+      StaffActionLogger.new(guardian.user).log_custom(
+        "configure_category_type",
+        { category_id: category.id, category_type: params.category_type },
+      )
+    end
+  end
+end
diff --git a/app/services/categories/type_registry.rb b/app/services/categories/type_registry.rb
new file mode 100644
index 0000000000000..8e80a20c9a6fe
--- /dev/null
+++ b/app/services/categories/type_registry.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Categories
+  class TypeRegistry
+    class << self
+      def register(klass, plugin_identifier: nil)
+        id = klass.type_id
+        if types.key?(id) && owners[id] != plugin_identifier
+          raise ArgumentError,
+                "Category type '#{id}' is already registered#{owners[id] ? " by #{owners[id]}" : ""}"
+        end
+        types[id] = klass
+        owners[id] = plugin_identifier
+      end
+
+      def get(id)
+        types[id.to_sym]
+      end
+
+      def get!(id)
+        get(id) || raise(ArgumentError, "Unknown category type: #{id}")
+      end
+
+      def all
+        types
+      end
+
+      def list
+        types.values.map(&:metadata)
+      end
+
+      def valid?(id)
+        types.key?(id.to_sym)
+      end
+
+      def reset!
+        @types = nil
+        @owners = nil
+      end
+
+      private
+
+      def types
+        @types ||= {}
+      end
+
+      def owners
+        @owners ||= {}
+      end
+    end
+  end
+end
diff --git a/app/services/categories/types/base.rb b/app/services/categories/types/base.rb
new file mode 100644
index 0000000000000..adccb489cc11a
--- /dev/null
+++ b/app/services/categories/types/base.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Categories
+  module Types
+    class Base
+      class << self
+        def type_id(id = nil)
+          if id
+            @type_id = id.to_sym
+          else
+            @type_id || name.demodulize.underscore.to_sym
+          end
+        end
+
+        def enable_plugin
+        end
+
+        def configure_site_settings(category, configuration_values: {})
+          configuration_schema[:site_settings]&.each do |setting_name, default_value|
+            value = configuration_values.fetch(setting_name.to_s, default_value)
+            SiteSetting.public_send("#{setting_name}=", value)
+          end
+        end
+
+        def configure_category(category, configuration_values: {})
+        end
+
+        def configuration_schema
+          {}
+        end
+
+        def available?
+          true
+        end
+
+        def icon
+          "comments"
+        end
+
+        def metadata
+          {
+            id: type_id,
+            name: I18n.t("category_types.#{type_id}.name", default: type_id.to_s.titleize),
+            description: I18n.t("category_types.#{type_id}.description", default: ""),
+            icon: icon,
+            available: available?,
+            configuration_schema: resolved_configuration_schema,
+          }
+        end
+
+        private
+
+        def resolved_configuration_schema
+          schema = configuration_schema
+          return [] if schema.blank?
+
+          entries = []
+
+          schema[:site_settings]&.each do |setting_name, target_value|
+            meta = SiteSetting.setting_metadata_hash(setting_name)
+            entries << {
+              key: setting_name.to_s,
+              default: target_value,
+              type: meta[:type],
+              label: meta[:humanized_name],
+              description: meta[:description],
+            }
+          end
+
+          schema[:category_settings]&.each do |field_name, config|
+            entries << {
+              key: field_name.to_s,
+              default: config[:default],
+              type: config[:type].to_s,
+              label: config[:label],
+              description: config[:description],
+            }
+          end
+
+          entries
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/categories/types/discussion.rb b/app/services/categories/types/discussion.rb
new file mode 100644
index 0000000000000..9d0010ffa032b
--- /dev/null
+++ b/app/services/categories/types/discussion.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Categories
+  module Types
+    class Discussion < Base
+    end
+  end
+end
diff --git a/config/initializers/012-category_types.rb b/config/initializers/012-category_types.rb
new file mode 100644
index 0000000000000..dfa44e30bebe9
--- /dev/null
+++ b/config/initializers/012-category_types.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.config.to_prepare do
+  Categories::TypeRegistry.register(Categories::Types::Discussion)
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 563acd0179d08..bbad73483db32 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -4667,7 +4667,11 @@ en:
       topic_featured_link_allowed: "Allow featured links in this category"
       delete: "Delete category"
       create: "New category"
+      create_with_type: "New %{typeName} category"
       create_long: "Create a new category"
+      choose_type:
+        title: "Choose category type"
+        requires_plugin: "Requires plugin"
       create_category: "Create category"
       save: "Save category"
       unsaved_changes: "You have unsaved changes"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 46d2c61e9944c..7f478035f9b1e 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -893,6 +893,12 @@ en:
         other: "Can't delete this category because it has %{count} topics. Oldest topic is %{topic_link}."
       topic_exists_no_oldest: "Can't delete this category because topic count is %{count}."
     uncategorized_description: "Topics that don't need a category, or don't fit into any other existing category."
+
+  category_types:
+    discussion:
+      name: "Discussion"
+      description: "General discussion topics"
+
   trust_levels:
     admin: "Admin"
     staff: "Staff"
diff --git a/config/routes.rb b/config/routes.rb
index 71229606060a4..d46e4bfad34b8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1331,6 +1331,7 @@ def patch(*)
 
     resources :categories, only: %i[index create update destroy]
     post "categories/reorder" => "categories#reorder"
+    get "categories/types" => "categories#types"
     get "categories/find" => "categories#find"
     post "categories/search" => "categories#search"
     get "categories/hierarchical_search" => "categories#hierarchical_search"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 6b4dc96523e8c..ec744b6dddcbe 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4308,3 +4308,7 @@ experimental:
       status: "experimental"
       impact: "feature,staff"
       learn_more_url: "https://meta.discourse.org/t/-/394971"
+  enable_category_type_setup:
+    default: false
+    hidden: true
+    client: true
\ No newline at end of file
diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.js
index 57467aad6ed08..f810512e6a1be 100644
--- a/frontend/discourse/admin/controllers/edit-category/tabs.js
+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js
@@ -7,6 +7,7 @@ import { service } from "@ember/service";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { AUTO_GROUPS } from "discourse/lib/constants";
 import discourseComputed from "discourse/lib/decorators";
+import { registeredEditCategoryTabs } from "discourse/lib/edit-category-tabs";
 import { trackedArray } from "discourse/lib/tracked-tools";
 import DiscourseURL from "discourse/lib/url";
 import { defaultHomepage } from "discourse/lib/utilities";
@@ -139,6 +140,12 @@ export default class EditCategoryTabsController extends Controller {
       });
     }
 
+    if (this.model.category_type_name) {
+      return i18n("category.create_with_type", {
+        typeName: this.model.category_type_name,
+      });
+    }
+
     return i18n("category.create");
   }
 
@@ -332,9 +339,16 @@ export default class EditCategoryTabsController extends Controller {
       this.showAdvancedTabs.toString()
     );
 
-    // Always ensure we're on general tab after toggling
-    next(() => {
-      this.selectedTab = "general";
-    });
+    // When collapsing, reset to general unless current tab is still visible
+    if (!this.showAdvancedTabs && this.selectedTab !== "general") {
+      const primaryTab = registeredEditCategoryTabs.find(
+        (tab) => tab.id === this.selectedTab && tab.primary
+      );
+      if (!primaryTab) {
+        next(() => {
+          this.selectedTab = "general";
+        });
+      }
+    }
   }
 }
diff --git a/frontend/discourse/admin/routes/new-category.js b/frontend/discourse/admin/routes/new-category.js
index c651bcfcc8396..603a224ecca65 100644
--- a/frontend/discourse/admin/routes/new-category.js
+++ b/frontend/discourse/admin/routes/new-category.js
@@ -14,6 +14,7 @@ function getNewCategoryDefaultColors() {
 }
 
 export default class NewCategory extends DiscourseRoute {
+  @service categoryTypeChooser;
   @service router;
 
   controllerName = "edit-category.tabs";
@@ -60,11 +61,22 @@ export default class NewCategory extends DiscourseRoute {
   setupController(controller) {
     super.setupController(...arguments);
 
+    const result = this.categoryTypeChooser.consume();
+    if (result) {
+      controller.model.set("category_type", result.type);
+      controller.model.set("category_type_name", result.typeName);
+      controller.model.set("category_type_schema", result.typeSchema);
+    }
+
     controller.selectedTab = "general";
     controller.parentParams = {};
   }
 
   titleToken() {
+    const typeName = this.controller?.model?.category_type_name;
+    if (typeName) {
+      return i18n("category.create_with_type", { typeName });
+    }
     return i18n("category.create");
   }
 
diff --git a/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs b/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs
index aaf76c1d77ecf..388070cb4b6f8 100644
--- a/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs
+++ b/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs
@@ -20,6 +20,17 @@ export default class EditCategoryTabsHorizontalTemplate extends Component {
     });
   }
 
+  get visiblePrimaryTabs() {
+    return registeredEditCategoryTabs.filter(
+      (tab) =>
+        tab.primary && this.evaluateTabCondition(tab, this.args.controller)
+    );
+  }
+
+  get hasPrimaryTabs() {
+    return this.visiblePrimaryTabs.length > 0;
+  }
+
   <template>
     {{#if (and @controller.site.desktopView @controller.model.id)}}
       <BackButton
@@ -50,6 +61,19 @@ export default class EditCategoryTabsHorizontalTemplate extends Component {
             @params={{@controller.parentParams}}
             @tab="general"
           />
+          {{#each registeredEditCategoryTabs as |pluginTab|}}
+            {{#if pluginTab.primary}}
+              {{#if (this.evaluateTabCondition pluginTab @controller)}}
+                <EditCategoryTab
+                  @panels={{@controller.panels}}
+                  @selectedTab={{@controller.selectedTab}}
+                  @params={{@controller.parentParams}}
+                  @tab={{pluginTab.id}}
+                  @tabTitle={{pluginTab.name}}
+                />
+              {{/if}}
+            {{/if}}
+          {{/each}}
           <EditCategoryTab
             @panels={{@controller.panels}}
             @selectedTab={{@controller.selectedTab}}
@@ -93,15 +117,33 @@ export default class EditCategoryTabsHorizontalTemplate extends Component {
           {{/if}}
 
           {{#each registeredEditCategoryTabs as |pluginTab|}}
-            {{#if (this.evaluateTabCondition pluginTab @controller)}}
-              <EditCategoryTab
-                @panels={{@controller.panels}}
-                @selectedTab={{@controller.selectedTab}}
-                @params={{@controller.parentParams}}
-                @tab={{pluginTab.id}}
-                @tabTitle={{pluginTab.name}}
-              />
-            {{/if}}
+            {{#unless pluginTab.primary}}
+              {{#if (this.evaluateTabCondition pluginTab @controller)}}
+                <EditCategoryTab
+                  @panels={{@controller.panels}}
+                  @selectedTab={{@controller.selectedTab}}
+                  @params={{@controller.parentParams}}
+                  @tab={{pluginTab.id}}
+                  @tabTitle={{pluginTab.name}}
+                />
+              {{/if}}
+            {{/unless}}
+          {{/each}}
+        {{else if this.hasPrimaryTabs}}
+          <EditCategoryTab
+            @panels={{@controller.panels}}
+            @selectedTab={{@controller.selectedTab}}
+            @params={{@controller.parentParams}}
+            @tab="general"
+          />
+          {{#each this.visiblePrimaryTabs as |pluginTab|}}
+            <EditCategoryTab
+              @panels={{@controller.panels}}
+              @selectedTab={{@controller.selectedTab}}
+              @params={{@controller.parentParams}}
+              @tab={{pluginTab.id}}
+              @tabTitle={{pluginTab.name}}
+            />
           {{/each}}
         {{/if}}
       </:tabs>
diff --git a/frontend/discourse/app/components/discovery/navigation.gjs b/frontend/discourse/app/components/discovery/navigation.gjs
index 3c7182254b07a..b3020758c5bda 100644
--- a/frontend/discourse/app/components/discovery/navigation.gjs
+++ b/frontend/discourse/app/components/discovery/navigation.gjs
@@ -19,9 +19,10 @@ import DiscourseURL from "discourse/lib/url";
 import Category from "discourse/models/category";
 
 export default class DiscoveryNavigation extends Component {
-  @service router;
+  @service categoryTypeChooser;
   @service currentUser;
   @service modal;
+  @service router;
 
   get filterMode() {
     return calculateFilterMode({
@@ -63,7 +64,7 @@ export default class DiscoveryNavigation extends Component {
 
   @action
   createCategory() {
-    this.router.transitionTo("newCategory");
+    this.categoryTypeChooser.createCategory();
   }
 
   @action
diff --git a/frontend/discourse/app/components/modal/choose-category-type.gjs b/frontend/discourse/app/components/modal/choose-category-type.gjs
new file mode 100644
index 0000000000000..32c9864fdddb9
--- /dev/null
+++ b/frontend/discourse/app/components/modal/choose-category-type.gjs
@@ -0,0 +1,84 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
+import DModal from "discourse/components/d-modal";
+import icon from "discourse/helpers/d-icon";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { bind } from "discourse/lib/decorators";
+import { i18n } from "discourse-i18n";
+
+export default class ChooseCategoryType extends Component {
+  @tracked loading = true;
+  @tracked types = [];
+
+  @bind
+  async loadTypes() {
+    try {
+      const result = await ajax("/categories/types");
+      this.types = result.types;
+    } catch (e) {
+      popupAjaxError(e);
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  @action
+  selectType(type) {
+    if (!type.available) {
+      return;
+    }
+    this.args.closeModal({
+      categoryType: type.id,
+      categoryTypeName: type.name,
+      categoryTypeSchema: type.configuration_schema,
+    });
+  }
+
+  <template>
+    <DModal
+      @title={{i18n "category.choose_type.title"}}
+      @closeModal={{@closeModal}}
+      {{didInsert this.loadTypes}}
+      class="choose-category-type-modal"
+    >
+      <:body>
+        <ConditionalLoadingSpinner @condition={{this.loading}}>
+          <div class="choose-category-type-modal__grid">
+            {{#each this.types as |type|}}
+              <button
+                type="button"
+                class="choose-category-type-modal__card
+                  {{unless type.available '--unavailable'}}"
+                disabled={{unless type.available true}}
+                {{on "click" (fn this.selectType type)}}
+              >
+                <span class="choose-category-type-modal__card-icon">
+                  {{icon type.icon}}
+                </span>
+                <span class="choose-category-type-modal__card-name">
+                  {{type.name}}
+                </span>
+                {{#if type.description}}
+                  <span class="choose-category-type-modal__card-description">
+                    {{type.description}}
+                  </span>
+                {{/if}}
+                {{#unless type.available}}
+                  <span class="choose-category-type-modal__card-badge">
+                    {{i18n "category.choose_type.requires_plugin"}}
+                  </span>
+                {{/unless}}
+              </button>
+            {{/each}}
+          </div>
+        </ConditionalLoadingSpinner>
+      </:body>
+    </DModal>
+  </template>
+}
diff --git a/frontend/discourse/app/components/sidebar/user/categories-section.gjs b/frontend/discourse/app/components/sidebar/user/categories-section.gjs
index 21776abcca1f8..a1cde80aa0ac3 100644
--- a/frontend/discourse/app/components/sidebar/user/categories-section.gjs
+++ b/frontend/discourse/app/components/sidebar/user/categories-section.gjs
@@ -16,10 +16,11 @@ export const REFRESH_COUNTS_APP_EVENT_NAME =
 
 export default class SidebarUserCategoriesSection extends CommonCategoriesSection {
   @service appEvents;
+  @service categoryTypeChooser;
   @service currentUser;
   @service modal;
   @service navigationMenu;
-  @service router;
+  @service siteSettings;
 
   constructor() {
     super(...arguments);
@@ -67,6 +68,10 @@ export default class SidebarUserCategoriesSection extends CommonCategoriesSectio
     return hasDefaultSidebarCategories(this.siteSettings);
   }
 
+  createCategory() {
+    this.categoryTypeChooser.createCategory();
+  }
+
   @cached
   get headerActions() {
     const actions = [];
@@ -74,7 +79,7 @@ export default class SidebarUserCategoriesSection extends CommonCategoriesSectio
     if (this.currentUser.can_create_category) {
       actions.push({
         id: "new-category",
-        action: () => this.router.transitionTo("newCategory"),
+        action: () => this.createCategory(),
         title: i18n("sidebar.sections.categories.header_action_new"),
       });
     }
diff --git a/frontend/discourse/app/lib/plugin-api.gjs b/frontend/discourse/app/lib/plugin-api.gjs
index de9a55a11877d..05eed01de2b39 100644
--- a/frontend/discourse/app/lib/plugin-api.gjs
+++ b/frontend/discourse/app/lib/plugin-api.gjs
@@ -3375,6 +3375,7 @@ class _PluginApi {
    * @param {string} tab.name - display name shown on the tab
    * @param {Class} tab.component - Glimmer component to render as tab content
    * @param {Function} [tab.condition] - optional callback returning boolean to conditionally show the tab
+   * @param {boolean} [tab.primary] - if true, tab is shown without requiring "Advanced settings" toggle
    */
   registerEditCategoryTab(tab) {
     registeredEditCategoryTabs.push(tab);
diff --git a/frontend/discourse/app/models/category.js b/frontend/discourse/app/models/category.js
index 7ceb9b73142b4..b39d4d3648dac 100644
--- a/frontend/discourse/app/models/category.js
+++ b/frontend/discourse/app/models/category.js
@@ -829,6 +829,9 @@ export default class Category extends RestModel {
         ...(this.siteSettings.content_localization_enabled && {
           category_localizations: this.localizations,
         }),
+        ...(!id && this.category_type
+          ? { category_type: this.category_type }
+          : {}),
         ...this._pluginSaveProperties(),
       }),
       type: id ? "PUT" : "POST",
diff --git a/frontend/discourse/app/services/category-type-chooser.js b/frontend/discourse/app/services/category-type-chooser.js
new file mode 100644
index 0000000000000..6ee7952dc91a7
--- /dev/null
+++ b/frontend/discourse/app/services/category-type-chooser.js
@@ -0,0 +1,43 @@
+import Service, { service } from "@ember/service";
+import ChooseCategoryType from "discourse/components/modal/choose-category-type";
+
+export default class CategoryTypeChooser extends Service {
+  @service modal;
+  @service router;
+  @service siteSettings;
+
+  _selection = null;
+
+  choose(typeId, typeName, typeSchema) {
+    this._selection = { type: typeId, typeName, typeSchema };
+  }
+
+  consume() {
+    const selection = this._selection;
+    this._selection = null;
+    return selection;
+  }
+
+  async createCategory() {
+    if (
+      this.siteSettings.enable_simplified_category_creation &&
+      this.siteSettings.enable_category_type_setup
+    ) {
+      const result = await this.modal.show(ChooseCategoryType);
+      if (!result?.categoryType) {
+        return;
+      }
+      this.choose(
+        result.categoryType,
+        result.categoryTypeName,
+        result.categoryTypeSchema
+      );
+    }
+
+    if (this.router.currentRouteName === "newCategory") {
+      this.router.refresh();
+    } else {
+      this.router.transitionTo("newCategory");
+    }
+  }
+}
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 967d65dda1e2e..fe0d6489fcc4e 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -400,6 +400,10 @@ def register_preloaded_category_custom_fields(field)
     reloadable_patch { Site.preloaded_category_custom_fields << field }
   end
 
+  def register_category_type(klass)
+    Categories::TypeRegistry.register(klass, plugin_identifier: self.metadata.name)
+  end
+
   def register_problem_check(klass)
     DiscoursePluginRegistry.register_problem_check(klass, self)
   end
diff --git a/plugins/chat/assets/javascripts/discourse/initializers/chat-category-tab.js b/plugins/chat/assets/javascripts/discourse/initializers/chat-category-tab.js
index d203f1b6b37eb..5db4b06b301e3 100644
--- a/plugins/chat/assets/javascripts/discourse/initializers/chat-category-tab.js
+++ b/plugins/chat/assets/javascripts/discourse/initializers/chat-category-tab.js
@@ -12,7 +12,9 @@ export default {
         name: i18n("chat.edit_category.tab_title"),
         component: CategoryChat,
         condition: ({ category, siteSettings }) =>
-          siteSettings.chat_enabled && category.id,
+          siteSettings.chat_enabled &&
+          category.id &&
+          siteSettings.enable_simplified_category_creation,
       });
     });
   },
diff --git a/plugins/discourse-solved/app/models/discourse_solved/category_type.rb b/plugins/discourse-solved/app/models/discourse_solved/category_type.rb
new file mode 100644
index 0000000000000..558356ba65fcd
--- /dev/null
+++ b/plugins/discourse-solved/app/models/discourse_solved/category_type.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module DiscourseSolved
+  class CategoryType < Categories::Types::Base
+    type_id :support
+
+    class << self
+      def enable_plugin
+        SiteSetting.solved_enabled = true
+      end
+
+      def configure_category(category, configuration_values: {})
+        category.custom_fields[DiscourseSolved::ENABLE_ACCEPTED_ANSWERS_CUSTOM_FIELD] = "true"
+
+        configuration_schema[:category_settings]&.each do |field_name, config|
+          value = configuration_values.fetch(field_name.to_s, config[:default])
+          category.custom_fields[field_name.to_s] = value
+        end
+        category.save_custom_fields
+        DiscourseSolved::AcceptedAnswerCache.reset_accepted_answer_cache
+      end
+
+      def configuration_schema
+        {
+          site_settings: {
+            show_filter_by_solved_status: true,
+            notify_on_staff_accept_solved: true,
+            empty_box_on_unsolved: true,
+          },
+          category_settings: {
+            solved_topics_auto_close_hours: {
+              default: 48,
+              type: :integer,
+              label: I18n.t("discourse_solved.category_type.solved_topics_auto_close_hours.label"),
+              description:
+                I18n.t("discourse_solved.category_type.solved_topics_auto_close_hours.description"),
+            },
+          },
+        }
+      end
+
+      def icon
+        "square-check"
+      end
+    end
+  end
+end
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/upsert-category-support.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/upsert-category-support.gjs
new file mode 100644
index 0000000000000..d0e7e99c7676a
--- /dev/null
+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/upsert-category-support.gjs
@@ -0,0 +1,62 @@
+import Component from "@glimmer/component";
+import { eq } from "discourse/truth-helpers";
+
+export default class UpsertCategorySupport extends Component {
+  constructor() {
+    super(...arguments);
+    this.applyDefaults();
+  }
+
+  get schema() {
+    return this.args.category?.category_type_schema ?? [];
+  }
+
+  applyDefaults() {
+    for (const entry of this.schema) {
+      if (
+        entry.default !== undefined &&
+        this.args.transientData?.[entry.key] === undefined
+      ) {
+        this.args.form.set(entry.key, entry.default);
+      }
+    }
+  }
+
+  <template>
+    <@form.Section
+      class="edit-category-tab edit-category-tab-support
+        {{if (eq @selectedTab 'support') 'active'}}"
+    >
+      {{#each this.schema as |entry|}}
+        {{#if (eq entry.type "bool")}}
+          <@form.Field
+            @name={{entry.key}}
+            @title={{entry.label}}
+            @format="large"
+            as |field|
+          >
+            <field.Checkbox />
+          </@form.Field>
+        {{else if (eq entry.type "integer")}}
+          <@form.Field
+            @name={{entry.key}}
+            @title={{entry.label}}
+            @format="large"
+            as |field|
+          >
+            <field.Input @type="number" />
+          </@form.Field>
+        {{else}}
+          <@form.Field
+            @name={{entry.key}}
+            @title={{entry.label}}
+            @format="large"
+            as |field|
+          >
+            <field.Input />
+          </@form.Field>
+        {{/if}}
+      {{/each}}
+    </@form.Section>
+  </template>
+}
diff --git a/plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-type-tab.js b/plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-type-tab.js
new file mode 100644
index 0000000000000..e79b605fdc91a
--- /dev/null
+++ b/plugins/discourse-solved/assets/javascripts/discourse/initializers/solved-category-type-tab.js
@@ -0,0 +1,23 @@
+import { withPluginApi } from "discourse/lib/plugin-api";
+import UpsertCategorySupport from "../components/upsert-category-support";
+
+export default {
+  name: "solved-category-type-tab",
+
+  initialize() {
+    withPluginApi((api) => {
+      api.registerEditCategoryTab({
+        id: "support",
+        name: "Support",
+        primary: true,
+        component: UpsertCategorySupport,
+        condition: ({ category, siteSettings }) =>
+          // TODO (martin) We only populate the category_type on category creation
+          // at the moment, we need to do the same in the serializer on edit
+          category.get("category_type") === "support" &&
+          siteSettings.enable_category_type_setup &&
+          siteSettings.enable_simplified_category_creation,
+      });
+    });
+  },
+};
diff --git a/plugins/discourse-solved/config/locales/server.en.yml b/plugins/discourse-solved/config/locales/server.en.yml
index 5daa66314d625..54b6a34e24d97 100644
--- a/plugins/discourse-solved/config/locales/server.en.yml
+++ b/plugins/discourse-solved/config/locales/server.en.yml
@@ -1,6 +1,17 @@
 en:
   accepted_answer: "Accepted Answer"
 
+  category_types:
+    support:
+      name: "Support"
+      description: "Q&A category where answers can be marked as solutions"
+
+  discourse_solved:
+    category_type:
+      solved_topics_auto_close_hours:
+        label: "Auto close solved topics (hours)"
+        description: "Automatically close topic after this many hours once marked as solved. Set to 0 to disable."
+
   site_settings:
     solved_enabled: "Enable solved plugin, allow users to select solutions for topics"
     allow_solved_on_all_topics: "Allow users to select solutions on all topics (when unchecked, solutions can be enabled per category or tag)"
diff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rb
index caf6d8c6ed9a9..d6041eb918ca7 100644
--- a/plugins/discourse-solved/plugin.rb
+++ b/plugins/discourse-solved/plugin.rb
@@ -24,6 +24,8 @@ module ::DiscourseSolved
 require_relative "lib/discourse_solved/engine"
 
 after_initialize do
+  register_category_type(DiscourseSolved::CategoryType)
+
   SeedFu.fixture_paths << Rails.root.join("plugins", "discourse-solved", "db", "fixtures").to_s
 
   module ::DiscourseSolved
diff --git a/plugins/discourse-solved/spec/models/discourse_solved/category_type_spec.rb b/plugins/discourse-solved/spec/models/discourse_solved/category_type_spec.rb
new file mode 100644
index 0000000000000..f7f1cea1e47f6
--- /dev/null
+++ b/plugins/discourse-solved/spec/models/discourse_solved/category_type_spec.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe DiscourseSolved::CategoryType do
+  fab!(:category)
+
+  describe ".enable_plugin" do
+    before { SiteSetting.solved_enabled = false }
+
+    it "enables the solved plugin" do
+      described_class.enable_plugin
+      expect(SiteSetting.solved_enabled).to eq(true)
+    end
+  end
+
+  describe ".configure_site_settings" do
+    before do
+      SiteSetting.show_filter_by_solved_status = false
+      SiteSetting.notify_on_staff_accept_solved = false
+      SiteSetting.empty_box_on_unsolved = false
+    end
+
+    it "enables sensible defaults for support categories" do
+      described_class.configure_site_settings(category)
+
+      expect(SiteSetting.show_filter_by_solved_status).to eq(true)
+      expect(SiteSetting.notify_on_staff_accept_solved).to eq(true)
+      expect(SiteSetting.empty_box_on_unsolved).to eq(true)
+    end
+
+    it "uses provided configuration_values over defaults" do
+      described_class.configure_site_settings(
+        category,
+        configuration_values: {
+          "show_filter_by_solved_status" => false,
+          "empty_box_on_unsolved" => false,
+        },
+      )
+
+      expect(SiteSetting.show_filter_by_solved_status).to eq(false)
+      expect(SiteSetting.notify_on_staff_accept_solved).to eq(true)
+      expect(SiteSetting.empty_box_on_unsolved).to eq(false)
+    end
+  end
+
+  describe ".configure_category" do
+    fab!(:admin)
+    fab!(:topic) { Fabricate(:topic, category: category) }
+    fab!(:reply) { Fabricate(:post, topic: topic, post_number: 2) }
+
+    before do
+      SiteSetting.solved_enabled = true
+      DiscourseSolved::AcceptedAnswerCache.reset_accepted_answer_cache
+    end
+
+    it "allows accepting answers on the category" do
+      expect(Guardian.new(admin).can_accept_answer?(topic, reply)).to eq(false)
+
+      described_class.configure_category(category)
+
+      expect(Guardian.new(admin).can_accept_answer?(topic, reply)).to eq(true)
+    end
+
+    it "sets default auto-close hours" do
+      described_class.configure_category(category)
+
+      expect(category.custom_fields["solved_topics_auto_close_hours"]).to eq("48")
+    end
+
+    it "uses provided configuration_values for auto-close hours" do
+      described_class.configure_category(
+        category,
+        configuration_values: {
+          "solved_topics_auto_close_hours" => 72,
+        },
+      )
+
+      expect(category.custom_fields["solved_topics_auto_close_hours"]).to eq("72")
+    end
+  end
+end
diff --git a/spec/services/categories/configure_spec.rb b/spec/services/categories/configure_spec.rb
new file mode 100644
index 0000000000000..e5d3986730d1c
--- /dev/null
+++ b/spec/services/categories/configure_spec.rb
@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+RSpec.describe Categories::Configure do
+  fab!(:admin)
+  fab!(:category)
+
+  let(:guardian) { Guardian.new(admin) }
+
+  describe ".call" do
+    context "with valid params" do
+      it "configures the discussion type successfully" do
+        result =
+          described_class.call(
+            guardian:,
+            params: {
+              category_id: category.id,
+              category_type: "discussion",
+            },
+          )
+
+        expect(result).to be_success
+      end
+
+      it "logs a staff action" do
+        described_class.call(
+          guardian:,
+          params: {
+            category_id: category.id,
+            category_type: "discussion",
+          },
+        )
+
+        log =
+          UserHistory.find_by(
+            acting_user_id: admin.id,
+            action: UserHistory.actions[:custom_staff],
+            custom_type: "configure_category_type",
+          )
+        expect(log).to be_present
+        expect(log.details).to include("category_type")
+      end
+    end
+
+    context "with invalid category_id" do
+      it "fails with model not found" do
+        result =
+          described_class.call(guardian:, params: { category_id: -1, category_type: "discussion" })
+
+        expect(result).to be_failure
+        expect(result["result.model.category"].not_found).to be true
+      end
+    end
+
+    context "with invalid category_type" do
+      it "fails with contract error" do
+        result =
+          described_class.call(
+            guardian:,
+            params: {
+              category_id: category.id,
+              category_type: "invalid_type",
+            },
+          )
+
+        expect(result).to be_failure
+        expect(result["result.contract.default"].errors[:category_type]).to be_present
+      end
+    end
+
+    context "when user cannot modify category" do
+      fab!(:user)
+      let(:guardian) { Guardian.new(user) }
+
+      it "fails with policy error" do
+        result =
+          described_class.call(
+            guardian:,
+            params: {
+              category_id: category.id,
+              category_type: "discussion",
+            },
+          )
+
+        expect(result).to be_failure
+        expect(result["result.policy.can_modify_category"]).to be_failure
+      end
+    end
+  end
+end
diff --git a/spec/services/categories/type_registry_spec.rb b/spec/services/categories/type_registry_spec.rb
new file mode 100644
index 0000000000000..4268e0a1a86ca
--- /dev/null
+++ b/spec/services/categories/type_registry_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+RSpec.describe Categories::TypeRegistry do
+  describe ".all" do
+    it "includes the discussion type" do
+      expect(described_class.all).to include(discussion: Categories::Types::Discussion)
+    end
+  end
+
+  describe ".get" do
+    it "returns the type class for a valid type" do
+      expect(described_class.get(:discussion)).to eq(Categories::Types::Discussion)
+    end
+
+    it "returns nil for an unknown type" do
+      expect(described_class.get(:unknown)).to be_nil
+    end
+  end
+
+  describe ".get!" do
+    it "raises ArgumentError for an unknown type" do
+      expect { described_class.get!(:unknown) }.to raise_error(
+        ArgumentError,
+        /Unknown category type/,
+      )
+    end
+  end
+
+  describe ".valid?" do
+    it "returns true for a valid type" do
+      expect(described_class.valid?(:discussion)).to be true
+    end
+
+    it "returns false for an unknown type" do
+      expect(described_class.valid?(:unknown)).to be false
+    end
+  end
+
+  describe ".list" do
+    it "returns metadata including the discussion type" do
+      discussion = described_class.list.find { |t| t[:id] == :discussion }
+
+      expect(discussion).to include(icon: "comments", available: true)
+    end
+  end
+
+  describe ".register" do
+    let(:test_type) do
+      Class.new(Categories::Types::Base).tap { |t| t.type_id(:test_registry_type) }
+    end
+
+    after { described_class.all.delete(:test_registry_type) }
+
+    it "registers and exposes a new type" do
+      described_class.register(test_type)
+
+      expect(described_class.get(:test_registry_type)).to eq(test_type)
+      expect(described_class.valid?(:test_registry_type)).to be true
+    end
+
+    it "raises when a type_id is already registered by another owner" do
+      described_class.register(test_type, plugin_identifier: "plugin-a")
+
+      other_type = Class.new(Categories::Types::Base).tap { |t| t.type_id(:test_registry_type) }
+
+      expect { described_class.register(other_type, plugin_identifier: "plugin-b") }.to raise_error(
+        ArgumentError,
+        /already registered/,
+      )
+    end
+  end
+end
diff --git a/spec/services/categories/types/base_spec.rb b/spec/services/categories/types/base_spec.rb
new file mode 100644
index 0000000000000..7bf3f0085abb7
--- /dev/null
+++ b/spec/services/categories/types/base_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+RSpec.describe Categories::Types::Base do
+  describe ".type_id" do
+    it "can be explicitly set" do
+      test_type = Class.new(described_class)
+      test_type.type_id(:custom)
+
+      expect(test_type.type_id).to eq(:custom)
+    end
+  end
+
+  describe ".metadata" do
+    it "returns type information including configuration_schema" do
+      expect(described_class.metadata).to include(
+        id: :base,
+        icon: "comments",
+        available: true,
+        configuration_schema: [],
+      )
+    end
+  end
+
+  describe ".configure_site_settings" do
+    it "applies site settings from configuration_schema defaults" do
+      test_type =
+        Class.new(described_class) do
+          type_id :test_configure
+
+          def self.configuration_schema
+            { site_settings: { title: "Configured Forum" } }
+          end
+        end
+
+      test_type.configure_site_settings(nil)
+      expect(SiteSetting.title).to eq("Configured Forum")
+    end
+
+    it "prefers configuration_values over defaults" do
+      test_type =
+        Class.new(described_class) do
+          type_id :test_configure_override
+
+          def self.configuration_schema
+            { site_settings: { title: "Default" } }
+          end
+        end
+
+      test_type.configure_site_settings(nil, configuration_values: { "title" => "Override" })
+      expect(SiteSetting.title).to eq("Override")
+    end
+  end
+
+  describe ".resolved_configuration_schema" do
+    it "resolves site setting metadata" do
+      test_type =
+        Class.new(described_class) do
+          type_id :test_site_settings
+
+          def self.configuration_schema
+            { site_settings: { title: "My Forum" } }
+          end
+        end
+
+      schema = test_type.send(:resolved_configuration_schema)
+      expect(schema.length).to eq(1)
+
+      entry = schema.first
+      expect(entry[:key]).to eq("title")
+      expect(entry[:default]).to eq("My Forum")
+      expect(entry[:type]).to be_present
+      expect(entry[:label]).to be_present
+    end
+
+    it "passes through category settings" do
+      test_type =
+        Class.new(described_class) do
+          type_id :test_category_settings
+
+          def self.configuration_schema
+            { category_settings: { my_field: { default: 42, type: :integer, label: "My Field" } } }
+          end
+        end
+
+      schema = test_type.send(:resolved_configuration_schema)
+      expect(schema.length).to eq(1)
+
+      entry = schema.first
+      expect(entry[:key]).to eq("my_field")
+      expect(entry[:default]).to eq(42)
+      expect(entry[:type]).to eq("integer")
+      expect(entry[:label]).to eq("My Field")
+    end
+  end
+end

From 58af64e217ce92abf270bcf15e57f483be989f8d Mon Sep 17 00:00:00 2001
From: David Battersby <info@davidbattersby.com>
Date: Fri, 27 Feb 2026 12:04:10 +0400
Subject: [PATCH 135/168] DEV: remove assign entrypoint from solved plugin
 (#38060)

Moves the assign code that was in Discourse Solved into the assigned
plugin, which now runs if Discourse Solved is enabled. Most of this is
just moving the code across but it also means moving site settings and
translations too.
---
 .../config/locales/server.en.yml              |   3 +
 plugins/discourse-assign/config/settings.yml  |   8 ++
 plugins/discourse-assign/plugin.rb            |  37 +++++
 .../integration/solved_integration_spec.rb    | 127 ++++++++++++++++++
 .../config/locales/server.en.yml              |   3 -
 plugins/discourse-solved/config/settings.yml  |   8 --
 .../lib/discourse_assign/entry_point.rb       |  45 -------
 plugins/discourse-solved/plugin.rb            |   1 -
 .../spec/integration/solved_spec.rb           | 126 -----------------
 9 files changed, 175 insertions(+), 183 deletions(-)
 create mode 100644 plugins/discourse-assign/spec/integration/solved_integration_spec.rb
 delete mode 100644 plugins/discourse-solved/lib/discourse_assign/entry_point.rb

diff --git a/plugins/discourse-assign/config/locales/server.en.yml b/plugins/discourse-assign/config/locales/server.en.yml
index 6d0ac6fb5126d..1f2f47baa7c11 100644
--- a/plugins/discourse-assign/config/locales/server.en.yml
+++ b/plugins/discourse-assign/config/locales/server.en.yml
@@ -19,6 +19,9 @@ en:
     assign_allowed_on_groups: "Users in these groups are allowed to assign topics and can be assigned topics."
     enable_assign_status: "Add a customizable status field to every assignment."
     assign_statuses: "List of statuses available to each assignment. The first status is the default status applied to every new assignment."
+    ignore_solved_topics_in_assigned_reminder: "Prevent reminders for assignments from including solved topics. Only relevant when using the discourse-solved plugin."
+    assignment_status_on_solve: "When a topic is solved update all assignments to this status"
+    assignment_status_on_unsolve: "When a topic is unsolved update all assignments to this status"
     errors:
       assign_statuses:
         too_few: "There must be at least two different statuses available."
diff --git a/plugins/discourse-assign/config/settings.yml b/plugins/discourse-assign/config/settings.yml
index 795e0f0f2abe0..f6f5c5294090c 100644
--- a/plugins/discourse-assign/config/settings.yml
+++ b/plugins/discourse-assign/config/settings.yml
@@ -47,3 +47,11 @@ discourse_assign:
     default: "New|In Progress|Done"
     allow_any: true
     validator: AssignStatusesValidator
+  ignore_solved_topics_in_assigned_reminder:
+    default: false
+  assignment_status_on_solve:
+    type: string
+    default: ""
+  assignment_status_on_unsolve:
+    type: string
+    default: ""
diff --git a/plugins/discourse-assign/plugin.rb b/plugins/discourse-assign/plugin.rb
index 6abee802201bb..41f93012c9e91 100644
--- a/plugins/discourse-assign/plugin.rb
+++ b/plugins/discourse-assign/plugin.rb
@@ -1012,4 +1012,41 @@ module ::DiscourseAssign
       end
     end
   end
+
+  if defined?(DiscourseSolved)
+    register_modifier(:assigns_reminder_assigned_topics_query) do |query|
+      next query if !SiteSetting.ignore_solved_topics_in_assigned_reminder
+      query.where.not(id: DiscourseSolved::SolvedTopic.select(:topic_id))
+    end
+
+    register_modifier(:assigned_count_for_user_query) do |query, user|
+      next query if !SiteSetting.ignore_solved_topics_in_assigned_reminder
+      next query if SiteSetting.assignment_status_on_solve.blank?
+      query.where.not(status: SiteSetting.assignment_status_on_solve)
+    end
+
+    on(:accepted_solution) do |post|
+      next if SiteSetting.assignment_status_on_solve.blank?
+      assignments = Assignment.includes(:target).where(topic: post.topic)
+      assignments.each do |assignment|
+        assigned_user = User.find_by(id: assignment.assigned_to_id)
+        Assigner.new(assignment.target, assigned_user).assign(
+          assigned_user,
+          status: SiteSetting.assignment_status_on_solve,
+        )
+      end
+    end
+
+    on(:unaccepted_solution) do |post|
+      next if SiteSetting.assignment_status_on_unsolve.blank?
+      assignments = Assignment.includes(:target).where(topic: post.topic)
+      assignments.each do |assignment|
+        assigned_user = User.find_by(id: assignment.assigned_to_id)
+        Assigner.new(assignment.target, assigned_user).assign(
+          assigned_user,
+          status: SiteSetting.assignment_status_on_unsolve,
+        )
+      end
+    end
+  end
 end
diff --git a/plugins/discourse-assign/spec/integration/solved_integration_spec.rb b/plugins/discourse-assign/spec/integration/solved_integration_spec.rb
new file mode 100644
index 0000000000000..fec9c9e947829
--- /dev/null
+++ b/plugins/discourse-assign/spec/integration/solved_integration_spec.rb
@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+RSpec.describe "Solved integration", if: defined?(DiscourseSolved) do
+  fab!(:topic)
+  fab!(:post) { Fabricate(:post, topic: topic) }
+  fab!(:user)
+  fab!(:group)
+
+  before do
+    SiteSetting.solved_enabled = true
+    SiteSetting.assign_enabled = true
+    SiteSetting.enable_assign_status = true
+    SiteSetting.assign_allowed_on_groups = "#{group.id}"
+    SiteSetting.assigns_public = true
+    SiteSetting.assignment_status_on_solve = "Done"
+    SiteSetting.assignment_status_on_unsolve = "New"
+    SiteSetting.ignore_solved_topics_in_assigned_reminder = false
+    group.add(post.acting_user)
+    group.add(user)
+  end
+
+  describe "updating assignment status on solve" do
+    it "updates all assignments to assignment_status_on_solve status when a post is accepted" do
+      assigner = Assigner.new(topic, user)
+      result = assigner.assign(user)
+      expect(result[:success]).to eq(true)
+
+      expect(topic.assignment.status).to eq("New")
+      DiscourseSolved.accept_answer!(post, user)
+      topic.reload
+
+      expect(topic.solved.answer_post_id).to eq(post.id)
+      expect(topic.assignment.reload.status).to eq("Done")
+    end
+
+    it "updates all assignments to assignment_status_on_unsolve status when a post is unaccepted" do
+      assigner = Assigner.new(topic, user)
+      result = assigner.assign(user)
+      expect(result[:success]).to eq(true)
+
+      DiscourseSolved.accept_answer!(post, user)
+
+      expect(topic.assignment.reload.status).to eq("Done")
+
+      DiscourseSolved.unaccept_answer!(post)
+
+      expect(topic.assignment.reload.status).to eq("New")
+    end
+
+    it "does not update the assignee when a post is accepted" do
+      user_2 = Fabricate(:user)
+      user_3 = Fabricate(:user)
+      group.add(user)
+      group.add(user_2)
+      group.add(user_3)
+
+      topic_question = Fabricate(:topic, user: user)
+
+      Fabricate(:post, topic: topic_question, user: user)
+      Fabricate(:post, topic: topic_question, user: user_2)
+
+      result = Assigner.new(topic_question, user_2).assign(user_2)
+      expect(result[:success]).to eq(true)
+
+      post_response = Fabricate(:post, topic: topic_question, user: user_3)
+      Assigner.new(post_response, user_3).assign(user_3)
+
+      DiscourseSolved.accept_answer!(post_response, user)
+
+      expect(topic_question.assignment.assigned_to_id).to eq(user_2.id)
+      expect(post_response.assignment.assigned_to_id).to eq(user_3.id)
+      DiscourseSolved.unaccept_answer!(post_response)
+
+      expect(topic_question.assignment.assigned_to_id).to eq(user_2.id)
+      expect(post_response.assignment.assigned_to_id).to eq(user_3.id)
+    end
+
+    describe "assigned topic reminder" do
+      it "excludes solved topics when ignore_solved_topics_in_assigned_reminder is true" do
+        other_topic = Fabricate(:topic, title: "Topic that should be there")
+        other_post = Fabricate(:post, topic: other_topic, user: user)
+
+        other_topic2 = Fabricate(:topic, title: "Topic that should be there2")
+        other_post2 = Fabricate(:post, topic: other_topic2, user: user)
+
+        Assigner.new(other_topic, user).assign(user)
+        Assigner.new(other_topic2, user).assign(user)
+
+        reminder = PendingAssignsReminder.new
+        topics = reminder.send(:assigned_topics, user, order: :asc)
+        expect(topics.to_a.length).to eq(2)
+
+        DiscourseSolved.accept_answer!(other_post2, Discourse.system_user)
+        topics = reminder.send(:assigned_topics, user, order: :asc)
+        expect(topics.to_a.length).to eq(2)
+        expect(topics).to include(other_topic2)
+
+        SiteSetting.ignore_solved_topics_in_assigned_reminder = true
+        topics = reminder.send(:assigned_topics, user, order: :asc)
+        expect(topics.to_a.length).to eq(1)
+        expect(topics).not_to include(other_topic2)
+        expect(topics).to include(other_topic)
+      end
+    end
+
+    describe "assigned count for user" do
+      it "does not count solved topics using assignment_status_on_solve status" do
+        SiteSetting.ignore_solved_topics_in_assigned_reminder = true
+
+        other_topic = Fabricate(:topic, title: "Topic that should be there")
+        other_post = Fabricate(:post, topic: other_topic, user: user)
+
+        other_topic2 = Fabricate(:topic, title: "Topic that should be there2")
+        other_post2 = Fabricate(:post, topic: other_topic2, user: user)
+
+        Assigner.new(other_topic, user).assign(user)
+        Assigner.new(other_topic2, user).assign(user)
+
+        reminder = PendingAssignsReminder.new
+        expect(reminder.send(:assigned_count_for, user)).to eq(2)
+
+        DiscourseSolved.accept_answer!(other_post2, Discourse.system_user)
+        expect(reminder.send(:assigned_count_for, user)).to eq(1)
+      end
+    end
+  end
+end
diff --git a/plugins/discourse-solved/config/locales/server.en.yml b/plugins/discourse-solved/config/locales/server.en.yml
index 54b6a34e24d97..f6861bc42fbef 100644
--- a/plugins/discourse-solved/config/locales/server.en.yml
+++ b/plugins/discourse-solved/config/locales/server.en.yml
@@ -23,9 +23,6 @@ en:
     solved_topics_auto_close_hours: "Auto close topic (n) hours after the last reply once the topic has been marked as solved. Set to 0 to disable auto closing."
     show_filter_by_solved_status: "Show a dropdown to filter a topic list by solved status."
     notify_on_staff_accept_solved: "Send notification to the topic creator when a post is marked as solution by a staff."
-    ignore_solved_topics_in_assigned_reminder: "Prevent reminders for assignments from including solved topics. Only relevant when using the discourse-assign plugin."
-    assignment_status_on_solve: "When a topic is solved update all assignments to this status"
-    assignment_status_on_unsolve: "When a topic is unsolved update all assignments to this status"
     disable_solved_education_message: "Disable education message for solved topics."
     accept_solutions_topic_author: "Allow the topic author to accept a solution."
     solved_add_schema_markup: "Add QAPage schema markup to HTML."
diff --git a/plugins/discourse-solved/config/settings.yml b/plugins/discourse-solved/config/settings.yml
index 5a63ee1173400..c328bdfa821b8 100644
--- a/plugins/discourse-solved/config/settings.yml
+++ b/plugins/discourse-solved/config/settings.yml
@@ -41,14 +41,6 @@ discourse_solved:
     client: true
   notify_on_staff_accept_solved:
     default: false
-  ignore_solved_topics_in_assigned_reminder:
-    default: false
-  assignment_status_on_solve:
-    type: string
-    default: ""
-  assignment_status_on_unsolve:
-    type: string
-    default: ""
   disable_solved_education_message:
     default: false
   accept_solutions_topic_author:
diff --git a/plugins/discourse-solved/lib/discourse_assign/entry_point.rb b/plugins/discourse-solved/lib/discourse_assign/entry_point.rb
deleted file mode 100644
index 12821f6aa6f55..0000000000000
--- a/plugins/discourse-solved/lib/discourse_assign/entry_point.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module DiscourseAssign
-  class EntryPoint
-    # TODO: These four plugin api usages should ideally be in the assign plugin, not the solved plugin.
-    # They have been moved here from plugin.rb as part of the custom fields migration.
-
-    def self.inject(plugin)
-      plugin.register_modifier(:assigns_reminder_assigned_topics_query) do |query|
-        next query if !SiteSetting.ignore_solved_topics_in_assigned_reminder
-        query.where.not(id: DiscourseSolved::SolvedTopic.select(:topic_id))
-      end
-
-      plugin.register_modifier(:assigned_count_for_user_query) do |query, user|
-        next query if !SiteSetting.ignore_solved_topics_in_assigned_reminder
-        next query if SiteSetting.assignment_status_on_solve.blank?
-        query.where.not(status: SiteSetting.assignment_status_on_solve)
-      end
-
-      plugin.on(:accepted_solution) do |post|
-        next if SiteSetting.assignment_status_on_solve.blank?
-        assignments = Assignment.includes(:target).where(topic: post.topic)
-        assignments.each do |assignment|
-          assigned_user = User.find_by(id: assignment.assigned_to_id)
-          Assigner.new(assignment.target, assigned_user).assign(
-            assigned_user,
-            status: SiteSetting.assignment_status_on_solve,
-          )
-        end
-      end
-
-      plugin.on(:unaccepted_solution) do |post|
-        next if SiteSetting.assignment_status_on_unsolve.blank?
-        assignments = Assignment.includes(:target).where(topic: post.topic)
-        assignments.each do |assignment|
-          assigned_user = User.find_by(id: assignment.assigned_to_id)
-          Assigner.new(assignment.target, assigned_user).assign(
-            assigned_user,
-            status: SiteSetting.assignment_status_on_unsolve,
-          )
-        end
-      end
-    end
-  end
-end
diff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rb
index d6041eb918ca7..15e4f7506c601 100644
--- a/plugins/discourse-solved/plugin.rb
+++ b/plugins/discourse-solved/plugin.rb
@@ -388,5 +388,4 @@ def self.skip_db?
 
   DiscourseDev::DiscourseSolved.populate(self)
   DiscourseAutomation::EntryPoint.inject(self) if defined?(DiscourseAutomation)
-  DiscourseAssign::EntryPoint.inject(self) if defined?(DiscourseAssign)
 end
diff --git a/plugins/discourse-solved/spec/integration/solved_spec.rb b/plugins/discourse-solved/spec/integration/solved_spec.rb
index 5ecd0dd4e6fcd..4161a706667df 100644
--- a/plugins/discourse-solved/spec/integration/solved_spec.rb
+++ b/plugins/discourse-solved/spec/integration/solved_spec.rb
@@ -482,132 +482,6 @@
     end
   end
 
-  context "with discourse-assign installed", if: defined?(DiscourseAssign) do
-    let(:admin) { Fabricate(:admin) }
-    fab!(:group)
-    before do
-      SiteSetting.solved_enabled = true
-      SiteSetting.assign_enabled = true
-      SiteSetting.enable_assign_status = true
-      SiteSetting.assign_allowed_on_groups = "#{group.id}"
-      SiteSetting.assigns_public = true
-      SiteSetting.assignment_status_on_solve = "Done"
-      SiteSetting.assignment_status_on_unsolve = "New"
-      SiteSetting.ignore_solved_topics_in_assigned_reminder = false
-      group.add(p1.acting_user)
-      group.add(user)
-
-      sign_in(user)
-    end
-
-    describe "updating assignment status on solve when assignment_status_on_solve is set" do
-      it "update all assignments to this status when a post is accepted" do
-        assigner = Assigner.new(p1.topic, user)
-        result = assigner.assign(user)
-        expect(result[:success]).to eq(true)
-
-        expect(p1.topic.assignment.status).to eq("New")
-        DiscourseSolved.accept_answer!(p1, user)
-        topic.reload
-
-        expect(topic.solved.answer_post_id).to eq(p1.id)
-        expect(p1.topic.assignment.reload.status).to eq("Done")
-      end
-
-      it "update all assignments to this status when a post is unaccepted" do
-        assigner = Assigner.new(p1.topic, user)
-        result = assigner.assign(user)
-        expect(result[:success]).to eq(true)
-
-        DiscourseSolved.accept_answer!(p1, user)
-
-        expect(p1.reload.topic.assignment.reload.status).to eq("Done")
-
-        DiscourseSolved.unaccept_answer!(p1)
-
-        expect(p1.reload.topic.assignment.reload.status).to eq("New")
-      end
-
-      it "does not update the assignee when a post is accepted" do
-        user = Fabricate(:user)
-        user_2 = Fabricate(:user)
-        user_3 = Fabricate(:user)
-        group.add(user)
-        group.add(user_2)
-        group.add(user_3)
-
-        topic_question = Fabricate(:topic, user: user)
-
-        Fabricate(:post, topic: topic_question, user: user)
-        Fabricate(:post, topic: topic_question, user: user_2)
-
-        result = Assigner.new(topic_question, user_2).assign(user_2)
-        expect(result[:success]).to eq(true)
-
-        post_response = Fabricate(:post, topic: topic_question, user: user_3)
-        Assigner.new(post_response, user_3).assign(user_3)
-
-        DiscourseSolved.accept_answer!(post_response, user)
-
-        expect(topic_question.assignment.assigned_to_id).to eq(user_2.id)
-        expect(post_response.assignment.assigned_to_id).to eq(user_3.id)
-        DiscourseSolved.unaccept_answer!(post_response)
-
-        expect(topic_question.assignment.assigned_to_id).to eq(user_2.id)
-        expect(post_response.assignment.assigned_to_id).to eq(user_3.id)
-      end
-
-      describe "assigned topic reminder" do
-        it "excludes solved topics when ignore_solved_topics_in_assigned_reminder is false" do
-          other_topic = Fabricate(:topic, title: "Topic that should be there")
-          post = Fabricate(:post, topic: other_topic, user: user)
-
-          other_topic2 = Fabricate(:topic, title: "Topic that should be there2")
-          post2 = Fabricate(:post, topic: other_topic2, user: user)
-
-          Assigner.new(post.topic, user).assign(user)
-          Assigner.new(post2.topic, user).assign(user)
-
-          reminder = PendingAssignsReminder.new
-          topics = reminder.send(:assigned_topics, user, order: :asc)
-          expect(topics.to_a.length).to eq(2)
-
-          DiscourseSolved.accept_answer!(post2, Discourse.system_user)
-          topics = reminder.send(:assigned_topics, user, order: :asc)
-          expect(topics.to_a.length).to eq(2)
-          expect(topics).to include(other_topic2)
-
-          SiteSetting.ignore_solved_topics_in_assigned_reminder = true
-          topics = reminder.send(:assigned_topics, user, order: :asc)
-          expect(topics.to_a.length).to eq(1)
-          expect(topics).not_to include(other_topic2)
-          expect(topics).to include(other_topic)
-        end
-      end
-
-      describe "assigned count for user" do
-        it "does not count solved topics using assignment_status_on_solve status" do
-          SiteSetting.ignore_solved_topics_in_assigned_reminder = true
-
-          other_topic = Fabricate(:topic, title: "Topic that should be there")
-          post = Fabricate(:post, topic: other_topic, user: user)
-
-          other_topic2 = Fabricate(:topic, title: "Topic that should be there2")
-          post2 = Fabricate(:post, topic: other_topic2, user: user)
-
-          Assigner.new(post.topic, user).assign(user)
-          Assigner.new(post2.topic, user).assign(user)
-
-          reminder = PendingAssignsReminder.new
-          expect(reminder.send(:assigned_count_for, user)).to eq(2)
-
-          DiscourseSolved.accept_answer!(post2, Discourse.system_user)
-          expect(reminder.send(:assigned_count_for, user)).to eq(1)
-        end
-      end
-    end
-  end
-
   describe "#unaccept_answer!" do
     it "works even when the topic has been deleted" do
       user = Fabricate(:user, trust_level: 1)

From bf03c3447bb630f5cb9376835435161f45d17004 Mon Sep 17 00:00:00 2001
From: Discourse Translator Bot <discourse.translator.bot@gmail.com>
Date: Fri, 27 Feb 2026 05:12:08 -0500
Subject: [PATCH 136/168] I18N: Update translations (#38108)

---
 config/locales/client.ar.yml                  |   4 +-
 config/locales/client.be.yml                  |   1 -
 config/locales/client.bg.yml                  |   1 -
 config/locales/client.bs_BA.yml               |   1 -
 config/locales/client.ca.yml                  |   2 +-
 config/locales/client.cs.yml                  |   2 +-
 config/locales/client.da.yml                  |   2 +-
 config/locales/client.de.yml                  |   6 +-
 config/locales/client.el.yml                  | 112 ++++++++++++++++--
 config/locales/client.es.yml                  |   3 +-
 config/locales/client.et.yml                  |   1 -
 config/locales/client.fa_IR.yml               |   1 -
 config/locales/client.fi.yml                  |   3 +-
 config/locales/client.fr.yml                  |   3 +-
 config/locales/client.gl.yml                  |   2 +-
 config/locales/client.he.yml                  |   3 +-
 config/locales/client.hr.yml                  |   3 +-
 config/locales/client.hu.yml                  |   2 +-
 config/locales/client.hy.yml                  |   1 -
 config/locales/client.id.yml                  |   1 -
 config/locales/client.it.yml                  |   3 +-
 config/locales/client.ja.yml                  |   4 +-
 config/locales/client.ko.yml                  |   1 -
 config/locales/client.lt.yml                  |   2 +-
 config/locales/client.lv.yml                  |   1 -
 config/locales/client.nb_NO.yml               |   2 +-
 config/locales/client.nl.yml                  |   3 +-
 config/locales/client.pl_PL.yml               |   6 +-
 config/locales/client.pt.yml                  |   2 +-
 config/locales/client.pt_BR.yml               |   3 +-
 config/locales/client.ro.yml                  |   2 +-
 config/locales/client.ru.yml                  |   3 +-
 config/locales/client.sk.yml                  |   2 +-
 config/locales/client.sl.yml                  |   1 -
 config/locales/client.sq.yml                  |   1 -
 config/locales/client.sr.yml                  |   1 -
 config/locales/client.sv.yml                  |   2 +-
 config/locales/client.sw.yml                  |   1 -
 config/locales/client.te.yml                  |   1 -
 config/locales/client.tr_TR.yml               |   3 +-
 config/locales/client.ug.yml                  |   2 +-
 config/locales/client.uk.yml                  |   3 +-
 config/locales/client.ur.yml                  |  10 +-
 config/locales/client.vi.yml                  |   3 +-
 config/locales/client.zh_CN.yml               |  54 ++++++++-
 config/locales/client.zh_TW.yml               |   1 -
 config/locales/server.ar.yml                  |   2 +
 config/locales/server.bg.yml                  |   1 +
 config/locales/server.de.yml                  |   1 +
 config/locales/server.el.yml                  |   7 +-
 config/locales/server.fr.yml                  |   1 +
 config/locales/server.he.yml                  |   1 +
 config/locales/server.hu.yml                  |   1 +
 config/locales/server.id.yml                  |   1 +
 config/locales/server.it.yml                  |   1 +
 config/locales/server.ja.yml                  |   2 +
 config/locales/server.nl.yml                  |   1 +
 config/locales/server.pl_PL.yml               |   1 +
 config/locales/server.pt_BR.yml               |   1 +
 config/locales/server.ru.yml                  |   1 +
 config/locales/server.sk.yml                  |   1 +
 config/locales/server.sv.yml                  |   1 +
 config/locales/server.te.yml                  |   1 +
 config/locales/server.tr_TR.yml               |   1 +
 config/locales/server.ug.yml                  |   1 +
 config/locales/server.uk.yml                  |   1 +
 config/locales/server.zh_CN.yml               |  23 +++-
 .../automation/config/locales/server.cs.yml   |   1 -
 .../automation/config/locales/server.de.yml   |   1 -
 .../config/locales/server.pl_PL.yml           |   1 -
 .../automation/config/locales/server.uk.yml   |   1 -
 .../config/locales/server.zh_CN.yml           |   1 -
 plugins/chat/config/locales/client.ar.yml     |   7 --
 plugins/chat/config/locales/client.be.yml     |   5 -
 plugins/chat/config/locales/client.bg.yml     |   6 -
 plugins/chat/config/locales/client.bs_BA.yml  |   5 -
 plugins/chat/config/locales/client.ca.yml     |   6 -
 plugins/chat/config/locales/client.cs.yml     |  14 ---
 plugins/chat/config/locales/client.da.yml     |   7 --
 plugins/chat/config/locales/client.de.yml     |  25 ----
 plugins/chat/config/locales/client.el.yml     |   7 --
 plugins/chat/config/locales/client.en_GB.yml  |   2 -
 plugins/chat/config/locales/client.es.yml     |  10 --
 plugins/chat/config/locales/client.et.yml     |   7 --
 plugins/chat/config/locales/client.fa_IR.yml  |   7 --
 plugins/chat/config/locales/client.fi.yml     |   7 --
 plugins/chat/config/locales/client.fr.yml     |   7 --
 plugins/chat/config/locales/client.gl.yml     |   6 -
 plugins/chat/config/locales/client.he.yml     |   8 --
 plugins/chat/config/locales/client.hr.yml     |   7 --
 plugins/chat/config/locales/client.hu.yml     |   7 --
 plugins/chat/config/locales/client.hy.yml     |   6 -
 plugins/chat/config/locales/client.id.yml     |   5 -
 plugins/chat/config/locales/client.it.yml     |   7 --
 plugins/chat/config/locales/client.ja.yml     |   7 --
 plugins/chat/config/locales/client.ko.yml     |   7 --
 plugins/chat/config/locales/client.lt.yml     |   6 -
 plugins/chat/config/locales/client.lv.yml     |   5 -
 plugins/chat/config/locales/client.nb_NO.yml  |   6 -
 plugins/chat/config/locales/client.nl.yml     |   7 --
 plugins/chat/config/locales/client.pl_PL.yml  |  27 -----
 plugins/chat/config/locales/client.pt.yml     |   6 -
 plugins/chat/config/locales/client.pt_BR.yml  |   7 --
 plugins/chat/config/locales/client.ro.yml     |   6 -
 plugins/chat/config/locales/client.ru.yml     |   7 --
 plugins/chat/config/locales/client.sk.yml     |   7 --
 plugins/chat/config/locales/client.sl.yml     |   6 -
 plugins/chat/config/locales/client.sq.yml     |   6 -
 plugins/chat/config/locales/client.sr.yml     |   5 -
 plugins/chat/config/locales/client.sv.yml     |   7 --
 plugins/chat/config/locales/client.sw.yml     |   6 -
 plugins/chat/config/locales/client.te.yml     |   5 -
 plugins/chat/config/locales/client.th.yml     |   5 -
 plugins/chat/config/locales/client.tr_TR.yml  |   7 --
 plugins/chat/config/locales/client.ug.yml     |   7 --
 plugins/chat/config/locales/client.uk.yml     |  15 ---
 plugins/chat/config/locales/client.ur.yml     |   7 --
 plugins/chat/config/locales/client.vi.yml     |   6 -
 plugins/chat/config/locales/client.zh_CN.yml  |  13 --
 plugins/chat/config/locales/client.zh_TW.yml  |   6 -
 plugins/chat/config/locales/server.cs.yml     |   1 -
 plugins/chat/config/locales/server.de.yml     |  11 --
 plugins/chat/config/locales/server.es.yml     |   1 -
 plugins/chat/config/locales/server.pl_PL.yml  |  13 --
 plugins/chat/config/locales/server.uk.yml     |   1 -
 plugins/chat/config/locales/server.zh_CN.yml  |   3 -
 .../config/locales/client.ar.yml              |   8 --
 .../config/locales/client.be.yml              |   6 -
 .../config/locales/client.bg.yml              |   7 --
 .../config/locales/client.bs_BA.yml           |   8 --
 .../config/locales/client.ca.yml              |   8 --
 .../config/locales/client.cs.yml              |   7 --
 .../config/locales/client.da.yml              |   7 --
 .../config/locales/client.de.yml              |  13 --
 .../config/locales/client.el.yml              |   7 --
 .../config/locales/client.en_GB.yml           |   5 -
 .../config/locales/client.es.yml              |   8 --
 .../config/locales/client.et.yml              |   7 --
 .../config/locales/client.fa_IR.yml           |   8 --
 .../config/locales/client.fi.yml              |   8 --
 .../config/locales/client.fr.yml              |   8 --
 .../config/locales/client.gl.yml              |   7 --
 .../config/locales/client.he.yml              |   8 --
 .../config/locales/client.hr.yml              |   7 --
 .../config/locales/client.hu.yml              |   7 --
 .../config/locales/client.hy.yml              |   7 --
 .../config/locales/client.id.yml              |   7 --
 .../config/locales/client.it.yml              |   8 --
 .../config/locales/client.ja.yml              |   8 --
 .../config/locales/client.ko.yml              |   8 --
 .../config/locales/client.lt.yml              |   7 --
 .../config/locales/client.lv.yml              |   7 --
 .../config/locales/client.nb_NO.yml           |   7 --
 .../config/locales/client.nl.yml              |   8 --
 .../config/locales/client.pl_PL.yml           |  13 --
 .../config/locales/client.pt.yml              |   7 --
 .../config/locales/client.pt_BR.yml           |   8 --
 .../config/locales/client.ro.yml              |   8 --
 .../config/locales/client.ru.yml              |   8 --
 .../config/locales/client.sk.yml              |   8 --
 .../config/locales/client.sl.yml              |   7 --
 .../config/locales/client.sq.yml              |   7 --
 .../config/locales/client.sr.yml              |   6 -
 .../config/locales/client.sv.yml              |   8 --
 .../config/locales/client.sw.yml              |   7 --
 .../config/locales/client.te.yml              |   7 --
 .../config/locales/client.th.yml              |   7 --
 .../config/locales/client.tr_TR.yml           |   8 --
 .../config/locales/client.ug.yml              |   7 --
 .../config/locales/client.uk.yml              |  13 --
 .../config/locales/client.ur.yml              |   8 --
 .../config/locales/client.vi.yml              |   7 --
 .../config/locales/client.zh_CN.yml           |   8 --
 .../config/locales/client.zh_TW.yml           |   7 --
 .../discourse-ai/config/locales/client.ar.yml |  17 ---
 .../discourse-ai/config/locales/client.be.yml |  10 --
 .../discourse-ai/config/locales/client.bg.yml |  12 --
 .../config/locales/client.bs_BA.yml           |  11 --
 .../discourse-ai/config/locales/client.ca.yml |  12 --
 .../discourse-ai/config/locales/client.cs.yml |  17 ---
 .../discourse-ai/config/locales/client.da.yml |  13 --
 .../discourse-ai/config/locales/client.de.yml |  58 ---------
 .../discourse-ai/config/locales/client.el.yml |  14 +--
 .../discourse-ai/config/locales/client.es.yml |  17 ---
 .../discourse-ai/config/locales/client.et.yml |  11 --
 .../config/locales/client.fa_IR.yml           |  14 ---
 .../discourse-ai/config/locales/client.fi.yml |  17 ---
 .../discourse-ai/config/locales/client.fr.yml |  17 ---
 .../discourse-ai/config/locales/client.gl.yml |  12 --
 .../discourse-ai/config/locales/client.he.yml |  17 ---
 .../discourse-ai/config/locales/client.hr.yml |  13 --
 .../discourse-ai/config/locales/client.hu.yml |  13 --
 .../discourse-ai/config/locales/client.hy.yml |  12 --
 .../discourse-ai/config/locales/client.id.yml |   9 --
 .../discourse-ai/config/locales/client.it.yml |  17 ---
 .../discourse-ai/config/locales/client.ja.yml |  16 ---
 .../discourse-ai/config/locales/client.ko.yml |  12 --
 .../discourse-ai/config/locales/client.lt.yml |  13 --
 .../discourse-ai/config/locales/client.lv.yml |  11 --
 .../config/locales/client.nb_NO.yml           |  13 --
 .../discourse-ai/config/locales/client.nl.yml |  17 ---
 .../config/locales/client.pl_PL.yml           |  58 ---------
 .../discourse-ai/config/locales/client.pt.yml |  15 ---
 .../config/locales/client.pt_BR.yml           |  17 ---
 .../discourse-ai/config/locales/client.ro.yml |  15 ---
 .../discourse-ai/config/locales/client.ru.yml |  17 ---
 .../discourse-ai/config/locales/client.sk.yml |  17 ---
 .../discourse-ai/config/locales/client.sl.yml |  12 --
 .../discourse-ai/config/locales/client.sq.yml |  12 --
 .../discourse-ai/config/locales/client.sr.yml |  11 --
 .../discourse-ai/config/locales/client.sv.yml |  13 --
 .../discourse-ai/config/locales/client.sw.yml |  11 --
 .../discourse-ai/config/locales/client.te.yml |  12 --
 .../discourse-ai/config/locales/client.th.yml |  10 --
 .../config/locales/client.tr_TR.yml           |  17 ---
 .../discourse-ai/config/locales/client.ug.yml |  13 --
 .../discourse-ai/config/locales/client.uk.yml |  56 ---------
 .../discourse-ai/config/locales/client.ur.yml |  13 --
 .../discourse-ai/config/locales/client.vi.yml |  13 --
 .../config/locales/client.zh_CN.yml           |  47 --------
 .../config/locales/client.zh_TW.yml           |  13 --
 .../discourse-ai/config/locales/server.de.yml |  28 -----
 .../config/locales/server.pl_PL.yml           |  50 --------
 .../discourse-ai/config/locales/server.uk.yml |  21 ----
 .../config/locales/server.zh_CN.yml           |  13 --
 .../config/locales/client.cs.yml              |   2 -
 .../config/locales/client.de.yml              |   2 -
 .../config/locales/client.pl_PL.yml           |   2 -
 .../config/locales/client.uk.yml              |   2 -
 .../config/locales/client.zh_CN.yml           |   2 -
 .../config/locales/server.ar.yml              |   1 -
 .../config/locales/server.cs.yml              |   1 -
 .../config/locales/server.da.yml              |   1 -
 .../config/locales/server.de.yml              |   2 -
 .../config/locales/server.es.yml              |   1 -
 .../config/locales/server.fi.yml              |   1 -
 .../config/locales/server.fr.yml              |   1 -
 .../config/locales/server.he.yml              |   1 -
 .../config/locales/server.hu.yml              |   1 -
 .../config/locales/server.it.yml              |   1 -
 .../config/locales/server.ja.yml              |   1 -
 .../config/locales/server.nl.yml              |   1 -
 .../config/locales/server.pl_PL.yml           |   2 -
 .../config/locales/server.pt_BR.yml           |   1 -
 .../config/locales/server.ru.yml              |   1 -
 .../config/locales/server.sk.yml              |   1 -
 .../config/locales/server.sl.yml              |   1 -
 .../config/locales/server.sv.yml              |   1 -
 .../config/locales/server.tr_TR.yml           |   1 -
 .../config/locales/server.uk.yml              |   1 -
 .../config/locales/server.zh_CN.yml           |   1 -
 .../config/locales/client.cs.yml              |   2 -
 .../config/locales/client.de.yml              |   2 -
 .../config/locales/client.pl_PL.yml           |   2 -
 .../config/locales/client.uk.yml              |   2 -
 .../config/locales/client.zh_CN.yml           |   2 -
 .../config/locales/server.de.yml              |   8 --
 .../config/locales/server.pl_PL.yml           |   8 --
 .../config/locales/server.uk.yml              |   8 --
 .../config/locales/server.zh_CN.yml           |   8 --
 .../config/locales/client.ar.yml              |   5 -
 .../config/locales/client.be.yml              |   2 -
 .../config/locales/client.bg.yml              |   2 -
 .../config/locales/client.bs_BA.yml           |   2 -
 .../config/locales/client.ca.yml              |   2 -
 .../config/locales/client.cs.yml              |   9 --
 .../config/locales/client.da.yml              |   3 -
 .../config/locales/client.de.yml              |  17 ---
 .../config/locales/client.el.yml              |   5 -
 .../config/locales/client.es.yml              |   5 -
 .../config/locales/client.et.yml              |   2 -
 .../config/locales/client.fa_IR.yml           |   3 -
 .../config/locales/client.fi.yml              |   4 -
 .../config/locales/client.fr.yml              |   4 -
 .../config/locales/client.gl.yml              |   2 -
 .../config/locales/client.he.yml              |   5 -
 .../config/locales/client.hr.yml              |   3 -
 .../config/locales/client.hu.yml              |   5 -
 .../config/locales/client.hy.yml              |   2 -
 .../config/locales/client.id.yml              |   2 -
 .../config/locales/client.it.yml              |   4 -
 .../config/locales/client.ja.yml              |   5 -
 .../config/locales/client.ko.yml              |   2 -
 .../config/locales/client.lt.yml              |   3 -
 .../config/locales/client.lv.yml              |   2 -
 .../config/locales/client.nb_NO.yml           |   2 -
 .../config/locales/client.nl.yml              |   4 -
 .../config/locales/client.pl_PL.yml           |  17 ---
 .../config/locales/client.pt.yml              |   2 -
 .../config/locales/client.pt_BR.yml           |   4 -
 .../config/locales/client.ro.yml              |   4 -
 .../config/locales/client.ru.yml              |   5 -
 .../config/locales/client.sk.yml              |   4 -
 .../config/locales/client.sl.yml              |   2 -
 .../config/locales/client.sq.yml              |   2 -
 .../config/locales/client.sr.yml              |   2 -
 .../config/locales/client.sv.yml              |   3 -
 .../config/locales/client.sw.yml              |   2 -
 .../config/locales/client.te.yml              |   2 -
 .../config/locales/client.th.yml              |   2 -
 .../config/locales/client.tr_TR.yml           |   4 -
 .../config/locales/client.ug.yml              |   5 -
 .../config/locales/client.uk.yml              |   7 --
 .../config/locales/client.ur.yml              |   4 -
 .../config/locales/client.vi.yml              |   5 -
 .../config/locales/client.zh_CN.yml           |   7 --
 .../config/locales/client.zh_TW.yml           |   2 -
 .../config/locales/server.de.yml              |  24 ----
 .../config/locales/server.pl_PL.yml           |  24 ----
 .../config/locales/server.uk.yml              |  22 ----
 .../config/locales/server.de.yml              |   1 -
 .../config/locales/server.pl_PL.yml           |   1 -
 .../config/locales/server.el.yml              |   1 +
 .../config/locales/server.de.yml              |   1 -
 .../config/locales/server.pl_PL.yml           |   1 -
 .../config/locales/server.uk.yml              |   1 -
 .../config/locales/server.zh_CN.yml           |   1 -
 .../config/locales/server.el.yml              |   3 +
 .../config/locales/client.ar.yml              |   4 -
 .../config/locales/client.cs.yml              |   6 -
 .../config/locales/client.de.yml              |   4 +-
 .../config/locales/client.el.yml              |   2 -
 .../config/locales/client.es.yml              |   2 -
 .../config/locales/client.hu.yml              |   2 +
 .../config/locales/client.ja.yml              |   4 -
 .../config/locales/client.pl_PL.yml           |   2 -
 .../config/locales/client.ru.yml              |   2 -
 .../config/locales/client.uk.yml              |   6 +-
 .../config/locales/client.zh_CN.yml           |   6 +-
 .../config/locales/client.ar.yml              |   3 -
 .../config/locales/client.be.yml              |   2 -
 .../config/locales/client.bg.yml              |   2 -
 .../config/locales/client.bs_BA.yml           |   2 -
 .../config/locales/client.ca.yml              |   3 -
 .../config/locales/client.cs.yml              |  16 ---
 .../config/locales/client.da.yml              |   3 -
 .../config/locales/client.de.yml              |  13 --
 .../config/locales/client.el.yml              |   3 -
 .../config/locales/client.es.yml              |   3 -
 .../config/locales/client.et.yml              |   2 -
 .../config/locales/client.fa_IR.yml           |   3 -
 .../config/locales/client.fi.yml              |   3 -
 .../config/locales/client.fr.yml              |   3 -
 .../config/locales/client.gl.yml              |   3 -
 .../config/locales/client.he.yml              |   3 -
 .../config/locales/client.hr.yml              |   3 -
 .../config/locales/client.hu.yml              |   3 -
 .../config/locales/client.hy.yml              |   3 -
 .../config/locales/client.id.yml              |   3 -
 .../config/locales/client.it.yml              |   3 -
 .../config/locales/client.ja.yml              |   3 -
 .../config/locales/client.ko.yml              |   3 -
 .../config/locales/client.lt.yml              |   3 -
 .../config/locales/client.lv.yml              |   2 -
 .../config/locales/client.nb_NO.yml           |   3 -
 .../config/locales/client.nl.yml              |   3 -
 .../config/locales/client.pl_PL.yml           |  17 ---
 .../config/locales/client.pt.yml              |   3 -
 .../config/locales/client.pt_BR.yml           |   3 -
 .../config/locales/client.ro.yml              |   2 -
 .../config/locales/client.ru.yml              |   3 -
 .../config/locales/client.sk.yml              |   3 -
 .../config/locales/client.sl.yml              |   3 -
 .../config/locales/client.sq.yml              |   3 -
 .../config/locales/client.sr.yml              |   2 -
 .../config/locales/client.sv.yml              |   3 -
 .../config/locales/client.sw.yml              |   2 -
 .../config/locales/client.te.yml              |   3 -
 .../config/locales/client.th.yml              |   2 -
 .../config/locales/client.tr_TR.yml           |   3 -
 .../config/locales/client.ug.yml              |   3 -
 .../config/locales/client.uk.yml              |  17 ---
 .../config/locales/client.ur.yml              |   3 -
 .../config/locales/client.vi.yml              |   3 -
 .../config/locales/client.zh_CN.yml           |  10 --
 .../config/locales/client.zh_TW.yml           |   3 -
 .../config/locales/server.cs.yml              |   1 -
 .../config/locales/server.de.yml              |   2 -
 .../config/locales/server.pl_PL.yml           |   2 -
 .../config/locales/server.uk.yml              |   1 -
 .../config/locales/server.zh_CN.yml           |   1 -
 .../config/locales/client.cs.yml              |   2 -
 .../config/locales/client.de.yml              |   2 -
 .../config/locales/client.pl_PL.yml           |   2 -
 .../config/locales/client.uk.yml              |   2 -
 .../config/locales/client.zh_CN.yml           |   2 -
 386 files changed, 276 insertions(+), 2330 deletions(-)

diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index f32429bd79a7c..89c953162f0c1 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -5138,11 +5138,13 @@ ar:
         delete: "حذف"
         add: "إضافة مجموعة الوسوم المطلوبة"
         placeholder: "تحديد مجموعة الوسوم…"
+        tag_group: "مجموعة الوسوم"
       topic_featured_link_allowed: "السماح بالروابط المميَّزة في هذه الفئة."
       delete: "احذف الفئة"
       create: "فئة جديدة"
       create_long: "إنشاء فئة جديدة"
       save: "احفظ الفئة"
+      unsaved_changes: "لديك تغييرات غير محفوظة"
       slug: "مسار الفئة"
       parent: "الفئة الرئيسية"
       slug_placeholder: "(اختياري) كلمات مفصولة بشرطة لعنوان URL"
@@ -6484,7 +6486,6 @@ ar:
   admin_js:
     type_to_filter: "اكتب للتصفية…"
     settings: "الإعدادات"
-    reset_filter: "إعادة التعيين"
     toggle_filters: "تبديل عوامل تصفية القائمة المنسدلة"
     admin:
       title: "مسؤول Discourse"
@@ -7029,6 +7030,7 @@ ar:
         new_features:
           title: "ما الجديد؟"
           subtitle: "نحن نصدر ميزات وتحسينات جديدة طوال الوقت. تغطي هذه الصفحة أبرز النقاط، ولكن يمكنك النقر على \"معرفة المزيد\" للاطلاع على ملاحظات الإصدار الشاملة."
+          no_new_features_error: "حدث خطأ أثناء تحميل الموجز. يمكنك الاطلاع على الإعلانات السابقة للميزات الجديدة في <a href='%{url}' target='_blank'>مجتمع Discourse Meta</a>."
           learn_more: "معرفة المزيد..."
         last_checked: "تاريخ آخر تحقُّق"
         refresh_problems: "تحديث"
diff --git a/config/locales/client.be.yml b/config/locales/client.be.yml
index 8b0b2f23af68c..ce05db7dff62e 100644
--- a/config/locales/client.be.yml
+++ b/config/locales/client.be.yml
@@ -1980,7 +1980,6 @@ be:
         categories: "Усе катэгорыі"
   admin_js:
     settings: "Налады"
-    reset_filter: "Скінуць"
     admin:
       moderator: "Мадэратар"
       tags:
diff --git a/config/locales/client.bg.yml b/config/locales/client.bg.yml
index 0675cc27ab69c..2b1aedf80aeed 100644
--- a/config/locales/client.bg.yml
+++ b/config/locales/client.bg.yml
@@ -3428,7 +3428,6 @@ bg:
         categories: "Всички категории"
   admin_js:
     settings: "Настройки"
-    reset_filter: "Нулиране"
     admin:
       title: "Discourse Админ"
       moderator: "Модератор"
diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml
index 165d5dd59d3f1..7ca93b92d3b9c 100644
--- a/config/locales/client.bs_BA.yml
+++ b/config/locales/client.bs_BA.yml
@@ -3147,7 +3147,6 @@ bs_BA:
         categories: "Sve kategorije"
   admin_js:
     settings: "Postavke"
-    reset_filter: "Resetovati"
     admin:
       title: "Discourse Admin"
       moderator: "Moderator"
diff --git a/config/locales/client.ca.yml b/config/locales/client.ca.yml
index 7f0c8993c3eb2..1103683f9e8a5 100644
--- a/config/locales/client.ca.yml
+++ b/config/locales/client.ca.yml
@@ -2489,6 +2489,7 @@ ca:
       allow_global_tags_label: "Permet també altres etiquetes"
       required_tag_group:
         delete: "Suprimeix"
+        tag_group: "Grup d'etiquetes"
       topic_featured_link_allowed: "Permet enllaços destacats dins aquesta categoria"
       create_long: "Crea una categoria nova"
       slug_placeholder: "(opcional) paraules amb guionets per a url"
@@ -3056,7 +3057,6 @@ ca:
         categories: "Totes les categories"
   admin_js:
     settings: "Configuració"
-    reset_filter: "Restableix"
     admin:
       title: "Administració de Discourse"
       moderator: "Moderador"
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 32d7cd3dfcc85..1e93d71559b5a 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -4722,6 +4722,7 @@ cs:
       create: "Přidat kategorii"
       create_long: "Vytvořit novou kategorii"
       save: "Uložit kategorii"
+      unsaved_changes: "Máte neuložené změny"
       slug: "URL kategorie"
       parent: "Nadřazená kategorie"
       slug_placeholder: "(Nepovinné) slova s pomlčkou pro URL"
@@ -5986,7 +5987,6 @@ cs:
   admin_js:
     type_to_filter: "Text pro filtrování..."
     settings: "Nastavení"
-    reset_filter: "obnovit výchozí"
     toggle_filters: "Přepnout rozbalovací filtry"
     admin:
       title: "Administrátor"
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 10b43b63a26dc..3706eb4ef69fe 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -3476,6 +3476,7 @@ da:
         delete: "Slet"
         add: "Tilføj obligatorisk mærkegruppe"
         placeholder: "Vælg mærkegruppe…"
+        tag_group: "Mærkegruppe"
       topic_featured_link_allowed: "Tillad fremhævede links i denne kategori"
       create_long: "Opret en ny kategori"
       slug_placeholder: "(Valgfri) gennemstregede-ord for URL"
@@ -4328,7 +4329,6 @@ da:
   admin_js:
     type_to_filter: "Skriv for at filtrere…"
     settings: "Indstillinger"
-    reset_filter: "Nulstil"
     admin:
       title: "Discourse Admin"
       moderator: "Moderator"
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index cfff7a1f4dccb..1867172b8dd2e 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -4319,11 +4319,15 @@ de:
         delete: "Löschen"
         add: "Erforderliche Schlagwortgruppe hinzufügen"
         placeholder: "Schlagwortgruppe auswählen …"
+        min_count: "Anzahl der Schlagwörter"
+        tag_group: "Schlagwortgruppe"
       topic_featured_link_allowed: "Erlaube hervorgehobene Links in dieser Kategorie"
       delete: "Kategorie löschen"
       create: "Neue Kategorie"
       create_long: "Eine neue Kategorie erstellen"
+      create_category: "Kategorie erstellen"
       save: "Kategorie speichern"
+      unsaved_changes: "Du hast ungespeicherte Änderungen"
       slug: "Sprechender Name für URL der Kategorie"
       parent: "Übergeordnete Kategorie"
       slug_placeholder: "(Optional) durch Bindestrich getrennte Wörter für URL"
@@ -5522,7 +5526,7 @@ de:
   admin_js:
     type_to_filter: "Zum Filtern hier eingeben …"
     settings: "Einstellungen"
-    reset_filter: "Zurücksetzen"
+    reset_filter: "Filter zurücksetzen"
     toggle_filters: "Dropdowns zum Filtern anzeigen/ausblenden"
     admin:
       title: "Discourse-Administrator"
diff --git a/config/locales/client.el.yml b/config/locales/client.el.yml
index 662b7a85396ab..2a6b556c6d2c6 100644
--- a/config/locales/client.el.yml
+++ b/config/locales/client.el.yml
@@ -307,6 +307,8 @@ el:
     software_update_prompt:
       message: "Ενημερώσαμε αυτόν τον ιστότοπο, <span>παρακαλούμε κάντε ανανέωση</span> για να συνεχιστεί η ομαλή λειτουργία."
       dismiss: "Παράβλεψη"
+    notifications_tracking:
+      tooltip: "Επίπεδο ειδοποίησης: %{level}"
     back_button: "Πίσω"
     welcome_banner:
       header:
@@ -332,6 +334,8 @@ el:
       theme_source: "Θέμα <a target='_blank' href='%{path}'>'%{name}'</a>"
       plugin_source: "Πρόσθετο '%{name}'"
       unknown_source: "Ένα από τα θέματα ή τα πρόσθετα σας"
+    dev_tools:
+      drag_to_move: "Σύρετε για μετακίνηση"
     s3:
       regions:
         ap_northeast_1: "Ασία Ειρηνικός (Τόκιο)"
@@ -421,13 +425,40 @@ el:
       pill: "Προτεινόμενα"
       pm_title: "Προτεινόμενα μηνύματα"
     admin_onboarding_banner:
+      launch_in_easy_steps: "Εκκίνηση σε %{step_count} εύκολα βήματα"
+      skipped: "Η λίστα ελέγχου ενσωμάτωσης διαχειριστή έχει πλέον παραλειφθεί. Εάν θέλετε να την ενεργοποιήσετε ξανά, αναζητήστε το `enable site owner onboarding` στις ρυθμίσεις ιστότοπου."
+      congrats_onboarding_complete: "Συγχαρητήρια για την ολοκλήρωση της διαδικασίας ενσωμάτωσης!"
+      invite_collaborators:
+        title: "Προσκαλέστε συνεργάτες"
+        description: "Τα πρώτα μέλη βοηθούν να ζωντανέψει η κοινότητά σας"
+        action: "Δημιουργία πρόσκλησης"
       start_posting:
+        title: "Ξεκινήστε να αναρτάτε"
+        description: "Δώστε στον κόσμο κάτι για να συζητήσουν μαζί"
+        action: "Ιδέες για το σπάσιμο του πάγου"
+        choose_option: "Πώς θα θέλατε να ξεκινήσετε;"
+        predefined_topics: "Πρότυπα για το σπάσιμο του πάγου"
+        predefined_topics_subtitle: "Δώστε στα νέα μέλη κάτι για να συζητήσουν, επιλέξτε ένα πρότυπο για επεξεργασία και δημιουργήστε το δικό σας."
+        predefined_topics_description: "Διαλέξτε από μια συλλογή από αφορμές για συζήτηση για να ξεκινήσουν οι συζητήσεις"
+        use_predefined: "Περιήγηση προτύπων"
+        start_with_this: "Ξεκινήστε με αυτό"
         back: "Πίσω"
         icebreakers:
+          fun_facts:
+            title: "Ποιές είναι μερικές ενδιαφέρουσες πληροφορίες για εσάς;"
+            body: "Γεια σε όλους! Είμαι ενθουσιασμένος που ξεκινάω αυτή τη νέα κοινότητα. Για να ξεκινήσουμε, ας μοιραστούμεμια ενδιαφέρουσα πληροφορία για τους εαυτούς μας. Θα ξεκινήσω πρώτος: Λατρεύω την πεζοπορία και την εξερεύνηση νέων μονοπατιών! Τι είναι κάτι ενδιαφέρον για εσάς;"
           coolest_thing_you_have_seen_today:
             title: "Ποιο είναι το πιο ωραίο πράγμα που είδατε σήμερα;"
             body: "Ποιο είναι το πιο ωραίο πράγμα που είδατε ή βιώσατε σήμερα; Θα μπορούσε να είναι οτιδήποτε, από ένα όμορφο ηλιοβασίλεμα μέχρι μια τυχαία πράξη καλοσύνης. Θα ξεκινήσω: Είδα έναν σκύλο να βοηθάει έναν ηλικιωμένο να διασχίσει τον δρόμο!"
+          introduce_yourself:
+            title: "Συστηθείτε"
+            body: "Καλώς ορίσατε στην κοινότητα! Ας γνωριστούμε. Συστηθείτε μας και μοιραστείτε μαζί μας λίγα πράγματα για τα ενδιαφέροντά σας. Θα ξεκινήσω πρώτος: Είμαι παθιασμένος με την τεχνολογία και μου αρέσει να διδάσκω άλλους!"
+          what_is_your_favorite_food:
+            title: "Ποιο είναι το αγαπημένο σας φαγητό;"
+            body: "Μοιραστείτε το αγαπημένο σας φαγητό με την κοινότητα! Θα ξεκινήσω: Λατρεύω την πίτσα, ειδικά με έξτρα τυρί και πεπερόνι."
       spread_the_word:
+        title: "Διαδώστε τα νέα!"
+        description: "Μοιραστείτε έναν σύνδεσμο με όλους στο δίκτυό σας"
         action: "Αντιγραφή συνδέσμου"
         copied_to_clipboard: "Ο σύνδεσμος αντιγράφηκε στο πρόχειρο!"
     about:
@@ -540,7 +571,7 @@ el:
       save: "Αποθήκευση"
       no_timezone: 'Δεν έχετε ορίσει ζώνη ώρας ακόμη. Δε θα μπορείτε να ορίσετε υπενθυμίσεις. Ρυθμίστε κάποια <a href="%{basePath}/my/preferences/profile">στο προφίλ σας</a>.'
       invalid_custom_datetime: "Η ημερομηνία και η ώρα που δώσατε δεν είναι έγκυρη, παρακαλώ δοκιμάστε ξανά."
-      list_permission_denied: "Δεν έχετε άδεια για την προβολή των σελιδοδεικτών αυτού του χρήστη."
+      list_permission_denied: "Δεν έχετε δικαίωμα για την προβολή των σελιδοδεικτών αυτού του χρήστη."
       no_user_bookmarks: "Δεν έχετε σελιδοδείκτες. Οι σελιδοδείκτες σας επιτρέπουν να ανατρέξετε γρήγορα σε συγκεκριμένες αναρτήσεις."
       auto_delete_preference:
         label: "Αφού ειδοποιηθείτε"
@@ -604,6 +635,10 @@ el:
         other_drafts:
           one: "+%{count} ακόμα προσχέδιο"
           other: "+%{count} ακόμα προσχέδια"
+    embed_mode:
+      storage_access_prompt: "Έχετε ήδη λογαριασμό στο %{site_name}; Επιτρέψτε την πρόσβαση στη συνεδρία σας για να σχολιάσετε ως εσείς."
+      allow_access: "Επιτρέψτε την πρόσβαση"
+      continue_as_guest: "Συνέχεια ως Επισκέπτης"
     topic_count_all:
       one: "Δείτε %{count} νέο θέμα"
       other: "Δείτε %{count} νέα θέματα"
@@ -699,6 +734,7 @@ el:
         custom_reason: "Δώστε μια σαφή περιγραφή του λόγου"
         other_reason: "Άλλο..."
         optional: "προεραιτικό"
+      stale_help: "Αυτό το στοιχείο έχει επιλυθεί από <b>%{username}</b>."
       claim_help:
         optional: "Μπορείτε να υποβάλετε αξίωση για αυτό το στοιχείο για να αποτρέψετε την αξιολόγηση από άλλους."
         required: "Πρέπει να διεκδικήσετε στοιχεία για να μπορέσετε να τα ελέγξετε."
@@ -1497,7 +1533,7 @@ el:
       no_notifications_page_title: "Δεν έχετε ειδοποιήσεις ακόμη"
       dynamic_favicon: "Εμφάνιση μετρήσεων στο εικονίδιο του περιηγητή"
       skip_new_user_tips:
-        description: "Παράλειψη συμβουλών και σημάτων για την ενσωμάτωση νέου χρήστη"
+        description: "Παράλειψη συμβουλών και παρασήμων για την ενσωμάτωση νέου χρήστη"
       reset_seen_user_tips: "Εμφάνιση συμβουλών χρήστη ξανά"
       theme_default_on_all_devices: "Όρισε αυτό ως προεπιλεγμένο θέμα σε όλες τις συσκευές μου"
       color_scheme_default_on_all_devices: "Ορισμός προεπιλεγμένής παλέτας χρωμάτων και λειτουργίας σε όλες τις συσκευές μου"
@@ -1610,6 +1646,9 @@ el:
         flags_given:
           one: '<span class="%{className}">%{count}</span> χρήσιμη αναφορά'
           other: '<span class="%{className}">%{count}</span> χρήσιμες αναφορές'
+        flags:
+          one: '<span class="%{className}">%{count}</span> αναφορά'
+          other: '<span class="%{className}">%{count}</span> αναφορές'
         deleted_posts:
           one: '<span class="%{className}">%{count}</span> διαγραμμένη ανάρτηση'
           other: '<span class="%{className}">%{count}</span> διαγραμμένες αναρτήσεις'
@@ -1764,6 +1803,7 @@ el:
           Σαρώστε αυτόν τον κωδικό QR σε μια υποστηριζόμενη εφαρμογή (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> - <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a>) και εισαγάγετε τον κωδικό ελέγχου ταυτότητας.
         disable_description: "Παρακαλώ εισαγάγετε τον κωδικό ελέγχου ταυτότητας από την εφαρμογή σας"
         show_key_description: "Εισαγάγετε χειροκίνητα"
+        oauth_enabled_warning: "Λάβετε υπόψη ότι οι συνδέσεις κοινωνικών δικτύων θα απενεργοποιηθούν μόλις ενεργοποιηθεί ο έλεγχος ταυτότητας δύο παραγόντων στον λογαριασμό σας."
         use: "Χρησιμοποιήστε την εφαρμογή Authenticator"
         disable: "Απενεργοποίηση"
         delete: "Διαγραφή"
@@ -2086,7 +2126,7 @@ el:
           title: "Σύνδεσμος πρόσκλησης"
           success: "Η δημιουργία του συνδέσμου πρόσκλησης έγινε επιτυχώς!"
           error: "Παρουσιάστηκε σφάλμα κατά τη δημιουργία συνδέσμου πρόσκλησης"
-        cannot_invite_to_forum: "Λυπούμαστε, δεν έχετε άδεια δημιουργίας προσκλήσεων. Επικοινωνήστε με έναν διαχειριστή για να σας παραχωρήσει άδεια πρόσκλησης."
+        cannot_invite_to_forum: "Λυπούμαστε, δεν έχετε δικαίωμα δημιουργίας προσκλήσεων. Επικοινωνήστε με έναν διαχειριστή για να σας παραχωρήσει δικαίωμα πρόσκλησης."
         invite:
           new_title: "Πρόσκληση μελών"
           edit_title: "Επεξεργασία πρόσκλησης"
@@ -2306,6 +2346,9 @@ el:
     form_kit:
       reset: Επαναφορά
       optional: προεραιτικό
+      errors_summary_title:
+        one: "Διορθώστε αυτό το σφάλμα για να συνεχίσετε"
+        other: "Διορθώστε αυτά τα σφάλματα για να συνεχίσετε"
       dirty_form: "Δεν έχετε υποβάλει τις αλλαγές σας! Σίγουρα θέλετε να αποχωρήσετε;"
       errors:
         starts_with: "Πρέπει να ξεκινά με %{prefix}"
@@ -2325,6 +2368,8 @@ el:
         too_short:
           one: "Πρέπει να είναι τουλάχιστον %{count} χαρακτήρας"
           other: "Πρέπει να είναι τουλάχιστον %{count} χαρακτήρες"
+      color:
+        already_used: "Χρησιμοποιείται ήδη"
     close: "Κλείσιμο"
     assets_changed_confirm: "Αυτός ο ιστότοπος μόλις έλαβε μια αναβάθμιση λογισμικού. Λήψη της πιο πρόσφατης έκδοσης τώρα;"
     logout: "Αποσυνδέθηκες."
@@ -2369,6 +2414,7 @@ el:
         }.
     learn_more: "Μάθετε περισσότερα…"
     learn_more_with_link: "<a href='%{url}' target='_blank'>Μάθετε περισσότερα…</a>"
+    feedback_with_link: "<a href='%{url}' target='_blank'>Ανατροφοδότηση…</a>"
     mute: Σίγαση
     unmute: Άρση σίγασης
     last_post: Ανάρτησε
@@ -2840,6 +2886,7 @@ el:
       upload_description: "δώσε μια περιγραφή για την μεταφόρτωση"
       olist_title: "Αριθμημένη λίστα"
       ulist_title: "Λίστα με κουκκίδες"
+      list_title: "Λίστες"
       list_item: "Στοιχείο Λίστας"
       toggle_direction: "Εναλλαγή κατεύθυνσης"
       wrap_modal:
@@ -3251,6 +3298,7 @@ el:
         deleted_post: "(διαγραμμένη ανάρτηση)"
         post_number_with_topic_title: "ανάρτηση #%{post_number} - %{title}"
         new_post_in_topic: "νέα δημοσίευση στο %{title}"
+        new_post_in_deleted_topic: "νέα ανάρτηση σε διαγραμμένο θέμα"
         user_requires_approval: "%{username} χρειάζεται έγκριση"
         default_item: "αναθεωρήσιμο στοιχείο #%{reviewable_id}"
     topics:
@@ -3334,6 +3382,15 @@ el:
         notify: "Ειδοποιήστε τους χρήστες για αυτήν την αλλαγή."
         performing: "Εκτελούνται μαζικές λειτουργίες, παρακαλώ περιμένετε…"
         completed: "Οι μαζικές λειτουργίες ολοκληρώθηκαν με επιτυχία!"
+        completed_count:
+          one: "<b>%{count}</b> θέμα ενημερώθηκε."
+          other: "<b>%{count}</b> θέματα ενημερώθηκαν."
+        not_completed:
+          one: "<b>%{count}</b> θέμα δεν μπόρεσε να ενημερωθεί:"
+          other: "<b>%{count}</b> θέματα δεν μπόρεσαν να ενημερωθούν:"
+        skipped_count:
+          one: "<b>%{count}</b> θέμα ήταν ήδη ενημερωμένο."
+          other: "<b>%{count}</b> θέματα ήταν ήδη ενημερωμένα."
         error_topic_count:
           one: "%{count} θέμα"
           other: "%{count} θέματα"
@@ -3391,6 +3448,7 @@ el:
         other: "%{count} αναρτήσεις σε θέμα"
       create: "Νέο Θέμα"
       create_long: "Δημιουργία νέου θέματος"
+      create_group: "Νέο θέμα και προσχέδια"
       open_draft: "Άνοιγμα προσχεδίου"
       private_message: "Στείλε ένα προσωπικό μήνυμα"
       archive_message:
@@ -4004,6 +4062,7 @@ el:
         admin: "ενέργειες διαχειριστή ανάρτησης"
         admin_action: "Διαχειριστής"
         permanently_delete: "Μόνιμη Διαγραφή"
+        permanently_delete_confirmation: "Σίγουρα θέλετε να διαγράψετε οριστικά αυτήν την ανάρτηση; Δεν θα μπορείτε να την ανακτήσετε."
         wiki: "Δημιουργία Βίκι"
         unwiki: "Αφαίρεση Βίκι"
         convert_to_moderator: "Πρόσθεσε Χρώμα Συνεργάτη"
@@ -4017,8 +4076,8 @@ el:
         lock_post_description: "αποτρέψτε τον συντάκτη από την επεξεργασία αυτής της ανάρτησης"
         unlock_post: "Ξεκλείδωμα ανάρτησης"
         unlock_post_description: "επιτρέψτε στον συντάκτη να επεξεργαστεί αυτήν την ανάρτηση"
-        delete_topic_disallowed_modal: "Δεν έχετε άδεια διαγραφής αυτού του θέματος. Εάν θέλετε πραγματικά να διαγραφεί, υποβάλετε μια αναφορά για έλεγχο από συντονιστή μαζί με το σκεπτικό."
-        delete_topic_disallowed: "δεν έχετε άδεια να διαγράψετε αυτό το θέμα"
+        delete_topic_disallowed_modal: "Δεν έχετε δικαίωμα διαγραφής αυτού του θέματος. Εάν θέλετε πραγματικά να διαγραφεί, υποβάλετε μια αναφορά για έλεγχο από συντονιστή μαζί με το σκεπτικό."
+        delete_topic_disallowed: "δεν έχετε δικαίωμα διαγραφής αυτού του θέματος"
         delete_topic_confirm_modal:
           one: "Αυτό το θέμα έχει πάνω από %{count} προβολή και ίσως να είναι ένας δημοφιλής προορισμός αναζήτησης. Σίγουρα θέλετε να διαγράψετε αυτό το θέμα εντελώς, αντί να το επεξεργαστείτε για να το βελτιώσετε;"
           other: "Αυτό το θέμα έχει πάνω από %{count} προβολές και ίσως να είναι ένας δημοφιλής προορισμός αναζήτησης. Σίγουρα θέλετε να διαγράψετε αυτό το θέμα εντελώς, αντί να το επεξεργαστείτε για να το βελτιώσετε;"
@@ -4168,16 +4227,19 @@ el:
         delete: "Σβήσιμο"
         add: "Προσθήκη απαιτούμενης ομάδας ετικετών"
         placeholder: "Επιλέξτε ομάδα ετικετών…"
+        tag_group: "Ομάδα ετικετών"
       topic_featured_link_allowed: "Να επιτρέπονται αναδεδειγμένοι συνδέσμοι σε αυτήν την κατηγορία"
       delete: "Διαγραφή κατηγορίας"
       create: "Νέα κατηγορία"
       create_long: "Δημιουργία νέας κατηγορίας"
       save: "Αποθήκευση κατηγορίας"
+      unsaved_changes: "Έχετε μη αποθηκευμένες αλλαγές"
       parent: "Γονική κατηγορία"
       slug_placeholder: "(Προαιρετικά) λέξεις ενωμένες με παύλα για το URL"
       creation_error: Παρουσιάστηκε κάποιο σφάλμα κατά την δημιουργία της κατηγορίας
       save_error: Παρουσιάστηκε κάποιο σφάλμα κατά την αποθήκευση της κατηγορίας.
       validations:
+        emoji_required: "Επιλέξτε ένα emoji."
         icon_required: "Επιλέξτε ένα εικονίδιο."
       name: "Όνομα κατηγορίας"
       description: "Περιγραφή"
@@ -4226,6 +4288,9 @@ el:
         no_groups_selected: "Δεν έχει δοθεί πρόσβαση σε ομάδες. Αυτή η κατηγορία θα είναι ορατή μόνο στο προσωπικό."
         everyone_full_access: 'Αυτή η κατηγορία είναι δημόσια, όλοι μπορούν να δουν, να απαντήσουν και να δημιουργήσουν αναρτήσεις. Για να περιορίσετε τα δικαιώματα, αφαιρέστε ένα ή περισσότερα από τα δικαιώματα που έχουν εκχωρηθεί στην ομάδα "%{everyone_group}".'
         specific_groups_have_access: "Αυτή η κατηγορία είναι ιδιωτική, μόνο οι επιλεγμένες ομάδες μπορούν να δουν, να απαντήσουν και να δημιουργήσουν αναρτήσεις."
+        toggle_reply: "Εναλλαγή δικαιώματος απάντησης"
+        toggle_full: "Εναλλαγή δικαιώματος δημιουργίας"
+        inherited: 'Αυτό το δικαίωμα κληρονομείται από "%{everyone_group}"'
       uncategorized_security_warning: "Αυτή η κατηγορία είναι ξεχωριστή. Προορίζεται ως περιοχή διατήρησης για θέματα που δεν έχουν κατηγορία. Δε μπορεί να έχει ρυθμίσεις ασφαλείας."
       uncategorized_general_warning: 'Αυτή η κατηγορία είναι ξεχωριστή. Χρησιμοποιείται ως προεπιλεγμένη κατηγορία για νέα θέματα που δεν έχουν επιλεγμένη κατηγορία. Αν θέλετε να αποτρέψετε αυτήν τη συμπεριφορά και να επιβάλετε επιλογή κατηγορίας, <a href="%{settingLink}">παρακαλώ απενεργοποιήστε τη ρύθμιση εδώ</a>. Εάν θέλετε να αλλάξετε το όνομα ή την περιγραφή, μεταβείτε στο <a href="%{customizeLink}">Προσαρμογή/Περιεχόμενο κειμένου</a>.'
       pending_permission_change_alert: "Δεν έχετε προσθέσει %{group} σε αυτήν την κατηγορία· κάντε κλικ σε αυτό το κουμπί για να προσθέσετε."
@@ -4253,6 +4318,7 @@ el:
       this_year: "φέτος"
       position: "Θέση στη σελίδα κατηγοριών:"
       default_position: "Προεπιλεγμένη θέση"
+      position_disabled: "Οι κατηγορίες θα εμφανίζονται κατά σειρά δραστηριότητας. Για να ελέγχετε τη σειρά των κατηγοριών στις λίστες, ενεργοποιήστε τη ρύθμιση <a href='%{url}'>'fixed category positions'</a>."
       minimum_required_tags: "Ελάχιστος αριθμός ετικετών που απαιτούνται σε ένα θέμα:"
       default_slow_mode: 'Ενεργοποιήστε την "Αργή λειτουργία" για νέα θέματα σε αυτήν την κατηγορία.'
       subcategory_of: "Υποκατηγορία του..."
@@ -4265,7 +4331,9 @@ el:
         group_restricted: "Ιδιωτική"
         who_can_see: "Ποιος μπορεί να δει αυτή την κατηγορία"
         who_can_post: "Ποιος μπορεί να δημοσιεύσει σε αυτήν την κατηγορία"
+        which_groups_can_access: "Ποιες ομάδες μπορούν να δουν και να δημοσιεύσουν σε αυτήν την κατηγορία"
         more_options_hint: "Περισσότερα δικαιώματα διαθέσιμα στις <a href>προχωρημένες ρυθμίσεις</a>."
+        inherited_from_parent: "Τα δικαιώματα κληρονομούνται από τη γονική κατηγορία. Για να βελτιώσετε, επισκεφθείτε τις <a href>προχωρημένες ρυθμίσεις</a>."
       num_auto_bump_daily: "Αριθμός ανοιχτών θεμάτων για αυτόματη ώθηση καθημερινά:"
       navigate_to_first_post_after_read: "Μεταβείτε στην πρώτη ανάρτηση μετά την ανάγνωση των θεμάτων"
       notifications:
@@ -4350,6 +4418,8 @@ el:
       notify_user_textarea_label: "Μήνυμα για το χρήστη"
       custom_placeholder_notify_moderators: "Παρακαλούμε πες τι ακριβως είναι αυτό που σε ανησυχεί. Αν είναι δυνατό, παράπεμψε σε σχετικούς συνδέσμους και παραδείγματα."
       notify_moderators_textarea_label: "Μήνυμα για τους συντονιστές"
+      custom_placeholder_illegal: "Παρακαλούμε ενημερώστε μας συγκεκριμένα για ποιον λόγο πιστεύετε ότι το περιεχόμενο αυτό είναι παράνομο, και παρέχετε σχετικούς συνδέσμους και παραδείγματα όπου είναι δυνατόν."
+      confirmation_illegal: "Ό,τι έγραψα παραπάνω είναι ακριβές και πλήρες."
       custom_message:
         at_least:
           one: "βάλε τουλάχιστον %{count} χαρακτήρα"
@@ -4540,9 +4610,9 @@ el:
         today: "Σήμερα"
         custom: "Προσαρμοσμένο"
     permission_types:
-      full: "Δημιούργησε / Απάντησε / Δες"
-      create_post: "Απάντησε / Δες"
-      readonly: "Δες"
+      full: "Δημιουργία / Απάντηση / Προβολή"
+      create_post: "Απάντηση / Προβολή"
+      readonly: "Προβολή"
     preloader_text: "Φόρτωση"
     lightbox:
       download: "Κατέβασμα"
@@ -4740,16 +4810,21 @@ el:
         other: "επιλέξτε %{count} ετικέτες από '%{name}'…"
       info: "Εμφάνιση πληροφοριών ετικέτας"
       default_info: "Αυτή η ετικέτα δεν περιορίζεται σε καμία κατηγορία και δεν έχει συνώνυμα."
-      category_restricted: "Αυτή η ετικέτα περιορίζεται σε κατηγορίες στις οποίες δεν έχετε άδεια πρόσβασης."
+      category_restricted: "Αυτή η ετικέτα περιορίζεται σε κατηγορίες στις οποίες δεν έχετε δικαίωμα πρόσβασης."
       synonyms: "Συνώνυμα"
       synonyms_description: "Όταν χρησιμοποιούνται οι ακόλουθες ετικέτες, θα αντικατασταθούν με <b>%{base_tag_name}</b>."
       save: "Αποθήκευση ονόματος και περιγραφής της ετικέτας"
       tag_groups_info:
         one: 'Αυτή η ετικέτα ανήκει στην ομάδα "%{tag_groups}".'
         other: "Αυτή η ετικέτα ανήκει σε αυτές τις ομάδες: %{tag_groups}."
+      tag_groups_info_prefix:
+        one: "Αυτή η ετικέτα ανήκει στην ομάδα "
+        other: "Αυτή η ετικέτα ανήκει σε αυτές τις ομάδες: "
       category_restrictions:
         one: "Μπορεί να χρησιμοποιηθεί μόνο σε αυτήν την κατηγορία:"
         other: "Μπορεί να χρησιμοποιηθεί μόνο σε αυτές τις κατηγορίες:"
+      restricted_to: "Περιορίζεται σε"
+      no_synonyms: "Αυτή η ετικέτα δεν έχει συνώνυμα."
       edit_synonyms: "Επεξεργασία συνωνύμων"
       add_synonyms_label: "Προσθήκη συνωνύμων:"
       add_synonyms: "Προσθήκη"
@@ -4772,13 +4847,20 @@ el:
       description: "Περιγραφή"
       settings:
         title: "Ρυθμίσεις"
+        edit_title: "Επεξεργασία ετικέτας: %{name}"
+        edit_tag_prefix: "Επεξεργασία ετικέτας:"
+        select_tag: "Επιλέξτε μια ετικέτα για επεξεργασία"
         general: "Γενικά"
         back: "Πίσω"
         name: "Όνομα"
         slug: "Slug"
         name_placeholder: "Όνομα ετικέτας"
+        saved: "Οι ρυθμίσεις ετικέτας αποθηκεύτηκαν"
+        no_synonyms: "Δεν έχουν οριστεί συνώνυμα για αυτήν την ετικέτα."
         add_synonym_placeholder: "Αναζήτησε ετικέτες για προσθήκη ως συνώνυμα..."
         synonyms_subtitle: "Όταν χρησιμοποιούνται οι ακόλουθες ετικέτες, θα αντικατασταθούν με %{name}"
+        save: "Αποθήκευση ετικέτας"
+        delete: "Διαγραφή ετικέτας"
       localization:
         name: "Όνομα"
         description: "Περιγραφή"
@@ -5272,12 +5354,13 @@ el:
       toggle_localized:
         translated: "Η σελίδα είναι μεταφρασμένη από μηχανή. Κάντε κλικ για να δείτε το πρωτότυπο."
         not_translated: "Η σελίδα δεν έχει μεταφραστεί. Κάντε κλικ για μετάφραση."
+        translations_enabled: "Μεταφράσεις ενεργοποιημένες"
+        translations_disabled: "Μεταφράσεις απενεργοποιημένες"
     language_switcher:
       title: "Αλλαγή γλώσσας ιστότοπου"
   admin_js:
     type_to_filter: "Πληκτρολογήστε για φιλτράρισμα…"
     settings: "Ρυθμίσεις"
-    reset_filter: "Επαναφορά"
     toggle_filters: "Εναλλαγή αναπτυσσόμενων φίλτρων"
     admin:
       title: "Διαχειριστής"
@@ -5295,6 +5378,7 @@ el:
         back: "Πίσω σε όλες τις αναφορές"
         group_traffic: "Κίνηση"
         group_members: "Μέλη"
+        group_content: "Περιεχόμενο & Υγεία"
         group_moderation: "Συντονισμός"
         group_security: "Ασφάλεια"
         group_other: "Άλλα"
@@ -5313,6 +5397,8 @@ el:
           title: "Ασφάλεια"
         plugins:
           title: "Πρόσθετα"
+        advanced:
+          title: "Προχωρημένα"
       upcoming_changes:
         name: "Όνομα"
         plugin: "Πρόσθετο"
@@ -5325,6 +5411,7 @@ el:
         add_groups_to_enable: "Προσθέστε ομάδες για να ενεργοποιήσετε αυτήν τη λειτουργία"
         no_changes_to_save: "Δεν υπάρχουν αλλαγές για αποθήκευση"
         select_groups: "Επιλέξτε ομάδες…"
+        show_related_settings: "Εμφάνιση σχετικών ρυθμίσεων..."
         change_enabled_for_success: "Έχετε ενεργοποιήσει αυτήν την αλλαγή για %{enabledFor}"
         change_disabled: "Έχετε εξαιρεθεί από αυτήν την αλλαγή"
         permanent_notice: "Αυτή η αλλαγή είναι πλέον μόνιμη και σύντομα θα καταργηθεί. Δεν μπορείτε πλέον να εξαιρεθείτε."
@@ -5335,6 +5422,7 @@ el:
         enabled_for_options:
           no_one: "Κανέναν"
           everyone: "Όλοι"
+          staff: "%{staffGroupName} μόνο"
           specific_groups: "Συγκεκριμένη/ες ομάδα/ες"
           specific_groups_with_group_names:
             one: "η ομάδα %{groupNames}"
@@ -5354,6 +5442,8 @@ el:
           no_results: "Καμία επερχόμενη αλλαγή δεν αντιστοιχεί με το φίλτρο σας"
           all: "Όλα"
           enabled: "Ενεργοποιημένα"
+          enabled_for_staff: "Ενεργοποιημένη για %{staffGroupName}"
+          enabled_for_specific_groups: "Ενεργοποιημένη για συγκεκριμένες ομάδες"
           disabled: "Απενεργοποιημένο"
           impact_type_feature: "Λειτουργία"
           impact_type_other: "Άλλα"
@@ -5603,6 +5693,8 @@ el:
           header_description: "Ανακατευθύνσεις προς εφαρμογή σε διευθύνσεις URL που δεν είναι γνωστές στο forum"
         user_defaults:
           title: "Προεπιλογές χρήστη"
+          header_description: "Ορίστε προεπιλεγμένες τιμές για ρυθμίσεις που επηρεάζουν τους χρήστες σας, διαμορφώνοντας την εμπειρία ενσωμάτωσής τους"
+          keywords: "χρήστες|ενσωμάτωση|νέοι"
         user_fields:
           title: "Πεδία χρήστη"
         color_palettes:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 65dab3652bbd3..e86f960c48e1f 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -4195,11 +4195,13 @@ es:
         delete: "Eliminar"
         add: "Añadir grupo de etiquetas obligado"
         placeholder: "Selecciona un grupo de etiquetas…"
+        tag_group: "Grupo de etiquetas"
       topic_featured_link_allowed: "Permitir enlaces destacados en esta categoría"
       delete: "Eliminar categoría"
       create: "Crear categoría"
       create_long: "Crear una nueva categoría"
       save: "Guardar categoría"
+      unsaved_changes: "Tienes cambios sin guardar"
       slug: "Identificador de URL de la categoría"
       parent: "Categoría padre"
       slug_placeholder: "(Opcional) palabras-separadas-por-guiones para URL"
@@ -5350,7 +5352,6 @@ es:
   admin_js:
     type_to_filter: "Escribe para filtrar…"
     settings: "Ajustes"
-    reset_filter: "Restablecer"
     admin:
       title: "Administrador de Discourse"
       moderator: "Moderador"
diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml
index 5a030b9efd91c..a187fd0e17f7c 100644
--- a/config/locales/client.et.yml
+++ b/config/locales/client.et.yml
@@ -2726,7 +2726,6 @@ et:
         categories: "Kõik kategooriad"
   admin_js:
     settings: "Sätted"
-    reset_filter: "Nulli"
     admin:
       title: "Discourse'i adminn"
       moderator: "Moderaator"
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 3b2a68c5cbd20..15fabfd0c865d 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -4840,7 +4840,6 @@ fa_IR:
   admin_js:
     type_to_filter: "برای فیلتر کردن تایپ کنید..."
     settings: "تنظیمات"
-    reset_filter: "بازنشانی"
     admin:
       title: "مدیر ارشد دیسکورس"
       moderator: "ناظر"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 5ed273bf894e9..74faf25e7d035 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -4072,8 +4072,10 @@ fi:
         delete: "Poista"
         add: "Lisää pakollinen tunnisteryhmä"
         placeholder: "Valitse tunnisteryhmä…"
+        tag_group: "Tunnisteryhmä"
       topic_featured_link_allowed: "Salli ketjulinkit tällä alueella"
       create_long: "Luo uusi alue"
+      unsaved_changes: "Sinulla on tallentamattomia muutoksia"
       slug_placeholder: "(Valinnainen) väliviivoilla erotettuja sanoja URL-osoitetta varten"
       creation_error: Alueen luonnissa tapahtui virhe.
       save_error: Alueen tallennuksessa tapahtui virhe.
@@ -5171,7 +5173,6 @@ fi:
   admin_js:
     type_to_filter: "Kirjoita suodattaaksesi…"
     settings: "Asetukset"
-    reset_filter: "Palauta"
     admin:
       title: "Discoursen ylläpitäjä"
       moderator: "Valvoja"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 04ecbdf1e12d5..523894993678a 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -4098,8 +4098,10 @@ fr:
         delete: "Supprimer"
         add: "Ajouter le groupe d'étiquettes requis"
         placeholder: "Sélectionner un groupe d'étiquettes…"
+        tag_group: "Groupe d'étiquettes "
       topic_featured_link_allowed: "Autoriser les liens à la une dans cette catégorie"
       create_long: "Créer une nouvelle catégorie"
+      unsaved_changes: "Vous avez des modifications non enregistrées"
       slug_placeholder: "(Facultatif) mots séparés par des tirets pour l'URL"
       creation_error: Une erreur s'est produite lors de la création de la catégorie.
       save_error: Une erreur s'est produite lors de l'enregistrement de la catégorie.
@@ -5197,7 +5199,6 @@ fr:
   admin_js:
     type_to_filter: "Commencez votre saisie pour filtrer…"
     settings: "Paramètres"
-    reset_filter: "Réinitialiser"
     admin:
       title: "Administrateur Discourse"
       moderator: "Modérateur"
diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml
index 241ea76656c79..210634a21466b 100644
--- a/config/locales/client.gl.yml
+++ b/config/locales/client.gl.yml
@@ -2759,6 +2759,7 @@ gl:
       allow_global_tags_label: "Permitir tamén outras etiquetas"
       required_tag_group:
         delete: "Eliminar"
+        tag_group: "Grupo de etiquetas"
       topic_featured_link_allowed: "Permitir ligazóns de actualidade nesta categoría"
       create_long: "Crear unha nova categoría"
       slug_placeholder: "Inserir guións entre palabras para o url (opcional)"
@@ -3403,7 +3404,6 @@ gl:
         categories: "Todas as categorías"
   admin_js:
     settings: "Configuración"
-    reset_filter: "Restabelecer"
     admin:
       title: "Administrador de Discourse"
       moderator: "Moderador"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 4e80e96c0d16c..abe2b8b5a9534 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -4655,11 +4655,13 @@ he:
         delete: "הסרה"
         add: "הוספת קבוצת תגיות נדרשת"
         placeholder: "בחירת קבוצת תגיות…"
+        tag_group: "קבוצת תגיות"
       topic_featured_link_allowed: "אפשרו קישורים מומלצים בקטגוריה זו"
       delete: "מחיקת קטגוריה"
       create: "קטגוריה חדשה"
       create_long: "יצירת קטגוריה חדשה"
       save: "שמירת קטגוריה"
+      unsaved_changes: "יש שינויים שלא נשמרו"
       slug: "כתובת ייצוגית לקטגוריה"
       parent: "קטגוריית הורה"
       slug_placeholder: "(רשות) מילים-מחוברות-במקפים-ככתובת"
@@ -5901,7 +5903,6 @@ he:
   admin_js:
     type_to_filter: "יש להקליד לסינון…"
     settings: "הגדרות"
-    reset_filter: "איפוס"
     admin:
       title: "ניהול Discourse"
       moderator: "מפקח"
diff --git a/config/locales/client.hr.yml b/config/locales/client.hr.yml
index e10f0cf06b0a0..3fc6a1afb3c4a 100644
--- a/config/locales/client.hr.yml
+++ b/config/locales/client.hr.yml
@@ -4302,8 +4302,10 @@ hr:
         delete: "Pobriši"
         add: "Dodajte potrebnu grupu oznaka"
         placeholder: "Odaberite grupu oznaka"
+        tag_group: "Grupa oznaka"
       topic_featured_link_allowed: "Dopusti istaknute poveznice u ovoj kategoriji"
       create_long: "Stvorite novu kategoriju"
+      unsaved_changes: "Imate nespremljene promjene"
       slug_placeholder: "(Neobavezno) spojene-riječi za url"
       creation_error: Dogodila se greška pri stvaranju kategorije.
       save_error: Dogodila se greška pri spremanju kategorije.
@@ -5443,7 +5445,6 @@ hr:
   admin_js:
     type_to_filter: "Upišite za filtriranje…"
     settings: "Postavke"
-    reset_filter: "Resetirati"
     admin:
       title: "Administrator"
       moderator: "Moderator"
diff --git a/config/locales/client.hu.yml b/config/locales/client.hu.yml
index 6d25ba9fa850a..5dbfcb898ac17 100644
--- a/config/locales/client.hu.yml
+++ b/config/locales/client.hu.yml
@@ -4259,6 +4259,7 @@ hu:
       create: "Új kategória"
       create_long: "Új kategória létrehozása"
       save: "Kategória mentése"
+      unsaved_changes: "Nem mentett módosításai vannak"
       slug: "Kategória URL-végződés"
       parent: "Szülő kategória"
       slug_placeholder: "(Nem kötelező) kötőjeles-szavak a webcímhez"
@@ -5432,7 +5433,6 @@ hu:
   admin_js:
     type_to_filter: "Írj ide a szűréshez.."
     settings: "Beállítások"
-    reset_filter: "Alaphelyzetbe állítás"
     toggle_filters: "Legördülő szűrők be- és kikapcsolása"
     admin:
       title: "Discourse Adminisztrátor"
diff --git a/config/locales/client.hy.yml b/config/locales/client.hy.yml
index 8e6bf1ce69ad8..fd052f2173aeb 100644
--- a/config/locales/client.hy.yml
+++ b/config/locales/client.hy.yml
@@ -3797,7 +3797,6 @@ hy:
         categories: "Բոլոր կատեգորիաները"
   admin_js:
     settings: "Կարգավորումներ"
-    reset_filter: "Վերահաստատե;"
     admin:
       title: "Discourse Ադմին"
       moderator: "Մոդերատոր"
diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml
index e433b4cae69ff..4c28aeb561ee5 100644
--- a/config/locales/client.id.yml
+++ b/config/locales/client.id.yml
@@ -2316,7 +2316,6 @@ id:
         categories: "Semua kategori"
   admin_js:
     settings: "Pengaturan"
-    reset_filter: "Reset"
     admin:
       title: "Admin Discourse"
       moderator: "Moderator"
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index ccd2bbedb48d8..27a00dc657214 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -4069,8 +4069,10 @@ it:
         delete: "Cancella"
         add: "Aggiungi il gruppo di etichette richiesto"
         placeholder: "Seleziona un gruppo di etichette…"
+        tag_group: "Gruppo di Etichette"
       topic_featured_link_allowed: "Consenti collegamenti in primo piano in questa categoria"
       create_long: "Crea una nuova categoria"
+      unsaved_changes: "Hai modifiche non salvate"
       slug_placeholder: "(Facoltativo) parole-sillabate per URL"
       creation_error: Si è verificato un errore nella creazione della categoria.
       save_error: Si è verificato un errore durante il salvataggio della categoria.
@@ -5168,7 +5170,6 @@ it:
   admin_js:
     type_to_filter: "Digita per filtrare…"
     settings: "Impostazioni"
-    reset_filter: "Reimposta"
     admin:
       title: "Amministratore Discourse"
       moderator: "Moderatore"
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index ca81f84c25726..80eb34ce1f631 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -4021,11 +4021,13 @@ ja:
         delete: "削除"
         add: "必須タググループを追加する"
         placeholder: "タググループを選択…"
+        tag_group: "タググループ"
       topic_featured_link_allowed: "このカテゴリに注目のリンクを許可する"
       delete: "カテゴリを削除する"
       create: "新しいカテゴリ"
       create_long: "新しいカテゴリを作成する"
       save: "カテゴリを保存する"
+      unsaved_changes: "保存されていない変更があります"
       slug: "カテゴリのスラッグ"
       parent: "親カテゴリ"
       slug_placeholder: "(オプション) URL 用のダッシュ区切りの語"
@@ -5147,7 +5149,6 @@ ja:
   admin_js:
     type_to_filter: "入力してフィルタ..."
     settings: "設定"
-    reset_filter: "リセット"
     toggle_filters: "ドロップダウンのフィルタを切り替える"
     admin:
       title: "Discourse の管理者"
@@ -5677,6 +5678,7 @@ ja:
         new_features:
           title: "新機能"
           subtitle: "新しい機能や改善機能は常にリリースされています。このページでは主な内容を説明していますが、'詳細' をクリックすると、さらに詳しく説明されたリリースノートをご覧いただけます。"
+          no_new_features_error: "フィードを読み込み中にエラーが発生しました。以前の新機能の発表は <a href='%{url}' target='_blank'>Discover Meta コミュニティー</a>をご覧ください。"
           learn_more: "もっと詳しく..."
         last_checked: "最終チェック"
         refresh_problems: "更新"
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 04885a4072a64..6b961d8e2aa96 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -3781,7 +3781,6 @@ ko:
   admin_js:
     type_to_filter: "필터 입력..."
     settings: "설정"
-    reset_filter: "리셋"
     admin:
       title: "Discourse 관리자"
       moderator: "운영자"
diff --git a/config/locales/client.lt.yml b/config/locales/client.lt.yml
index 175daddf3954e..e15babdb15786 100644
--- a/config/locales/client.lt.yml
+++ b/config/locales/client.lt.yml
@@ -3406,6 +3406,7 @@ lt:
       allow_global_tags_label: "Taip pat leiskite kitas žymas"
       required_tag_group:
         delete: "Pašalinti"
+        tag_group: "Žymų grupė"
       topic_featured_link_allowed: "Leisti svarbiausias šios kategorijos nuorodas"
       create_long: "Sukurti naują kategoriją"
       slug_placeholder: "(Pasirinktinai) brūkšniniai žodžiai skirti URL"
@@ -4125,7 +4126,6 @@ lt:
   admin_js:
     type_to_filter: "Įveskite filtrą…"
     settings: "Nustatymai"
-    reset_filter: "Atstatyti"
     admin:
       title: "Forumo administratorius"
       moderator: "Moderatorius"
diff --git a/config/locales/client.lv.yml b/config/locales/client.lv.yml
index 41e9fa802abe4..637883b7663a7 100644
--- a/config/locales/client.lv.yml
+++ b/config/locales/client.lv.yml
@@ -2845,7 +2845,6 @@ lv:
         categories: "Visas sadaļas"
   admin_js:
     settings: "Iestatījumi"
-    reset_filter: "Atlikt"
     admin:
       title: "Discourse administrators"
       moderator: "Moderators"
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 5b732bc9ea50f..854379089876b 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -3639,6 +3639,7 @@ nb_NO:
         delete: "Slett"
         add: "Legg til påkrevd stikkordgruppe"
         placeholder: "Velg stikkordgruppe…"
+        tag_group: "Stikkordgrupper"
       topic_featured_link_allowed: "Tillat fremhevede lenker i denne kategorien"
       create_long: "Opprett en ny kategori"
       slug_placeholder: "(Valgfritt) sammensatte ord for bruk i URL"
@@ -4330,7 +4331,6 @@ nb_NO:
   admin_js:
     type_to_filter: "Skriv for å filtrere…"
     settings: "Instillinger"
-    reset_filter: "Tilbakestill"
     admin:
       title: "Discourse-admin"
       moderator: "Moderator"
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 0b8131de278e7..7b31eb5af6e39 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -4136,8 +4136,10 @@ nl:
         delete: "Verwijderen"
         add: "Vereiste taggroep toevoegen"
         placeholder: "Selecteer taggroep…"
+        tag_group: "Tag-groep"
       topic_featured_link_allowed: "Uitgelichte links toestaan in deze categorie"
       create_long: "Nieuwe categorie maken"
+      unsaved_changes: "Je hebt niet-opgeslagen wijzigingen"
       slug_placeholder: "(Optioneel) met streepjes verbonden woorden voor URL"
       creation_error: Er is een fout opgetreden bij het maken van de categorie.
       save_error: Er is een fout opgetreden bij het opslaan van de categorie.
@@ -5236,7 +5238,6 @@ nl:
   admin_js:
     type_to_filter: "Typ om te filteren…"
     settings: "Instellingen"
-    reset_filter: "Resetten"
     admin:
       title: "Discourse-beheerder"
       moderator: "Moderator"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index aafb2cb5d0a88..54baa0e28d091 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -4815,11 +4815,15 @@ pl_PL:
         delete: "Usuń"
         add: "Dodaj wymaganą grupę tagów"
         placeholder: "Wybierz grupę tagów…"
+        min_count: "Liczba tagów"
+        tag_group: "Grupa tagów"
       topic_featured_link_allowed: "Zezwól na wybrane linki w tej kategorii"
       delete: "Usuń kategorię"
       create: "Nowa kategoria"
       create_long: "Utwórz nową kategorię"
+      create_category: "Utwórz kategorię"
       save: "Zapisz kategorię"
+      unsaved_changes: "Masz niezapisane zmiany"
       slug: "Slug kategorii"
       parent: "Kategoria nadrzędna"
       slug_placeholder: "(opcjonalne) słowa-z-myślnikiem dla URLi"
@@ -6106,7 +6110,7 @@ pl_PL:
   admin_js:
     type_to_filter: "Pisz, aby filtrować…"
     settings: "Ustawienia"
-    reset_filter: "Przywróć"
+    reset_filter: "Zresetuj filtr"
     toggle_filters: "Przełącz filtry rozwijane"
     admin:
       title: "Administrator Discourse"
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index e945109db4d53..5e98ca53fdc2e 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -3868,6 +3868,7 @@ pt:
       allow_global_tags_label: "Permita também outras tags"
       required_tag_group:
         delete: "Eliminar"
+        tag_group: "Grupo de tags"
       topic_featured_link_allowed: "Permitir hiperligações em destaque nesta categoria"
       create_long: "Criar uma nova categoria"
       slug_placeholder: "(Opcional) palavras com travessão no URL"
@@ -4521,7 +4522,6 @@ pt:
   admin_js:
     type_to_filter: "Digite para filtrar..."
     settings: "Configurações"
-    reset_filter: "Repor"
     admin:
       title: "Administração Discourse"
       moderator: "Moderador"
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 9387e5e865d5d..96a39fb876097 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -4115,8 +4115,10 @@ pt_BR:
         delete: "Excluir"
         add: "Adicionar grupo de tags necessário"
         placeholder: "Selecionar grupo de etiquetas…"
+        tag_group: "Grupo de etiquetas"
       topic_featured_link_allowed: "Permitir links em destaque nesta categoria"
       create_long: "Criar uma nova categoria"
+      unsaved_changes: "Você tem alterações não salvas"
       slug_placeholder: "(Opcional) palavras hifenizadas para url"
       creation_error: Houve um erro durante a criação da categoria.
       save_error: Houve um erro ao salvar a categoria.
@@ -5214,7 +5216,6 @@ pt_BR:
   admin_js:
     type_to_filter: "Digite para filtrar..."
     settings: "Configurações"
-    reset_filter: "Redefinir"
     admin:
       title: "Administrador(a) do Discourse"
       moderator: "Moderador(a)"
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 4380e5d7ae10b..7d69a3a031923 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -3158,6 +3158,7 @@ ro:
         delete: "Șterge"
       topic_featured_link_allowed: "Permite link-uri promovate în această categorie."
       create_long: "Creează o categorie nouă"
+      unsaved_changes: "Ai modificări nesalvate"
       slug_placeholder: "(Opțional) cuvinte-punctate pentru url"
       creation_error: A apărut o eroare în timpul creării categoriei.
       save_error: A apărut o eroare in timpul salvării categoriei.
@@ -3882,7 +3883,6 @@ ro:
   admin_js:
     type_to_filter: "Tastează pentru a filtra…"
     settings: "Opțiuni"
-    reset_filter: "Resetare"
     admin:
       title: "Admin Discourse"
       moderator: "Moderator"
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 4c6dd2559a30d..929f33b23997d 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -4551,8 +4551,10 @@ ru:
         delete: "Удалить"
         add: "Добавить необходимую группу тегов"
         placeholder: "Выберите группу тегов…"
+        tag_group: "Группа тегов"
       topic_featured_link_allowed: "Разрешить избранные ссылки в этой категории"
       create_long: "Создать новую категорию"
+      unsaved_changes: "У вас есть несохраненные изменения"
       slug_placeholder: "(Необязат.) Слова для URL, разделённые дефисами"
       creation_error: При создании новой категории возникла ошибка.
       save_error: При сохранении категории возникла ошибка.
@@ -5741,7 +5743,6 @@ ru:
   admin_js:
     type_to_filter: "Фильтрация настроек…"
     settings: "Настройки"
-    reset_filter: "Сбросить"
     admin:
       title: "Администратор Discourse"
       moderator: "Модератор"
diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml
index 888481bdc8d68..e636cd5091838 100644
--- a/config/locales/client.sk.yml
+++ b/config/locales/client.sk.yml
@@ -4395,6 +4395,7 @@ sk:
         placeholder: "Vybrať skupinu značiek…"
       topic_featured_link_allowed: "Povoliť odporúčané odkazy v tejto kategórii"
       create_long: "Vytvoriť novú kategóriu"
+      unsaved_changes: "Máte neuložené zmeny"
       slug_placeholder: "(Voliteľné) pomlčkou-prerušované-slová pre url"
       creation_error: Nastala chyba počas vytvárania kategórie.
       save_error: Nastala chyba počas ukladania kategórie
@@ -5579,7 +5580,6 @@ sk:
   admin_js:
     type_to_filter: "Filtrovať..."
     settings: "Nastavenia"
-    reset_filter: "Resetovať"
     admin:
       title: "Administrátor Discourse"
       moderator: "Moderátor"
diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml
index a7ac57161b3aa..f7959217541df 100644
--- a/config/locales/client.sl.yml
+++ b/config/locales/client.sl.yml
@@ -3722,7 +3722,6 @@ sl:
         categories: "Vse kategorije"
   admin_js:
     settings: "Nastavitve"
-    reset_filter: "Ponastavi"
     admin:
       title: "Discourse Admin"
       moderator: "Moderator"
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 681226b2c6330..62b22a72b7028 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -3953,7 +3953,6 @@ sq:
         categories: "Të gjitha kategoritë"
   admin_js:
     settings: "Rregullimet"
-    reset_filter: "Rivendosni"
     admin:
       title: "Administrator"
       moderator: "Moderator"
diff --git a/config/locales/client.sr.yml b/config/locales/client.sr.yml
index 3b08b812fcc79..53cabdae1300c 100644
--- a/config/locales/client.sr.yml
+++ b/config/locales/client.sr.yml
@@ -2602,7 +2602,6 @@ sr:
         categories: "Sve kategorije"
   admin_js:
     settings: "Podešavanja"
-    reset_filter: "Reset"
     admin:
       title: "Administrator"
       moderator: "Moderator"
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index 14cee055a6f77..7c731cbfea9f1 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -3449,6 +3449,7 @@ sv:
         delete: "Radera"
         add: "Lägg till obligatorisk tagg-grupp"
         placeholder: "Välj tagg-grupp…"
+        tag_group: "Tagg-grupp"
       topic_featured_link_allowed: "Tillåt utvalda länkar i denna kategori"
       create_long: "Skapa en ny kategori"
       slug_placeholder: "(Valfritt) streckade ord för url"
@@ -4360,7 +4361,6 @@ sv:
   admin_js:
     type_to_filter: "Skriv för att filtrera…"
     settings: "Inställningar"
-    reset_filter: "Återställ"
     admin:
       title: "Discourse-administratör"
       moderator: "Moderator"
diff --git a/config/locales/client.sw.yml b/config/locales/client.sw.yml
index f2619aa7e3b6b..b1e677d525219 100644
--- a/config/locales/client.sw.yml
+++ b/config/locales/client.sw.yml
@@ -2401,7 +2401,6 @@ sw:
         categories: "Kategoria Zote"
   admin_js:
     settings: "Mipangilio"
-    reset_filter: "Weka/Anzisha Upya"
     admin:
       title: "Kiongozi wa Discourse"
       moderator: "Msimamizi"
diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml
index ec2117ac69b4a..058597c49ee77 100644
--- a/config/locales/client.te.yml
+++ b/config/locales/client.te.yml
@@ -4338,7 +4338,6 @@ te:
   admin_js:
     type_to_filter: "ఫిల్టర్ చేయడానికి టైప్ చేయండి…"
     settings: "అమరికలు"
-    reset_filter: "రీసెట్ చేయండి"
     admin:
       title: "డిస్కోర్స్ అడ్మిన్"
       moderator: "నిర్వాహకుడు"
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index 5c9699d794413..e288788227b48 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -4072,8 +4072,10 @@ tr_TR:
         delete: "Sil"
         add: "Gerekli etiket grubu ekleyin"
         placeholder: "Etiket grubu seç…"
+        tag_group: "Etiket grubu"
       topic_featured_link_allowed: "Bu kategoride öne çıkan bağlantılara izin ver"
       create_long: "Yeni bir kategori oluştur"
+      unsaved_changes: "Kaydedilmemiş değişiklikleriniz var"
       slug_placeholder: "(İsteğe bağlı) url için çizgiyle ayrılmış kelimeler"
       creation_error: Kategori oluşturulurken bir hata oluştu.
       save_error: Kategori kaydedilirken bir hata oluştu.
@@ -5171,7 +5173,6 @@ tr_TR:
   admin_js:
     type_to_filter: "Filtrelemek için yazın…"
     settings: "Ayarlar"
-    reset_filter: "Sıfırla"
     admin:
       title: "Discourse Yöneticisi"
       moderator: "Moderatör"
diff --git a/config/locales/client.ug.yml b/config/locales/client.ug.yml
index 1463002adc5c1..cbad2778ccfc7 100644
--- a/config/locales/client.ug.yml
+++ b/config/locales/client.ug.yml
@@ -4233,6 +4233,7 @@ ug:
       create: "يېڭى سەھىپە"
       create_long: "يېڭى سەھىپە قۇرىدۇ"
       save: "سەھىپە ساقلا"
+      unsaved_changes: "ساقلانمىغان ئۆزگەرتىشلىرىڭىز بار"
       slug: "سەھىپە قىسقارتما"
       parent: "ئانا سەھىپە"
       slug_placeholder: "(تاللاشچان) تور ئادرېسىغا ئىشلىتىلىدىغان سىزىقلىق سۆز"
@@ -5381,7 +5382,6 @@ ug:
   admin_js:
     type_to_filter: "كىرگۈزۈلسە سۈزىدۇ…"
     settings: "تەڭشەكلەر"
-    reset_filter: "ئەسلىگە قايتۇر"
     toggle_filters: "تارتما سۈزگۈچنى ئالماشتۇرىدۇ"
     admin:
       title: "Discourse باشقۇرغۇچى"
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 8fdf6983cd493..1e5a18a8076a5 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -4787,11 +4787,13 @@ uk:
         delete: "Вилучити"
         add: "Додайте необхідну групу теґів"
         placeholder: "Вибрати групу тегів…"
+        tag_group: "Група тегів"
       topic_featured_link_allowed: "Дозволити популярні посилання в цьому розділі"
       delete: "Видалити категорію"
       create: "Нова категорія"
       create_long: "Створити розділ"
       save: "Зберегти категорію"
+      unsaved_changes: "Є незбережені зміни"
       slug: "Посилання на розділ"
       parent: "Батьківська категорія"
       slug_placeholder: "(Опція) дефіси в url"
@@ -6080,7 +6082,6 @@ uk:
   admin_js:
     type_to_filter: "Текст для пошуку…"
     settings: "Налаштування"
-    reset_filter: "Скинути"
     toggle_filters: "Перемкнути випадаючі фільтри"
     admin:
       title: "Адміністратор Discourse"
diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml
index 45713de325863..11feff18bf86c 100644
--- a/config/locales/client.ur.yml
+++ b/config/locales/client.ur.yml
@@ -3333,6 +3333,12 @@ ur:
         delete_topics_count:
           one: "موضوع حذف کریں"
           other: "موضوعات حذف کریں"
+        delete_posts_count:
+          one: "پوسٹ حذف کریں"
+          other: "پوسٹس حذف کریں"
+        delete_posts_confirmation:
+          one: "کیا آپ واقعی %{count} پوسٹ حذف کرنا چاہتے ہیں؟"
+          other: "کیا آپ واقعی %{count} پوسٹس حذف کرنا چاہتے ہیں؟"
         dismiss: "بر خاست کریں"
         dismiss_read: "تمام بغیر پڑھے ہوئے بر خاست کریں"
         dismiss_read_with_selected:
@@ -3910,6 +3916,7 @@ ur:
         actions: "حجمی عوامل"
     post:
       accessible_heading: "پوسٹ منجانب %{username} %{date}"
+      heading_anchor: "ہیڈنگ لنک"
       confirm_delete: "کیا آپ واقعی اس پوسٹ کو حذف کرنا چاہتے ہیں؟"
       quote_reply: "اقتباس کریں"
       quote_reply_shortcut: "اقتباس (یا q دبائیں)"
@@ -4236,8 +4243,10 @@ ur:
         delete: "مٹائیں"
         add: "مطلوبہ دہجی گروپ شامل کریں"
         placeholder: "دہجی گروپ کا انتخاب"
+        tag_group: "ٹیگ گروپ"
       topic_featured_link_allowed: "اس زمرہ میں نمایاں رابطوں کو اجازت دیں"
       create_long: "نیا زمرہ بنائیں"
+      unsaved_changes: "آپ کی تبدلیاں محفوظ نہیں ہوئیں"
       slug_placeholder: "(اختیاری) URL کے لئے ڈیش دار الفاظ"
       creation_error: زمرہ بنانے کے دوران ایک خرابی کا سامنا کرنا پڑا۔
       save_error: زمرہ محفوظ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔
@@ -5337,7 +5346,6 @@ ur:
   admin_js:
     type_to_filter: "کو فلٹر کرنے کے لیے ٹائپ کریں…"
     settings: "ترتیبات"
-    reset_filter: "رِی سَیٹ"
     admin:
       title: "ڈِسکورس منتظم"
       moderator: "نگران"
diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml
index 48d59a5713089..03183ff2e19d4 100644
--- a/config/locales/client.vi.yml
+++ b/config/locales/client.vi.yml
@@ -4024,11 +4024,13 @@ vi:
         delete: "Xóa"
         add: "Thêm nhóm thẻ bắt buộc"
         placeholder: "Chọn nhóm thẻ…"
+        tag_group: "Nhóm thẻ"
       topic_featured_link_allowed: "Cho phép các liên kết nổi bật trong chuyên mục này"
       delete: "Xóa chuyên mục"
       create: "Chuyên mục mới"
       create_long: "Tạo Chủ đề mới"
       save: "Lưu chuyên mục"
+      unsaved_changes: "Bạn có những thay đổi chưa được lưu"
       slug: "Đường dẫn chuyên mục"
       parent: "Chuyên mục chính"
       slug_placeholder: "(Tùy chọn) các từ sử dụng trong url"
@@ -5155,7 +5157,6 @@ vi:
   admin_js:
     type_to_filter: "Gõ vào bộ lọc…"
     settings: "Cài đặt"
-    reset_filter: "Cài lại"
     toggle_filters: "Bật/tắt bộ lọc thả xuống"
     admin:
       title: "Quản trị Diễn đàn"
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 56632e9c7a84e..55c745cb09864 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -9,10 +9,19 @@ zh_CN:
     blocks:
       ghost:
         status: "状态"
+        conditions: "条件"
+        arguments: "参数"
+        container_args: "容器参数"
         in_location: "位置："
         hidden: "已隐藏"
         not_registered: "未注册"
+        no_visible_children: "没有可见子项"
         failed: "失败"
+      ghost_reasons:
+        optional_missing_hint: "由于该可选代码块未注册，因此不会被渲染。"
+        no_visible_children_hint: "由于该容器块中的所有子元素都不可见，因此该容器块不会被渲染。"
+        condition_failed_hint: "由于条件不满足，此代码块未渲染。"
+        head_hidden_tail_hint: "由于 `head` 容器中已先渲染了另一个代码块，因此该代码块未被渲染。"
     carousel:
       go_to_slide: "转到幻灯片 %{index}"
       previous: "上一张幻灯片"
@@ -276,6 +285,7 @@ zh_CN:
     skip_to_top: "跳转到顶部"
     skip_user_nav: "跳到个人资料内容"
     emails_are_disabled: "所有外发电子邮件已被管理员全局禁用。任何类型的电子邮件通知都不会发出。"
+    emails_are_disabled_no_smtp: "由于未配置SMTP服务器，所有外发邮件功能均已禁用。无法发送任何类型的邮件。"
     emails_are_disabled_non_staff: "非管理员用户无法向外发送电子邮件。"
     software_update_prompt:
       message: "我们更新了网站，<span>请刷新</span>以保持网站顺利运行。"
@@ -301,12 +311,27 @@ zh_CN:
     broken_page_change_alert: "onPageChange 处理程序出错。请查看浏览器开发者工具了解更多信息。"
     broken_plugin_alert: "由插件 '%{name}' 引起"
     broken_transformer_alert: "出错了。您的网站可能无法正常运行。"
+    broken_block_alert: "检测到区块配置错误。请查看浏览器控制台了解详情。"
+    broken_block_factory_alert: "区块加载失败。某些 UI 元素可能无法正确显示。"
     critical_deprecation:
       notice: "<b>[管理员通知]</b> %{source} 包含需要更新的代码。（id：%{id}）"
       learn_more_link: "(<a href='%{url}' target='_blank'><em>了解详情</em></a>)"
       theme_source: "主题 <a target='_blank' href='%{path}'>'%{name}'</a>"
       plugin_source: "插件 '%{name}'"
       unknown_source: "您的某个主题或插件"
+    dev_tools:
+      drag_to_move: "拖动移动"
+      toggle_plugin_outlet_debug: "切换插件出口调试"
+      toggle_block_debug: "切换区块调试"
+      block_debug:
+        outlet_boundaries: "出口边界"
+        visual_overlay: "视觉叠加"
+        ghost_blocks: "幽灵块"
+        condition_debugging: "条件调试"
+      toggle_safe_mode: "切换安全模式"
+      toggle_verbose_localization: "切换详细本地化"
+      toggle_mobile_view: "切换移动视图"
+      disable_dev_tools: "禁用开发者工具"
     s3:
       regions:
         ap_northeast_1: "亚太地区（东京）"
@@ -403,6 +428,12 @@ zh_CN:
         title: "开始发帖"
         description: "给人们一些共同谈论的话题"
         action: "破冰创意"
+        choose_option: "你想如何开始？"
+        predefined_topics: "破冰模板"
+        predefined_topics_subtitle: "给新成员一些话题，选择一个模板进行编辑，然后自己制作。"
+        predefined_topics_description: "从一系列对话开场白中挑选一些，开启讨论。"
+        use_predefined: "浏览模板"
+        start_with_this: "从这里开始"
         back: "返回"
         icebreakers:
           fun_facts:
@@ -648,8 +679,10 @@ zh_CN:
         ignore_all: "全部忽略"
         enable_plugins: "启用插件"
         delete_confirm: "确定要删除所有由禁用插件创建的审核队列项目吗？"
+        ignore_success: "所有由禁用插件创建的审核已被删除。"
       explain:
         why: "解释为什么此条目最终进入队列"
+        title: "审核队列项目评分"
         formula: "公式"
         subtotal: "小计"
         total: "总计"
@@ -663,8 +696,10 @@ zh_CN:
           title: "所提交的举报一直都获得同意的用户将获得加分。"
         trust_level_bonus:
           name: "信任级别"
+          title: "由较高信任级别的用户创建的可审核条目具有较高的分数。"
         type_bonus:
           name: "奖励加分"
+          title: "某些可审核类型可以由管理人员分配加分，以使其具有更高的优先级。"
       revise_and_reject_post:
         title: "修订"
         reason: "原因"
@@ -673,6 +708,7 @@ zh_CN:
         custom_reason: "清楚地描述原因"
         other_reason: "其他…"
         optional: "可选"
+      stale_help: "此可审核条目已被 <b>%{username}</b> 解决。"
       claim_help:
         optional: "您可以认领此条目以避免被他人审核。"
         required: "您必须先认领条目才能进行审核。"
@@ -2773,6 +2809,7 @@ zh_CN:
       upload_description: "在此处输入上传描述"
       olist_title: "编号列表"
       ulist_title: "项目符号列表"
+      list_title: "列表"
       list_item: "列表条目"
       toggle_direction: "切换方向"
       apply_wrap_title: "应用换行"
@@ -4061,11 +4098,15 @@ zh_CN:
         delete: "删除"
         add: "添加所需标签组"
         placeholder: "选择标签群组…"
+        min_count: "标签数"
+        tag_group: "标签组"
       topic_featured_link_allowed: "在此类别中允许精选链接"
       delete: "删除类别"
       create: "新建类别"
       create_long: "创建新类别"
+      create_category: "创建类别"
       save: "保存类别"
+      unsaved_changes: "您有未保存的更改"
       slug: "类别缩略名"
       parent: "父类别"
       slug_placeholder: "（可选）用于 URL 以“-”分隔的字词"
@@ -4712,9 +4753,12 @@ zh_CN:
         synonyms_hint: "使用上述标签时，它们将被替换为 %{baseTagName}。"
         add_synonyms_confirm: "当前使用 %{synonymNames} 的地方都将更改为使用 %{tagName} 。您确定要进行此更改吗？"
       localization:
+        hint: "添加本地化功能，以便为不同语言的用户显示不同的标签名称。"
         locale: "语言区域"
         name: "名称"
         description: "描述"
+        add: "添加本地化"
+        remove: "移除本地化"
       sort_by: "排序依据："
       sort_by_count: "计数"
       sort_by_name: "名称"
@@ -5216,7 +5260,7 @@ zh_CN:
   admin_js:
     type_to_filter: "输入以筛选…"
     settings: "设置"
-    reset_filter: "重置"
+    reset_filter: "重置筛选器"
     toggle_filters: "切换下拉筛选器"
     admin:
       title: "Discourse 管理员"
@@ -5232,11 +5276,14 @@ zh_CN:
         title: "可用报告列表"
         sidebar_title: "报告"
         back: "返回到所有报告"
+        group_engagement: "参与度"
         group_traffic: "流量"
         group_members: "成员"
+        group_content: "内容与健康"
         group_moderation: "审核"
         group_security: "安全性"
         group_other: "其他"
+        legacy_warning: "这是一份旧版报告，即将停用。如果您需要帮助寻找替代报告，请联系技术支持。"
       config_sections:
         account:
           title: "帐户"
@@ -5281,6 +5328,7 @@ zh_CN:
         enabled_for_options:
           no_one: "没有人"
           everyone: "所有人"
+          staff: "%{staffGroupName} 仅限"
           specific_groups: "特定群组"
           specific_groups_with_group_names:
             other: "群组 %{groupNames}"
@@ -5302,6 +5350,7 @@ zh_CN:
           all: "所有"
           enabled_all: "所有已启用的状态"
           enabled: "已启用"
+          enabled_for_staff: "已启用 %{staffGroupName}"
           enabled_for_specific_groups: "为特定群组启用"
           disabled: "已禁用"
           impact_type_all: "所有影响类型"
@@ -5391,6 +5440,7 @@ zh_CN:
               help_text: "建议尺寸为 600 x 80 像素。"
             large_icon:
               title: "方形图标"
+              description: "网站顶部会显示一个方形版本的徽标图像，该徽标同时也是移动应用程序的徽标。"
               help_text: "建议尺寸为 512 x 512 像素。"
             square_icon_dark:
               required: "为深色模式使用不同的方形图标？"
@@ -5754,6 +5804,7 @@ zh_CN:
         new_features:
           title: "最新变化"
           subtitle: "我们一直在发布新功能和改进。本页涵盖了重点内容，但您也可以点击“了解详情”查看详细的版本说明。"
+          no_new_features_found: "新闻源中没有项目，或者您所选的过滤器没有返回结果。 您可以在 <a href='%{url}' target='_blank'>Discourse Meta 社区</a> 上看到以前的新功能公告。"
           no_new_features_error: "加载最新功能列表时出现错误。您可以在<a href='%{url}' target='_blank'>Discourse Meta 社区</a>查看以前的新功能公告。"
           learn_more: "了解详情…"
         last_checked: "上次检查"
@@ -5934,6 +5985,7 @@ zh_CN:
         cancel: "取消"
         continue: "继续"
         copy_key: "复制"
+        key_copied_to_clipboard: "API密钥已复制到剪贴板"
         back: "返回到 API 密钥"
         revoke: "撤销"
         undo_revoke: "取消撤销"
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index e587f6b4e1e23..539aa21004587 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -4634,7 +4634,6 @@ zh_TW:
   admin_js:
     type_to_filter: "篩選類型…"
     settings: "設定"
-    reset_filter: "重置"
     admin:
       title: "論壇管理員"
       moderator: "板主"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 66b24703b5213..14d6043978d55 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -2452,6 +2452,7 @@ ar:
     mailgun_api_key: "مفتاح API السري لمحرك Mailgun والمُستخدَم في التحقُّق من رسائل خطاف الويب"
     sendgrid_verification_key: "مفتاح التحقق Sendgrid المُستخدَم للتحقق من رسائل خطاف الويب."
     mailjet_webhook_token: "الرمز المُستخدَم للتحقق من حمولة خطاف الويب. يجب تمريره في صورة معلمة الاستعلام 't' لخطاف الويب؛ على سبيل المثال: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "الرمز المُستخدَم للتحقق من حمولة خطاف الويب. يجب تمريره في صورة معلمة الاستعلام 't' لخطاف الويب؛ على سبيل المثال: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "مفتاح المصادقة Mandrill المُستخدَم للتحقق من رسائل خطاف الويب."
     postmark_webhook_token: "الرمز المُستخدَم للتحقق من حمولة خطاف الويب. يجب تمريره في صورة معلمة الاستعلام 't' لخطاف الويب؛ على سبيل المثال: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "الرمز المُستخدَم للتحقق من حمولة خطاف الويب. يجب تمريره في صورة معلمة الاستعلام 't' لخطاف الويب؛ على سبيل المثال: https://example.com/webhook/sparkpost?t=supersecret"
@@ -2770,6 +2771,7 @@ ar:
     enable_upcoming_changes: "تمكين التغييرات القادمة"
     fake_upcoming_change: "هذا التغيير الوهمي مزيف ويُستخدم لأغراض الاختبار فقط. لا داعي لترجمة هذه العبارة."
     floating_dismiss_topics_on_mobile: "يعرض زرًا عائمًا باسم \"رفض...\" في نسخة الهاتف المحمول لقائمة الموضوعات، ما يسهل الوصول إليه ويحرر مساحة في الجزء العلوي من قائمة الموضوعات."
+    rename_faq_to_guidelines: "يعيد هذا التغيير تسمية صفحة الأسئلة الشائعة إلى \"الإرشادات\". ستظل صفحة الأسئلة الشائعة متاحة على الرابط /faq. ويستمر إعداد \"رابط الأسئلة الشائعة\" في العمل كما هو."
     enable_simplified_category_creation: "يُفعّل هذا الإعداد إنشاء الفئات بطريقة مبسطة مع تقليل عدد الخيارات وتوفير واجهة أكثر نظافة ووضوحًا."
     errors:
       invalid_css_color: "لون غير صالح. أدخِل اسم لون أو قيمة سداسية عشرية."
diff --git a/config/locales/server.bg.yml b/config/locales/server.bg.yml
index 83cc3bba20c1d..ecdfd60909360 100644
--- a/config/locales/server.bg.yml
+++ b/config/locales/server.bg.yml
@@ -865,6 +865,7 @@ bg:
     strip_images_from_short_emails: "Премахни от имейлите по-малките от 2800 байта изображения"
     sendgrid_verification_key: "Ключ за проверка на Sendgrid, използван за проверка на съобщенията на Webhook."
     mailjet_webhook_token: "Токен, използван за проверка на полезния товар на webhook. Той трябва да бъде предаден като параметър на заявката \"t\" на webhook, например: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Токен, използван за проверка на полезния товар на webhook. Той трябва да бъде предаден като параметър на заявката \"t\" на webhook, например: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Ключ за удостоверение Mandrill, който се използва за проверка на webhook съобщения"
     postmark_webhook_token: "Токен, използван за проверка на полезния товар на webhook. Той трябва да бъде предаден като параметър на заявката \"t\" на webhook, например: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Токен, използван за проверка на полезния товар на webhook. Той трябва да бъде предаден като параметър на заявката \"t\" на webhook, например: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index a9d9d1d4cd228..c602fbbbeac3d 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -2155,6 +2155,7 @@ de:
     mailgun_api_key: "Geheimer Mailgun-API-Schlüssel, um Webhook-Nachrichten zu überprüfen."
     sendgrid_verification_key: "Sendgrid-Verifizierungsschlüssel, der zur Verifizierung von Webhook-Nachrichten verwendet wird."
     mailjet_webhook_token: "Token, das zur Verifizierung der Webhook-Payload verwendet wird. Es muss als „t“-Abfrageparameter des Webhooks übergeben werden, zum Beispiel: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token, das zur Verifizierung der Webhook-Payload verwendet wird. Es muss als „t“-Abfrageparameter des Webhooks übergeben werden, zum Beispiel: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Mandrill-Authentifizierungsschlüssel, der zur Verifizierung von Webhook-Nachrichten verwendet wird."
     postmark_webhook_token: "Token, das zur Verifizierung der Webhook-Payload verwendet wird. Es muss als „t“-Abfrageparameter des Webhooks übergeben werden, zum Beispiel: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token, das zur Verifizierung der Webhook-Payload verwendet wird. Es muss als „t“-Abfrageparameter des Webhooks übergeben werden, zum Beispiel: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml
index 586df155a2ffd..f8609e615452c 100644
--- a/config/locales/server.el.yml
+++ b/config/locales/server.el.yml
@@ -1161,7 +1161,8 @@ el:
     logo_small: "Η μικρή εικόνα λογότυπου επάνω αριστερά στον ιστότοπό σας, που φαίνεται κατά την κύλιση προς τα κάτω. Χρησιμοποιήστε μια εικόνα 120 × 120. Εάν αφεθεί κενό, θα εμφανιστεί ένα σύμβολο αρχικής σελίδας."
     notification_email: "Η από: διεύθυνση email που χρησιμοποιείται για την αποστολή όλων των απαραιτήτων μηνυμάτων του συστήματος. Ο τομέας που καθορίζεται εδώ πρέπει να έχει SPF, DKIM και reverse PTR αρχεία ρυθμισμένα σωστά για να φθάσει το μήνυμα."
     email_subject: "Προσαρμόσιμη μορφή θέματος για τυπικά μηνύματα email. Δείτε το <a href='https://meta.discourse.org/t/customizing-specific-system-email-templates/88323' target='_blank'>https://meta.discourse.org/t/customizing-specific-system-email-templates/88323</a>"
-    force_https: "Αναγκάζει το site σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις κοινωνικές συνδέσεις και τα εξωτερικά σας λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
+    enforce_second_factor_on_external_auth: "Να απαιτείται από τους χρήστες να χρησιμοποιούν πάντα τον έλεγχο ταυτότητας δύο παραγόντων (2FA). Όταν είναι ενεργοποιημένο, αυτό θα εμποδίζει τους χρήστες να συνδέονται με εξωτερικές μεθόδους ελέγχου ταυτότητας, όπως συνδέσεις κοινωνικών δικτύων, εάν έχουν ενεργοποιήσει τον έλεγχο ταυτότητας δύο παραγόντων. Όταν είναι απενεργοποιημένο, οι χρήστες θα χρειάζεται μόνο να επιβεβαιώσουν τον έλεγχο ταυτότητας δύο παραγόντων κατά τη σύνδεση με όνομα χρήστη και κωδικό πρόσβασης. Δείτε επίσης τη ρύθμιση `enforce_second_factor`."
+    force_https: "Αναγκάζει τον ιστότοπό σας να χρησιμοποιεί μόνο HTTPS. ΠΡΟΣΟΧΗ: Μην το ενεργοποιήσετε, μέχρι να επαληθεύσετε ότι το HTTPS είναι πλήρως εγκατεστημένο και λειτουργεί απολύτως παντού! Ελέγξατε το CDN σας, όλες τις συνδέσεις κοινωνικών δικτύων και τα εξωτερικά σας λογότυπα / εξαρτήσεις για να βεβαιωθείτε ότι είναι όλα συμβατά με HTTPS;"
     summary_score_threshold: "Η ελάχιστη βαθμολογία που απαιτείται από μια ανάρτηση για να συμπεριληφθεί στο «Συνοψίστε αυτό το θέμα»"
     summary_percent_filter: "Όταν ο χρήστης επιλέξει «Συνοψίστε αυτό το θέμα», δείξε το κορυφαίο % των αναρτήσεων"
     long_polling_base_url: "Base URL που χρησιμοποιείτε για μακρύ ψήφισμα (όταν ένα CDN εξυπηρετεί δυναμικό περιεχόμενο, βεβαιωθείτε ότι το ορίσατε σε έλξη προέλευσης ) π.χ.: http://origin.site.com"
@@ -1430,7 +1431,7 @@ el:
     default_other_enable_quoting: "Ενεργοποίηση απάντησης με παράθεση για επιλεγμένο κείμενο από προεπιλογή"
     default_other_enable_markdown_monospace_font: "Χρήση γραμματοσειράς monospace στη λειτουργία Markdown του συνθέτη από προεπιλογή."
     default_other_dynamic_favicon: "Δείχνε τον αριθμό νέων/ενημερωμένων θεμάτων στο εικονίδιο του προγράμματος περιήγησης από προεπιλογή. "
-    default_other_skip_new_user_tips: "Παράλειψη συμβουλών και σημάτων για την ενσωμάτωση νέου χρήστη."
+    default_other_skip_new_user_tips: "Παράλειψη συμβουλών και παρασήμων για την ενσωμάτωση νέου χρήστη."
     default_topics_automatic_unpin: "Αυτόματο ξεκαρφίτσωμα των θεμάτων, όταν ο χρήστης φτάνει στο κάτω μέρος από προεπιλογή."
     default_categories_watching: "Λίστα κατηγοριών που επιτηρούνται από προεπιλογή."
     default_categories_tracking: "Λίστα κατηγοριών που παρακολουθούνται από προεπιλογή."
@@ -1453,6 +1454,7 @@ el:
     suppress_overlapping_tags_in_list: "Αν μία ετικέτα ταιριάζει ακριβώς με μία λέξη στον τίτλο ενός θέματος, τότε μην εμφανίσεις την ετικέτα. "
     shared_drafts_allowed_groups: "Να επιτρέπεται στους χρήστες σε αυτές τις ομάδες να βλέπουν και να επεξεργάζονται Κοινόχρηστα Προσχέδια."
     enable_desktop_push_notifications: "Ενεργοποιήστε τις ειδοποιήσεις push για τη διεπαφή στους υπολογιστές. Αυτή η λειτουργία επιτρέπει την αποστολή ειδοποιήσεων σε πραγματικό χρόνο από τον ιστότοπο απευθείας στον υπολογιστή σας, ενισχύοντας την αλληλεπίδραση και διασφαλίζοντας ότι οι χρήστες είναι πάντα ενημερωμένοι. Ωστόσο, η αποτελεσματικότητα αυτής της λειτουργίας εξαρτάται από την υποστήριξη του προγράμματος περιήγησης για ειδοποιήσεις push."
+    enable_site_owner_onboarding: "Εμφανίζει ένα πλαίσιο στην αρχική σελίδα στους νέους διαχειριστές για να τους βοηθήσει να ξεκινήσουν. Ενεργοποιήστε ξανά αυτήν τη ρύθμιση για να δείτε ξανά τα βήματα ενσωμάτωσης."
     impersonate_without_logout: "Να επιτρέπεται στους διαχειριστές να προσποιούνται έναν χρήστη χωρίς να χρειάζεται να αποσυνδεθούν από τον λογαριασμό διαχειριστή τους."
     experimental_impersonation_time_limit_minutes: "Πόσος χρόνος προτού τερματιστεί αυτόματα μια συνεδρία πλαστοπροσωπίας."
     viewport_based_mobile_mode: "Χρησιμοποιήστε το πλάτος του παραθύρου προβολής για να προσδιορίσετε τις λειτουργίες για κινητά/υπολογιστές. Αυτή η ρύθμιση θα καταργηθεί σύντομα. Εάν διαπιστώσετε ότι χρειάζεται να την απενεργοποιήσετε, ενημερώστε μας <a href='https://meta.discourse.org/t/384280'>στο Meta</a>."
@@ -1494,6 +1496,7 @@ el:
     results_page: "Αποτελέσματα αναζήτησης για '%{term}'"
   filter:
     description:
+      status_deleted: "Εμφάνιση διαγραμμένων θεμάτων (αν έχετε δικαίωμα)"
       in_bookmarked: "Εμφάνιση θεμάτων που έχετε σελιδοδεικτήσει"
       in_unseen: "Εμφάνιση θεμάτων που δεν έχετε δει"
       order_latest_post: "Ταξινόμηση κατά ημερομηνία τελευταίας ανάρτησης (νεότερη πρώτη)"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 35d072be9da7f..dc8faeddfc492 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -2104,6 +2104,7 @@ fr:
     mailgun_api_key: "Clé d'API secrète de Mailgun utilisée pour vérifier les messages du webhook."
     sendgrid_verification_key: "Clé de vérification Sendgrid utilisée pour vérifier les messages du webhook."
     mailjet_webhook_token: "Jeton utilisé pour vérifier la charge utile du webhook. Il doit être transmis en tant que paramètre de requête « t » du webhook, par exemple : https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Jeton utilisé pour vérifier la charge utile du webhook. Il doit être transmis en tant que paramètre de requête « t » du webhook, par exemple : https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Clé d'authentification Mandrill utilisée pour vérifier les messages du webhook."
     postmark_webhook_token: "Jeton utilisé pour vérifier la charge utile du webhook. Il doit être transmis en tant que paramètre de requête « t » du webhook, par exemple : https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Jeton utilisé pour vérifier la charge utile du webhook. Il doit être transmis en tant que paramètre de requête « t » du webhook, par exemple : https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index e2f14e05ee8f6..0d58fb0d44a83 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -2281,6 +2281,7 @@ he:
     mailgun_api_key: "מפתח API סודי של Mailgun לאימות של הודעות webhook."
     sendgrid_verification_key: "מפתח התיקוף של Sendgrid משמש לתיקוף הודעות התליה."
     mailjet_webhook_token: "אסימון המשמש לתיקוף מטען של התליה. חובה להעביר אותו בתור המשתנה ‚t’ בשאילתה של ההתליה, למשל: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "אסימון המשמש לתיקוף מטען של התליה. חובה להעביר אותו בתור המשתנה ‚t’ בשאילתה של ההתליה, למשל: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "מפתח האימות של Mandrill משמש לאימות הודעות התליה."
     postmark_webhook_token: "אסימון המשמש לתיקוף מטען של התליה. חובה להעביר אותו בתור המשתנה ‚t’ בשאילתה של ההתליה, למשל: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "אסימון המשמש לתיקוף מטען של התליה. חובה להעביר אותו בתור המשתנה ‚t’ בשאילתה של ההתליה, למשל: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.hu.yml b/config/locales/server.hu.yml
index 5debd17a1990c..ae62c12290d60 100644
--- a/config/locales/server.hu.yml
+++ b/config/locales/server.hu.yml
@@ -2145,6 +2145,7 @@ hu:
     mailgun_api_key: "Mailgun titkos API-kulcs a webhook-üzenetek ellenőrzésére."
     sendgrid_verification_key: "Sendgrid ellenőrző kulcs, amelyet a webhook üzenetek ellenőrzésére használnak."
     mailjet_webhook_token: "A webhook hasznos terhelésének ellenőrzésére használt token. Ezt a webhook 't' lekérdezési paramétereként kell átadni, például: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "A webhook hasznos terhelésének ellenőrzésére használt token. Ezt a webhook 't' lekérdezési paramétereként kell átadni, például: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Mandrill hitelesítési kulcs a webhook üzenetek ellenőrzésére."
     postmark_webhook_token: "A webhook hasznos terhelésének ellenőrzésére használt token. Ezt a webhook „t” lekérdezési paramétereként kell átadni, például: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "A webhook hasznos terhelésének ellenőrzésére használt token. Ezt a webhook 't' lekérdezési paramétereként kell átadni, például: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml
index ed6f496e0e333..f15389993953d 100644
--- a/config/locales/server.id.yml
+++ b/config/locales/server.id.yml
@@ -1231,6 +1231,7 @@ id:
     dark_mode_none: "Tidak ada"
     sendgrid_verification_key: "Kunci verifikasi Sendgrid digunakan untuk memverifikasi pesan webhook."
     mailjet_webhook_token: "Token digunakan untuk memverifikasi payload webhook. Itu harus diteruskan sebagai parameter kueri 't' dari webhook, misalnya: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token digunakan untuk memverifikasi payload webhook. Itu harus diteruskan sebagai parameter kueri 't' dari webhook, misalnya: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Kunci autentikasi Mandrill digunakan untuk memverifikasi pesan webhook."
     postmark_webhook_token: "Token digunakan untuk memverifikasi payload webhook. Itu harus diteruskan sebagai parameter kueri 't' dari webhook, misalnya: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token digunakan untuk memverifikasi payload webhook. Itu harus diteruskan sebagai parameter kueri 't' dari webhook, misalnya: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 24a4276cf43d3..6f105be3c5654 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -2098,6 +2098,7 @@ it:
     mailgun_api_key: "Chiave API Segreta di Mailgun usata per verificare i messaggi webhook. "
     sendgrid_verification_key: "Chiave di verifica Sendgrid utilizzata per verificare i messaggi webhook."
     mailjet_webhook_token: "Token utilizzato per verificare il payload del webhook. Deve essere passato come parametro di query 't' del webhook, ad esempio: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token utilizzato per verificare il payload del webhook. Deve essere passato come parametro di query 't' del webhook, ad esempio: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Chiave di autenticazione Mandrill usata per verificare i messaggi webhook."
     postmark_webhook_token: "Token utilizzato per verificare il payload del webhook. Deve essere passato come parametro di query 't' del webhook, ad esempio: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token utilizzato per verificare il payload del webhook. Deve essere passato come parametro di query 't' del webhook, ad esempio: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 210350b5be2b3..a941cf154bfb0 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -2067,6 +2067,7 @@ ja:
     mailgun_api_key: "Webhook メッセージを検証するために使用される Mailgun Secret API キー。"
     sendgrid_verification_key: "Webhook メッセージの検証に使用される Sendgrid 検証キー。"
     mailjet_webhook_token: "Webhook ペイロードの検証に使用されるトークン。webhook の 't' クエリパラメーターとして渡される必要があります。例: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Webhook ペイロードの検証に使用されるトークン。webhook の 't' クエリパラメーターとして渡される必要があります。例: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Webhook メッセージの検証に使用される Mandrill 認証キー。"
     postmark_webhook_token: "Webhook ペイロードの検証に使用されるトークン。webhook の 't' クエリパラメーターとして渡される必要があります。例: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Webhook ペイロードの検証に使用されるトークン。webhook の 't' クエリパラメーターとして渡される必要があります。例: https://example.com/webhook/sparkpost?t=supersecret"
@@ -2385,6 +2386,7 @@ ja:
     enable_upcoming_changes: "次回の変更を有効にする"
     fake_upcoming_change: "これは実際の次回の変更ではありません。テストを目的としているため、この文字列の翻訳は不要です。"
     floating_dismiss_topics_on_mobile: "モバイル版では、アクセスの簡易性とトピックリストの上部のスペースを空けるために「閉じる...」フローティングボタンを表示する"
+    rename_faq_to_guidelines: "この変更によって FAQ ページの名前が「ガイドライン」に変更されます。FAQ ページは引き続き /faq で利用できます。'faq url' 設定はこれまで通り機能します。"
     enable_simplified_category_creation: "より少ないオプションとクリーンなインターフェースによって、シンプルなカテゴリ作成フローを実現します。"
     errors:
       invalid_css_color: "無効な色です。色名または 16 進数値を入力してください。"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index b90591eb98c85..4defbbb84f89e 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -2098,6 +2098,7 @@ nl:
     mailgun_api_key: "Geheime API-sleutel van Mailgun voor het verifiëren van webhookberichten."
     sendgrid_verification_key: "SendGrid-verificatiesleutel die wordt gebruikt om webhookberichten te verifiëren."
     mailjet_webhook_token: "Token dat wordt gebruikt om webhookpayloads te verifiëren. Het moet worden doorgegeven als de queryparameter 't' van de webhook, bijvoorbeeld: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token dat wordt gebruikt om webhookpayloads te verifiëren. Het moet worden doorgegeven als de queryparameter 't' van de webhook, bijvoorbeeld: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Mandrill-verificatiesleutel die wordt gebruikt om webhookberichten te verifiëren."
     postmark_webhook_token: "Token dat wordt gebruikt om webhookpayloads te verifiëren. Het moet worden doorgegeven als de queryparameter 't' van de webhook, bijvoorbeeld: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token dat wordt gebruikt om webhookpayloads te verifiëren. Het moet worden doorgegeven als de queryparameter 't' van de webhook, bijvoorbeeld: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index f1abe827159d7..1c7d12513c7df 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -2310,6 +2310,7 @@ pl_PL:
     mailgun_api_key: "Klucz Mailgun Secret API używany do weryfikacji wiadomości webhook."
     sendgrid_verification_key: "Klucz weryfikacyjny Sendgrid używany do weryfikacji wiadomości webhook."
     mailjet_webhook_token: "Token używany do weryfikacji zawartości webhooka. Musi być przekazany jako parametr zapytania 't' w webhooku, na przykład: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token używany do weryfikacji zawartości webhooka. Musi być przekazany jako parametr zapytania 't' w webhooku, na przykład: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Klucz uwierzytelniania Mandrill używany do weryfikowania wiadomości webhook."
     postmark_webhook_token: "Token używany do weryfikacji zawartości webhooka. Musi być przekazany jako parametr zapytania 't' w webhooku, na przykład: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token używany do weryfikacji zawartości webhooka. Musi być przekazany jako parametr zapytania 't' w webhooku, na przykład: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index 4c95d672577ce..5240f1bacb4d0 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -2099,6 +2099,7 @@ pt_BR:
     mailgun_api_key: "A chave da API secreta do Mailgun é usada para verificar as mensagens do webhook."
     sendgrid_verification_key: "Chave de verificação Sendgrid usada para verificar mensagens de webhook."
     mailjet_webhook_token: "Token usado para verificar o payload do webhook. Deve ser passado como parâmetro de consulta 't' do webhook, por exemplo: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token usado para verificar o payload do webhook. Deve ser passado como parâmetro de consulta 't' do webhook, por exemplo: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Chave de autenticação Mandrill usada para verificar mensagens de webhook."
     postmark_webhook_token: "Token usado para verificar o payload do webhook. Deve ser passado como parâmetro de consulta 't' do webhook, por exemplo: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token usado para verificar o payload do webhook. Deve ser passado como parâmetro de consulta 't' do webhook, por exemplo: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index 2e2baf8bb2d58..f494984ecd72f 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -2257,6 +2257,7 @@ ru:
     mailgun_api_key: "Секретный ключ API Mailgun, используемый для проверки сообщений вебхука."
     sendgrid_verification_key: "Ключ верификации Sendgrid, используемый для проверки сообщений вебхука."
     mailjet_webhook_token: "Токен для проверки полезной нагрузки вебхука. Передается как параметр «t» запроса в вебхуке, например: https://example.com/webhook/mailjet?t=supersecret."
+    mailpace_webhook_token: "Токен для проверки полезной нагрузки вебхука. Передается как параметр «t» запроса в вебхуке, например: https://example.com/webhook/mailpace?t=supersecret."
     mandrill_authentication_key: "Ключ аутентификации Mandrill, используемый для проверки сообщений вебхука."
     postmark_webhook_token: "Токен для проверки полезной нагрузки вебхука. Передается как параметр «t» запроса в вебхуке, например: https://example.com/webhook/postmark?t=supersecret."
     sparkpost_webhook_token: "Токен для проверки полезной нагрузки вебхука. Передается как параметр «t» запроса в вебхуке, например: https://example.com/webhook/sparkpost?t=supersecret."
diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml
index b63919fe7e4dd..3e8f38ec7fa01 100644
--- a/config/locales/server.sk.yml
+++ b/config/locales/server.sk.yml
@@ -2247,6 +2247,7 @@ sk:
     mailgun_api_key: "Mailgun Secret API kľúč používaný na overenie správ webhooku."
     sendgrid_verification_key: "Overovací kľúč Sendgrid používaný na overovanie správ webhook."
     mailjet_webhook_token: "Token používaný na overenie payload webového háku. Musí byť odovzdaný ako parameter dotazu 't' webového háku, napríklad: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token používaný na overenie payload webového háku. Musí byť odovzdaný ako parameter dotazu 't' webového háku, napríklad: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Autentizačný kľúč Mandrill používaný na overovanie správ webhook."
     postmark_webhook_token: "Token používaný na overenie užitočného zaťaženia webhooku. Musí sa odovzdať ako parameter dopytu \"t\" webhooku, napríklad: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token používaný na overenie obsahu webhooku. Musí sa odovzdať ako parameter dopytu „t“ webhooku, napríklad: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index 755172b4b46f9..a5c3f9bfea23a 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -1811,6 +1811,7 @@ sv:
     mailgun_api_key: "Mailgun Secret API-nyckel att använda för att verifiera webhook-meddelanden."
     sendgrid_verification_key: "Verifieringsnyckel för Sendgrid som används för att verifiera webhook-meddelanden."
     mailjet_webhook_token: "Token som används för att verifiera webhook-nyttolasten. Den måste skickas som frågeparametern \"t\" för webhook, till exempel: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Token som används för att verifiera webhook-nyttolasten. Den måste skickas som frågeparametern \"t\" för webhook, till exempel: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Mandrill-autentiseringsnyckel som används för att verifiera webhook-meddelanden."
     postmark_webhook_token: "Token som används för att verifiera webhook-nyttolasten. Den måste skickas som frågeparametern \"t\" för webhook, till exempel: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Token som används för att verifiera webhook-nyttolasten. Den måste skickas som frågeparametern \"t\" för webhook, till exempel: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml
index 6382190f87f33..d1e3ffe941a78 100644
--- a/config/locales/server.te.yml
+++ b/config/locales/server.te.yml
@@ -1396,6 +1396,7 @@ te:
     mailgun_api_key: "వెబ్‌హుక్ సందేశాలను ధృవీకరించడానికి Mailgun సీక్రెట్ API కీ ఉపయోగించబడుతుంది."
     sendgrid_verification_key: "webhook సందేశాలను ధృవీకరించడానికి Sendgrid ధృవీకరణ కీ ఉపయోగించబడుతుంది."
     mailjet_webhook_token: "వెబ్‌హుక్ పేలోడ్‌ని ధృవీకరించడానికి టోకెన్ ఉపయోగించబడింది. ఇది తప్పనిసరిగా webhook యొక్క 't' ప్రశ్న పరామితి వలె పాస్ చేయబడాలి, ఉదాహరణకు: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "వెబ్‌హుక్ పేలోడ్‌ని ధృవీకరించడానికి టోకెన్ ఉపయోగించబడింది. ఇది తప్పనిసరిగా webhook యొక్క 't' ప్రశ్న పరామితి వలె పాస్ చేయబడాలి, ఉదాహరణకు: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "వెబ్‌హుక్ సందేశాలను ధృవీకరించడానికి మాండ్రిల్ ప్రమాణీకరణ కీ ఉపయోగించబడుతుంది."
     postmark_webhook_token: "వెబ్‌హుక్ పేలోడ్‌ని ధృవీకరించడానికి టోకెన్ ఉపయోగించబడింది. ఇది తప్పనిసరిగా webhook యొక్క 't' ప్రశ్న పరామితి వలె పాస్ చేయబడాలి, ఉదాహరణకు: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "వెబ్‌హుక్ పేలోడ్‌ని ధృవీకరించడానికి టోకెన్ ఉపయోగించబడింది. ఇది తప్పనిసరిగా webhook యొక్క 't' ప్రశ్న పరామితి వలె పాస్ చేయబడాలి, ఉదాహరణకు: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 34dc59299cb76..b2c49d9aad2e0 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -2104,6 +2104,7 @@ tr_TR:
     mailgun_api_key: "Web kancası mesajlarını doğrulamak için kullanılan Mailgun Gizli API anahtarı."
     sendgrid_verification_key: "Web kancası mesajlarını doğrulamak için kullanılan Sendgrid doğrulama anahtarı."
     mailjet_webhook_token: "Web kancası yükünü doğrulamak için kullanılan token. Web kancasının \"t\" sorgu parametresi olarak geçirilmelidir, örneğin: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Web kancası yükünü doğrulamak için kullanılan token. Web kancasının \"t\" sorgu parametresi olarak geçirilmelidir, örneğin: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Web kancası mesajlarını doğrulamak için kullanılan Mandrill kimlik doğrulama anahtarı."
     postmark_webhook_token: "Web kancası yükünü doğrulamak için kullanılan token. Web kancasının \"t\" sorgu parametresi olarak geçirilmelidir, örneğin: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Web kancası yükünü doğrulamak için kullanılan token. Web kancasının \"t\" sorgu parametresi olarak geçirilmelidir, örneğin: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.ug.yml b/config/locales/server.ug.yml
index 85f63080d4599..dfd0e6688e219 100644
--- a/config/locales/server.ug.yml
+++ b/config/locales/server.ug.yml
@@ -2101,6 +2101,7 @@ ug:
     mailgun_api_key: "تور ئىلمىكى ئۇچۇرىنى دەلىللەشكە ئىشلىتىدىغان Mailgun بىخەتەرلىك API ئاچقۇچى."
     sendgrid_verification_key: "تور ئىلمىكى ئۇچۇرىنى دەلىللەشكە ئىشلىتىدىغان Sendgrid دەلىللەش ئاچقۇچى."
     mailjet_webhook_token: "تور ئىلمىكىنىڭ يۈكىنى دەلىللەشكە ئىشلىتىدىغان پەرمان تاختىسى. ئۇ چوقۇم تور ئىلمىكىنىڭ «t» سۈرۈشتۈرۈشىنىڭ پارامېتىرى بولۇپ يوللىنىدۇ، مەسىلەن: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "تور ئىلمىكىنىڭ يۈكىنى دەلىللەشكە ئىشلىتىدىغان پەرمان تاختىسى. ئۇ چوقۇم تور ئىلمىكىنىڭ «t» سۈرۈشتۈرۈشىنىڭ پارامېتىرى بولۇپ يوللىنىدۇ، مەسىلەن: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "تور ئىلمىكى ئۇچۇرىنى دەلىللەشكە ئىشلىتىدىغان Sendgrid سالاھىيەت دەلىللەش ئاچقۇچى."
     postmark_webhook_token: "تور ئىلمىكىنىڭ يۈكىنى دەلىللەشكە ئىشلىتىدىغان پەرمان تاختىسى. ئۇ چوقۇم تور ئىلمىكىنىڭ «t» سۈرۈشتۈرۈشىنىڭ پارامېتىرى بولۇپ يوللىنىدۇ، مەسىلەن: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "تور ئىلمىكىنىڭ يۈكىنى دەلىللەشكە ئىشلىتىدىغان پەرمان تاختىسى. ئۇ چوقۇم تور ئىلمىكىنىڭ «t» سۈرۈشتۈرۈشىنىڭ پارامېتىرى بولۇپ يوللىنىدۇ، مەسىلەن: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml
index a47e90db81666..396af5886cc51 100644
--- a/config/locales/server.uk.yml
+++ b/config/locales/server.uk.yml
@@ -2307,6 +2307,7 @@ uk:
     mailgun_api_key: "Ключ API Mailgun Secret, який використовується для перевірки повідомлень webhook."
     sendgrid_verification_key: "Ключ перевірки Sendgrid, який використовується для перевірки повідомлень webhook."
     mailjet_webhook_token: "Маркер, який використовується для перевірки корисного навантаження вебхуку. Його потрібно передати як параметр запиту «t» вебхука, наприклад: https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "Маркер, який використовується для перевірки корисного навантаження вебхуку. Його потрібно передати як параметр запиту «t» вебхуку, наприклад: https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "Ключ автентифікації Mandrill, який використовується для перевірки повідомлень webhook."
     postmark_webhook_token: "Маркер, який використовується для перевірки корисного навантаження вебхуку. Його потрібно передати як параметр запиту «t» вебхуку, наприклад: https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "Маркер, який використовується для перевірки корисного навантаження вебхуку. Його потрібно передати як параметр запиту «t» вебхуку, наприклад: https://example.com/webhook/sparkpost?t=supersecret"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 05dc1447ae0a6..feb599ce0cdef 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -19,7 +19,7 @@ zh_CN:
       calendar_ics: "%Y%m%dT%H%M%SZ"
   date:
     month_names:
-    -
+    - null
     - 1 月
     - 2 月
     - 3 月
@@ -60,6 +60,8 @@ zh_CN:
   inline_oneboxer:
     topic_page_title_post_number: "#%{post_number}"
     topic_page_title_post_number_by_user: "#%{post_number}，来自 %{username}"
+    too_many_urls: "单次请求中无法将超过 10 个 URL 转换为内联单选框。"
+    concurrency_not_allowed: "不允许同时请求将 URL 转换为内联单选框。请一次只发送一个请求。"
   components:
     enabled_filter: "已启用"
     disabled_filter: "已禁用"
@@ -238,6 +240,7 @@ zh_CN:
   errors: &errors
     format: ! "%{attribute} %{message}"
     format_with_full_message: "<b>%{attribute}</b>：%{message}"
+    diff_too_complex: "差异过于复杂，无法安全计算。请尝试进行较小的修改。"
     messages:
       invalid_locale: "%{invalid_locale} 不是一个有效的语言区域"
       too_long_validation:
@@ -318,6 +321,7 @@ zh_CN:
       slow_down_crawler_user_agent_must_be_at_least_3_characters: "用户代理的长度必须至少为 3 个字符，以避免意外限制合法用户的速率。"
       slow_down_crawler_user_agent_cannot_be_popular_browsers: "您不能将以下任何值添加到设置中：%{values}。"
       strip_image_metadata_cannot_be_disabled_if_composer_media_optimization_image_enabled: "如果启用了 'composer media optimization image enabled'，则无法禁用带状图片元数据。在禁用带状图片元数据之前，禁用 'composer media optimization image enabled'。"
+      x_summary_large_image_no_svg: "用于 twitter:image 元数据的 Twitter 总结图片不能是 .svg 图片。"
       tl0_and_anonymous_flag: "对于匿名用户，必须提供 'site contact email' 或 'email address to report illegal content'。"
       allow_likes_in_anonymous_mode_without_anonymous_mode_enabled: "此设置需要先启用 'allow anonymous mode' 设置。"
     conflicting_google_user_id: '此帐户的 Google 帐号 ID 已更改；出于安全原因，需要管理人员干预。请联系管理人员并将他们指向 <br><a href="https://meta.discourse.org/t/76575">https://meta.discourse.org/t/76575</a>'
@@ -1631,6 +1635,8 @@ zh_CN:
     max_oneboxes_per_post: "设置单个帖子中可以包含的最大 onebox 数量。onebox 提供了帖子中链接内容的预览。"
     facebook_app_access_token: "从您的 Facebook 应用 ID 和密钥生成的令牌。用于生成 Instagram Onebox。"
     github_onebox_access_tokens: "GitHub 组织或用户与 GitHub 访问令牌之间的映射，用于为私有仓库、提交、拉取请求、议题和文件内容生成 GitHub onebox。如果没有此映射，将只为公开 GitHub URL 创建 onebox。"
+    reddit_onebox_client_id: "Reddit API OAuth 客户端 ID，用于认证 Reddit onebox。在 reddit.com/prefs/apps 上创建 \"脚本 \"类型的应用程序，以获取凭证。"
+    reddit_onebox_client_secret: "用于已认证 Reddit OneBox 的 Reddit API OAuth 客户端密钥。可在 reddit.com/prefs/apps 创建的“脚本”类型应用下找到。"
     logo: "您的网站左上角的徽标图片。使用高度为 120 且宽高比大于 3:1 的宽矩形图片。如果留空，将显示网站标题文本。"
     logo_small: "您的网站左上角的小徽标图片，向下滚动后可见。使用 120×120 的方形图片。如果留空，将显示首页标志符号。"
     digest_logo: "在您网站的电子邮件总结顶部使用的备用徽标图片。使用宽矩形图片。不要使用 SVG 图片。如果留空，则使用 `logo` 设置中的图片。"
@@ -1811,6 +1817,7 @@ zh_CN:
     enable_local_logins_via_email: "允许用户请求通过电子邮件向他们发送一键登录链接。"
     allow_new_registrations: "允许新用户注册。取消选中此项以防止任何人创建新帐户。"
     enable_signup_cta: "向回访匿名用户显示通知，提示他们注册帐户。"
+    enable_discourse_id: "通过 Discourse ID 启用身份验证，这是一种单点登录服务，允许用户使用一个帐户登录多个 Discourse 站点。无需额外配置即可支持 Google、Facebook、Apple 和 GitHub 等常见社交登录提供商。如需了解详情，请参阅 <a href='https://id.discourse.com' target='_blank'>id.discourse.com</a>。"
     enable_google_oauth2_logins: "启用 Google Oauth2 身份验证。这是 Google 当前支持的身份验证方法。要求密钥和密钥代码。请参阅<a href='https://meta.discourse.org/t/15858' target='_blank'>为 Discourse 配置 Google 登录</a>。"
     google_oauth2_client_id: "由 Google 应用程序提供的唯一客户端 ID，用于身份验证流程。"
     google_oauth2_client_secret: "您的 Google 应用的客户端密钥。"
@@ -2053,6 +2060,7 @@ zh_CN:
     alternative_reply_by_email_addresses: "通过传入电子邮件地址回复的备用模板列表。示例：%%{reply_key}@reply.example.com|replies+%%{reply_key}@example.com"
     incoming_email_prefer_html: "对传入电子邮件使用 HTML 而不是文本。"
     strip_incoming_email_lines: "从传入电子邮件的每一行中移除前导和尾随空格。"
+    disable_emails: "禁止 Discourse 发送任何类型的电子邮件。选择“是”将对所有用户禁用电子邮件。选择“非管理人员”将仅对非管理人员用户禁用电子邮件。"
     allow_email_invites: "禁用后，用户将无法通过 Discourse 发送邀请电子邮件。"
     strip_images_from_short_emails: "从大小小于 2800 字节的电子邮件中去除图片"
     short_email_length: "定义电子邮件被归类为“短”以禁止图片的最大长度（以字节为单位）。如果电子邮件的大小未超过此设置，则电子邮件中的任何图片（例如头像和表情符号）都将被删除。"
@@ -2071,6 +2079,7 @@ zh_CN:
     mailgun_api_key: "用于验证网络钩子消息的 Mailgun Secret API 密钥。"
     sendgrid_verification_key: "用于验证网络钩子消息的 Sendgrid 验证密钥。"
     mailjet_webhook_token: "用于验证网络钩子负载的令牌。它必须作为网络钩子的 't' 查询参数传递，例如：https://example.com/webhook/mailjet?t=supersecret"
+    mailpace_webhook_token: "用于验证网络钩子负载的令牌。它必须作为网络钩子的 't' 查询参数传递，例如：https://example.com/webhook/mailpace?t=supersecret"
     mandrill_authentication_key: "用于验证网络钩子消息的 Mandrill 身份验证密钥。"
     postmark_webhook_token: "用于验证网络钩子负载的令牌。它必须作为网络钩子的 't' 查询参数传递，例如：https://example.com/webhook/postmark?t=supersecret"
     sparkpost_webhook_token: "用于验证网络钩子负载的令牌。它必须作为网络钩子的 't' 查询参数传递，例如：https://example.com/webhook/sparkpost?t=supersecret"
@@ -2343,6 +2352,7 @@ zh_CN:
     dashboard_hidden_reports: "允许从信息中心隐藏指定报告。"
     dashboard_visible_tabs: "选择可见的信息中心标签页。"
     dashboard_general_tab_activity_metrics: "选择要在“常规”标签页上显示为活动指标的报告。"
+    gravatar_enabled: "使用 <a href='https://gravatar.com/'>Gravatar</a> 服务制作用户头像。这将阻止用户改用 Gravatar 制作头像，但不会影响已使用 Gravatar 的用户。"
     gravatar_name: "指定 Gravatar 服务提供商的名称。此名称通常用于标识向网站提供 Gravatar 头像的来源。"
     gravatar_base_url: "指定用于访问 Gravatar 提供商的 API 的 URL。此设置对于将电子邮件地址转换为存储头像图片的 Gravatar URL 至关重要。"
     gravatar_login_url: "相对于 `gravatar_base_url` 的 URL，它为用户提供了登录 Gravatar 服务的途径。"
@@ -2397,9 +2407,11 @@ zh_CN:
     fake_upcoming_change: "这是用于测试目的虚假即将推出的更改。无需翻译此字符串。"
     floating_dismiss_topics_on_mobile: "在移动设备上为话题列表显示一个浮动式 'Dismiss...' 按钮，以方便用户访问，并腾出话题列表顶部的空间"
     rename_faq_to_guidelines: "此更改将常见问题页面重命名为指南。常见问题页面仍可通过 /faq 访问。 'faq url' 的设置与以前一样有效。"
+    experimental_tag_settings_page: "在 /tag/:slug/:id/edit 启用标签专用设置页面。"
     enable_simplified_category_creation: "使用更少的选项和更简洁的界面简化类别创建流程。"
     enable_custom_splash_screen: "允许您使用自己的 SVG 图片自定义加载启动画面。通过“启动画面图片”设置上传图片。警告：这可能会对 LCP 分数和 Google 索引产生负面影响。"
     modernize_foundation_theme: "此次更改对 Discourse 中的 Foundation 主题进行了设计修改。"
+    reporting_improvements: "改进了 Discourse 管理报告的导航、设计和可用性。"
     errors:
       invalid_css_color: "颜色无效。输入颜色名称或十六进制值。"
       invalid_datetime: "日期时间格式无效。请确保输入有效的日期和时间。"
@@ -2407,6 +2419,8 @@ zh_CN:
       invalid_username: "没有使用该用户名的用户。"
       valid_username: "存在一个使用该用户名的用户。"
       invalid_group: "没有使用该名称的群组。"
+      invalid_svg: "SVG图像无效。它必须包含SVG元素，且不能包含任何脚本或事件处理程序。"
+      invalid_upload: "上传内容无效或不存在。"
       invalid_topic: "没有与该 ID 匹配的话题。"
       invalid_integer_min_max: "值必须介于 %{min} 和 %{max}之间。"
       invalid_integer_min: "值必须为 %{min} 或更大。"
@@ -2442,6 +2456,12 @@ zh_CN:
       reply_by_email_disabled: "在启用此设置之前，您必须先启用 'reply by email'。"
       discourse_connect_url_is_empty: "在启用此设置之前，您必须先设置 'discourse connect url'。"
       enable_local_logins_disabled: "在启用此设置之前，您必须先启用 'enable local logins'。"
+      min_username_length_exists: "您不能将最小用户名长度设置为高于最短用户名 (%{username})。"
+      min_group_name_length_exists: "您不能将最小用户名长度设置为大于最短群组名称 (%{group_name})。"
+      min_username_length_range: "用户名最小长度不能设置得高于用户名最大长度。"
+      max_username_length_exists: "您不能将最大用户名长度设置为低于最长用户名 (%{username})。"
+      max_group_name_length_exists: "您不能将最大用户名长度设置为小于最长群组名称 (%{group_name})。"
+      max_username_length_range: "您不能将“最大用户名长度”设置为低于“最小用户名长度”。"
       invalid_hex_value: "颜色值必须是 6 位十六进制代码。"
       empty_selectable_avatars: "在启用此设置之前，您必须先上传至少两个可选择的头像。"
       category_search_priority:
@@ -4948,6 +4968,7 @@ zh_CN:
   dev_mode:
     title: "开发者模式"
     enable_rack_mini_profiler: "启用 Rack Mini Profiler，使其在会话切换后保持 1 小时。"
+    enter: "进入开发者模式"
   wizard:
     title: "Discourse 设置"
     step:
diff --git a/plugins/automation/config/locales/server.cs.yml b/plugins/automation/config/locales/server.cs.yml
index 4a4b67117d526..00fa46c50502e 100644
--- a/plugins/automation/config/locales/server.cs.yml
+++ b/plugins/automation/config/locales/server.cs.yml
@@ -15,7 +15,6 @@ cs:
         transition_placeholder: "z %{from_level_name} na %{to_level_name}"
       topic:
         title: Témata
-        description: Přidružený skript bude použit pouze pro zadané téma, což je užitečné například pro skripty provádějící validaci.
     scriptables:
       pin_topic:
         title: Připnout téma
diff --git a/plugins/automation/config/locales/server.de.yml b/plugins/automation/config/locales/server.de.yml
index 5edbc67410525..88cf04e33031b 100644
--- a/plugins/automation/config/locales/server.de.yml
+++ b/plugins/automation/config/locales/server.de.yml
@@ -72,7 +72,6 @@ de:
         description: Wenn die Schlagwörter eines Themas geändert werden, wird die Automatisierung ausgelöst
       topic:
         title: Thema
-        description: Das zugehörige Skript wird nur für das angegebene Thema verwendet. Dies ist beispielsweise für Skripts nützlich, die eine Validierung durchführen
       topic_closed:
         title: Thema geschlossen
         description: Löst ein Skript aus, wenn ein Thema geschlossen wird.
diff --git a/plugins/automation/config/locales/server.pl_PL.yml b/plugins/automation/config/locales/server.pl_PL.yml
index 9e1e994954e4a..3510034d2b8dd 100644
--- a/plugins/automation/config/locales/server.pl_PL.yml
+++ b/plugins/automation/config/locales/server.pl_PL.yml
@@ -72,7 +72,6 @@ pl_PL:
         description: Gdy tagi tematu zostaną zmienione, zostanie uruchomiona automatyzacja
       topic:
         title: Temat
-        description: Powiązany skrypt będzie używany tylko w określonym temacie, jest to przydatne na przykład w przypadku skryptów wykonujących walidację
       topic_closed:
         title: Temat zamknięty
         description: Uruchamia skrypt po zamknięciu tematu.
diff --git a/plugins/automation/config/locales/server.uk.yml b/plugins/automation/config/locales/server.uk.yml
index 9a0bc2264e28e..bab78b672c7fa 100644
--- a/plugins/automation/config/locales/server.uk.yml
+++ b/plugins/automation/config/locales/server.uk.yml
@@ -72,7 +72,6 @@ uk:
         description: Коли теги теми змінюються, запускається автоматизація
       topic:
         title: Тема
-        description: Пов’язаний скрипт буде використано лише для вказаної теми, це корисно, наприклад, для скриптів, що виконують перевірку
       topic_closed:
         title: Тема закрита
         description: Запускає скрипт, коли тему закрито.
diff --git a/plugins/automation/config/locales/server.zh_CN.yml b/plugins/automation/config/locales/server.zh_CN.yml
index 2cde3d6d8b65c..e62e7d7a89f47 100644
--- a/plugins/automation/config/locales/server.zh_CN.yml
+++ b/plugins/automation/config/locales/server.zh_CN.yml
@@ -72,7 +72,6 @@ zh_CN:
         description: 当话题的标签发生变化时，将触发自动化
       topic:
         title: 话题
-        description: 关联的脚本将仅用于指定的话题，这对于执行验证的脚本十分有用
       topic_closed:
         title: 话题已关闭
         description: 当话题关闭时触发脚本。
diff --git a/plugins/chat/config/locales/client.ar.yml b/plugins/chat/config/locales/client.ar.yml
index 23ce28507321c..8f6bc8eb0f908 100644
--- a/plugins/chat/config/locales/client.ar.yml
+++ b/plugins/chat/config/locales/client.ar.yml
@@ -48,12 +48,6 @@ ar:
           many: "رسالة دردشة"
           other: "رسالة دردشة"
     chat:
-      edit_category:
-        tab_title: "الدردشة"
-        channel: "القناة"
-        description: "الوصف"
-        actions: "الإجراءات"
-        settings: "الإعدادان"
       text_copied: تم نسخ النص إلى الحافظة
       link_copied: تم نسخ الرابط إلى الحافظة
       back_to_forum: "المنتدى"
@@ -71,7 +65,6 @@ ar:
       starred: "مميز بنجمة"
       starred_channels: "القنوات المميزة بنجمة"
       starred_channels_empty: "لا توجد قنوات مميّزة بنجمة حتى الآن. أضِف نجمة إلى القنوات التي تهمك لتظهر هنا ويسهل الوصول إليها."
-      pinned: "مثبَّت"
       browse_all_channels: "استعراض كل القنوات"
       see_in: "رؤيتها في"
       open_channel_menu: "افتح قائمة القناة"
diff --git a/plugins/chat/config/locales/client.be.yml b/plugins/chat/config/locales/client.be.yml
index cfbee854f558d..98fedcb2716d7 100644
--- a/plugins/chat/config/locales/client.be.yml
+++ b/plugins/chat/config/locales/client.be.yml
@@ -12,16 +12,11 @@ be:
           always: "заўсёды"
           never: "ніколі"
     chat:
-      edit_category:
-        description: "Апісанне"
-        actions: "Дзеянні"
-        settings: "Налады"
       deleted_chat_username: аддалены
       dates:
         yesterday: "учора"
       create: "стварыць"
       cancel: "адмяніць"
-      pinned: "замацаваныя"
       channel_settings:
         edit: "рэдагаваць"
         add: "дадаць"
diff --git a/plugins/chat/config/locales/client.bg.yml b/plugins/chat/config/locales/client.bg.yml
index a5eaea2c7896f..60d7b23a6c5c6 100644
--- a/plugins/chat/config/locales/client.bg.yml
+++ b/plugins/chat/config/locales/client.bg.yml
@@ -28,11 +28,6 @@ bg:
             chat:
               create_message: "Създаване на чат съобщение в зададен канал."
     chat:
-      edit_category:
-        tab_title: "Чат"
-        description: "Описание"
-        actions: "Действия"
-        settings: "Настройки"
       deleted_chat_username: изтрит
       dates:
         yesterday: "Вчера"
@@ -44,7 +39,6 @@ bg:
       cancel: "Прекрати"
       cancel_reply: "Отмяна на отговора"
       chat_channels: "Канали"
-      pinned: "Закована"
       browse_all_channels: "Преглед на всички канали"
       move_to_channel:
         title: "Преместване на съобщенията в канал"
diff --git a/plugins/chat/config/locales/client.bs_BA.yml b/plugins/chat/config/locales/client.bs_BA.yml
index fb8fc64bb5a3f..0652e03859d3a 100644
--- a/plugins/chat/config/locales/client.bs_BA.yml
+++ b/plugins/chat/config/locales/client.bs_BA.yml
@@ -12,16 +12,11 @@ bs_BA:
           always: "Uvijek"
           never: "Nikad"
     chat:
-      edit_category:
-        description: "Opis"
-        actions: "Akcije"
-        settings: "Postavke"
       deleted_chat_username: obrisano
       dates:
         yesterday: "Yesterday"
       create: "napravi"
       cancel: "Odustani"
-      pinned: "Zakačena"
       channel_settings:
         edit: "Edit"
         add: "Add"
diff --git a/plugins/chat/config/locales/client.ca.yml b/plugins/chat/config/locales/client.ca.yml
index d1c1c274243fb..68f348a3269d1 100644
--- a/plugins/chat/config/locales/client.ca.yml
+++ b/plugins/chat/config/locales/client.ca.yml
@@ -12,17 +12,11 @@ ca:
           always: "Sempre"
           never: "Mai"
     chat:
-      edit_category:
-        channel: "Canal"
-        description: "Descripció"
-        actions: "Accions"
-        settings: "Configuració"
       deleted_chat_username: suprimit
       dates:
         yesterday: "Ahir"
       create: "Crea"
       cancel: "Cancel·la"
-      pinned: "Afixat"
       channel_settings:
         edit: "Edita"
         add: "Afegeix"
diff --git a/plugins/chat/config/locales/client.cs.yml b/plugins/chat/config/locales/client.cs.yml
index 7983cac69e99b..3663c1f36b2f3 100644
--- a/plugins/chat/config/locales/client.cs.yml
+++ b/plugins/chat/config/locales/client.cs.yml
@@ -46,12 +46,6 @@ cs:
           many: "%{formatted_number} zpráv chatu"
           other: "%{formatted_number} zpráv chatu"
     chat:
-      edit_category:
-        tab_title: "Konverzace"
-        channel: "Kanál"
-        description: "Popis"
-        actions: "Akce"
-        settings: "Nastavení"
       text_copied: Zkopírováno do schránky
       link_copied: Odkaz zkopírován do schránky
       back_to_forum: "Fórum"
@@ -69,7 +63,6 @@ cs:
       starred: "Oblíbené"
       starred_channels: "Oblíbené kanály"
       starred_channels_empty: "Zatím jste neoznačili žádné kanály jako oblíbené. Ty se zde objeví pro rychlejší přístup."
-      pinned: "Připnuto"
       browse_all_channels: "Procházet všechny kanály"
       see_in: "Zobrazit v"
       open_channel_menu: "Otevřít nabídku kanálu"
@@ -669,19 +662,12 @@ cs:
           many: "%{commaSeparatedUsernames} a %{count} dalších píší"
           other: "%{commaSeparatedUsernames} a %{count} dalších píší"
       retention_reminders:
-        chat_settings: "Nastavení chatu"
         indefinitely_short: "navždy"
-        indefinitely_long: "%{chatSettingsLink} bylo nastaveno tak, aby uchovávalo zprávy kanálu na dobu neurčitou."
         short:
           one: "%{count} den"
           few: "%{count} dny"
           many: "%{count} dní"
           other: "%{count} dní"
-        long:
-          one: "%{chatSettingsLink} bylo nastaveno tak, aby uchovávalo zprávy kanálu po dobu %{count} dne."
-          few: "%{chatSettingsLink} bylo nastaveno tak, aby uchovávalo zprávy kanálu po dobu %{count} dnů."
-          many: "%{chatSettingsLink} bylo nastaveno tak, aby uchovávalo zprávy kanálu po dobu %{count} dnů."
-          other: "%{chatSettingsLink} bylo nastaveno tak, aby uchovávalo zprávy kanálu po dobu %{count} dnů."
       flags:
         off_topic: "Tato zpráva není relevantní pro aktuální diskusi, definovanou názvem kanálu, a pravděpodobně by měla být přesunuta jinam."
         inappropriate: "Tato zpráva obsahuje obsah, který by rozumný člověk mohl považovat za urážlivý, zneužívající nebo porušující <a href=\"%{basePath}/guidelines\">naše pravidla komunity</a>."
diff --git a/plugins/chat/config/locales/client.da.yml b/plugins/chat/config/locales/client.da.yml
index 2d16b85addf00..780e17bd636fb 100644
--- a/plugins/chat/config/locales/client.da.yml
+++ b/plugins/chat/config/locales/client.da.yml
@@ -28,12 +28,6 @@ da:
             chat:
               create_message: "Opret en chatbesked i en angivet kanal."
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Kanal"
-        description: "Beskrivelse"
-        actions: "Handlinger"
-        settings: "Indstillinger"
       back_to_forum: "Forum"
       deleted_chat_username: slettet
       dates:
@@ -46,7 +40,6 @@ da:
       cancel: "Annuller"
       cancel_reply: "Annuller svar"
       chat_channels: "Kanaler"
-      pinned: "Fastgjort"
       browse_all_channels: "Gennemse alle kanaler"
       move_to_channel:
         title: "Flyt beskeder til kanal"
diff --git a/plugins/chat/config/locales/client.de.yml b/plugins/chat/config/locales/client.de.yml
index 2a043a8124241..771d24105a1df 100644
--- a/plugins/chat/config/locales/client.de.yml
+++ b/plugins/chat/config/locales/client.de.yml
@@ -44,15 +44,6 @@ de:
           one: "%{formatted_number} Chat-Nachricht"
           other: "%{formatted_number} Chat-Nachrichten"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Kanal"
-        description: "Beschreibung"
-        actions: "Aktionen"
-        settings: "Einstellungen"
-        no_channels: "Dieser Kategorie sind keine Chat-Kanäle zugeordnet"
-        no_channels_body: "Du kannst mehrere Kanäle pro Kategorie haben, die basierend auf den Sicherheitseinstellungen der Kategorie für dieselben Mitglieder zugänglich sind. <a href='%{chatBrowseUrl}'>Erstelle einen Chat-Kanal</a>."
-        include_subcategories: "Kanäle in Unterkategorien einbeziehen"
       text_copied: Text in die Zwischenablage kopiert
       link_copied: Link in die Zwischenablage kopiert
       back_to_forum: "Forum"
@@ -70,15 +61,6 @@ de:
       starred: "Mit Sternchen"
       starred_channels: "Kanäle mit Sternchen"
       starred_channels_empty: "Du hast noch keine Kanäle mit einem Sternchen versehen. Markiere Kanäle mit einem Sternchen, um sie hier für schnellen Zugriff zu sehen."
-      pinned_messages:
-        title: "Angeheftete Nachrichten"
-        close: "Angeheftete Nachrichten schließen"
-        pinned_by_you: "Angeheftet von dir"
-        pinned_by_user: "Angeheftet von %{username}"
-      no_pinned_messages: "Keine angehefteten Nachrichten in diesem Kanal."
-      pin_message: "Nachricht anheften"
-      unpin_message: "Nachricht loslösen"
-      pinned: "Angeheftet"
       browse_all_channels: "Alle Kanäle durchsuchen"
       see_in: "Ansehen in"
       open_channel_menu: "Kanalmenü öffnen"
@@ -100,8 +82,6 @@ de:
         unstar_channel: "Sternchen von Kanal entfernen"
         close_channel: "Kanal schließen"
         open_channel: "Kanal öffnen"
-        open_channel_disabled_archived: "Archivierte Kanäle können nicht wieder geöffnet werden."
-        open_channel_disabled_read_only: "Schreibgeschützte Kanäle können nicht wieder geöffnet werden."
         archive_channel: "Kanal archivieren"
         delete_channel: "Kanal löschen"
         join_channel: "Kanal beitreten"
@@ -620,15 +600,10 @@ de:
           one: "%{commaSeparatedUsernames} und %{count} andere Person schreiben"
           other: "%{commaSeparatedUsernames} und %{count} andere Personen schreiben"
       retention_reminders:
-        chat_settings: "Chat-Einstellungen"
         indefinitely_short: "unbestimmt"
-        indefinitely_long: "Die %{chatSettingsLink} wurden so eingestellt, dass Kanalnachrichten zeitlich unbegrenzt gespeichert werden."
         short:
           one: "%{count} Tag"
           other: "%{count} Tage"
-        long:
-          one: "Die %{chatSettingsLink} wurden so eingestellt, dass Kanalnachrichten für %{count} Tag aufbewahrt werden."
-          other: "Die %{chatSettingsLink} wurden so eingestellt, dass Kanalnachrichten für %{count} Tage aufbewahrt werden."
       flags:
         off_topic: "Diese Nachricht ist für die aktuelle Diskussion im Sinne des Kanaltitels nicht relevant und sollte wahrscheinlich an eine andere Stelle verschoben werden."
         inappropriate: "Diese Nachricht enthält Inhalte, die eine vernünftige Person als anstößig, beleidigend oder als Verstoß gegen <a href=\"%{basePath}/guidelines\">unsere Community-Richtlinien</a> ansehen würde."
diff --git a/plugins/chat/config/locales/client.el.yml b/plugins/chat/config/locales/client.el.yml
index c70e1d572e592..8a389c7f8b359 100644
--- a/plugins/chat/config/locales/client.el.yml
+++ b/plugins/chat/config/locales/client.el.yml
@@ -38,12 +38,6 @@ el:
           one: "%{formatted_number} μήνυμα συνομιλίας"
           other: "%{formatted_number} μηνύματα συνομιλίας"
     chat:
-      edit_category:
-        tab_title: "Συνομιλία"
-        channel: "Κανάλι"
-        description: "Περιγραφή"
-        actions: "Ενέργειες"
-        settings: "Ρυθμίσεις"
       text_copied: Το κείμενο αντιγράφηκε στο πρόχειρο
       link_copied: Ο σύνδεσμος αντιγράφηκε στο πρόχειρο
       back_to_forum: "Φόρουμ"
@@ -57,7 +51,6 @@ el:
       cancel: "Ακύρωση"
       cancel_reply: "Ακύρωση απάντησης"
       chat_channels: "Κανάλια"
-      pinned: "Καρφιτσωμένο"
       browse_all_channels: "Περιήγηση σε όλα τα κανάλια"
       see_in: "Δείτε σε"
       open_channel_menu: "Άνοιγμα μενού καναλιού"
diff --git a/plugins/chat/config/locales/client.en_GB.yml b/plugins/chat/config/locales/client.en_GB.yml
index 364e28fe19850..95405c4a379f9 100644
--- a/plugins/chat/config/locales/client.en_GB.yml
+++ b/plugins/chat/config/locales/client.en_GB.yml
@@ -7,8 +7,6 @@
 en_GB:
   js:
     chat:
-      edit_category:
-        description: "Description"
       about_view:
         description: Description
       composer:
diff --git a/plugins/chat/config/locales/client.es.yml b/plugins/chat/config/locales/client.es.yml
index 748ce2f048e05..823edc2e9035f 100644
--- a/plugins/chat/config/locales/client.es.yml
+++ b/plugins/chat/config/locales/client.es.yml
@@ -44,13 +44,6 @@ es:
           one: "%{formatted_number} mensaje de chat"
           other: "%{formatted_number} mensajes de chat"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Canal"
-        description: "Descripción"
-        actions: "Acciones"
-        settings: "Ajustes"
-        no_channels: "No hay canales de chat asociados a esta categoría"
       text_copied: Texto copiado en el portapapeles
       link_copied: Enlace copiado en el portapapeles
       back_to_forum: "Foro"
@@ -65,7 +58,6 @@ es:
       cancel: "Cancelar"
       cancel_reply: "Cancelar respuesta"
       chat_channels: "Canales"
-      pinned: "Anclado"
       browse_all_channels: "Examinar todos los canales"
       see_in: "Ver en"
       move_to_channel:
@@ -586,9 +578,7 @@ es:
           one: "%{commaSeparatedUsernames} y %{count} más está escribiendo"
           other: "%{commaSeparatedUsernames} y %{count} más están escribiendo"
       retention_reminders:
-        chat_settings: "Los ajustes de chat"
         indefinitely_short: "indefinidamente"
-        indefinitely_long: "%{chatSettingsLink} están configurados para conservar los mensajes del canal indefinidamente."
         short:
           one: "%{count} día"
           other: "%{count} días"
diff --git a/plugins/chat/config/locales/client.et.yml b/plugins/chat/config/locales/client.et.yml
index 55c70b1e13425..723b047e08de6 100644
--- a/plugins/chat/config/locales/client.et.yml
+++ b/plugins/chat/config/locales/client.et.yml
@@ -22,12 +22,6 @@ et:
             chat_channel_status_change: "Vestluskanali staatus muutus"
             chat_channel_delete: "Vestlus on kustutatud"
     chat:
-      edit_category:
-        tab_title: "Vestlus"
-        channel: "Kanal"
-        description: "Kirjeldus"
-        actions: "Tegevused"
-        settings: "Seaded"
       back_to_forum: "Foorum"
       deleted_chat_username: kustutatud
       dates:
@@ -37,7 +31,6 @@ et:
       cancel: "Tühista"
       cancel_reply: "Tühista vastus"
       chat_channels: "Kanalid"
-      pinned: "Esiletõstetud"
       browse_all_channels: "Sirvi kõiki kanaleid"
       channel_settings:
         edit: "Muuda"
diff --git a/plugins/chat/config/locales/client.fa_IR.yml b/plugins/chat/config/locales/client.fa_IR.yml
index 9e9cc999cfa97..08d2f9502c371 100644
--- a/plugins/chat/config/locales/client.fa_IR.yml
+++ b/plugins/chat/config/locales/client.fa_IR.yml
@@ -44,12 +44,6 @@ fa_IR:
           one: "%{formatted_number} پیام چت"
           other: "%{formatted_number} پیام چت"
     chat:
-      edit_category:
-        tab_title: "گفتگو"
-        channel: "کانال"
-        description: "توضیح"
-        actions: "عملیات"
-        settings: "تنظیم"
       text_copied: متن در کلیپ بورد کپی شد
       link_copied: پیوند در کلیپ بورد کپی شد
       back_to_forum: "انجمن"
@@ -64,7 +58,6 @@ fa_IR:
       cancel: "انصراف"
       cancel_reply: "لغو پاسخ"
       chat_channels: "کانال‌ها"
-      pinned: "سنجاق شده"
       browse_all_channels: "مرور همه کانال‌ها"
       see_in: "ببینید در"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.fi.yml b/plugins/chat/config/locales/client.fi.yml
index 66464764c1b2a..5eabc27a8f089 100644
--- a/plugins/chat/config/locales/client.fi.yml
+++ b/plugins/chat/config/locales/client.fi.yml
@@ -44,12 +44,6 @@ fi:
           one: "%{formatted_number} chat-viesti"
           other: "%{formatted_number} chat-viestuä"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Kanava"
-        description: "Kuvaus"
-        actions: "Toiminnot"
-        settings: "Asetukset"
       text_copied: Teksti kopioitiin leikepöydälle
       link_copied: Linkki kopioitiin leikepöydälle
       back_to_forum: "Foorumi"
@@ -64,7 +58,6 @@ fi:
       cancel: "Peruuta"
       cancel_reply: "Peruuta vastaus"
       chat_channels: "Kanavat"
-      pinned: "Kiinnitetty"
       browse_all_channels: "Selaa kaikkia kanavia"
       see_in: "Katso:"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.fr.yml b/plugins/chat/config/locales/client.fr.yml
index 23376bbe0861a..a9eba5b430226 100644
--- a/plugins/chat/config/locales/client.fr.yml
+++ b/plugins/chat/config/locales/client.fr.yml
@@ -44,12 +44,6 @@ fr:
           one: "%{formatted_number} message de discussion"
           other: "%{formatted_number} messages de discussion"
     chat:
-      edit_category:
-        tab_title: "Discussion"
-        channel: "Canal"
-        description: "Description"
-        actions: "Actions"
-        settings: "Paramètres"
       text_copied: Texte copié dans le presse-papiers
       link_copied: Lien copié dans le presse-papiers
       back_to_forum: "Forum"
@@ -64,7 +58,6 @@ fr:
       cancel: "Annuler"
       cancel_reply: "Annuler la réponse"
       chat_channels: "Canaux"
-      pinned: "Épinglé"
       browse_all_channels: "Parcourir tous les canaux"
       see_in: "Voir dans"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.gl.yml b/plugins/chat/config/locales/client.gl.yml
index 1f20b39d799bd..4e06d9692090f 100644
--- a/plugins/chat/config/locales/client.gl.yml
+++ b/plugins/chat/config/locales/client.gl.yml
@@ -12,17 +12,11 @@ gl:
           always: "Sempre"
           never: "Nunca"
     chat:
-      edit_category:
-        channel: "Canle"
-        description: "Descrición"
-        actions: "Accións"
-        settings: "Configuración"
       deleted_chat_username: eliminado
       dates:
         yesterday: "Onte"
       create: "Crear"
       cancel: "Cancelar"
-      pinned: "Fixado"
       channel_settings:
         edit: "Editar"
         add: "Engadir"
diff --git a/plugins/chat/config/locales/client.he.yml b/plugins/chat/config/locales/client.he.yml
index c66a74b770c7b..6591d767963b5 100644
--- a/plugins/chat/config/locales/client.he.yml
+++ b/plugins/chat/config/locales/client.he.yml
@@ -46,13 +46,6 @@ he:
           many: "%{formatted_number} הודעות צ׳אט"
           other: "%{formatted_number} הודעות צ׳אט"
     chat:
-      edit_category:
-        tab_title: "צ׳אט"
-        channel: "ערוץ"
-        description: "תיאור"
-        actions: "פעולות"
-        settings: "הגדרות"
-        no_channels: "אין ערוצי צ׳אט המשויכים לקטגוריה הזאת"
       text_copied: טקסט הועתק ללוח הגזירים
       link_copied: קישור הועתק ללוח הגזירים
       back_to_forum: "פורום"
@@ -67,7 +60,6 @@ he:
       cancel: "ביטול"
       cancel_reply: "ביטול תגובה"
       chat_channels: "ערוצים"
-      pinned: "נעוץ"
       browse_all_channels: "עיון בכל הערוצים"
       see_in: "לראות ב־"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.hr.yml b/plugins/chat/config/locales/client.hr.yml
index 81ef0b8ed5620..87ad15745716c 100644
--- a/plugins/chat/config/locales/client.hr.yml
+++ b/plugins/chat/config/locales/client.hr.yml
@@ -28,12 +28,6 @@ hr:
             chat:
               create_message: "Izradite chat poruku na određenom kanalu."
     chat:
-      edit_category:
-        tab_title: "Čavrljanje"
-        channel: "Kanal"
-        description: "Opis"
-        actions: "Akcije"
-        settings: "Postavke"
       deleted_chat_username: izbrisao
       dates:
         yesterday: "Jučer"
@@ -45,7 +39,6 @@ hr:
       cancel: "Odustani"
       cancel_reply: "Otkaži odgovor"
       chat_channels: "Kanali"
-      pinned: "Zakvačeno"
       move_to_channel:
         title: "Premještanje poruka na kanal"
         instructions:
diff --git a/plugins/chat/config/locales/client.hu.yml b/plugins/chat/config/locales/client.hu.yml
index bf078892a743d..0fb28171874e5 100644
--- a/plugins/chat/config/locales/client.hu.yml
+++ b/plugins/chat/config/locales/client.hu.yml
@@ -44,12 +44,6 @@ hu:
           one: "%{formatted_number} csevegőüzenet"
           other: "%{formatted_number} csevegőüzenet"
     chat:
-      edit_category:
-        tab_title: "Csevegés"
-        channel: "Csatorna"
-        description: "Leírás"
-        actions: "Műveletek"
-        settings: "Beállítások"
       text_copied: Szöveg vágólapra másolva
       link_copied: Hivatkozás vágólapra másolva
       back_to_forum: "Fórum"
@@ -67,7 +61,6 @@ hu:
       starred: "Csillagozott"
       starred_channels: "Csillagozott csatornák"
       starred_channels_empty: "Még nem csillagozott meg egyetlen csatornát sem. Csillagozd meg a csatornákat, hogy itt lásd őket a gyors hozzáférés érdekében."
-      pinned: "Kiemelt"
       browse_all_channels: "Összes csatorna tallózása"
       see_in: "Lásd itt"
       open_channel_menu: "Csatornamenü megnyitása"
diff --git a/plugins/chat/config/locales/client.hy.yml b/plugins/chat/config/locales/client.hy.yml
index 4546dae463eab..db24069ed596f 100644
--- a/plugins/chat/config/locales/client.hy.yml
+++ b/plugins/chat/config/locales/client.hy.yml
@@ -12,17 +12,11 @@ hy:
           always: "Միշտ"
           never: "Երբեք"
     chat:
-      edit_category:
-        channel: "Ալիք"
-        description: "Նկարագրություն"
-        actions: "Գործողություններ"
-        settings: "Կարգավորումներ"
       deleted_chat_username: ջնջված
       dates:
         yesterday: "Երեկվա"
       create: "Ստեղծել"
       cancel: "Չեղարկել"
-      pinned: "Ամրակցված"
       channel_settings:
         edit: "Խմբագրել"
         add: "Ավելացնել"
diff --git a/plugins/chat/config/locales/client.id.yml b/plugins/chat/config/locales/client.id.yml
index f9f5d5b172ad8..927f98c14203f 100644
--- a/plugins/chat/config/locales/client.id.yml
+++ b/plugins/chat/config/locales/client.id.yml
@@ -27,11 +27,6 @@ id:
             chat:
               create_message: "Buat pesan obrolan di kanal tertentu"
     chat:
-      edit_category:
-        tab_title: "Obrolan"
-        description: "Deskripsi"
-        actions: "Aksi"
-        settings: "Pengaturan"
       text_copied: Teks disalin ke papan klip
       link_copied: Tautan disalin ke papan klip
       deleted_chat_username: dihapus
diff --git a/plugins/chat/config/locales/client.it.yml b/plugins/chat/config/locales/client.it.yml
index ff5e54e7483cf..b5b187bd4df5e 100644
--- a/plugins/chat/config/locales/client.it.yml
+++ b/plugins/chat/config/locales/client.it.yml
@@ -44,12 +44,6 @@ it:
           one: "%{formatted_number} messaggio di chat"
           other: "%{formatted_number} messaggi di chat"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Canale"
-        description: "Descrizione"
-        actions: "Azioni"
-        settings: "Impostazioni"
       text_copied: Testo copiato negli appunti
       link_copied: Link copiato negli appunti
       back_to_forum: "Forum"
@@ -64,7 +58,6 @@ it:
       cancel: "Annulla"
       cancel_reply: "Annulla risposta"
       chat_channels: "Canali"
-      pinned: "Appuntato"
       browse_all_channels: "Sfoglia tutti i canali"
       see_in: "Da' un'occhiata"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.ja.yml b/plugins/chat/config/locales/client.ja.yml
index 6aacf648d4bab..b7b43f32acfdd 100644
--- a/plugins/chat/config/locales/client.ja.yml
+++ b/plugins/chat/config/locales/client.ja.yml
@@ -43,12 +43,6 @@ ja:
         chat_messages:
           other: "%{formatted_number} チャットメッセージ"
     chat:
-      edit_category:
-        tab_title: "チャット"
-        channel: "チャンネル"
-        description: "説明"
-        actions: "アクション"
-        settings: "設定"
       text_copied: テキストをクリップボードにコピーしました
       link_copied: リンクをクリップボードにコピーしました
       back_to_forum: "フォーラム"
@@ -66,7 +60,6 @@ ja:
       starred: "スター付き"
       starred_channels: "スター付きのチャンネル"
       starred_channels_empty: "まだどのチャンネルにもスターを設定していません。チャンネルにスターを設定すると、ここで素早くアクセスできます。"
-      pinned: "固定"
       browse_all_channels: "すべてのチャンネルを閲覧する"
       see_in: "表示:"
       open_channel_menu: "チャンネルメニューを開く"
diff --git a/plugins/chat/config/locales/client.ko.yml b/plugins/chat/config/locales/client.ko.yml
index a0f4f7b0c3ca5..cdea1c9d39f7f 100644
--- a/plugins/chat/config/locales/client.ko.yml
+++ b/plugins/chat/config/locales/client.ko.yml
@@ -23,12 +23,6 @@ ko:
             chat_channel_delete: "채팅 채널 삭제됨"
             chat_auto_remove_membership: "채널에서 자동으로 제거된 멤버십"
     chat:
-      edit_category:
-        tab_title: "채팅"
-        channel: "채널"
-        description: "내용"
-        actions: "작업"
-        settings: "설정"
       deleted_chat_username: 삭제되었습니다
       dates:
         yesterday: "어제"
@@ -37,7 +31,6 @@ ko:
       create: "글"
       cancel: "취소"
       chat_channels: "채널"
-      pinned: "핀 지정됨"
       move_to_channel:
         instructions:
           other: "<strong>%{count}개</strong>의 메시지를 옮기고 있습니다. 새로운 채널을 선택하세요. <strong>%{channelTitle}</strong>에 메시지가 이동되었다는 것이 표시될 것입니다. 답변된 메시지는 새로운 채널에 이동되지 않을 것이며, 기존 채널의 메시지는 답변하는 메시지로 표시되지 않을 것입니다."
diff --git a/plugins/chat/config/locales/client.lt.yml b/plugins/chat/config/locales/client.lt.yml
index 294792d52c1be..4e4d2d01fff78 100644
--- a/plugins/chat/config/locales/client.lt.yml
+++ b/plugins/chat/config/locales/client.lt.yml
@@ -46,11 +46,6 @@ lt:
           many: "%{formatted_number} pokalbių žinutė"
           other: "%{formatted_number} pokalbių žinutės"
     chat:
-      edit_category:
-        tab_title: "Pokalbis"
-        description: "Aprašymas"
-        actions: "Veiksmai"
-        settings: "Nustatymai"
       text_copied: Tekstas nukopijuotas į iškarpinę
       link_copied: Nuoroda nukopijuota į iškarpinę
       back_to_forum: "Forumas"
@@ -65,7 +60,6 @@ lt:
       cancel: "Atšaukti"
       cancel_reply: "Atšaukti atsakymą"
       chat_channels: "Kanalai"
-      pinned: "Prisegta"
       browse_all_channels: "Naršyti visus kanalus"
       see_in: "Žiūrėti"
       open_channel_menu: "Atidaryti kanalo meniu"
diff --git a/plugins/chat/config/locales/client.lv.yml b/plugins/chat/config/locales/client.lv.yml
index c7684fdc04b43..83602740fd19f 100644
--- a/plugins/chat/config/locales/client.lv.yml
+++ b/plugins/chat/config/locales/client.lv.yml
@@ -12,16 +12,11 @@ lv:
           always: "Vienmēr"
           never: "Nekad"
     chat:
-      edit_category:
-        description: "Apraksts"
-        actions: "Darbības"
-        settings: "Iestatījumi"
       deleted_chat_username: dzēsts
       dates:
         yesterday: "Vakar"
       create: "Izveidot"
       cancel: "Atcelt"
-      pinned: "Piesprausts"
       channel_settings:
         edit: "Rediģēt"
         add: "Pievienot"
diff --git a/plugins/chat/config/locales/client.nb_NO.yml b/plugins/chat/config/locales/client.nb_NO.yml
index 673c9eca3a847..35e2c08f72ce8 100644
--- a/plugins/chat/config/locales/client.nb_NO.yml
+++ b/plugins/chat/config/locales/client.nb_NO.yml
@@ -12,17 +12,11 @@ nb_NO:
           always: "Alltid"
           never: "Aldri"
     chat:
-      edit_category:
-        channel: "Kanal"
-        description: "Beskrivelse"
-        actions: "Handlinger"
-        settings: "Innstillinger"
       deleted_chat_username: slettet
       dates:
         yesterday: "I går"
       create: "Opprett"
       cancel: "Avbryt"
-      pinned: "Fastsatt"
       channel_settings:
         edit: "Endre"
         add: "Legg til"
diff --git a/plugins/chat/config/locales/client.nl.yml b/plugins/chat/config/locales/client.nl.yml
index 1e83523a50ea6..11b8fbdb852a1 100644
--- a/plugins/chat/config/locales/client.nl.yml
+++ b/plugins/chat/config/locales/client.nl.yml
@@ -44,12 +44,6 @@ nl:
           one: "%{formatted_number} chatbericht"
           other: "%{formatted_number} chatberichten"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Kanaal"
-        description: "Beschrijving"
-        actions: "Acties"
-        settings: "Instellingen"
       text_copied: Tekst gekopieerd naar klembord
       link_copied: Link gekopieerd naar klembord
       back_to_forum: "Forum"
@@ -64,7 +58,6 @@ nl:
       cancel: "Annuleren"
       cancel_reply: "Antwoord annuleren"
       chat_channels: "Kanalen"
-      pinned: "Vastgemaakt"
       browse_all_channels: "Alle kanalen bekijken"
       see_in: "Bekijken in"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.pl_PL.yml b/plugins/chat/config/locales/client.pl_PL.yml
index afcd67df7706f..e1e702460942a 100644
--- a/plugins/chat/config/locales/client.pl_PL.yml
+++ b/plugins/chat/config/locales/client.pl_PL.yml
@@ -46,15 +46,6 @@ pl_PL:
           many: "%{formatted_number} wiadomości czatu"
           other: "%{formatted_number} wiadomości czatu"
     chat:
-      edit_category:
-        tab_title: "Czat"
-        channel: "Kanał"
-        description: "Opis"
-        actions: "Akcje"
-        settings: "Ustawienia"
-        no_channels: "Brak kanałów czatu powiązanych z tą kategorią"
-        no_channels_body: "Możesz mieć wiele kanałów w każdej kategorii, dostępnych dla tych samych członków na podstawie ustawień bezpieczeństwa kategorii. <a href='%{chatBrowseUrl}'>Utwórz kanał czatu</a>."
-        include_subcategories: "Uwzględnij kanały podkategorii"
       text_copied: Tekst skopiowany do schowka
       link_copied: Link skopiowany do schowka
       back_to_forum: "Forum"
@@ -72,15 +63,6 @@ pl_PL:
       starred: "Wyróżnione"
       starred_channels: "Wyróżnione kanały"
       starred_channels_empty: "Nie wyróżniono jeszcze żadnego kanału. Wyróżnij kanały, aby je tu zobaczyć i mieć do nich szybki dostęp."
-      pinned_messages:
-        title: "Przypięte wiadomości"
-        close: "Zamknij przypięte wiadomości"
-        pinned_by_you: "Przypięte przez Ciebie"
-        pinned_by_user: "Przypięte przez %{username}"
-      no_pinned_messages: "Żadnych przypiętych wiadomości na tym kanale."
-      pin_message: "Przypnij wiadomość"
-      unpin_message: "Odepnij wiadomość"
-      pinned: "Przypięty"
       browse_all_channels: "Przeglądaj wszystkie kanały"
       see_in: "Zobacz w"
       open_channel_menu: "Otwórz menu kanału"
@@ -106,8 +88,6 @@ pl_PL:
         unstar_channel: "Usuń wyróżnienie kanału"
         close_channel: "Zamknij kanał"
         open_channel: "Otwórz kanał"
-        open_channel_disabled_archived: "Zarchiwizowanych kanałów nie można ponownie otworzyć."
-        open_channel_disabled_read_only: "Kanałów przeznaczonych tylko do odczytu nie można ponownie otworzyć."
         archive_channel: "Archiwizuj kanał"
         delete_channel: "Usuń kanał"
         join_channel: "Dołącz do kanału"
@@ -666,19 +646,12 @@ pl_PL:
           many: "%{commaSeparatedUsernames} i %{count} inni piszą"
           other: "%{commaSeparatedUsernames} i %{count} innych piszą"
       retention_reminders:
-        chat_settings: "Ustawienia czatu"
         indefinitely_short: "nieokreślony"
-        indefinitely_long: "%{chatSettingsLink} zostały ustawione w celu bezterminowego przechowywania wiadomości kanału."
         short:
           one: "%{count} dzień"
           few: "%{count} dni"
           many: "%{count} dni"
           other: "%{count} dni"
-        long:
-          one: "%{chatSettingsLink} ustawiono tak, aby zachowywać wiadomości kanału przez %{count} dzień."
-          few: "%{chatSettingsLink} ustawiono tak, aby zachowywać wiadomości kanału przez %{count} dni."
-          many: "%{chatSettingsLink} ustawiono tak, aby zachowywać wiadomości kanału przez %{count} dni."
-          other: "%{chatSettingsLink} ustawiono tak, aby zachowywać wiadomości kanału przez %{count} dni."
       flags:
         off_topic: "Ta wiadomość nie jest związana z bieżącą dyskusją określoną w tytule kanału i prawdopodobnie powinna zostać przeniesiona w inne miejsce."
         inappropriate: "Ta wiadomość zawiera treści, które rozsądna osoba mogłaby uznać za obraźliwe, krzywdzące lub stanowiące naruszenie <a href=\"%{basePath}/guidelines\">naszych wytycznych dotyczących społeczności</a>."
diff --git a/plugins/chat/config/locales/client.pt.yml b/plugins/chat/config/locales/client.pt.yml
index 07ce57e48f2c3..ffee632e1a9eb 100644
--- a/plugins/chat/config/locales/client.pt.yml
+++ b/plugins/chat/config/locales/client.pt.yml
@@ -16,11 +16,6 @@ pt:
           actions:
             chat_auto_remove_membership: "Assinaturas removidas automaticamente dos canais"
     chat:
-      edit_category:
-        channel: "Canal"
-        description: "Descrição"
-        actions: "Ações"
-        settings: "Configurações"
       deleted_chat_username: eliminado
       dates:
         yesterday: "Ontem"
@@ -32,7 +27,6 @@ pt:
       cancel: "Cancelar"
       cancel_reply: "Cancelar resposta"
       chat_channels: "Canais"
-      pinned: "Fixado"
       browse_all_channels: "Navegar todos os canais"
       move_to_channel:
         title: "Mover mensagens para o canal"
diff --git a/plugins/chat/config/locales/client.pt_BR.yml b/plugins/chat/config/locales/client.pt_BR.yml
index 1bc8260148008..1b56bd4534ffb 100644
--- a/plugins/chat/config/locales/client.pt_BR.yml
+++ b/plugins/chat/config/locales/client.pt_BR.yml
@@ -44,12 +44,6 @@ pt_BR:
           one: "%{formatted_number} mensagem de chat"
           other: "%{formatted_number} mensagens de chat"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Canal"
-        description: "Descrição"
-        actions: "Ações"
-        settings: "Definições"
       text_copied: Texto copiado para área de transferência
       link_copied: Link copiado para área de transferência
       back_to_forum: "Fórum"
@@ -64,7 +58,6 @@ pt_BR:
       cancel: "Cancelar"
       cancel_reply: "Cancelar resposta"
       chat_channels: "Canais"
-      pinned: "Fixado"
       browse_all_channels: "Navegar por todos os canais"
       see_in: "Veja em"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.ro.yml b/plugins/chat/config/locales/client.ro.yml
index 24f2dff906dd7..306e741c873e6 100644
--- a/plugins/chat/config/locales/client.ro.yml
+++ b/plugins/chat/config/locales/client.ro.yml
@@ -16,18 +16,12 @@ ro:
           actions:
             chat_auto_remove_membership: "Membrii sunt eliminați automat din canale"
     chat:
-      edit_category:
-        channel: "Canal"
-        description: "Descriere"
-        actions: "Acțiuni"
-        settings: "Setări"
       back_to_forum: "Forum"
       deleted_chat_username: șters
       dates:
         yesterday: "Ieri"
       create: "Creează"
       cancel: "Anulează"
-      pinned: "Fixat"
       move_to_channel:
         instructions:
           one: "Mutați <strong>%{count}</strong> mesaj. Selectați un canal de destinație. Un mesaj placeholder va fi creat în canalul <strong>%{channelTitle}</strong> pentru a indica faptul că acest mesaj a fost mutat. Retineți că lanțurile de răspuns nu vor fi păstrate în noul canal, iar mesajele din vechiul canal nu vor mai apărea ca raspunsuri la mesajele mutate."
diff --git a/plugins/chat/config/locales/client.ru.yml b/plugins/chat/config/locales/client.ru.yml
index d9de808e994c7..24534ba83658c 100644
--- a/plugins/chat/config/locales/client.ru.yml
+++ b/plugins/chat/config/locales/client.ru.yml
@@ -46,12 +46,6 @@ ru:
           many: "%{formatted_number} сообщений чата"
           other: "%{formatted_number} сообщения чата"
     chat:
-      edit_category:
-        tab_title: "Чат"
-        channel: "Канал"
-        description: "Описание"
-        actions: "Действия"
-        settings: "настроек"
       text_copied: Текст скопирован в буфер обмена
       link_copied: Ссылка скопирована в буфер обмена
       back_to_forum: "Форум"
@@ -67,7 +61,6 @@ ru:
       cancel_reply: "Отменить ответ"
       chat_channels: "Каналы"
       starred: "Отмечено звездочкой"
-      pinned: "Закреплена"
       browse_all_channels: "Просмотреть все каналы"
       see_in: "Смотреть в:"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.sk.yml b/plugins/chat/config/locales/client.sk.yml
index 6b22570b67ec0..39114c2fd1113 100644
--- a/plugins/chat/config/locales/client.sk.yml
+++ b/plugins/chat/config/locales/client.sk.yml
@@ -46,12 +46,6 @@ sk:
           many: "%{formatted_number} správ v chate"
           other: "%{formatted_number} správy v chate"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        channel: "Kanál"
-        description: "Popis"
-        actions: "Akcie"
-        settings: "Nastavení"
       text_copied: Text bol skopírovaný do schránky
       link_copied: Odkaz bol skopírovaný do schránky
       back_to_forum: "fórum"
@@ -66,7 +60,6 @@ sk:
       cancel: "Zrušiť"
       cancel_reply: "Zrušiť odpoveď"
       chat_channels: "Kanály"
-      pinned: "Pripnutý"
       browse_all_channels: "Prehľadávať všetky kanály"
       see_in: "Vidieť v"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.sl.yml b/plugins/chat/config/locales/client.sl.yml
index 7af1ba3c3a6b3..db075041400ec 100644
--- a/plugins/chat/config/locales/client.sl.yml
+++ b/plugins/chat/config/locales/client.sl.yml
@@ -29,11 +29,6 @@ sl:
       chat_channels_count: "Kanali klepeta"
       chat_users_count: "Uporabniki klepeta"
     chat:
-      edit_category:
-        tab_title: "Klepet"
-        description: "Opis"
-        actions: "Akcije"
-        settings: "Nastavitve"
       text_copied: Besedilo je bilo kopirano v odložišče
       link_copied: Povezava je bila kopirana v odložišče
       deleted_chat_username: izbrisano
@@ -41,7 +36,6 @@ sl:
         yesterday: "Včeraj"
       create: "Ustvari"
       cancel: "Prekliči"
-      pinned: "Pripeto"
       channel_settings:
         edit: "Uredi"
         add: "Dodaj"
diff --git a/plugins/chat/config/locales/client.sq.yml b/plugins/chat/config/locales/client.sq.yml
index 96e2d87da497d..2b782b750a697 100644
--- a/plugins/chat/config/locales/client.sq.yml
+++ b/plugins/chat/config/locales/client.sq.yml
@@ -40,11 +40,6 @@ sq:
       chat_channels_count: "Kanalet e bisedës"
       chat_users_count: "Përdoruesit e bisedës"
     chat:
-      edit_category:
-        tab_title: "Biseda"
-        description: "Përshkrimi"
-        actions: "Veprimet"
-        settings: "Rregullimet"
       text_copied: Teksti u kopjua në memo
       link_copied: Linku u kopjua në memo
       back_to_forum: "Forumi"
@@ -57,7 +52,6 @@ sq:
       bot: "bot"
       create: "Krijo"
       cancel: "Anulo"
-      pinned: "E përzgjedhur"
       channel_settings:
         edit: "Redakto"
         add: "Shto"
diff --git a/plugins/chat/config/locales/client.sr.yml b/plugins/chat/config/locales/client.sr.yml
index e05b64656293a..f170ca9b45075 100644
--- a/plugins/chat/config/locales/client.sr.yml
+++ b/plugins/chat/config/locales/client.sr.yml
@@ -16,15 +16,10 @@ sr:
           actions:
             chat_auto_remove_membership: "Članstva su automatski uklonjena s kanala"
     chat:
-      edit_category:
-        description: "Opis"
-        actions: "Akcije"
-        settings: "Podešavanje"
       dates:
         yesterday: "Juče"
       all_loaded: "Prikaz svih poruka"
       cancel: "Odustani"
-      pinned: "Zakvačeno"
       channel_settings:
         edit: "Izmeni"
         add: "Dodaj"
diff --git a/plugins/chat/config/locales/client.sv.yml b/plugins/chat/config/locales/client.sv.yml
index 3fd595e7cb470..865680ce46732 100644
--- a/plugins/chat/config/locales/client.sv.yml
+++ b/plugins/chat/config/locales/client.sv.yml
@@ -40,12 +40,6 @@ sv:
       chat_channels_count: "Chattkanaler"
       chat_users_count: "Chattanvändare"
     chat:
-      edit_category:
-        tab_title: "Chatt"
-        channel: "Kanal"
-        description: "Beskrivning"
-        actions: "Åtgärder"
-        settings: "Inställningar"
       text_copied: Texten har kopierats till urklipp
       link_copied: Länken har kopierats till urklipp
       back_to_forum: "Forum"
@@ -60,7 +54,6 @@ sv:
       cancel: "Avbryt"
       cancel_reply: "Avbryt svar"
       chat_channels: "Kanaler"
-      pinned: "Fäst"
       browse_all_channels: "Bläddra bland alla kanaler"
       see_in: "Se i"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.sw.yml b/plugins/chat/config/locales/client.sw.yml
index 7ee486cb8d5e6..a5a4b20b70a0d 100644
--- a/plugins/chat/config/locales/client.sw.yml
+++ b/plugins/chat/config/locales/client.sw.yml
@@ -12,17 +12,11 @@ sw:
           always: "Mara kwa mara"
           never: "Kamwe"
     chat:
-      edit_category:
-        channel: "Chaneli"
-        description: "Maelezo"
-        actions: "Vitendo"
-        settings: "Mipangilio"
       deleted_chat_username: imefutwa
       dates:
         yesterday: "Jana"
       create: "Tengeneza"
       cancel: "Ghairi"
-      pinned: "Imebandikwa"
       channel_settings:
         edit: "Hariri"
         add: "ongeza"
diff --git a/plugins/chat/config/locales/client.te.yml b/plugins/chat/config/locales/client.te.yml
index b3422b30c2e8d..0c7fc1dd8e9f5 100644
--- a/plugins/chat/config/locales/client.te.yml
+++ b/plugins/chat/config/locales/client.te.yml
@@ -12,17 +12,12 @@ te:
           always: "ఎల్లప్పుడూ"
           never: "ఎప్పటికీ వద్దు"
     chat:
-      edit_category:
-        description: "వివరణ"
-        actions: "చర్యలు"
-        settings: "అమరికలు"
       back_to_forum: "ఫోరం"
       deleted_chat_username: తొలగించారు
       dates:
         yesterday: "నిన్న"
       create: "సృష్టించండి"
       cancel: "రద్దుచేయి"
-      pinned: "పిన్ చేయబడింది"
       channel_settings:
         edit: "సవరణ"
         add: "కలుపు"
diff --git a/plugins/chat/config/locales/client.th.yml b/plugins/chat/config/locales/client.th.yml
index f3902033543e7..c8d7342c8f31e 100644
--- a/plugins/chat/config/locales/client.th.yml
+++ b/plugins/chat/config/locales/client.th.yml
@@ -12,16 +12,11 @@ th:
           always: "เสมอ"
           never: "ไม่เคย"
     chat:
-      edit_category:
-        description: "รายละเอียด"
-        actions: "การกระทำ"
-        settings: "การตั้งค่า"
       deleted_chat_username: ลบ
       dates:
         yesterday: "เมื่อวาน"
       create: "สร้าง"
       cancel: "ยกเลิก"
-      pinned: "ปักหมุดแล้ว"
       channel_settings:
         edit: "แก้ไข"
         add: "เพิ่ม"
diff --git a/plugins/chat/config/locales/client.tr_TR.yml b/plugins/chat/config/locales/client.tr_TR.yml
index ec588ad5dbaa0..8b4ccc45b091b 100644
--- a/plugins/chat/config/locales/client.tr_TR.yml
+++ b/plugins/chat/config/locales/client.tr_TR.yml
@@ -44,12 +44,6 @@ tr_TR:
           one: "%{formatted_number} sohbet mesajı"
           other: "%{formatted_number} sohbet mesajları"
     chat:
-      edit_category:
-        tab_title: "Sohbet"
-        channel: "Kanal"
-        description: "Açıklama"
-        actions: "Eylemler"
-        settings: "Ayarlar"
       text_copied: Metin panoya kopyalandı
       link_copied: Bağlantı panoya kopyalandı
       back_to_forum: "Forum"
@@ -64,7 +58,6 @@ tr_TR:
       cancel: "İptal et"
       cancel_reply: "Yanıtı iptal et"
       chat_channels: "Kanallar"
-      pinned: "Sabitlendi"
       browse_all_channels: "Tüm kanallara göz atın"
       see_in: "Şurada bak:"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.ug.yml b/plugins/chat/config/locales/client.ug.yml
index ab404b19cadfc..de6caf6001cb7 100644
--- a/plugins/chat/config/locales/client.ug.yml
+++ b/plugins/chat/config/locales/client.ug.yml
@@ -44,12 +44,6 @@ ug:
           one: "%{formatted_number} سۆھبەت ئۇچۇرى"
           other: "%{formatted_number} سۆھبەت ئۇچۇرى"
     chat:
-      edit_category:
-        tab_title: "سۆھبەت"
-        channel: "قانال"
-        description: "چۈشەندۈرۈش"
-        actions: "مەشغۇلات"
-        settings: "تەڭشەك"
       text_copied: تېكىست چاپلاش تاختىسىغا كۆچۈرۈلدى
       link_copied: ئۇلانما چاپلاش تاختىسىغا كۆچۈرۈلدى
       back_to_forum: "مۇنبەر"
@@ -65,7 +59,6 @@ ug:
       cancel_reply: "جاۋابتىن ۋازكەچ"
       chat_channels: "قانال"
       starred: "يۇلتۇزلانغان"
-      pinned: "چوققىلاندى"
       browse_all_channels: "بارلىق قانالغا كۆز يۈگۈرتىدۇ"
       see_in: "قاراڭ"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.uk.yml b/plugins/chat/config/locales/client.uk.yml
index 3247b515ffcc7..a9ee2ae188bf8 100644
--- a/plugins/chat/config/locales/client.uk.yml
+++ b/plugins/chat/config/locales/client.uk.yml
@@ -46,13 +46,6 @@ uk:
           many: "%{formatted_number} повідомлень чату"
           other: "%{formatted_number} повідомлень чату"
     chat:
-      edit_category:
-        tab_title: "Чат"
-        channel: "Канал"
-        description: "Опис"
-        actions: "Дії"
-        settings: "Налаштування"
-        no_channels: "З цією категорією не пов'язано жодного чат-каналу"
       text_copied: Текст скопійовано в буфер обміну
       link_copied: Посилання скопійовано до буфера обміну
       back_to_forum: "Форум"
@@ -70,7 +63,6 @@ uk:
       starred: "Позначено зірочкою"
       starred_channels: "Позначені канали"
       starred_channels_empty: "Ви ще не позначили жодного каналу зірочкою. Позначте канали зірочкою, щоб побачити їх тут для швидкого доступу."
-      pinned: "Закріплені"
       browse_all_channels: "Переглянути всі канали"
       see_in: "Дивіться в"
       open_channel_menu: "Відкрити меню каналу"
@@ -682,19 +674,12 @@ uk:
           many: "%{commaSeparatedUsernames} та %{count} інших набирають текст"
           other: "%{commaSeparatedUsernames} та %{count} інших набирають текст"
       retention_reminders:
-        chat_settings: "Налаштування чату"
         indefinitely_short: "безстроково"
-        indefinitely_long: "%{chatSettingsLink} налаштовано зберігати повідомлення каналу необмежений час."
         short:
           one: "%{count} день"
           few: "%{count} дні"
           many: "%{count} днів"
           other: "%{count} днів"
-        long:
-          one: "%{chatSettingsLink} налаштовано зберігати повідомлення каналу протягом %{count} дня."
-          few: "%{chatSettingsLink} налаштовано зберігати повідомлення каналу протягом %{count} днів."
-          many: "%{chatSettingsLink} налаштовано зберігати повідомлення каналу протягом %{count} днів."
-          other: "%{chatSettingsLink} налаштовано зберігати повідомлення каналу протягом %{count} днів."
       flags:
         off_topic: "Це повідомлення не має відношення до поточної дискусії як визначено назвою каналів, і, ймовірно, має бути переміщене в інше місце."
         inappropriate: "Це повідомлення містить вміст, який розумна людина вважає образливим або порушенням <a href=\"%{basePath}/guidelines\">наших правил спільноти</a>."
diff --git a/plugins/chat/config/locales/client.ur.yml b/plugins/chat/config/locales/client.ur.yml
index 27af3ad6bf486..d95b42f70ec1c 100644
--- a/plugins/chat/config/locales/client.ur.yml
+++ b/plugins/chat/config/locales/client.ur.yml
@@ -44,12 +44,6 @@ ur:
           one: "%{formatted_number} چیٹ پیغام"
           other: "%{formatted_number} چیٹ کے پیغامات"
     chat:
-      edit_category:
-        tab_title: "گفتگو"
-        channel: "چَینل"
-        description: "تفصیل"
-        actions: "عمل"
-        settings: "سیٹِنگ"
       text_copied: متن کلپ بورڈ پر کاپی ہوا
       link_copied: رابطہ کلپ بورڈ پر کاپی ہوا
       back_to_forum: "فورم"
@@ -64,7 +58,6 @@ ur:
       cancel: "منسوخ"
       cancel_reply: "جواب منسوخ کریں"
       chat_channels: "چینلز"
-      pinned: "پِن ہوا"
       browse_all_channels: "تمام چینلز کو براؤز کریں"
       see_in: "میں دیکھیں"
       move_to_channel:
diff --git a/plugins/chat/config/locales/client.vi.yml b/plugins/chat/config/locales/client.vi.yml
index e16f60d533fec..7dfff0f78eaa4 100644
--- a/plugins/chat/config/locales/client.vi.yml
+++ b/plugins/chat/config/locales/client.vi.yml
@@ -17,11 +17,6 @@ vi:
         chat_messages:
           other: "%{formatted_number} tin chat"
     chat:
-      edit_category:
-        tab_title: "Chat"
-        description: "Mô tả"
-        actions: "Hành động"
-        settings: "Cài đặt"
       back_to_forum: "Diễn đàn"
       deleted_chat_username: đã bị xóa
       dates:
@@ -29,7 +24,6 @@ vi:
       create: "Tạo"
       cancel: "Hủy"
       chat_channels: "Các kênh"
-      pinned: "Đã ghim"
       browse_all_channels: "Xem tất cả kênh"
       channel_settings:
         edit: "Sửa"
diff --git a/plugins/chat/config/locales/client.zh_CN.yml b/plugins/chat/config/locales/client.zh_CN.yml
index 0d67c6ba7b651..93431ac00c0e1 100644
--- a/plugins/chat/config/locales/client.zh_CN.yml
+++ b/plugins/chat/config/locales/client.zh_CN.yml
@@ -43,12 +43,6 @@ zh_CN:
         chat_messages:
           other: "%{formatted_number} 条聊天消息"
     chat:
-      edit_category:
-        tab_title: "聊天"
-        channel: "频道"
-        description: "描述"
-        actions: "操作"
-        settings: "设置"
       text_copied: 文本已复制到剪贴板
       link_copied: 链接已复制到剪贴板
       back_to_forum: "论坛"
@@ -66,7 +60,6 @@ zh_CN:
       starred: "收藏"
       starred_channels: "收藏的频道"
       starred_channels_empty: "您未收藏任何频道。收藏一些频道，以便在此处快速访问它们。"
-      pinned: "已置顶"
       browse_all_channels: "浏览所有频道"
       see_in: "参见"
       open_channel_menu: "打开频道菜单"
@@ -86,8 +79,6 @@ zh_CN:
         unstar_channel: "取消收藏频道"
         close_channel: "关闭频道"
         open_channel: "打开频道"
-        open_channel_disabled_archived: "无法重新打开已存档的频道。"
-        open_channel_disabled_read_only: "无法重新打开只读频道。"
         archive_channel: "归档频道"
         delete_channel: "删除频道"
         join_channel: "加入频道"
@@ -575,13 +566,9 @@ zh_CN:
         many_users:
           other: "%{commaSeparatedUsernames} 和其他 %{count} 人正在输入"
       retention_reminders:
-        chat_settings: "聊天设置"
         indefinitely_short: "无限期"
-        indefinitely_long: "%{chatSettingsLink} 已设置为无限期保留频道消息。"
         short:
           other: "%{count} 天"
-        long:
-          other: "%{chatSettingsLink} 已设置为保留频道消息 %{count} 天。"
       flags:
         off_topic: "此消息与频道标题定义的当前讨论无关，可能应当移至其他地方。"
         inappropriate: "此消息包含理性的人会认为具有攻击性、辱骂性或违反<a href=\"%{basePath}/guidelines\">我们的社区准则</a>的内容。"
diff --git a/plugins/chat/config/locales/client.zh_TW.yml b/plugins/chat/config/locales/client.zh_TW.yml
index 2e285143da1e4..44009c69e9535 100644
--- a/plugins/chat/config/locales/client.zh_TW.yml
+++ b/plugins/chat/config/locales/client.zh_TW.yml
@@ -31,11 +31,6 @@ zh_TW:
       chat_channels_count: "聊天頻道"
       chat_users_count: "聊天使用者"
     chat:
-      edit_category:
-        tab_title: "聊天"
-        description: "描述"
-        actions: "動作"
-        settings: "設定"
       back_to_forum: "論壇"
       deleted_chat_username: 已刪除
       dates:
@@ -48,7 +43,6 @@ zh_TW:
       cancel: "取消"
       cancel_reply: "取消回覆"
       chat_channels: "頻道"
-      pinned: "已釘選"
       browse_all_channels: "瀏覽所有頻道"
       move_to_channel:
         title: "將訊息移至頻道"
diff --git a/plugins/chat/config/locales/server.cs.yml b/plugins/chat/config/locales/server.cs.yml
index baf506199fdb8..52c37dcfcfd30 100644
--- a/plugins/chat/config/locales/server.cs.yml
+++ b/plugins/chat/config/locales/server.cs.yml
@@ -73,7 +73,6 @@ cs:
         closed: "Kanál je uzavřen, žádné zprávy nelze upravovat ani mazat"
         read_only: "Kanál je pouze pro čtení, žádné zprávy nelze upravovat ani mazat"
       user_cannot_send_message: "Momentálně nelze odesílat zprávy."
-      user_not_in_channel: "Musíte být členem tohoto kanálu."
       rate_limit_exceeded: "Překročení limitu zpráv chatu, které lze odeslat během 30 sekund."
       auto_silence_from_flags: "Zpráva v chatu nahlášená dostatečně vysokým skóre, aby uživatele ztišila."
       channel_cannot_be_archived: "Kanál nelze v tuto chvíli archivovat, musí být buď uzavřen, nebo otevřen pro archivaci."
diff --git a/plugins/chat/config/locales/server.de.yml b/plugins/chat/config/locales/server.de.yml
index afc5102c0b3d9..e0e40a77719f4 100644
--- a/plugins/chat/config/locales/server.de.yml
+++ b/plugins/chat/config/locales/server.de.yml
@@ -8,7 +8,6 @@ de:
   site_settings:
     chat_separate_sidebar_mode: "Zeige separate Seitenleisten-Modi für Forum und Chat."
     chat_enabled: "Chat aktivieren."
-    chat_pinned_messages: "Angeheftete Nachrichten in Chat-Kanälen aktivieren."
     enable_public_channels: "Öffentliche Kanäle basierend auf Kategorien aktivieren."
     chat_allowed_groups: "Benutzer in diesen Gruppen können chatten. Beachte, dass Administratoren und Moderatoren immer auf den Chat zugreifen können."
     chat_channel_retention_days: "Chat-Nachrichten in regulären Kanälen werden so viele Tage lang aufbewahrt. Auf „0“ setzen, um Nachrichten für immer aufzubewahren."
@@ -24,7 +23,6 @@ de:
     chat_archive_destination_topic_status: "Der Status, den das Zielthema haben soll, sobald eine Kanalarchivierung abgeschlossen ist. Dies gilt nur, wenn das Zielthema ein neues Thema ist und kein vorhandenes."
     direct_message_enabled_groups: "Benutzern in diesen Gruppen erlauben, persönliche Benutzer-zu-Benutzer-Chats zu erstellen. Hinweis: Teammitglieder können immer persönliche Chats erstellen und Benutzer können auf persönliche Chats antworten, die von Benutzern initiiert wurden, die die Berechtigung haben, sie zu erstellen."
     chat_message_flag_allowed_groups: "Benutzer in diesen Gruppen dürfen Chat-Nachrichten melden. Beachte, dass Administratoren und Moderatoren immer Chatnachrichten melden können."
-    chat_pinning_messages_allowed_groups: "Benutzer in diesen Gruppen dürfen Chatnachrichten in Kanälen, auf die sie Zugriff haben, anheften. Administratoren und Moderatoren können Chatnachrichten immer anheften. Jedes Mitglied eines Gruppenchats oder einer DN kann Nachrichten dort anheften."
     max_mentions_per_chat_message: "Maximale Anzahl von @name-Benachrichtigungen, die ein Benutzer in einer Chat-Nachricht verwenden kann."
     chat_max_direct_message_users: "Benutzer können nicht mehr als diese Anzahl anderer Benutzer hinzufügen, wenn sie eine neue Direktnachricht erstellen. Auf 0 setzen, um nur Nachrichten an sich selbst zuzulassen. Teammitglieder sind von dieser Einstellung ausgenommen."
     chat_allow_archiving_channels: "Dem Team erlauben, Nachrichten zu einem Thema zu archivieren, wenn sie einen Kanal schließen."
@@ -75,7 +73,6 @@ de:
         closed: "Der Kanal ist geschlossen, es können keine Nachrichten bearbeitet oder gelöscht werden"
         read_only: "Der Kanal ist schreibgeschützt, es können keine Nachrichten bearbeitet oder gelöscht werden"
       user_cannot_send_message: "Du kannst derzeit keine Nachrichten senden."
-      user_not_in_channel: "Du musst Mitglied in diesem Kanal sein."
       rate_limit_exceeded: "Das Limit der Chat-Nachrichten, die innerhalb von 30 Sekunden gesendet werden können, wurde überschritten"
       auto_silence_from_flags: "Chat-Nachricht wurde mit einer Punktzahl markiert, die hoch genug ist, um den Benutzer stummzuschalten."
       channel_cannot_be_archived: "Der Kanal kann zu diesem Zeitpunkt nicht archiviert werden, er muss entweder geschlossen oder geöffnet sein."
@@ -107,9 +104,6 @@ de:
       thread_invalid_for_channel: "Der Thread ist nicht Teil des bereitgestellten Kanals."
       thread_does_not_match_parent: "Der Thread stimmt nicht mit der übergeordneten Nachricht überein."
       invalid_direct_message: "Du bist nicht berechtigt, diese Direktnachricht zu erstellen."
-      pin_limit_reached: "Dieser Kanal hat die maximale Anzahl angehefteter Nachrichten erreicht (%{limit})."
-      message_already_pinned: "Diese Nachricht ist bereits angeheftet."
-      message_not_pinned: "Diese Nachricht ist nicht angeheftet."
     reviewables:
       message_already_handled: "Danke, aber wir haben diese Nachricht bereits überprüft und festgestellt, dass sie nicht erneut markiert werden muss."
       actions:
@@ -262,19 +256,14 @@ de:
         watched_thread:
           one: "[%{site_name}] Neue Thread-Nachricht in %{channel}"
           other: "[%{site_name}] Neue Thread-Nachrichten in %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Neue Thread-Nachrichten in %{channel} und %{count} anderen Kanal"
-          other: "[%{site_name}] Neue Thread-Nachrichten in %{channel} und %{count} anderen Kanälen"
         chat_dm_1:
           one: "[%{site_name}] Neue Nachricht von %{name}"
           other: "[%{site_name}] Neue Nachrichten von %{name}"
         chat_dm_2: "[%{site_name}] Neue Nachrichten von %{name_1} und %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Neue Nachrichten von %{name} und in %{count} anderen Kanälen"
         chat_channel_1:
           one: "[%{site_name}] Neue Nachricht in %{channel}"
           other: "[%{site_name}] Neue Nachrichten in %{channel}"
         chat_channel_2: "[%{site_name}] Neue Nachrichten in %{channel_1} und %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Neue Nachrichten in %{channel} und %{count} anderen Kanälen"
         chat_channel_and_dm: "[%{site_name}] Neue Nachrichten in %{channel} und von %{name}"
       unsubscribe: "Diese Chat-Zusammenfassung wird dir von %{site_link} gesendet, wenn du abwesend bist. Ändere deine %{email_preferences_link} oder %{unsubscribe_link}, um dich abzumelden."
       unsubscribe_no_link: "Diese Chat-Zusammenfassung wird dir von %{site_link} gesendet, wenn du abwesend bist. Ändere deine %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.es.yml b/plugins/chat/config/locales/server.es.yml
index 427f2d1924c53..a168f49615f18 100644
--- a/plugins/chat/config/locales/server.es.yml
+++ b/plugins/chat/config/locales/server.es.yml
@@ -72,7 +72,6 @@ es:
         closed: "El canal está cerrado, no se pueden editar ni eliminar mensajes"
         read_only: "El canal es de solo lectura, no se pueden editar ni eliminar mensajes"
       user_cannot_send_message: "No puedes enviar mensajes en este momento."
-      user_not_in_channel: "Debes unirte a este canal."
       rate_limit_exceeded: "Se ha superado el límite de mensajes de chat que se pueden enviar en 30 segundos"
       auto_silence_from_flags: "Mensaje de chat marcado con una puntuación lo suficientemente alta como para silenciar al usuario."
       channel_cannot_be_archived: "El canal no se puede archivar en este momento, debe estar cerrado o abierto para ser archivado."
diff --git a/plugins/chat/config/locales/server.pl_PL.yml b/plugins/chat/config/locales/server.pl_PL.yml
index 072c8009a873a..2dea809d12b24 100644
--- a/plugins/chat/config/locales/server.pl_PL.yml
+++ b/plugins/chat/config/locales/server.pl_PL.yml
@@ -8,7 +8,6 @@ pl_PL:
   site_settings:
     chat_separate_sidebar_mode: "Pokaż oddzielne tryby paska bocznego dla forum i czatu."
     chat_enabled: "Włącz czat."
-    chat_pinned_messages: "Włącz przypinanie wiadomości na kanałach czatu."
     enable_public_channels: "Włącz kanały publiczne na podstawie kategorii."
     chat_allowed_groups: "Użytkownicy w tych grupach mogą czatować. Pamiętaj, że administratorzy i moderatorzy zawsze mają dostęp do czatu."
     chat_channel_retention_days: "Wiadomości czatu w zwykłych kanałach będą przechowywane przez tyle dni. Ustaw '0', aby zachować wiadomości na zawsze."
@@ -24,7 +23,6 @@ pl_PL:
     chat_archive_destination_topic_status: "Status, jaki powinien mieć temat docelowy po zakończeniu archiwizacji kanału. Dotyczy to tylko sytuacji, gdy temat docelowy jest nowym tematem, a nie istniejącym."
     direct_message_enabled_groups: "Zezwól użytkownikom w tych grupach na tworzenie czatów osobistych między użytkownikami. Uwaga: personel zawsze może tworzyć czaty osobiste, a użytkownicy będą mogli odpowiadać na czaty osobiste inicjowane przez użytkowników, którzy mają uprawnienia do ich tworzenia."
     chat_message_flag_allowed_groups: "Użytkownicy w tych grupach mogą oznaczać flagami wiadomości czatu. Należy pamiętać, że administratorzy i moderatorzy zawsze mogą oznaczać flagami wiadomości czatu."
-    chat_pinning_messages_allowed_groups: "Użytkownicy w tych grupach mogą przypinać wiadomości czatu w kanałach, do których mają dostęp. Pamiętaj, że administratorzy i moderatorzy zawsze mogą przypinać wiadomości czatu. Każdy członek czatu grupowego lub wiadomości prywatnej może przypinać tam wiadomości."
     max_mentions_per_chat_message: "Maksymalna liczba powiadomień @name, których użytkownik może użyć w wiadomości na czacie."
     chat_max_direct_message_users: "Użytkownicy nie mogą dodać więcej niż ta liczba innych użytkowników podczas tworzenia nowej wiadomości bezpośredniej. Ustaw na 0, aby zezwolić na wysyłanie wiadomości tylko do siebie. Personel jest zwolniony z tego ustawienia."
     chat_allow_archiving_channels: "Zezwól personelowi na archiwizowanie wiadomości w temacie podczas zamykania kanału."
@@ -75,7 +73,6 @@ pl_PL:
         closed: "Kanał jest zamknięty, nie można edytować ani usuwać żadnych wiadomości"
         read_only: "Kanał jest tylko do odczytu, nie można edytować ani usuwać żadnych wiadomości"
       user_cannot_send_message: "W tej chwili nie możesz wysyłać wiadomości."
-      user_not_in_channel: "Musisz być członkiem tego kanału."
       rate_limit_exceeded: "Przekroczono limit wiadomości na czacie, które można wysłać w ciągu 30 sekund"
       auto_silence_from_flags: "Wiadomość na czacie oflagowana z wynikiem wystarczającym do wyciszenia użytkownika."
       channel_cannot_be_archived: "Kanał nie może być w tej chwili zarchiwizowany, musi być zamknięty lub otwarty do archiwizacji."
@@ -113,9 +110,6 @@ pl_PL:
       thread_invalid_for_channel: "Wątek nie jest częścią udostępnionego kanału."
       thread_does_not_match_parent: "Wątek nie pasuje do wiadomości nadrzędnej."
       invalid_direct_message: "Nie możesz utworzyć tej wiadomości bezpośredniej."
-      pin_limit_reached: "Ten kanał osiągnął maksymalną liczbę przypiętych wiadomości (%{limit})."
-      message_already_pinned: "Ta wiadomość jest już przypięta."
-      message_not_pinned: "Ta wiadomość nie jest przypięta."
     reviewables:
       message_already_handled: "Dziękujemy, ale sprawdziliśmy już tę wiadomość i ustaliliśmy, że nie trzeba jej ponownie oznaczać."
       actions:
@@ -294,25 +288,18 @@ pl_PL:
           few: "[%{site_name}] Nowe wiadomość wątku w %{channel}"
           many: "[%{site_name}] Nowe wiadomość wątku w %{channel}"
           other: "[%{site_name}] Nowe wiadomość wątku w %{channel}"
-        watched_threads:
-          one: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innym kanale"
-          few: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innych kanałach"
-          many: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innych kanałach"
-          other: "[%{site_name}] Nowe wiadomości wątku na %{channel} i %{count} innych kanałach"
         chat_dm_1:
           one: "[%{site_name}] Nowa wiadomość od %{name}"
           few: "[%{site_name}] Nowe wiadomości od %{name}"
           many: "[%{site_name}] Nowe wiadomości od %{name}"
           other: "[%{site_name}] Nowe wiadomości od %{name}"
         chat_dm_2: "[%{site_name}] Nowe wiadomości od %{name_1} i %{name_2}"
-        chat_dm_3_or_more: "[%{site_name}] Nowe wiadomości z %{name} i %{count} innych kanałów wiadomości bezpośrednich"
         chat_channel_1:
           one: "[%{site_name}] Nowa wiadomość w %{channel}"
           few: "[%{site_name}] Nowe wiadomości w %{channel}"
           many: "[%{site_name}] Nowe wiadomości w %{channel}"
           other: "[%{site_name}] Nowe wiadomości w %{channel}"
         chat_channel_2: "[%{site_name}] Nowe wiadomości w %{channel_1} i %{channel_2}"
-        chat_channel_3_or_more: "[%{site_name}] Nowe wiadomości na %{channel} i %{count} innych kanałach"
         chat_channel_and_dm: "[%{site_name}] Nowe wiadomości w %{channel} i od %{name}"
       unsubscribe: "To podsumowanie czatu jest wysyłane z %{site_link} kiedy cię nie ma. Zmień swoje %{email_preferences_link}, lub %{unsubscribe_link}, aby zrezygnować z subskrypcji."
       unsubscribe_no_link: "To podsumowanie czatu jest wysyłane z %{site_link} kiedy cię nie ma. Zmień swoje %{email_preferences_link}."
diff --git a/plugins/chat/config/locales/server.uk.yml b/plugins/chat/config/locales/server.uk.yml
index 716ff73d1de1b..499d461b5b207 100644
--- a/plugins/chat/config/locales/server.uk.yml
+++ b/plugins/chat/config/locales/server.uk.yml
@@ -73,7 +73,6 @@ uk:
         closed: "Канал закритий, жодні повідомлення не можна редагувати чи видаляти"
         read_only: "Канал доступний лише для читання, жодні повідомлення не можна редагувати чи видаляти"
       user_cannot_send_message: "В даний момент ви не можете надсилати повідомлення."
-      user_not_in_channel: "Ви повинні бути учасником цього каналу."
       rate_limit_exceeded: "Перевищено ліміт повідомлень чату, які можна надсилати протягом 30 секунд"
       auto_silence_from_flags: "Повідомлення чату, позначене достатньо високим балом, щоб заблокувати користувача."
       channel_cannot_be_archived: "Канал наразі не можна архівувати, він має бути або закритим, або відкритим для архівування."
diff --git a/plugins/chat/config/locales/server.zh_CN.yml b/plugins/chat/config/locales/server.zh_CN.yml
index c39c5b3aa73d9..4c6413221881b 100644
--- a/plugins/chat/config/locales/server.zh_CN.yml
+++ b/plugins/chat/config/locales/server.zh_CN.yml
@@ -73,7 +73,6 @@ zh_CN:
         closed: "该频道已关闭，无法编辑或删除任何消息"
         read_only: "该频道为只读频道，无法编辑或删除任何消息"
       user_cannot_send_message: "您目前无法发送消息。"
-      user_not_in_channel: "您必须是本频道的会员。"
       rate_limit_exceeded: "超过了 30 秒内可发送的聊天消息的上限"
       auto_silence_from_flags: "聊天消息被举报的分数高到足以将用户禁言。"
       channel_cannot_be_archived: "目前无法归档该频道，必须将其关闭或打开才能归档。"
@@ -241,8 +240,6 @@ zh_CN:
           other: "[%{site_name}] 新消息"
         watched_thread:
           other: "[%{site_name}] %{channel} 中有新对话消息"
-        watched_threads:
-          other: "[%{site_name}] %{channel} 和其他 %{count} 个频道中的新对话消息"
         chat_dm_1:
           other: "[%{site_name}] 来自 %{name} 的新消息"
         chat_dm_2: "[%{site_name}] 来自 %{name_1} 和 %{name_2} 的新消息"
diff --git a/plugins/discourse-adplugin/config/locales/client.ar.yml b/plugins/discourse-adplugin/config/locales/client.ar.yml
index a94a54355b409..111b562e481b2 100644
--- a/plugins/discourse-adplugin/config/locales/client.ar.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ar.yml
@@ -37,9 +37,6 @@ ar:
           new_name: "New House Ad"
           save: "حفظ"
           delete: "حذف"
-          html: "HTML"
-          categories: "الفئات"
-          groups: "المجموعات"
           filter_placeholder: "حدِّد الإعلانات..."
           more_settings: "إعدادات إضافية"
           show_to_anons: "العرض للمستخدمين المجهولين"
@@ -49,11 +46,6 @@ ar:
           route_chooser_description: "اختر الصفحات أو المسارات التي يجب عرض هذا الإعلان فيها. اترك هذا الخيار واختيارات الفئات فارغة لعرض الإعلان في كل مكان."
           group_chooser_description: "اختر المجموعات التي يمكنها عرض هذا الإعلان أو اتركها فارغة لعرض الإعلان لجميع المستخدمين الذين سجَّلوا الدخول."
           preview: "معاينة"
-          back: "House Ads"
-          name: "الاسم"
-          edit: "تعديل"
-          tabs:
-            settings: "الإعدادان"
           topic_list_top:
             title: "الإعلانات أعلى قائمة الموضوعات"
             description: "إعلانات لعرضها في أعلى صفحات قائمة الموضوعات"
diff --git a/plugins/discourse-adplugin/config/locales/client.be.yml b/plugins/discourse-adplugin/config/locales/client.be.yml
index 2c768babd21fb..66589751a9eea 100644
--- a/plugins/discourse-adplugin/config/locales/client.be.yml
+++ b/plugins/discourse-adplugin/config/locales/client.be.yml
@@ -13,10 +13,4 @@ be:
           settings: "Налады"
           save: "Захаваць"
           delete: "Выдаліць"
-          categories: "катэгорыі"
-          groups: "Груп"
           preview: "Папярэдні прагляд"
-          name: "Імя"
-          edit: "Рэдагаваць"
-          tabs:
-            settings: "Налады"
diff --git a/plugins/discourse-adplugin/config/locales/client.bg.yml b/plugins/discourse-adplugin/config/locales/client.bg.yml
index 5e22a8612d445..13df68b079e9d 100644
--- a/plugins/discourse-adplugin/config/locales/client.bg.yml
+++ b/plugins/discourse-adplugin/config/locales/client.bg.yml
@@ -13,11 +13,4 @@ bg:
           settings: "Настройки"
           save: "Запази "
           delete: "Изтрий"
-          html: "HTML"
-          categories: "Категории"
-          groups: "Групи"
           preview: "Преглед"
-          name: "Име"
-          edit: "Редактирай"
-          tabs:
-            settings: "Настройки"
diff --git a/plugins/discourse-adplugin/config/locales/client.bs_BA.yml b/plugins/discourse-adplugin/config/locales/client.bs_BA.yml
index 358c0639b7fd2..1ddf52382b985 100644
--- a/plugins/discourse-adplugin/config/locales/client.bs_BA.yml
+++ b/plugins/discourse-adplugin/config/locales/client.bs_BA.yml
@@ -25,17 +25,9 @@ bs_BA:
           new_name: "Novi Kućni Oglas"
           save: "Sačuvaj"
           delete: "Delete"
-          html: "HTML"
-          categories: "Kategorije"
-          groups: "Grupa"
           filter_placeholder: "Izaberi oglase ..."
           more_settings: "Više Postavka"
           preview: "Pregled"
-          back: "Kućni oglasi"
-          name: "Ime"
-          edit: "Izmijeni"
-          tabs:
-            settings: "Postavke"
           topic_list_top:
             title: "Top topic list top ads"
             description: "Oglasi koji se prikazuju na vrhu liste tema."
diff --git a/plugins/discourse-adplugin/config/locales/client.ca.yml b/plugins/discourse-adplugin/config/locales/client.ca.yml
index 27541950ecb9b..e578fbae498cc 100644
--- a/plugins/discourse-adplugin/config/locales/client.ca.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ca.yml
@@ -26,17 +26,9 @@ ca:
           new_name: "Nou anunci propi"
           save: "Desa"
           delete: "Suprimeix"
-          html: "HTML"
-          categories: "Categories"
-          groups: "Grups"
           filter_placeholder: "Selecciona anuncis ..."
           more_settings: "Més paràmetres"
           preview: "Previsualitza"
-          back: "Anuncis propis"
-          name: "Nom"
-          edit: "Edita"
-          tabs:
-            settings: "Configuració"
           topic_list_top:
             title: "Anuncis principals en la llista de temes"
             description: "Anuncis que es mostraran a la part superior de les pàgines de la llista de temes."
diff --git a/plugins/discourse-adplugin/config/locales/client.cs.yml b/plugins/discourse-adplugin/config/locales/client.cs.yml
index 5219b47eac316..e9a6c1367b262 100644
--- a/plugins/discourse-adplugin/config/locales/client.cs.yml
+++ b/plugins/discourse-adplugin/config/locales/client.cs.yml
@@ -23,11 +23,4 @@ cs:
           settings: "Nastavení"
           save: "Uložit"
           delete: "Smazat"
-          html: "HTML"
-          categories: "Kategorie"
-          groups: "Skupiny"
           preview: "Náhled"
-          name: "Jméno"
-          edit: "Upravit"
-          tabs:
-            settings: "Nastavení"
diff --git a/plugins/discourse-adplugin/config/locales/client.da.yml b/plugins/discourse-adplugin/config/locales/client.da.yml
index 0398987fab7ab..fa202a74b54cb 100644
--- a/plugins/discourse-adplugin/config/locales/client.da.yml
+++ b/plugins/discourse-adplugin/config/locales/client.da.yml
@@ -19,11 +19,4 @@ da:
           settings: "Indstillinger"
           save: "Gem"
           delete: "Slet"
-          html: "HTML"
-          categories: "Kategorier"
-          groups: "Grupper"
           preview: "Forhåndsvisning"
-          name: "Navn"
-          edit: "Rediger"
-          tabs:
-            settings: "Indstillinger"
diff --git a/plugins/discourse-adplugin/config/locales/client.de.yml b/plugins/discourse-adplugin/config/locales/client.de.yml
index a6222bc83c8bd..0ea27b30b4dbb 100644
--- a/plugins/discourse-adplugin/config/locales/client.de.yml
+++ b/plugins/discourse-adplugin/config/locales/client.de.yml
@@ -37,13 +37,6 @@ de:
           new_name: "Neue Eigenanzeige"
           save: "Speichern"
           delete: "Löschen"
-          confirm_delete: "Bist du sicher, dass du diese Anzeige löschen möchtest?"
-          html: "HTML"
-          categories: "Kategorien"
-          routes: "Routen"
-          groups: "Gruppen"
-          description: "Erstelle und verwalte deine eigenen Anzeigen, die du auf deiner Website an verschiedenen Positionen einblenden kannst."
-          get_started: "Es wurden noch keine Eigenanzeigen erstellt."
           filter_placeholder: "Anzeigen auswählen …"
           more_settings: "Weitere Einstellungen"
           show_to_anons: "Für anonyme Benutzer anzeigen"
@@ -53,12 +46,6 @@ de:
           route_chooser_description: "Wähle die Seiten/Routen aus, auf denen diese Anzeige angezeigt werden soll. Lass das Feld und das Feld für die Kategorie leer, um die Anzeige überall anzuzeigen."
           group_chooser_description: "Wähle die Gruppen aus, die diese Anzeige sehen können, oder lass das Feld leer, um die Anzeige allen angemeldeten Benutzern zu zeigen."
           preview: "Vorschau"
-          back: "Eigenanzeigen"
-          name: "Name"
-          edit: "Bearbeiten"
-          tabs:
-            ads: "Anzeigen"
-            settings: "Einstellungen"
           topic_list_top:
             title: "Anzeigen oben bei der Themenliste"
             description: "Anzeigen, die oben auf den Themenlisten-Seiten gezeigt werden sollen."
diff --git a/plugins/discourse-adplugin/config/locales/client.el.yml b/plugins/discourse-adplugin/config/locales/client.el.yml
index 66ae51c36f1c2..137a7e67a3766 100644
--- a/plugins/discourse-adplugin/config/locales/client.el.yml
+++ b/plugins/discourse-adplugin/config/locales/client.el.yml
@@ -21,13 +21,6 @@ el:
           settings: "Ρυθμίσεις"
           save: "Αποθήκευση"
           delete: "Σβήσιμο"
-          html: "HTML"
-          categories: "Κατηγορίες"
-          groups: "Ομάδες"
           filter_placeholder: "Επιλέξτε διαφημίσεις..."
           show_to_anons: "Εμφάνιση σε ανώνυμους χρήστες"
           preview: "Προεπισκόπηση"
-          name: "Όνομα"
-          edit: "Επεξεργασία"
-          tabs:
-            settings: "Ρυθμίσεις"
diff --git a/plugins/discourse-adplugin/config/locales/client.en_GB.yml b/plugins/discourse-adplugin/config/locales/client.en_GB.yml
index 6dc8ae9f2eec6..2d4fa180ec739 100644
--- a/plugins/discourse-adplugin/config/locales/client.en_GB.yml
+++ b/plugins/discourse-adplugin/config/locales/client.en_GB.yml
@@ -5,8 +5,3 @@
 # https://translate.discourse.org/
 
 en_GB:
-  admin_js:
-    admin:
-      adplugin:
-        house_ads:
-          categories: "Categories"
diff --git a/plugins/discourse-adplugin/config/locales/client.es.yml b/plugins/discourse-adplugin/config/locales/client.es.yml
index a057424296555..b74bb7686ee22 100644
--- a/plugins/discourse-adplugin/config/locales/client.es.yml
+++ b/plugins/discourse-adplugin/config/locales/client.es.yml
@@ -33,9 +33,6 @@ es:
           new_name: "Nueva publicidad interna"
           save: "Guardar"
           delete: "Eliminar"
-          html: "HTML"
-          categories: "Categorías"
-          groups: "Grupos"
           filter_placeholder: "Seleccionar anuncios..."
           more_settings: "Más ajustes"
           show_to_anons: "Mostrar a usuarios anónimos"
@@ -43,11 +40,6 @@ es:
           category_chooser_description: "Elige las categorías en las que debe mostrarse este anuncio o déjalo vacío para mostrar el anuncio en todas partes. El ajuste del sitio «no_ads_for_categories» tiene prioridad sobre este ajuste."
           group_chooser_description: "Elige los grupos que pueden ver este anuncio o déjalo vacío para mostrar el anuncio a todos los usuarios registrados."
           preview: "Vista previa"
-          back: "Publicidad interna"
-          name: "Nombre"
-          edit: "Editar"
-          tabs:
-            settings: "Ajustes"
           topic_list_top:
             title: "Anuncios destacados de la lista de temas"
             description: "Anuncios a mostrar en la parte superior de las listas de temas."
diff --git a/plugins/discourse-adplugin/config/locales/client.et.yml b/plugins/discourse-adplugin/config/locales/client.et.yml
index 82f7898299165..c19eaa4c41f0e 100644
--- a/plugins/discourse-adplugin/config/locales/client.et.yml
+++ b/plugins/discourse-adplugin/config/locales/client.et.yml
@@ -20,11 +20,4 @@ et:
           settings: "Seaded"
           save: "Salvesta"
           delete: "Kustuta"
-          html: "HTML"
-          categories: "Liigid"
-          groups: "Rühmad"
           preview: "Eelvaade"
-          name: "Nimi"
-          edit: "Muuda"
-          tabs:
-            settings: "Seaded"
diff --git a/plugins/discourse-adplugin/config/locales/client.fa_IR.yml b/plugins/discourse-adplugin/config/locales/client.fa_IR.yml
index 639282494d3fd..c2760e95b0d89 100644
--- a/plugins/discourse-adplugin/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-adplugin/config/locales/client.fa_IR.yml
@@ -25,17 +25,9 @@ fa_IR:
           new_name: "آگهی خانه جدید"
           save: "ذخیره"
           delete: "حذف"
-          html: "HTML"
-          categories: "دسته‌بندی‌ها"
-          groups: "گروه‌ها"
           filter_placeholder: "انتخاب آگهی..."
           more_settings: "تنظیمات بیشتر"
           preview: "پیش‌نمایش"
-          back: "آگهی خانه"
-          name: "نام"
-          edit: "ویرایش"
-          tabs:
-            settings: "تنظیم"
           post_bottom:
             title: "بین پست‌ها"
           topic_list_between:
diff --git a/plugins/discourse-adplugin/config/locales/client.fi.yml b/plugins/discourse-adplugin/config/locales/client.fi.yml
index 83f7fcf17f628..e80a8f9e7e850 100644
--- a/plugins/discourse-adplugin/config/locales/client.fi.yml
+++ b/plugins/discourse-adplugin/config/locales/client.fi.yml
@@ -26,9 +26,6 @@ fi:
           new_name: "Uusi oma mainos"
           save: "Tallenna"
           delete: "Poista"
-          html: "HTML"
-          categories: "Kategoriat"
-          groups: "Ryhmät"
           filter_placeholder: "Valitse mainokset..."
           more_settings: "Lisää asetuksia"
           show_to_anons: "Näytä anonyymeille käyttäjille"
@@ -36,11 +33,6 @@ fi:
           category_chooser_description: "Valitse alueet, joissa tämä mainos näytetään, tai jätä tyhjäksi, jos haluat näyttää mainoksen kaikkialla. \"No_ads_for_categories\"-sivustoasetuksella on etusija tähän asetukseen nähden."
           group_chooser_description: "Valitse ryhmät, jotka voivat nähdä tämän mainoksen, tai jätä tyhjäksi, jos haluat näyttää mainoksen kaikille kirjautuneille käyttäjille."
           preview: "Esikatselu"
-          back: "Omat mainokset"
-          name: "Nimi"
-          edit: "Muokkaa"
-          tabs:
-            settings: "Asetukset"
           topic_list_top:
             title: "Ketjuluettelon ylämainokset"
             description: "Mainokset, jotka näytetään aiheluettelosivun yläreunassa."
diff --git a/plugins/discourse-adplugin/config/locales/client.fr.yml b/plugins/discourse-adplugin/config/locales/client.fr.yml
index 20962adeb562f..33bf3dd6c45ba 100644
--- a/plugins/discourse-adplugin/config/locales/client.fr.yml
+++ b/plugins/discourse-adplugin/config/locales/client.fr.yml
@@ -26,9 +26,6 @@ fr:
           new_name: "Nouvelle annonce maison"
           save: "Enregistrer"
           delete: "Supprimer"
-          html: "HTML"
-          categories: "Catégories"
-          groups: "Groupes"
           filter_placeholder: "Sélectionnez les annonces…"
           more_settings: "Plus de paramètres"
           show_to_anons: "Afficher aux utilisateurs anonymes"
@@ -36,11 +33,6 @@ fr:
           category_chooser_description: "Choisissez les catégories dans lesquelles cette annonce doit être affichée ou laissez ce champ vide pour diffuser l'annonce partout. Le paramètre de site « no_ads_for_categories » a la priorité sur ce paramètre."
           group_chooser_description: "Choisissez les groupes qui peuvent voir cette annonce ou laissez ce champ vide pour diffuser l'annonce à tous les utilisateurs connectés."
           preview: "Aperçu"
-          back: "Annonces personnalisées"
-          name: "Nom"
-          edit: "Modifier"
-          tabs:
-            settings: "Paramètres"
           topic_list_top:
             title: "Annonces de la liste des sujets"
             description: "Annonces à afficher en haut des pages de la liste des sujets"
diff --git a/plugins/discourse-adplugin/config/locales/client.gl.yml b/plugins/discourse-adplugin/config/locales/client.gl.yml
index 1e71734403507..013aae5f2f98d 100644
--- a/plugins/discourse-adplugin/config/locales/client.gl.yml
+++ b/plugins/discourse-adplugin/config/locales/client.gl.yml
@@ -16,11 +16,4 @@ gl:
           settings: "Configuración"
           save: "Gardar"
           delete: "Eliminar"
-          html: "HTML"
-          categories: "Categorías"
-          groups: "Grupos"
           preview: "Visualizar"
-          name: "Nome"
-          edit: "Editar"
-          tabs:
-            settings: "Configuración"
diff --git a/plugins/discourse-adplugin/config/locales/client.he.yml b/plugins/discourse-adplugin/config/locales/client.he.yml
index be16fe765f5fb..ec02902c9eb81 100644
--- a/plugins/discourse-adplugin/config/locales/client.he.yml
+++ b/plugins/discourse-adplugin/config/locales/client.he.yml
@@ -37,9 +37,6 @@ he:
           new_name: "מודעת בית חדשה"
           save: "שמירה"
           delete: "מחיקה"
-          html: "HTML"
-          categories: "קטגוריות"
-          groups: "קבוצות"
           filter_placeholder: "בחירת פרסומות…"
           more_settings: "הגדרות נוספות"
           show_to_anons: "הצגה למשתמשים אלמוניים"
@@ -47,11 +44,6 @@ he:
           category_chooser_description: "נא לבחור את הקטגוריות בהן תופיע המודעה הזאת או להשאיר ריק כדי להציג את ההודעה איפשהו. להגדרת האתר `no_ads_for_categories` (אין מודעות בקטגוריות) יש עדיפות על פני ההגדרה הזאת."
           group_chooser_description: "נא לבחור קבוצות שיכולות לצפות במודעה הזאת או להשאיר ריק כדי להציג את המודעה לכל המשתמשים שנכנסים למערכת."
           preview: "תצוגה מקדימה"
-          back: "מודעות הבית"
-          name: "שם"
-          edit: "עריכה"
-          tabs:
-            settings: "הגדרות"
           topic_list_top:
             title: "פרסומות בראש רשימת הנושאים"
             description: "פרסומות שתופענה בראש עמוד רשימת הנושים."
diff --git a/plugins/discourse-adplugin/config/locales/client.hr.yml b/plugins/discourse-adplugin/config/locales/client.hr.yml
index bec36a6054cc1..5d19dc1e1ee33 100644
--- a/plugins/discourse-adplugin/config/locales/client.hr.yml
+++ b/plugins/discourse-adplugin/config/locales/client.hr.yml
@@ -13,11 +13,4 @@ hr:
           settings: "Postavke"
           save: "Spremi"
           delete: "Izbriši"
-          html: "HTML"
-          categories: "Kategorije"
-          groups: "Grupe"
           preview: "Pregled"
-          name: "Ime"
-          edit: "Uredi"
-          tabs:
-            settings: "Postavke"
diff --git a/plugins/discourse-adplugin/config/locales/client.hu.yml b/plugins/discourse-adplugin/config/locales/client.hu.yml
index 8aafb6f88342a..617000dba5fbd 100644
--- a/plugins/discourse-adplugin/config/locales/client.hu.yml
+++ b/plugins/discourse-adplugin/config/locales/client.hu.yml
@@ -19,11 +19,4 @@ hu:
           settings: "Beállítások"
           save: "Mentés"
           delete: "Törlés"
-          html: "HTML"
-          categories: "Kategóriák"
-          groups: "Csoportok"
           preview: "Előnézet"
-          name: "Név"
-          edit: "Szerkesztés"
-          tabs:
-            settings: "Beállítások"
diff --git a/plugins/discourse-adplugin/config/locales/client.hy.yml b/plugins/discourse-adplugin/config/locales/client.hy.yml
index 209308428a0f5..5625fed71e7af 100644
--- a/plugins/discourse-adplugin/config/locales/client.hy.yml
+++ b/plugins/discourse-adplugin/config/locales/client.hy.yml
@@ -24,11 +24,4 @@ hy:
           settings: "Կարգավորումներ"
           save: "Պահպանել"
           delete: "Ջնջել"
-          html: "HTML"
-          categories: "Կատեգորիաներ"
-          groups: "Խմբեր"
           preview: "Նախադիտում"
-          name: "Անուն"
-          edit: "Խմբագրել"
-          tabs:
-            settings: "Կարգավորումներ"
diff --git a/plugins/discourse-adplugin/config/locales/client.id.yml b/plugins/discourse-adplugin/config/locales/client.id.yml
index 07182131a0544..ca1579f89cdfb 100644
--- a/plugins/discourse-adplugin/config/locales/client.id.yml
+++ b/plugins/discourse-adplugin/config/locales/client.id.yml
@@ -13,10 +13,3 @@ id:
           settings: "Pengaturan"
           save: "Simpan"
           delete: "Hapus"
-          html: "HTML"
-          categories: "Kategori"
-          groups: "Grup"
-          name: "Nama"
-          edit: "Ubah"
-          tabs:
-            settings: "Pengaturan"
diff --git a/plugins/discourse-adplugin/config/locales/client.it.yml b/plugins/discourse-adplugin/config/locales/client.it.yml
index c87fff25ae960..9be698a636320 100644
--- a/plugins/discourse-adplugin/config/locales/client.it.yml
+++ b/plugins/discourse-adplugin/config/locales/client.it.yml
@@ -26,9 +26,6 @@ it:
           new_name: "Nuovi annunci interni"
           save: "Salva"
           delete: "Elimina"
-          html: "HTML"
-          categories: "Categorie"
-          groups: "Gruppi"
           filter_placeholder: "Seleziona annunci..."
           more_settings: "Altre Impostazioni"
           show_to_anons: "Mostra agli utenti anonimi"
@@ -36,11 +33,6 @@ it:
           category_chooser_description: "Scegli le categorie in cui visualizzare questo annuncio o lascia vuoto per mostrare l'annuncio ovunque. L'impostazione del sito \"no_ads_for_categories\" ha la priorità su questa impostazione."
           group_chooser_description: "Scegli i gruppi che possono visualizzare questo annuncio o lascia vuoto per mostrare l'annuncio a tutti gli utenti che hanno effettuato l'accesso."
           preview: "Anteprima"
-          back: "Annunci interni"
-          name: "Nome"
-          edit: "Modifica"
-          tabs:
-            settings: "Impostazioni"
           topic_list_top:
             title: "Annunci in cima all'elenco argomenti"
             description: "Annunci da mostrare in cima alle pagine con gli elenchi di argomenti."
diff --git a/plugins/discourse-adplugin/config/locales/client.ja.yml b/plugins/discourse-adplugin/config/locales/client.ja.yml
index 5e4df4d8eefd4..c3d63f1efd936 100644
--- a/plugins/discourse-adplugin/config/locales/client.ja.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ja.yml
@@ -37,9 +37,6 @@ ja:
           new_name: "新しい自社広告"
           save: "保存"
           delete: "削除"
-          html: "HTML"
-          categories: "カテゴリ"
-          groups: "グループ"
           filter_placeholder: "広告を選択..."
           more_settings: "その他の設定"
           show_to_anons: "匿名ユーザーに表示する"
@@ -49,11 +46,6 @@ ja:
           route_chooser_description: "この広告が表示されるページ/ルートを選択します。すべての場所の広告を表示する場合は、この設定とカテゴリの選択を空白のままにします。"
           group_chooser_description: "この広告を表示できるグループを選択するか、サインイン中のすべてのユーザーに広告を表示するには空白のままにします。"
           preview: "プレビュー"
-          back: "自社広告"
-          name: "名前"
-          edit: "編集"
-          tabs:
-            settings: "設定"
           topic_list_top:
             title: "トピックリストのトップ広告"
             description: "トピックリストページのトップに表示される広告です。"
diff --git a/plugins/discourse-adplugin/config/locales/client.ko.yml b/plugins/discourse-adplugin/config/locales/client.ko.yml
index ac6fe3351bbd6..c1f5377fd8dc6 100644
--- a/plugins/discourse-adplugin/config/locales/client.ko.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ko.yml
@@ -26,17 +26,9 @@ ko:
           new_name: "새 집 광고"
           save: "저장"
           delete: "삭제"
-          html: "HTML"
-          categories: "카테고리"
-          groups: "그룹"
           filter_placeholder: "광고 선택 ..."
           more_settings: "자세한 설정"
           preview: "미리 보기"
-          back: "하우스 광고"
-          name: "그룹명"
-          edit: "편집"
-          tabs:
-            settings: "설정"
           topic_list_top:
             title: "주제 목록 인기 광고"
             description: "주제 목록 페이지 상단에 게재 할 광고"
diff --git a/plugins/discourse-adplugin/config/locales/client.lt.yml b/plugins/discourse-adplugin/config/locales/client.lt.yml
index ee4bcb68e1d5b..a68eb84a48a5c 100644
--- a/plugins/discourse-adplugin/config/locales/client.lt.yml
+++ b/plugins/discourse-adplugin/config/locales/client.lt.yml
@@ -20,13 +20,6 @@ lt:
           settings: "Nustatymai"
           save: "Saugoti"
           delete: "Pašalinti"
-          html: "HTML"
-          categories: "Kategorijos"
-          groups: "Grupės"
           category_chooser_description_with_routes: "Pasirinkite kategorijas, kuriose turėtų būti rodomas šis skelbimas. Palikite šį ir nukreipimo pasirinkimus tuščius, kad skelbimas būtų rodomas visur. Svetainės nustatymas „no_ads_for_categories“ turi pirmenybę prieš šį nustatymą."
           route_chooser_description: "Pasirinkite puslapius / maršrutus, kuriuose turėtų būti rodomas šis skelbimas. Palikite šį ir kategorijos pasirinkimus tuščius, kad skelbimas būtų rodomas visur."
           preview: "Peržiūrėti"
-          name: "Vardas"
-          edit: "Redaguoti"
-          tabs:
-            settings: "Nustatymai"
diff --git a/plugins/discourse-adplugin/config/locales/client.lv.yml b/plugins/discourse-adplugin/config/locales/client.lv.yml
index 97fee9623168b..21dceda11d9bc 100644
--- a/plugins/discourse-adplugin/config/locales/client.lv.yml
+++ b/plugins/discourse-adplugin/config/locales/client.lv.yml
@@ -13,11 +13,4 @@ lv:
           settings: "Iestatījumi"
           save: "Saglabāt"
           delete: "Dzēst"
-          html: "HTML"
-          categories: "Sadaļas"
-          groups: "Grupas"
           preview: "Priekšskatījums"
-          name: "Vārds"
-          edit: "Labot"
-          tabs:
-            settings: "Iestatījumi"
diff --git a/plugins/discourse-adplugin/config/locales/client.nb_NO.yml b/plugins/discourse-adplugin/config/locales/client.nb_NO.yml
index 7695b81650079..53f1cfb65c110 100644
--- a/plugins/discourse-adplugin/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-adplugin/config/locales/client.nb_NO.yml
@@ -19,11 +19,4 @@ nb_NO:
           settings: "Innstillinger"
           save: "Lagre"
           delete: "Slett"
-          html: "HTML"
-          categories: "Kategorier"
-          groups: "Grupper"
           preview: "Forhåndsvis"
-          name: "Navn"
-          edit: "Rediger"
-          tabs:
-            settings: "Innstillinger"
diff --git a/plugins/discourse-adplugin/config/locales/client.nl.yml b/plugins/discourse-adplugin/config/locales/client.nl.yml
index d85bc522c504b..7bc7fbcdc63d2 100644
--- a/plugins/discourse-adplugin/config/locales/client.nl.yml
+++ b/plugins/discourse-adplugin/config/locales/client.nl.yml
@@ -26,9 +26,6 @@ nl:
           new_name: "Nieuwe House Ad"
           save: "Opslaan"
           delete: "Verwijderen"
-          html: "HTML"
-          categories: "Categorieën"
-          groups: "Groepen"
           filter_placeholder: "Selecteer advertenties..."
           more_settings: "Meer instellingen"
           show_to_anons: "Weergeven voor anonieme gebruikers"
@@ -36,11 +33,6 @@ nl:
           category_chooser_description: "Kies de categorieën waarin deze advertentie moet worden weergegeven of laat dit leeg om de advertentie overal weer te geven. De site-instelling 'no_ads_for_categories' heeft voorrang op deze instelling."
           group_chooser_description: "Kies de groepen die deze advertentie kunnen bekijken of laat dit leeg om de advertentie aan alle aangemelde gebruikers te tonen."
           preview: "Voorbeeld"
-          back: "House Ads"
-          name: "Naam"
-          edit: "Bewerken"
-          tabs:
-            settings: "Instellingen"
           topic_list_top:
             title: "Advertenteis boven topicslijst"
             description: "Advertenties die worden weergegeven bovenaan pagina's met topicslijsten."
diff --git a/plugins/discourse-adplugin/config/locales/client.pl_PL.yml b/plugins/discourse-adplugin/config/locales/client.pl_PL.yml
index b66153968348b..9d3df677fd172 100644
--- a/plugins/discourse-adplugin/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-adplugin/config/locales/client.pl_PL.yml
@@ -37,13 +37,6 @@ pl_PL:
           new_name: "New House Ad"
           save: "Zapisz"
           delete: "Usuń"
-          confirm_delete: "Czy na pewno chcesz usunąć to ogłoszenie?"
-          html: "HTML"
-          categories: "Kategorie"
-          routes: "Trasy"
-          groups: "Grupy"
-          description: "Twórz i zarządzaj własnymi reklamami, które będą wyświetlane w różnych miejscach Twojej witryny."
-          get_started: "Nie utworzono jeszcze żadnych ogłoszeń domowych."
           filter_placeholder: "Wybierz reklamy…"
           more_settings: "Więcej ustawień"
           show_to_anons: "Pokaż anonimowym użytkownikom"
@@ -53,12 +46,6 @@ pl_PL:
           route_chooser_description: "Wybierz strony/trasy, na których ta reklama ma być wyświetlana. Pozostaw to pole i wybór kategorii puste, aby reklama była wyświetlana wszędzie."
           group_chooser_description: "Wybierz grupy, które mogą oglądać to ogłoszenie lub pozostaw to pole puste, aby ogłoszenie było widoczne dla wszystkich zalogowanych użytkowników."
           preview: "Podgląd"
-          back: "Reklamy domowe"
-          name: "Nazwa"
-          edit: "Edytuj"
-          tabs:
-            ads: "Reklamy"
-            settings: "Ustawienia"
           topic_list_top:
             title: "Reklama nad listą tematów"
             description: "Reklamy do wyświetlania na górze listy tematów."
diff --git a/plugins/discourse-adplugin/config/locales/client.pt.yml b/plugins/discourse-adplugin/config/locales/client.pt.yml
index 322bee1913945..3e5dd34657458 100644
--- a/plugins/discourse-adplugin/config/locales/client.pt.yml
+++ b/plugins/discourse-adplugin/config/locales/client.pt.yml
@@ -21,11 +21,4 @@ pt:
           settings: "Configurações"
           save: "Guardar"
           delete: "Eliminar"
-          html: "HTML"
-          categories: "Categorias"
-          groups: "Grupos"
           preview: "Pré-visualização"
-          name: "Nome"
-          edit: "Editar"
-          tabs:
-            settings: "Configurações"
diff --git a/plugins/discourse-adplugin/config/locales/client.pt_BR.yml b/plugins/discourse-adplugin/config/locales/client.pt_BR.yml
index 9cf904cee3b42..f118252fcb017 100644
--- a/plugins/discourse-adplugin/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-adplugin/config/locales/client.pt_BR.yml
@@ -26,9 +26,6 @@ pt_BR:
           new_name: "Novo Anúncio Interno"
           save: "Salvar"
           delete: "Excluir"
-          html: "HTML"
-          categories: "Categorias"
-          groups: "Grupos"
           filter_placeholder: "Selecionar anúncios…"
           more_settings: "Mais Configurações"
           show_to_anons: "Mostrar para usuários(as) anônimos(as)"
@@ -36,11 +33,6 @@ pt_BR:
           category_chooser_description: "Escolha as categorias nas quais este anúncio deve ser exibido ou deixe vazio para exibir em todos os lugares. A configuração do site \"no_ads_for_categories\" tem prioridade em relação a esta configuração."
           group_chooser_description: "Escolha os grupos que podem visualizar este anúncio ou deixe vazio para exibir o anúncio a todos(as) os(as) usuários(as) que entraram com a conta."
           preview: "Pré-visualizar"
-          back: "Anúncios Internos"
-          name: "Nome"
-          edit: "Editar"
-          tabs:
-            settings: "Definições"
           topic_list_top:
             title: "Principais anúncios da lista de tópicos"
             description: "Anúncios para mostrar no topo das páginas da lista de tópicos."
diff --git a/plugins/discourse-adplugin/config/locales/client.ro.yml b/plugins/discourse-adplugin/config/locales/client.ro.yml
index e345e06f59ab4..8dfdcdda153fa 100644
--- a/plugins/discourse-adplugin/config/locales/client.ro.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ro.yml
@@ -24,16 +24,8 @@ ro:
           settings: "Setări"
           save: "Salvează"
           delete: "Șterge"
-          html: "HTML"
-          categories: "Categorii"
-          groups: "Grupuri"
           filter_placeholder: "Selectează reclame..."
           more_settings: "Mai multe setări"
           category_chooser_description: "Alege categoriile în care trebuie afișat acest anunț sau lasă gol pentru a afișa anunțul peste tot. Setarea site-ului `no_ads_for_categories` are prioritate față de această setare."
           group_chooser_description: "Alege grupurile care pot vizualiza acest anunț sau lasă gol pentru a afișa anunțul tuturor utilizatorilor conectați."
           preview: "Previzualizează"
-          back: "House Ads"
-          name: "Nume"
-          edit: "Editează"
-          tabs:
-            settings: "Setări"
diff --git a/plugins/discourse-adplugin/config/locales/client.ru.yml b/plugins/discourse-adplugin/config/locales/client.ru.yml
index 234fbdf92671b..36c7aebe60ab4 100644
--- a/plugins/discourse-adplugin/config/locales/client.ru.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ru.yml
@@ -26,9 +26,6 @@ ru:
           new_name: "Название"
           save: "Сохранить"
           delete: "Удалить"
-          html: "HTML"
-          categories: "Категории"
-          groups: "Группы"
           filter_placeholder: "Выберите объявления..."
           more_settings: "Больше настроек"
           show_to_anons: "Показывать анонимным пользователям"
@@ -36,11 +33,6 @@ ru:
           category_chooser_description: "Выберите категории, в которых должно показываться это рекламное объявление, или оставьте параметр пустым, чтобы оно отображалось везде. Настройка сайта `no_ads_for_categories` имеет приоритет над этим параметром."
           group_chooser_description: "Выберите группы, которые могут просматривать это рекламное объявление, или оставьте параметр пустым, чтобы оно показывалось всем вошедшим в систему пользователям."
           preview: "Предпросмотр"
-          back: "Собственные рекламные объявления"
-          name: "Название"
-          edit: "Изменить"
-          tabs:
-            settings: "настроек"
           topic_list_top:
             title: "Список рекламных объявлений"
             description: "Объявления для показа над списком тем."
diff --git a/plugins/discourse-adplugin/config/locales/client.sk.yml b/plugins/discourse-adplugin/config/locales/client.sk.yml
index 52bb51cc52241..3fb6a79cc8335 100644
--- a/plugins/discourse-adplugin/config/locales/client.sk.yml
+++ b/plugins/discourse-adplugin/config/locales/client.sk.yml
@@ -26,9 +26,6 @@ sk:
           new_name: "Reklama na nový dom"
           save: "Uložiť"
           delete: "Odstrániť"
-          html: "HTML"
-          categories: "Kategórie"
-          groups: "Skupiny"
           filter_placeholder: "Vybrať reklamy..."
           more_settings: "Ďalšie nastavenia"
           show_to_anons: "Zobraziť anonymným používateľom"
@@ -36,11 +33,6 @@ sk:
           category_chooser_description: "Vyberte kategórie, v ktorých sa má táto reklama zobrazovať, alebo nechajte prázdne, aby sa reklama zobrazovala všade. Nastavenie stránky `no_ads_for_categories` má pred týmto nastavením prednosť."
           group_chooser_description: "Vyberte skupiny, ktoré môžu túto reklamu zobraziť, alebo nechajte prázdne, aby sa reklama zobrazila všetkým prihláseným používateľom."
           preview: "Náhľad"
-          back: "Reklamy na dom"
-          name: "Meno"
-          edit: "Upraviť"
-          tabs:
-            settings: "Nastavení"
           topic_list_top:
             title: "Zoznam tém top reklamy"
             description: "Zobrazenie reklám v hornej časti stránok so zoznamom tém."
diff --git a/plugins/discourse-adplugin/config/locales/client.sl.yml b/plugins/discourse-adplugin/config/locales/client.sl.yml
index fc61b52d50963..c3c8e3f43cb0b 100644
--- a/plugins/discourse-adplugin/config/locales/client.sl.yml
+++ b/plugins/discourse-adplugin/config/locales/client.sl.yml
@@ -16,11 +16,4 @@ sl:
           settings: "Nastavitve"
           save: "Shrani"
           delete: "Izbriši"
-          html: "HTML"
-          categories: "Kategorije"
-          groups: "Skupine"
           preview: "Predogled"
-          name: "Ime"
-          edit: "Uredi"
-          tabs:
-            settings: "Nastavitve"
diff --git a/plugins/discourse-adplugin/config/locales/client.sq.yml b/plugins/discourse-adplugin/config/locales/client.sq.yml
index a6ee1d2890b92..5feb6cbf98977 100644
--- a/plugins/discourse-adplugin/config/locales/client.sq.yml
+++ b/plugins/discourse-adplugin/config/locales/client.sq.yml
@@ -13,11 +13,4 @@ sq:
           settings: "Rregullimet"
           save: "Ruani"
           delete: "Fshij"
-          html: "HTML"
-          categories: "Categories"
-          groups: "Grupet"
           preview: "Parashikimi"
-          name: "Emri"
-          edit: "Redaktoni"
-          tabs:
-            settings: "Rregullimet"
diff --git a/plugins/discourse-adplugin/config/locales/client.sr.yml b/plugins/discourse-adplugin/config/locales/client.sr.yml
index ca38eab59915e..f600023e53c0f 100644
--- a/plugins/discourse-adplugin/config/locales/client.sr.yml
+++ b/plugins/discourse-adplugin/config/locales/client.sr.yml
@@ -13,9 +13,3 @@ sr:
           settings: "Podešavanje"
           save: "Sačuvaj"
           delete: "Obriši"
-          categories: "Kategorije"
-          groups: "Grupe"
-          name: "Ime foruma"
-          edit: "Izmeni"
-          tabs:
-            settings: "Podešavanje"
diff --git a/plugins/discourse-adplugin/config/locales/client.sv.yml b/plugins/discourse-adplugin/config/locales/client.sv.yml
index 16790d8901d5f..d00eec61c1646 100644
--- a/plugins/discourse-adplugin/config/locales/client.sv.yml
+++ b/plugins/discourse-adplugin/config/locales/client.sv.yml
@@ -26,17 +26,9 @@ sv:
           new_name: "Ny egen annons"
           save: "Spara"
           delete: "Ta bort"
-          html: "HTML"
-          categories: "Kategorier"
-          groups: "Grupper"
           filter_placeholder: "Välj annonser..."
           more_settings: "Fler inställningar"
           preview: "Förhandsgranska"
-          back: "Egna annonser"
-          name: "Namn"
-          edit: "Redigera"
-          tabs:
-            settings: "Inställningar"
           topic_list_top:
             title: "Annonser i ämneslistans topp"
             description: "Annonser som visas i ämneslistans topp."
diff --git a/plugins/discourse-adplugin/config/locales/client.sw.yml b/plugins/discourse-adplugin/config/locales/client.sw.yml
index 6cd5bdedf73c6..e49f70f79fcb7 100644
--- a/plugins/discourse-adplugin/config/locales/client.sw.yml
+++ b/plugins/discourse-adplugin/config/locales/client.sw.yml
@@ -19,11 +19,4 @@ sw:
           settings: "Mipangilio"
           save: "Hifadhi"
           delete: "Futa"
-          html: "HTML"
-          categories: "Kategoria"
-          groups: "Makundi"
           preview: "Kihakiki"
-          name: "Jina"
-          edit: "Hariri"
-          tabs:
-            settings: "Mipangilio"
diff --git a/plugins/discourse-adplugin/config/locales/client.te.yml b/plugins/discourse-adplugin/config/locales/client.te.yml
index d23802b9bf0b0..9af2ded5dca45 100644
--- a/plugins/discourse-adplugin/config/locales/client.te.yml
+++ b/plugins/discourse-adplugin/config/locales/client.te.yml
@@ -13,11 +13,4 @@ te:
           settings: "అమరికలు"
           save: "సేవ్ చేయండి"
           delete: "తొలగించండి"
-          html: "HTML"
-          categories: "వర్గాలు"
-          groups: "సమూహాలు"
           preview: "ప్రివ్యూ"
-          name: "పేరు"
-          edit: "సవరించండి"
-          tabs:
-            settings: "అమరికలు"
diff --git a/plugins/discourse-adplugin/config/locales/client.th.yml b/plugins/discourse-adplugin/config/locales/client.th.yml
index 838aeeb590fc7..0da49aca19992 100644
--- a/plugins/discourse-adplugin/config/locales/client.th.yml
+++ b/plugins/discourse-adplugin/config/locales/client.th.yml
@@ -22,16 +22,9 @@ th:
           settings: "การตั้งค่า"
           save: "บันทึก"
           delete: "ลบ"
-          html: "HTML"
-          categories: "หมวดหมู่"
-          groups: "กลุ่ม"
           filter_placeholder: "เลือกโฆษณา ..."
           more_settings: "การตั้งค่าเพิ่มเติม"
           preview: "แสดงตัวอย่าง"
-          name: "ชื่อ"
-          edit: "แก้ไข"
-          tabs:
-            settings: "การตั้งค่า"
           topic_list_top:
             title: "หัวข้อรายการโฆษณายอดนิยม"
             description: "โฆษณาที่จะแสดงที่ด้านบนสุดของหน้ารายการหัวข้อ"
diff --git a/plugins/discourse-adplugin/config/locales/client.tr_TR.yml b/plugins/discourse-adplugin/config/locales/client.tr_TR.yml
index 1d9577531eb18..0e7aba0dfc379 100644
--- a/plugins/discourse-adplugin/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-adplugin/config/locales/client.tr_TR.yml
@@ -26,9 +26,6 @@ tr_TR:
           new_name: "Yeni Şirket İçi Reklam"
           save: "Kaydet"
           delete: "Sil"
-          html: "HTML"
-          categories: "Kategoriler"
-          groups: "Gruplar"
           filter_placeholder: "Reklamları seçin..."
           more_settings: "Daha Fazla Ayar"
           show_to_anons: "Anonim kullanıcılara göster"
@@ -36,11 +33,6 @@ tr_TR:
           category_chooser_description: "Bu reklamın gösterileceği kategorileri seçin veya reklamı her yerde göstermek için boş bırakın. `no_ads_for_categories` site ayarının bu ayar üzerinde önceliği vardır."
           group_chooser_description: "Bu reklamı görüntüleyebilecek grupları seçin veya reklamı oturum açmış tüm kullanıcılara göstermek için boş bırakın."
           preview: "Ön izle"
-          back: "Şirket İçi Reklamlar"
-          name: "Ad"
-          edit: "Düzenle"
-          tabs:
-            settings: "Ayarlar"
           topic_list_top:
             title: "Konu listesi üstü reklamları"
             description: "Konu listesi sayfalarının en üstünde gösterilecek reklamlar."
diff --git a/plugins/discourse-adplugin/config/locales/client.ug.yml b/plugins/discourse-adplugin/config/locales/client.ug.yml
index fea60d073b851..5380f7b41254a 100644
--- a/plugins/discourse-adplugin/config/locales/client.ug.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ug.yml
@@ -13,11 +13,4 @@ ug:
           settings: "تەڭشەك"
           save: "ساقلا"
           delete: "ئۆچۈر"
-          html: "HTML"
-          categories: "سەھىپە"
-          groups: "گۇرۇپپا"
           preview: "ئالدىن كۆزەت"
-          name: "ئىسمى"
-          edit: "تەھرىر"
-          tabs:
-            settings: "تەڭشەك"
diff --git a/plugins/discourse-adplugin/config/locales/client.uk.yml b/plugins/discourse-adplugin/config/locales/client.uk.yml
index 5ae8da4b183fd..2daebf46baff0 100644
--- a/plugins/discourse-adplugin/config/locales/client.uk.yml
+++ b/plugins/discourse-adplugin/config/locales/client.uk.yml
@@ -37,13 +37,6 @@ uk:
           new_name: "Новий House Ad"
           save: "Зберегти"
           delete: "Видалити"
-          confirm_delete: "Ви впевнені, що хочете видалити це оголошення?"
-          html: "HTML"
-          categories: "Розділи"
-          routes: "Маршрути"
-          groups: "Групи"
-          description: "Створюйте та керуйте власними оголошеннями для показу на вашому сайті в різних позиціях."
-          get_started: "Поки що не створено жодної власної реклами."
           filter_placeholder: "Виберіть рекламу..."
           more_settings: "Більше налаштувань"
           show_to_anons: "Показувати анонімним користувачам"
@@ -53,12 +46,6 @@ uk:
           route_chooser_description: "Виберіть сторінки/маршрути, де має відображатися це оголошення. Залиште це поле та вибір категорій порожніми, щоб показувати оголошення всюди."
           group_chooser_description: "Виберіть групи, які можуть переглядати цю рекламу, або залиште поле порожнім, щоб показувати рекламу всім зареєстрованим користувачам."
           preview: "Попередній перегляд"
-          back: "House Ads"
-          name: "Імʼя"
-          edit: "Редагувати"
-          tabs:
-            ads: "Реклама"
-            settings: "Налаштування"
           topic_list_top:
             title: "Перелік тем найкращих оголошень"
             description: "Оголошення для показу вгорі сторінок списку тем."
diff --git a/plugins/discourse-adplugin/config/locales/client.ur.yml b/plugins/discourse-adplugin/config/locales/client.ur.yml
index e78b4bc299fd6..833d95772d222 100644
--- a/plugins/discourse-adplugin/config/locales/client.ur.yml
+++ b/plugins/discourse-adplugin/config/locales/client.ur.yml
@@ -26,9 +26,6 @@ ur:
           new_name: "نیو ہائوز اشتھار"
           save: "محفوظ کریں"
           delete: "مٹائیں"
-          html: "HTML"
-          categories: "زمرہ جات"
-          groups: "گروپس"
           filter_placeholder: "اشتھارات منتخب کریں..."
           more_settings: "مزید ترتیبات"
           show_to_anons: "صرف غیر رجسٹرڈ اراکین کو دکھائیں"
@@ -36,11 +33,6 @@ ur:
           category_chooser_description: "وہ زمرے منتخب کریں جہاں یہ اشتہار دکھایا جانا چاہیے یا اشتہار کو ہر جگہ دکھانے کے لیے خالی چھوڑ دیں۔ 'no_ads_for_categories' سائٹ کی ترتیب کو اس ترتیب پر ترجیح حاصل ہے۔"
           group_chooser_description: "ان گروپس کا انتخاب کریں جو اس اشتہار کو دیکھ سکتے ہیں یا تمام سائن ان اراکین کو اشتہار دکھانے کے لیے خالی چھوڑ سکتے ہیں۔"
           preview: "جھلک دیکھیں"
-          back: "ہائوز اشتھارات"
-          name: "نام"
-          edit: "ترمیم کریں"
-          tabs:
-            settings: "سیٹِنگ"
           topic_list_top:
             title: "ٹاپک فہرست ٹاپ اشتھارات"
             description: "ٹاپک فہرست صفحات کے سب سے اوپر ظاہر کرنے کیلئے اشتھارات۔"
diff --git a/plugins/discourse-adplugin/config/locales/client.vi.yml b/plugins/discourse-adplugin/config/locales/client.vi.yml
index c19ed56cf2417..d8f9fa78ee788 100644
--- a/plugins/discourse-adplugin/config/locales/client.vi.yml
+++ b/plugins/discourse-adplugin/config/locales/client.vi.yml
@@ -21,11 +21,4 @@ vi:
           settings: "Cài đặt"
           save: "Lưu lại"
           delete: "Xóa"
-          html: "HTML"
-          categories: "Danh mục"
-          groups: "Nhóm"
           preview: "Xem trước"
-          name: "Tên"
-          edit: "Sửa"
-          tabs:
-            settings: "Cài đặt"
diff --git a/plugins/discourse-adplugin/config/locales/client.zh_CN.yml b/plugins/discourse-adplugin/config/locales/client.zh_CN.yml
index 1bbe60e8bda20..d17c7c6cf2b69 100644
--- a/plugins/discourse-adplugin/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-adplugin/config/locales/client.zh_CN.yml
@@ -37,9 +37,6 @@ zh_CN:
           new_name: "新建自家广告"
           save: "保存"
           delete: "删除"
-          html: "HTML"
-          categories: "类别"
-          groups: "群组"
           filter_placeholder: "选择广告…"
           more_settings: "更多设置"
           show_to_anons: "向匿名用户显示"
@@ -49,11 +46,6 @@ zh_CN:
           route_chooser_description: "选择应显示此广告的页面/路由。将此设置和类别选择留空会在任何地方显示广告。"
           group_chooser_description: "选择可以查看此广告的群组或留空以向所有登录用户显示广告。"
           preview: "预览"
-          back: "自家广告"
-          name: "名称"
-          edit: "编辑"
-          tabs:
-            settings: "设置"
           topic_list_top:
             title: "话题列表顶部广告"
             description: "在话题列表页面顶部显示的广告。"
diff --git a/plugins/discourse-adplugin/config/locales/client.zh_TW.yml b/plugins/discourse-adplugin/config/locales/client.zh_TW.yml
index 829af54504119..a958931ef630a 100644
--- a/plugins/discourse-adplugin/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-adplugin/config/locales/client.zh_TW.yml
@@ -22,16 +22,9 @@ zh_TW:
           settings: "設定"
           save: "儲存"
           delete: "刪除"
-          html: "HTML"
-          categories: "分類"
-          groups: "群組"
           filter_placeholder: "選擇廣告..."
           more_settings: "更多設置"
           preview: "預覽"
-          name: "名稱"
-          edit: "編輯"
-          tabs:
-            settings: "設定"
           topic_list_top:
             title: "主題列表頂部廣告"
             description: "顯示在主題列表頁面頂部的廣告。"
diff --git a/plugins/discourse-ai/config/locales/client.ar.yml b/plugins/discourse-ai/config/locales/client.ar.yml
index 73a5d86a2e0a3..f063af4e90083 100644
--- a/plugins/discourse-ai/config/locales/client.ar.yml
+++ b/plugins/discourse-ai/config/locales/client.ar.yml
@@ -225,8 +225,6 @@ ar:
       default_llm:
         title: "نموذج اللغة الكبير الافتراضي"
         description: "نموذج اللغة الكبير الافتراضي المستخدم لجميع ميزات الذكاء الاصطناعي. سيتم استخدامه إذا لم يتم تحديد نموذج آخر في إعدادات الميزة أو الشخصية. وإذا لم يُحدد نموذج افتراضي، سيتم استخدام آخر نموذج تم إنشاؤه."
-      llm_selector:
-        none: "لا يوجد"
       features:
         short_title: "الميزات"
         description: "هذه الميزات تمثل وظائف الذكاء الاصطناعي المتاحة للزوار على موقعك. يمكن تكوينها لاستخدام شخصيات ونماذج لغة كبيرة محددة، كما يمكن التحكم في الوصول إليها حسب المجموعات."
@@ -674,9 +672,7 @@ ar:
         parameter_description: "وصف المعلمة"
         enum_value: "قيمة التعداد"
         add_enum_value: "إضافة قيمة التعداد"
-        credential_not_set: "(غير معيَّن)"
         edit: "تعديل"
-        test: "اختبار"
         delete: "حذف"
         saved: "تم حفظ الأداة"
         confirm_delete: "هل تريد بالتأكيد حذف هذه الأداة؟"
@@ -684,16 +680,6 @@ ar:
           title: "اختبار أداة الذكاء الاصطناعي"
           run: "تشغيل الاختبار"
           result: "نتيجة الاختبار"
-      secrets:
-        short_title: "بيانات الاعتماد"
-        name: "الاسم"
-        secret: "القيمة"
-        back: "رجوع"
-        save: "حفظ"
-        edit: "تعديل"
-        delete: "حذف"
-        embedding: "التضمين"
-        tool: "أداة"
       llms:
         short_title: "نماذج اللغة الكبيرة"
         no_llms: "لا توجد نماذج لغة كبيرة بعد"
@@ -763,11 +749,8 @@ ar:
           other: "هذا النموذج مُستخدَم حاليًا من قِبل %{settings}. إذا تم تكوينه بشكلٍ خاطئ، فلن تعمل الميزات كما هو متوقَّع. "
         model_description:
           none: "الإعدادات العامة التي تعمل مع معظم نماذج اللغة"
-          anthropic-claude-opus-4-6: "النموذج الأكثر ذكاءً لدى Anthropic"
-          anthropic-claude-sonnet-4-6: "التوازن الأمثل بين السرعة والتكلفة"
           anthropic-claude-haiku-4-5: "سريع وفعَّال من حيث التكلفة"
           google-gemini-3-pro: "النموذج الأكثر ذكاءً لدى Google"
-          open_ai-gpt-5-nano: "أسرع وأوفر نموذج GPT-5 من حيث التكلفة"
         preseeded_model_description: "نموذج مفتوح المصدر تم تكوينه مسبقًا باستخدام %{model}"
         configured:
           title: "تم تكوين نماذج اللغة الكبيرة (LLM)"
diff --git a/plugins/discourse-ai/config/locales/client.be.yml b/plugins/discourse-ai/config/locales/client.be.yml
index 144d63739a3cd..134cd1ed1c6c3 100644
--- a/plugins/discourse-ai/config/locales/client.be.yml
+++ b/plugins/discourse-ai/config/locales/client.be.yml
@@ -34,8 +34,6 @@ be:
             canned_reply:
               label: "Адказаць"
     discourse_ai:
-      llm_selector:
-        none: "Няма"
       features:
         back: "Назад"
         disabled: "(адключана)"
@@ -109,14 +107,6 @@ be:
         parameter_required: "абавязковыя"
         edit: "Рэдагаваць"
         delete: "Выдаліць"
-      secrets:
-        name: "Імя"
-        secret: "значэнне"
-        back: "Назад"
-        save: "Захаваць"
-        edit: "Рэдагаваць"
-        delete: "Выдаліць"
-        embedding: "узаемадзеянне"
       llms:
         display_name: "Імя"
         save: "Захаваць"
diff --git a/plugins/discourse-ai/config/locales/client.bg.yml b/plugins/discourse-ai/config/locales/client.bg.yml
index 868c2d492d0aa..76d75ae7b591f 100644
--- a/plugins/discourse-ai/config/locales/client.bg.yml
+++ b/plugins/discourse-ai/config/locales/client.bg.yml
@@ -34,8 +34,6 @@ bg:
             canned_reply:
               label: "Отговорете"
     discourse_ai:
-      llm_selector:
-        none: "Без"
       features:
         back: "Назад"
         disabled: "(деактивирани)"
@@ -115,18 +113,8 @@ bg:
         save: "Запази"
         remove_parameter: "Премахване"
         parameter_required: "Задъжителни"
-        credential_not_set: "(не е зададено)"
         edit: "Редактирай"
         delete: "Изтрий"
-      secrets:
-        short_title: "Данни за удостоверяване"
-        name: "Име"
-        secret: "Стойност"
-        back: "Назад"
-        save: "Запази"
-        edit: "Редактирай"
-        delete: "Изтрий"
-        embedding: "Ембедване"
       llms:
         display_name: "Име"
         save: "Запази"
diff --git a/plugins/discourse-ai/config/locales/client.bs_BA.yml b/plugins/discourse-ai/config/locales/client.bs_BA.yml
index 0dfc53cd977a0..7268141711a6d 100644
--- a/plugins/discourse-ai/config/locales/client.bs_BA.yml
+++ b/plugins/discourse-ai/config/locales/client.bs_BA.yml
@@ -34,8 +34,6 @@ bs_BA:
             canned_reply:
               label: "Odgovori"
     discourse_ai:
-      llm_selector:
-        none: "Ništa"
       features:
         back: "Prethodno"
         disabled: "(neomogućen)"
@@ -112,15 +110,6 @@ bs_BA:
         parameter_required: "Required"
         edit: "Izmijeni"
         delete: "Delete"
-      secrets:
-        short_title: "Identifikacija"
-        name: "Ime"
-        secret: "Value"
-        back: "Prethodno"
-        save: "Sačuvaj"
-        edit: "Izmijeni"
-        delete: "Delete"
-        embedding: "Embedding"
       llms:
         display_name: "Ime"
         save: "Sačuvaj"
diff --git a/plugins/discourse-ai/config/locales/client.ca.yml b/plugins/discourse-ai/config/locales/client.ca.yml
index 6a3ec5afec86a..871d6db6fd7b3 100644
--- a/plugins/discourse-ai/config/locales/client.ca.yml
+++ b/plugins/discourse-ai/config/locales/client.ca.yml
@@ -34,8 +34,6 @@ ca:
             canned_reply:
               label: "Respon"
     discourse_ai:
-      llm_selector:
-        none: "Cap"
       features:
         back: "Enrere"
         disabled: "(desactivat)"
@@ -115,17 +113,7 @@ ca:
         remove_parameter: "Elimina"
         parameter_required: "Necessari"
         edit: "Edita"
-        test: "Test"
         delete: "Suprimeix"
-      secrets:
-        short_title: "Credencials"
-        name: "Nom"
-        secret: "Valor"
-        back: "Enrere"
-        save: "Desa"
-        edit: "Edita"
-        delete: "Suprimeix"
-        embedding: "Incrustant"
       llms:
         display_name: "Nom"
         provider: "Proveïdor"
diff --git a/plugins/discourse-ai/config/locales/client.cs.yml b/plugins/discourse-ai/config/locales/client.cs.yml
index ee57cc1f07a3a..4e62027510688 100644
--- a/plugins/discourse-ai/config/locales/client.cs.yml
+++ b/plugins/discourse-ai/config/locales/client.cs.yml
@@ -38,8 +38,6 @@ cs:
             canned_reply:
               label: "Odpověď"
     discourse_ai:
-      llm_selector:
-        none: "Žádný"
       features:
         back: "Zpět"
         disabled: "(vypnuto)"
@@ -144,22 +142,10 @@ cs:
         save: "Uložit"
         remove_parameter: "Smazat"
         parameter_required: "Povinné"
-        credential_not_set: "(nenastaveno)"
         edit: "Upravit"
-        test: "Test"
         delete: "Smazat"
         test_modal:
           run: "Spustit test"
-      secrets:
-        short_title: "Pověření"
-        name: "Název"
-        secret: "Hodnota"
-        back: "Zpět"
-        save: "Uložit"
-        edit: "Upravit"
-        delete: "Smazat"
-        embedding: "Zabudování"
-        tool: "Nástroj"
       llms:
         display_name: "Název"
         save: "Uložit"
@@ -180,9 +166,6 @@ cs:
         usage:
           ai_summarization: "Shrnout"
           ai_spam: "Spam"
-        model_description:
-          anthropic-claude-opus-4-6: "Nejinteligentnější model společnosti Anthropic"
-          anthropic-claude-sonnet-4-6: "Optimální poměr rychlosti a nákladů"
         next:
           title: "Další"
         tests:
diff --git a/plugins/discourse-ai/config/locales/client.da.yml b/plugins/discourse-ai/config/locales/client.da.yml
index f3cd1032f0762..719d2be46bb52 100644
--- a/plugins/discourse-ai/config/locales/client.da.yml
+++ b/plugins/discourse-ai/config/locales/client.da.yml
@@ -42,8 +42,6 @@ da:
             canned_reply:
               label: "Svar"
     discourse_ai:
-      llm_selector:
-        none: "Ingen"
       features:
         back: "Tilbage"
         disabled: "(deaktiveret)"
@@ -130,21 +128,10 @@ da:
         save: "Gem"
         remove_parameter: "Fjern"
         parameter_required: "Obligatoriske"
-        credential_not_set: "(ikke indstillet)"
         edit: "Rediger"
-        test: "Test"
         delete: "Slet"
         test_modal:
           run: "Kør test"
-      secrets:
-        short_title: "Legitimationsoplysninger"
-        name: "Navn"
-        secret: "værdi"
-        back: "Tilbage"
-        save: "Gem"
-        edit: "Rediger"
-        delete: "Slet"
-        embedding: "Indlejring"
       llms:
         display_name: "Navn"
         save: "Gem"
diff --git a/plugins/discourse-ai/config/locales/client.de.yml b/plugins/discourse-ai/config/locales/client.de.yml
index d9005c69826ff..b4c73ad31588e 100644
--- a/plugins/discourse-ai/config/locales/client.de.yml
+++ b/plugins/discourse-ai/config/locales/client.de.yml
@@ -14,7 +14,6 @@ de:
               search: "Ermöglicht KI-Suche"
               stream_completion: "Ermöglicht das Streamen von KI-Persona-Vervollständigungen"
               update_personas: "Ermöglicht die Aktualisierung von KI-Personas"
-              manage_artifacts: "Ermöglicht die Verwaltung von KI-Artefakten (auflisten, anzeigen, erstellen, aktualisieren, löschen)"
       site_settings:
         categories:
           discourse_ai: "Discourse KI"
@@ -45,9 +44,6 @@ de:
             create_ai_embedding: "KI-Einbettung erstellen"
             update_ai_embedding: "KI-Einbettung aktualisieren"
             delete_ai_embedding: "KI-Einbettung löschen"
-            create_ai_secret: "KI-Geheimschlüssel erstellen"
-            update_ai_secret: "KI-Geheimschlüssel aktualisieren"
-            delete_ai_secret: "KI-Geheimschlüssel löschen"
             update_ai_spam_settings: "KI-Spam-Einstellungen aktualisieren"
   js:
     discourse_automation:
@@ -229,9 +225,6 @@ de:
       default_llm:
         title: "Standard-LLM-Modell"
         description: "Das Standard-LLM-Modell für alle KI-Funktionen. Dieses wird verwendet, wenn in der Funktionskonfiguration oder Persona kein LLM angegeben ist. Wenn kein Standard-LLM angegeben ist, wird das zuletzt erstellte LLM verwendet."
-      llm_selector:
-        none: "Keiner"
-        saved: "Standard-LLM-Modell erfolgreich aktualisiert"
       features:
         short_title: "Funktionen"
         description: "Dies sind die KI-Funktionen, die den Besuchern deiner Website zur Verfügung stehen. Sie können so konfiguriert werden, dass sie bestimmte Personas und LLM verwenden, und der Zugriff kann mithilfe von Gruppen gesteuert werden."
@@ -326,7 +319,6 @@ de:
           image_caption: "Bildbeschriftungen"
           translator: "Übersetzer"
           post_illustrator: "Beitragsillustrator"
-          chat_thread_titles: "Titel von Chat-Threads"
           setting_groups:
             access_permissions: "Zugriff & Berechtigungen"
             enabled_features: "Aktivierte Funktionen"
@@ -506,7 +498,6 @@ de:
         overwrite: "Überschreiben"
         description: "Beschreibung"
         no_llm_selected: "Kein Sprachmodell ausgewählt"
-        use_parent_llm: "Verwende das Sprachmodell der Persona"
         max_context_posts: "Max. Kontext-Beiträge"
         max_context_posts_help: "Die maximale Anzahl von Beiträgen, die die KI als Kontext für die Antwort auf einen Nutzer verwenden soll (leer für Standardwert)."
         vision_enabled: Sehen aktiviert
@@ -641,14 +632,7 @@ de:
         parameter_description: "Parameterbeschreibung"
         enum_value: "Aufzählungswert"
         add_enum_value: "Aufzählungswert hinzufügen"
-        secret_alias: "Alias für Anmeldedaten"
-        secret_alias_help: "Alias, auf den in Skripten über secrets.get(\"alias_name\") verwiesen wird. Verwende Buchstaben, Zahlen und Unterstriche."
-        secret_credential: "Anmeldedaten"
-        add_secret_contract: "Anmeldedaten hinzufügen"
-        remove_secret_contract: "Anmeldedaten entfernen"
-        credential_not_set: "(nicht festgelegt)"
         edit: "Bearbeiten"
-        test: "Testen"
         delete: "Löschen"
         saved: "Tool gespeichert"
         confirm_delete: "Bist du sicher, dass du dieses Tool löschen willst?"
@@ -656,31 +640,6 @@ de:
           title: "KI-Tool testen"
           run: "Test ausführen"
           result: "Testergebnis"
-      secrets:
-        short_title: "Anmeldedaten"
-        description: "Verwalte Authentifizierungsdaten, die von allen LLMs, Einbettungen und Tools gemeinsam genutzt werden."
-        name: "Name"
-        secret: "Wert"
-        select_secret: "Wähle Anmeldedaten aus …"
-        create_new: "Neue Anmeldedaten"
-        add_secret: "Anmeldedaten hinzufügen"
-        saved: "Anmeldedaten gespeichert"
-        confirm_delete: "Bist du sicher, dass du diese Anmeldedaten löschen möchtest?"
-        delete_failed_in_use: "Diese Anmeldedaten werden derzeit verwendet und können nicht gelöscht werden."
-        no_secrets: "Noch keine Anmeldedaten"
-        new_title: "Neue Anmeldedaten"
-        edit_title: "Anmeldedaten bearbeiten"
-        back: "Zurück"
-        save: "Speichern"
-        edit: "Bearbeiten"
-        delete: "Löschen"
-        used_by: "Verwendet von"
-        not_used: "Nicht in Verwendung"
-        embedding: "Einbettung"
-        cannot_delete_in_use: "Diese Anmeldedaten können nicht gelöscht werden. Sie werden verwendet von:"
-        tool: "Tool"
-        modal:
-          title: "Neue Anmeldedaten erstellen"
       llms:
         short_title: "LLM"
         no_llms: "Noch keine LLM"
@@ -746,20 +705,8 @@ de:
           other: "Dieses Modell wird derzeit verwendet von: %{settings}. Wenn es falsch konfiguriert ist, werden die Funktionen nicht wie erwartet funktionieren. "
         model_description:
           none: "Allgemeine Einstellungen, die für die meisten Sprachmodelle funktionieren"
-          anthropic-claude-opus-4-6: "Das intelligenteste Modell von Anthropic"
-          anthropic-claude-sonnet-4-6: "Optimales Gleichgewicht zwischen Geschwindigkeit und Kosten"
           anthropic-claude-haiku-4-5: "Schnell und kosteneffizient"
           google-gemini-3-pro: "Googles intelligentestes Modell"
-          google-gemini-3-flash: "Schnell und kosteneffizient mit multimodaler Argumentation"
-          open_ai-gpt-5-2: "Das Vorzeigemodell von OpenAI, gut geeignet für Problemlösungen in verschiedenen Bereichen"
-          open_ai-gpt-5-mini: "Bietet ein ausgewogenes Verhältnis zwischen Intelligenz, Geschwindigkeit und Kosten."
-          open_ai-gpt-5-nano: "Das schnellste und kostengünstigste GPT-5-Modell"
-          open_router-deepseek-deepseek-v3-2: "DeepSeeks neuestes Hochleistungsmodell"
-          open_router-moonshotai-kimi-k2-5: "Moonshots multimodales Modell mit Bildverarbeitungsfunktionen"
-          open_router-x-ai-grok-4-fast: "Das Vorzeigemodell von xAI mit Bildverarbeitung"
-          open_router-minimax-minimax-m2-5: "Das multimodale Modell von MiniMax mit großem Kontext"
-          open_router-z-ai-glm-5: "Das multimodale Modell von Z-AI mit Bildverarbeitung"
-          open_router-arcee-ai-trinity-large-preview-free: "Kostenloses Open-Source-Modell von Arcee AI"
         preseeded_model_description: "Vorkonfiguriertes Open-Source-Modell unter Verwendung von %{model}"
         configured:
           title: "Konfigurierte LLMs"
@@ -814,7 +761,6 @@ de:
           disable_system_prompt: "Systemmeldung in Eingabeaufforderungen deaktivieren"
           enable_native_tool: "Aktiviere native Tool-Unterstützung"
           disable_native_tools: "Native Tool-Unterstützung deaktivieren (XML-basierte Tools verwenden)"
-          disable_native_structured_output: "Deaktiviere die native strukturierte Ausgabe (verwende stattdessen das Vorausfüllen von Assistenznachrichten, erforderlich für Claude 3.x und älter)"
           provider_order: "Anbieterreihenfolge (kommagetrennte Liste)"
           provider_quantizations: "Reihenfolge der Provider-Quantisierungen (kommagetrennte Liste, z. B.: fp16,fp8)"
           disable_streaming: "Streaming-Vervollständigung deaktivieren (Streaming-Anfragen in Nicht-Streaming-Anfragen umwandeln)"
@@ -829,7 +775,6 @@ de:
           prompt_caching_never: "Niemals - Keine zwischengespeicherten Aufforderungen verwenden"
           prompt_caching_tool_results: "Tool-Ergebnisse - Zwischenspeichern, wenn Tool-Ergebnisse vorhanden sind (empfohlen)"
           prompt_caching_always: "Immer - Immer zwischengespeicherte Aufforderungen verwenden"
-          effort: "Anstrengungsgrad"
       related_topics:
         title: "Verwandte Themen"
         pill: "Verwandt"
@@ -942,14 +887,11 @@ de:
           model_name: "Modellname"
         semantic_search: "Themen (semantisch)"
         semantic_search_results:
-          toggle: "KI-Ergebnisse"
           unavailable: "KI-Ergebnisse nicht verfügbar"
           zero_results_expanded: "Keine Ergebnisse gefunden, es werden %{count} KI-Ergebnisse angezeigt"
         semantic_search_tooltips:
           results_explanation: "Wenn diese Funktion aktiviert ist, werden zusätzliche KI-Suchergebnisse unten hinzugefügt."
           invalid_sort: "Die Suchergebnisse müssen nach Relevanz sortiert werden, um KI-Ergebnisse anzuzeigen"
-          not_submitted: "Führe eine Suche aus, um KI-Ergebnisse zu sehen."
-          no_results: "Für diese Suche wurden keine KI-Ergebnisse gefunden."
         semantic_search_unavailable_tooltip: "Die Suchergebnisse müssen nach Relevanz sortiert werden, um KI-Ergebnisse anzuzeigen"
         ai_generated_result: "Suchergebnis mit KI gefunden"
         quick_search:
diff --git a/plugins/discourse-ai/config/locales/client.el.yml b/plugins/discourse-ai/config/locales/client.el.yml
index dd030a998e066..f496832e49491 100644
--- a/plugins/discourse-ai/config/locales/client.el.yml
+++ b/plugins/discourse-ai/config/locales/client.el.yml
@@ -92,8 +92,6 @@ el:
               label: "Περιεχόμενο ΠΜ"
               description: "Προαιρετικό προσαρμοσμένο μήνυμα για αποστολή στον συντάκτη"
     discourse_ai:
-      llm_selector:
-        none: "Κανένα"
       features:
         back: "Πίσω"
         settings_save_error: "Δεν ήταν δυνατή η αποθήκευση ορισμένων ρυθμίσεων."
@@ -115,6 +113,7 @@ el:
           name: "Αναζήτηση"
         ai_helper:
           setting_groups:
+            access_permissions: "Πρόσβαση & Δικαιώματα"
             automation: "Αυτοματισμός"
         translation:
           post_raw_translator: "Μεταφραστής ακατέργαστης ανάρτησης"
@@ -195,19 +194,8 @@ el:
         save: "Αποθήκευση"
         remove_parameter: "Αφαίρεση"
         parameter_required: "Απαιτείται"
-        credential_not_set: "(δεν έχει οριστεί)"
         edit: "Επεξεργασία"
-        test: "Δοκιμή"
         delete: "Σβήσιμο"
-      secrets:
-        short_title: "Διαπιστευτήρια"
-        name: "Όνομα"
-        secret: "Τιμή"
-        back: "Πίσω"
-        save: "Αποθήκευση"
-        edit: "Επεξεργασία"
-        delete: "Σβήσιμο"
-        embedding: "Ενσωμάτωση"
       llms:
         no_llms: "Κανένα LLM ακόμη"
         display_name: "Όνομα"
diff --git a/plugins/discourse-ai/config/locales/client.es.yml b/plugins/discourse-ai/config/locales/client.es.yml
index 44671a3ddd9c1..16b8e61ae8c12 100644
--- a/plugins/discourse-ai/config/locales/client.es.yml
+++ b/plugins/discourse-ai/config/locales/client.es.yml
@@ -180,8 +180,6 @@ es:
       default_llm:
         title: "Modelo LLM por defecto"
         description: "El modelo LLM por defecto a utilizar para todas las características de IA. Se usará si no se especifica ningún LLM en la configuración de características o en la persona. Si no se especifica ningún LLM por defecto, se usará el último LLM creado."
-      llm_selector:
-        none: "Ninguna"
       features:
         short_title: "Características"
         description: "Estas son las características de IA disponibles para los visitantes de tu sitio. Se pueden configurar para usar personas y LLM específicos, y los grupos pueden controlar su acceso."
@@ -528,9 +526,7 @@ es:
         parameter_description: "Descripción del parámetro"
         enum_value: "Valor de enumeración"
         add_enum_value: "Añadir valor de enumeración"
-        credential_not_set: "(no establecido)"
         edit: "Editar"
-        test: "Probar"
         delete: "Eliminar"
         saved: "Herramienta guardada"
         confirm_delete: "¿Seguro que quieres eliminar esta herramienta?"
@@ -538,16 +534,6 @@ es:
           title: "Probar la herramienta de IA"
           run: "Ejecutar prueba"
           result: "Resultado de la prueba"
-      secrets:
-        short_title: "Credenciales"
-        name: "Nombre"
-        secret: "Valor"
-        back: "Atrás"
-        save: "Guardar"
-        edit: "Editar"
-        delete: "Eliminar"
-        embedding: "Incrustado"
-        tool: "Herramienta"
       llms:
         short_title: "LLM"
         no_llms: "Aún no hay LLM"
@@ -605,10 +591,7 @@ es:
           other: "Este modelo lo utilizan actualmente las siguientes %{settings}. Si está mal configurado, las características no funcionarán como se espera."
         model_description:
           none: "Ajustes generales que funcionan para la mayoría de los modelos lingüísticos"
-          anthropic-claude-opus-4-6: "El modelo antrópico más inteligente"
-          anthropic-claude-sonnet-4-6: "Equilibrio óptimo entre velocidad y coste"
           anthropic-claude-haiku-4-5: "Rápido y rentable"
-          open_ai-gpt-5-nano: "El modelo GPT-5 más rápido y rentable"
         preseeded_model_description: "Modelo de código abierto preconfigurado que utiliza %{model}"
         configured:
           title: "LLM configurados"
diff --git a/plugins/discourse-ai/config/locales/client.et.yml b/plugins/discourse-ai/config/locales/client.et.yml
index 183f8a6c527e9..fcec0e90b7cf3 100644
--- a/plugins/discourse-ai/config/locales/client.et.yml
+++ b/plugins/discourse-ai/config/locales/client.et.yml
@@ -34,8 +34,6 @@ et:
             canned_reply:
               label: "Vasta"
     discourse_ai:
-      llm_selector:
-        none: "Pole"
       features:
         back: "Tagasi"
         disabled: "(välja lülitatud)"
@@ -109,16 +107,7 @@ et:
         remove_parameter: "Eemalda"
         parameter_required: "Nõutud"
         edit: "Muuda"
-        test: "Proovi"
         delete: "Kustuta"
-      secrets:
-        name: "Nimi"
-        secret: "Väärtus"
-        back: "Tagasi"
-        save: "Salvesta"
-        edit: "Muuda"
-        delete: "Kustuta"
-        embedding: "Sängitamine"
       llms:
         display_name: "Nimi"
         provider: "Teenusepakkuja"
diff --git a/plugins/discourse-ai/config/locales/client.fa_IR.yml b/plugins/discourse-ai/config/locales/client.fa_IR.yml
index 3adf8bc473ca5..9660fd3e9cae7 100644
--- a/plugins/discourse-ai/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-ai/config/locales/client.fa_IR.yml
@@ -60,8 +60,6 @@ fa_IR:
               label: "پاسخ کاربر"
     discourse_ai:
       title: "هوش مصنوعی"
-      llm_selector:
-        none: "هیچ‌کدام"
       features:
         back: "بازگشت"
         disabled: "(غیرفعال)"
@@ -150,22 +148,10 @@ fa_IR:
         save: "ذخیره"
         remove_parameter: "پاک کردن"
         parameter_required: "مورد نیاز"
-        credential_not_set: "(تنظیم نشده)"
         edit: "ویرایش"
-        test: "آزمایش کردن"
         delete: "حذف"
         test_modal:
           run: "اجرا کردن تست"
-      secrets:
-        short_title: "اطلاعات ورود"
-        name: "نام"
-        secret: "مقدار"
-        back: "بازگشت"
-        save: "ذخیره"
-        edit: "ویرایش"
-        delete: "حذف"
-        embedding: "جاسازی"
-        tool: "ابزار"
       llms:
         display_name: "نام"
         provider: "ارائه‌دهنده"
diff --git a/plugins/discourse-ai/config/locales/client.fi.yml b/plugins/discourse-ai/config/locales/client.fi.yml
index 524d535faae11..364643a015a87 100644
--- a/plugins/discourse-ai/config/locales/client.fi.yml
+++ b/plugins/discourse-ai/config/locales/client.fi.yml
@@ -176,8 +176,6 @@ fi:
       default_llm:
         title: "Oletusarvoinen LLM-malli"
         description: "Oletusarvoinen LLM-malli, jota käytetään kaikissa tekoälyominaisuuksissa. Tätä käytetään, jos LLM:ää ei ole määritetty ominaisuuden määrityksissä tai persoonassa. Jos oletusarvoista LLM:ää ei ole määritetty, viimeksi luotua LLM:ää käytetääb."
-      llm_selector:
-        none: "Ei valittu"
       features:
         short_title: "Ominaisuudet"
         description: "Nämä ovat sivustosi kävijöiden käytettävissä olevat tekoälyominaisuudet. Ne voidaan määrittää käyttämään tiettyjä persoonia ja LLM:iä, ja niiden käyttöoikeuksia voi hallita ryhmäkohtaisesti."
@@ -520,9 +518,7 @@ fi:
         parameter_description: "Parametrin kuvaus"
         enum_value: "Enum-arvo"
         add_enum_value: "Lisää enum-arvo"
-        credential_not_set: "(ei asetettu)"
         edit: "Muokkaa"
-        test: "Testi"
         delete: "Poista"
         saved: "Työkalu tallennettu"
         confirm_delete: "Oletko varma, että haluat poistaa tämän työkalun?"
@@ -530,16 +526,6 @@ fi:
           title: "Testaa tekoälytyökalua"
           run: "Suorita testi"
           result: "Testin tulos"
-      secrets:
-        short_title: "Tunnistetiedot"
-        name: "Nimi"
-        secret: "Arvo"
-        back: "Takaisin"
-        save: "Tallenna"
-        edit: "Muokkaa"
-        delete: "Poista"
-        embedding: "Upottaminen"
-        tool: "Työkalu"
       llms:
         short_title: "LLM:t"
         no_llms: "LLM:iä ei ole vielä"
@@ -597,10 +583,7 @@ fi:
           other: "Tätä mallia käyttää tällä hetkellä seuraavat: %{settings}. Jos se on määritetty väärin, ominaisuus ei toimi odotetulla tavalla. "
         model_description:
           none: "Yleiset asetukset, jotka toimivat useimmissa kielimalleissa"
-          anthropic-claude-opus-4-6: "Anthropicin älykkäin malli"
-          anthropic-claude-sonnet-4-6: "Optimaalinen tasapaino nopeuden ja kustannusten välillä"
           anthropic-claude-haiku-4-5: "Nopea ja kustannustehokas"
-          open_ai-gpt-5-nano: "Nopein ja kustannustehokkain GPT-5-malli"
         preseeded_model_description: "Ennalta määritetty avoimen lähdekoodin malli, joka käyttää mallia %{model}"
         configured:
           title: "Määritetyt LLM:t"
diff --git a/plugins/discourse-ai/config/locales/client.fr.yml b/plugins/discourse-ai/config/locales/client.fr.yml
index 6fdd8510879d1..17751664ba5ea 100644
--- a/plugins/discourse-ai/config/locales/client.fr.yml
+++ b/plugins/discourse-ai/config/locales/client.fr.yml
@@ -176,8 +176,6 @@ fr:
       default_llm:
         title: "Modèle LLM par défaut"
         description: "Le modèle LLM par défaut à utiliser pour toutes les fonctionnalités d'IA. Cela sera utilisé si aucun LLM n'est spécifié dans la configuration des fonctionnalités ou dans le personnage. Si aucun LLM par défaut n'est spécifié, le dernier LLM créé sera utilisé."
-      llm_selector:
-        none: "Jamais"
       features:
         short_title: "Fonctionnalités"
         description: "Il s'agit des fonctionnalités d'IA disponibles pour les visiteurs de votre site. Elles peuvent être configurées pour utiliser des personnages IA et des LLM spécifiques, et leur accès peut être contrôlé par des groupes."
@@ -520,9 +518,7 @@ fr:
         parameter_description: "Description du paramètre"
         enum_value: "Valeur d'énumération"
         add_enum_value: "Ajouter une valeur d'énumération"
-        credential_not_set: "(non défini)"
         edit: "Modifier"
-        test: "Test"
         delete: "Supprimer"
         saved: "Outil enregistré"
         confirm_delete: "Voulez-vous vraiment supprimer cet outil ?"
@@ -530,16 +526,6 @@ fr:
           title: "Tester l'outil d'IA"
           run: "Lancer le test"
           result: "Résultat du test"
-      secrets:
-        short_title: "Identifiants"
-        name: "Nom"
-        secret: "Valeur"
-        back: "Retour"
-        save: "Enregistrer"
-        edit: "Modifier"
-        delete: "Supprimer"
-        embedding: "Intégration"
-        tool: "Outil"
       llms:
         short_title: "LLM"
         no_llms: "Pas encore de LLM"
@@ -597,10 +583,7 @@ fr:
           other: "Ce modèle est actuellement utilisé par %{settings}. Si la configuration est incorrecte, les fonctionnalités ne fonctionneront pas comme prévu. "
         model_description:
           none: "Paramètres généraux qui fonctionnent pour la plupart des modèles linguistiques"
-          anthropic-claude-opus-4-6: "Le modèle le plus intelligent d'Anthropic"
-          anthropic-claude-sonnet-4-6: "Équilibre optimal entre vitesse et coût"
           anthropic-claude-haiku-4-5: "Rapide et économique"
-          open_ai-gpt-5-nano: "Le modèle GPT-5 le plus rapide et le plus économique"
         preseeded_model_description: "Modèle open source préconfiguré utilisant %{model}"
         configured:
           title: "LLM configurés"
diff --git a/plugins/discourse-ai/config/locales/client.gl.yml b/plugins/discourse-ai/config/locales/client.gl.yml
index 115965a6d2a31..b701568377f30 100644
--- a/plugins/discourse-ai/config/locales/client.gl.yml
+++ b/plugins/discourse-ai/config/locales/client.gl.yml
@@ -36,8 +36,6 @@ gl:
             canned_reply:
               label: "Responder"
     discourse_ai:
-      llm_selector:
-        none: "Ningunha"
       features:
         back: "Volver"
         disabled: "(desactivado)"
@@ -117,17 +115,7 @@ gl:
         remove_parameter: "Retirar"
         parameter_required: "Obrigatorio"
         edit: "Editar"
-        test: "Proba"
         delete: "Eliminar"
-      secrets:
-        short_title: "Acreditacións"
-        name: "Nome"
-        secret: "Valor"
-        back: "Volver"
-        save: "Gardar"
-        edit: "Editar"
-        delete: "Eliminar"
-        embedding: "Incorporando"
       llms:
         display_name: "Nome"
         provider: "Fornecedor"
diff --git a/plugins/discourse-ai/config/locales/client.he.yml b/plugins/discourse-ai/config/locales/client.he.yml
index 3f6c2bc9c8ed0..5a7a7f8dc89c9 100644
--- a/plugins/discourse-ai/config/locales/client.he.yml
+++ b/plugins/discourse-ai/config/locales/client.he.yml
@@ -216,8 +216,6 @@ he:
       default_llm:
         title: "מודל LLM/מש״ג ברירת מחדל"
         description: "מודל המש״ג (LLM) לשימוש כברירת מחדל לכל יכולות הבינה המלאכותית. אם לא צוין מש״ג בהגדרות היכולת או הדמות ייעשה שימוש בזה. אם לא צוין מש״ג כברירת מחדל, ייעשה שימוש במש״ג האחרון שנוצר."
-      llm_selector:
-        none: "ללא"
       features:
         short_title: "יכולות"
         description: "אלו יכולות בינה מלאכותית שזמינות למבקרים באתר שלך. אפשר להגדיר אותן להשתמש בדמויות וב־LLMים (מש״גים) מסוימים ואפשר לשלוט בגישה אליהן על ידי קבוצות."
@@ -598,9 +596,7 @@ he:
         parameter_description: "תיאור משתנה"
         enum_value: "ערך מונה"
         add_enum_value: "הוספת ערך מונה"
-        credential_not_set: "(לא מוגדר)"
         edit: "עריכה"
-        test: "נסיון"
         delete: "מחיקה"
         saved: "הכלי נשמר"
         confirm_delete: "למחוק את הכלי הזה?"
@@ -608,16 +604,6 @@ he:
           title: "כלי בדיקת בינה מלאכותית"
           run: "הרצת בדיקה"
           result: "תוצאת הבדיקה"
-      secrets:
-        short_title: "פרטי גישה"
-        name: "שם"
-        secret: "ערך"
-        back: "חזרה"
-        save: "שמירה"
-        edit: "עריכה"
-        delete: "מחיקה"
-        embedding: "שילוב (embedding)"
-        tool: "כלי"
       llms:
         short_title: "LLMים"
         no_llms: "אין LLMים עדיין"
@@ -678,11 +664,8 @@ he:
           other: "המודל הזה משמש את: %{settings}. אם ההגדרות שגויות היכולת לא תעבודנה כמצופה."
         model_description:
           none: "הגדרות כלליות שעובדות עבור רוב המודלים של השפות"
-          anthropic-claude-opus-4-6: "המודל החכם ביותר של Anthropic"
-          anthropic-claude-sonnet-4-6: "איזון מיטבי בין מהירות לעלות"
           anthropic-claude-haiku-4-5: "מהיר וחסכוני"
           google-gemini-3-pro: "המודל החכם ביותר של Google"
-          open_ai-gpt-5-nano: "מודל GPT-5 החסכוני והמהיר ביותר"
         preseeded_model_description: "מודל קוד פתוח שהוגדר מראש ומשתמש ב־%{model}"
         configured:
           title: "LLMs (מודלי שפה גדולים) מוגדרים"
diff --git a/plugins/discourse-ai/config/locales/client.hr.yml b/plugins/discourse-ai/config/locales/client.hr.yml
index 1febcdd3c7f85..d7ad0bef3597b 100644
--- a/plugins/discourse-ai/config/locales/client.hr.yml
+++ b/plugins/discourse-ai/config/locales/client.hr.yml
@@ -36,8 +36,6 @@ hr:
             canned_reply:
               label: "Odgovor"
     discourse_ai:
-      llm_selector:
-        none: "Ništa"
       features:
         back: "Natrag"
         disabled: "(onemogućeno)"
@@ -123,19 +121,8 @@ hr:
         save: "Spremi"
         remove_parameter: "Ukloni"
         parameter_required: "Potrebno"
-        credential_not_set: "(nije postavljeno)"
         edit: "Uredi"
-        test: "Test"
         delete: "Izbriši"
-      secrets:
-        short_title: "Vjerodajnice"
-        name: "Ime"
-        secret: "Vrijednost"
-        back: "Natrag"
-        save: "Spremi"
-        edit: "Uredi"
-        delete: "Izbriši"
-        embedding: "Ugrađivanje"
       llms:
         display_name: "Ime"
         provider: "Pružatelj usluga"
diff --git a/plugins/discourse-ai/config/locales/client.hu.yml b/plugins/discourse-ai/config/locales/client.hu.yml
index 942e0e472eb9f..5677897cc8b50 100644
--- a/plugins/discourse-ai/config/locales/client.hu.yml
+++ b/plugins/discourse-ai/config/locales/client.hu.yml
@@ -38,8 +38,6 @@ hu:
             canned_reply:
               label: "Válasz"
     discourse_ai:
-      llm_selector:
-        none: "Egyik sem"
       features:
         back: "Vissza"
         disabled: "(kikapcsolva)"
@@ -131,21 +129,10 @@ hu:
         save: "Mentés"
         remove_parameter: "Eltávolítás"
         parameter_required: "Kötelező"
-        credential_not_set: "(nincs beállítva)"
         edit: "Szerkesztés"
-        test: "Teszt"
         delete: "Törlés"
         test_modal:
           run: "Teszt futtatása"
-      secrets:
-        short_title: "Hitelesítő adatok"
-        name: "Név"
-        secret: "Érték"
-        back: "Vissza"
-        save: "Mentés"
-        edit: "Szerkesztés"
-        delete: "Törlés"
-        embedding: "Beágyazás"
       llms:
         display_name: "Név"
         provider: "Szolgáltató"
diff --git a/plugins/discourse-ai/config/locales/client.hy.yml b/plugins/discourse-ai/config/locales/client.hy.yml
index dd45b168a8e1f..2ab59774d59d9 100644
--- a/plugins/discourse-ai/config/locales/client.hy.yml
+++ b/plugins/discourse-ai/config/locales/client.hy.yml
@@ -34,8 +34,6 @@ hy:
             canned_reply:
               label: "Պատասխանել"
     discourse_ai:
-      llm_selector:
-        none: "Ոչ մի"
       features:
         back: "Ետ"
         disabled: "(անջատված)"
@@ -113,17 +111,7 @@ hy:
         remove_parameter: "Հեռացնել"
         parameter_required: "Պարտադիր"
         edit: "Խմբագրել"
-        test: "Փորձարկել"
         delete: "Ջնջել"
-      secrets:
-        short_title: "Հավատարմագրեր"
-        name: "Անուն"
-        secret: "Արժեք"
-        back: "Ետ"
-        save: "Պահպանել"
-        edit: "Խմբագրել"
-        delete: "Ջնջել"
-        embedding: "Զետեղում"
       llms:
         display_name: "Անուն"
         provider: "Մատակարար"
diff --git a/plugins/discourse-ai/config/locales/client.id.yml b/plugins/discourse-ai/config/locales/client.id.yml
index d1c138ebb96fc..6e38b909f548f 100644
--- a/plugins/discourse-ai/config/locales/client.id.yml
+++ b/plugins/discourse-ai/config/locales/client.id.yml
@@ -84,8 +84,6 @@ id:
               label: "Balas"
     discourse_ai:
       title: "AI"
-      llm_selector:
-        none: "Tidak ada"
       features:
         back: "Kembali"
         disabled: "(dinonaktifkan)"
@@ -162,13 +160,6 @@ id:
         remove_parameter: "Hapus"
         edit: "Ubah"
         delete: "Hapus"
-      secrets:
-        short_title: "Kredensial"
-        name: "Nama"
-        back: "Kembali"
-        save: "Simpan"
-        edit: "Ubah"
-        delete: "Hapus"
       llms:
         display_name: "Nama"
         save: "Simpan"
diff --git a/plugins/discourse-ai/config/locales/client.it.yml b/plugins/discourse-ai/config/locales/client.it.yml
index 6f9e237ee336a..da2ac819a7ac0 100644
--- a/plugins/discourse-ai/config/locales/client.it.yml
+++ b/plugins/discourse-ai/config/locales/client.it.yml
@@ -176,8 +176,6 @@ it:
       default_llm:
         title: "Modello LLM predefinito"
         description: "Modello LLM predefinito da utilizzare per tutte le funzionalità IA. Verrà utilizzato se non è specificato alcun LLM nella configurazione della funzionalità o del personaggio. Se non è specificato alcun LLM predefinito, verrà utilizzato l'ultimo LLM creato."
-      llm_selector:
-        none: "Nessuna"
       features:
         short_title: "Funzionalità"
         description: "Le funzionalità IA a disposizione dei visitatori del tuo sito web. Possono essere configurate utilizzando personaggi e LLM specifici. I gruppi possono controllarne l'accesso."
@@ -520,9 +518,7 @@ it:
         parameter_description: "Descrizione del parametro"
         enum_value: "Valore enumerativo"
         add_enum_value: "Aggiungi valore enumerativo"
-        credential_not_set: "(non impostato)"
         edit: "Modifica"
-        test: "Test"
         delete: "Elimina"
         saved: "Strumento salvato"
         confirm_delete: "Vuoi davvero eliminare questo strumento?"
@@ -530,16 +526,6 @@ it:
           title: "Prova lo strumento IA"
           run: "Esegui test"
           result: "Risultato del test"
-      secrets:
-        short_title: "Credenziali"
-        name: "Nome"
-        secret: "Valore"
-        back: "Indietro"
-        save: "Salva"
-        edit: "Modifica"
-        delete: "Elimina"
-        embedding: "Integrazione"
-        tool: "Strumento"
       llms:
         short_title: "LLM"
         no_llms: "Ancora nessun LLM"
@@ -597,10 +583,7 @@ it:
           other: "Questo modello è attualmente utilizzato dai seguenti elementi: %{settings}. Se configurato in modo errato, le funzionalità non funzioneranno come previsto. "
         model_description:
           none: "Impostazioni generali che vanno bene per la maggior parte dei modelli linguistici"
-          anthropic-claude-opus-4-6: "Il modello più intelligente di Anthropic"
-          anthropic-claude-sonnet-4-6: "Equilibrio ottimale tra velocità e costi"
           anthropic-claude-haiku-4-5: "Veloce e conveniente"
-          open_ai-gpt-5-nano: "Il modello GPT-5 più veloce ed economicamente efficiente"
         preseeded_model_description: "Modello open source preconfigurato che utilizza %{model}"
         configured:
           title: "LLM configurati"
diff --git a/plugins/discourse-ai/config/locales/client.ja.yml b/plugins/discourse-ai/config/locales/client.ja.yml
index 3b3224112d5bf..888ee2db17bb7 100644
--- a/plugins/discourse-ai/config/locales/client.ja.yml
+++ b/plugins/discourse-ai/config/locales/client.ja.yml
@@ -225,8 +225,6 @@ ja:
       default_llm:
         title: "デフォルトの LLM モデル"
         description: "すべての AI 機能に使用するデフォルトの LLM モデル。これは、機能の構成またはペルソナで LLM が指定されていない場合に使用されます。デフォルトの LLM が指定されていない場合、最後に作成された LLM が使用されます。"
-      llm_selector:
-        none: "なし"
       features:
         short_title: "機能"
         description: "これらは、サイトの訪問者が使用できる AI 機能です。これらは、特定のペルソナと LLM を使用するために構成することができ、グループごとにアクセスを制御できます。"
@@ -624,9 +622,7 @@ ja:
         parameter_description: "パラメーターの説明"
         enum_value: "列挙型値"
         add_enum_value: "列挙型値を追加"
-        credential_not_set: "(未設定)"
         edit: "編集"
-        test: "テスト"
         delete: "削除"
         saved: "ツールが保存されました"
         confirm_delete: "このツールを削除してもよろしいですか？"
@@ -634,16 +630,6 @@ ja:
           title: "AI ツールのテスト"
           run: "テストを実行"
           result: "テストの結果"
-      secrets:
-        short_title: "資格情報"
-        name: "名前"
-        secret: "値"
-        back: "戻る"
-        save: "保存"
-        edit: "編集"
-        delete: "削除"
-        embedding: "埋め込み"
-        tool: "ツール"
       llms:
         short_title: "LLM"
         no_llms: "まだ LLM がありません"
@@ -708,8 +694,6 @@ ja:
           other: "このモデルは現在次によって使用されています: %{settings}。誤って構成されると、機能は期待どおりに動作しなくなります。 "
         model_description:
           none: "ほとんどの言語モデルで機能する一般的な設定"
-          anthropic-claude-opus-4-6: "Anthropic の最もインテリジェントなモデル"
-          anthropic-claude-sonnet-4-6: "速度とコストの最適なバランス"
           anthropic-claude-haiku-4-5: "高速でコスト効率に優れています"
           google-gemini-3-pro: "Google の最もインテリジェントなモデル"
         preseeded_model_description: "%{model} を利用する事前構成済みのオープンソースモデル"
diff --git a/plugins/discourse-ai/config/locales/client.ko.yml b/plugins/discourse-ai/config/locales/client.ko.yml
index 512bdae816206..4222a4625bbe2 100644
--- a/plugins/discourse-ai/config/locales/client.ko.yml
+++ b/plugins/discourse-ai/config/locales/client.ko.yml
@@ -38,8 +38,6 @@ ko:
             canned_reply:
               label: "댓글쓰기"
     discourse_ai:
-      llm_selector:
-        none: "없음"
       features:
         back: "뒤로"
         disabled: "(비활성)"
@@ -133,17 +131,7 @@ ko:
         remove_parameter: "제거"
         parameter_required: "필수"
         edit: "편집"
-        test: "테스트"
         delete: "삭제"
-      secrets:
-        short_title: "자격 증명"
-        name: "그룹명"
-        secret: "값"
-        back: "뒤로"
-        save: "저장"
-        edit: "편집"
-        delete: "삭제"
-        embedding: "삽입(Embedding)"
       llms:
         display_name: "그룹명"
         provider: "공급자"
diff --git a/plugins/discourse-ai/config/locales/client.lt.yml b/plugins/discourse-ai/config/locales/client.lt.yml
index 674b9806cdb4b..d60f35f844489 100644
--- a/plugins/discourse-ai/config/locales/client.lt.yml
+++ b/plugins/discourse-ai/config/locales/client.lt.yml
@@ -145,8 +145,6 @@ lt:
               label: "Slėpti temą"
     discourse_ai:
       title: "AI"
-      llm_selector:
-        none: "Nieko"
       features:
         back: "Atgal"
         settings_save_error: "Kai kurių nustatymų išsaugoti nepavyko."
@@ -327,18 +325,7 @@ lt:
         remove_parameter: "Pašalinti"
         parameter_required: "Privalomi"
         edit: "Redaguoti"
-        test: "Bandymas"
         delete: "Pašalinti"
-      secrets:
-        short_title: "Įgaliojimai"
-        name: "Vardas"
-        secret: "Reikšmė"
-        back: "Atgal"
-        save: "Saugoti"
-        edit: "Redaguoti"
-        delete: "Pašalinti"
-        embedding: "Įterpimai"
-        tool: "Įrankis"
       llms:
         display_name: "Vardas"
         save: "Saugoti"
diff --git a/plugins/discourse-ai/config/locales/client.lv.yml b/plugins/discourse-ai/config/locales/client.lv.yml
index f2c0edfb95cef..a7759288286f3 100644
--- a/plugins/discourse-ai/config/locales/client.lv.yml
+++ b/plugins/discourse-ai/config/locales/client.lv.yml
@@ -34,8 +34,6 @@ lv:
             canned_reply:
               label: "Atbilde"
     discourse_ai:
-      llm_selector:
-        none: "Nav"
       features:
         back: "Atpakaļ"
         disabled: "(atslēgt)"
@@ -113,15 +111,6 @@ lv:
         parameter_required: "Nepieciešams"
         edit: "Labot"
         delete: "Dzēst"
-      secrets:
-        short_title: "Atsauksme uz"
-        name: "Vārds"
-        secret: "Vērtība"
-        back: "Atpakaļ"
-        save: "Saglabāt"
-        edit: "Labot"
-        delete: "Dzēst"
-        embedding: "Ieguldīšana"
       llms:
         display_name: "Vārds"
         save: "Saglabāt"
diff --git a/plugins/discourse-ai/config/locales/client.nb_NO.yml b/plugins/discourse-ai/config/locales/client.nb_NO.yml
index 5d7defc58cdb4..1146343dabf80 100644
--- a/plugins/discourse-ai/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-ai/config/locales/client.nb_NO.yml
@@ -34,8 +34,6 @@ nb_NO:
             canned_reply:
               label: "Svar"
     discourse_ai:
-      llm_selector:
-        none: "Ingen"
       features:
         back: "Forrige"
         disabled: "(deaktivert)"
@@ -114,19 +112,8 @@ nb_NO:
         save: "Lagre"
         remove_parameter: "Fjern"
         parameter_required: "Påkrevd"
-        credential_not_set: "(ikke angitt)"
         edit: "Rediger"
-        test: "Test"
         delete: "Slett"
-      secrets:
-        short_title: "Legitimasjon"
-        name: "Navn"
-        secret: "Verdi"
-        back: "Forrige"
-        save: "Lagre"
-        edit: "Rediger"
-        delete: "Slett"
-        embedding: "Innbygging"
       llms:
         display_name: "Navn"
         provider: "Tilbyder"
diff --git a/plugins/discourse-ai/config/locales/client.nl.yml b/plugins/discourse-ai/config/locales/client.nl.yml
index 4bff30d0ca90b..013ea646c925c 100644
--- a/plugins/discourse-ai/config/locales/client.nl.yml
+++ b/plugins/discourse-ai/config/locales/client.nl.yml
@@ -176,8 +176,6 @@ nl:
       default_llm:
         title: "Standaard LLM-model"
         description: "Het standaard LLM-model dat voor alle AI-functies wordt gebruikt. Dit model wordt gebruikt als er geen LLM is opgegeven in de functieconfiguratie of persona. Als er geen standaard-LLM is opgegeven, wordt de laatst gemaakte LLM gebruikt."
-      llm_selector:
-        none: "Geen"
       features:
         short_title: "Functies"
         description: "Dit zijn de AI-functies die beschikbaar zijn voor bezoekers van je site. Deze kunnen worden geconfigureerd voor specifieke persona's en LLM's en de toegang kan per groep worden beheerd."
@@ -520,9 +518,7 @@ nl:
         parameter_description: "Parameterbeschrijving"
         enum_value: "Enumwaarde"
         add_enum_value: "Enumwaarde toevoegen"
-        credential_not_set: "(niet ingesteld)"
         edit: "Bewerken"
-        test: "Testen"
         delete: "Verwijderen"
         saved: "Tool opgeslagen"
         confirm_delete: "Weet je zeker dat je deze tool wilt verwijderen?"
@@ -530,16 +526,6 @@ nl:
           title: "AI-tool testen"
           run: "Test uitvoeren"
           result: "Testresultaat"
-      secrets:
-        short_title: "Aanmeldgegevens"
-        name: "Naam"
-        secret: "Waarde"
-        back: "Terug"
-        save: "Opslaan"
-        edit: "Bewerken"
-        delete: "Verwijderen"
-        embedding: "Insluiting"
-        tool: "Tool"
       llms:
         short_title: "LLM's"
         no_llms: "Nog geen LLM's"
@@ -597,10 +583,7 @@ nl:
           other: "Dit model wordt momenteel gebruikt door de volgende: %{settings}. Als het onjuist is geconfigureerd, werken functies niet zoals verwacht. "
         model_description:
           none: "Algemene instellingen die werken voor de meeste taalmodellen"
-          anthropic-claude-opus-4-6: "Het intelligentste model van Antropic"
-          anthropic-claude-sonnet-4-6: "Optimale balans tussen snelheid en kosten"
           anthropic-claude-haiku-4-5: "Snel en kosteneffectief"
-          open_ai-gpt-5-nano: "Snelste en meest kostenefficiënte GPT-5-model"
         preseeded_model_description: "Voorgeconfigureerd open-source model met %{model}"
         configured:
           title: "Geconfigureerde LLM's"
diff --git a/plugins/discourse-ai/config/locales/client.pl_PL.yml b/plugins/discourse-ai/config/locales/client.pl_PL.yml
index ccb340ad9f978..92cbddfe49d53 100644
--- a/plugins/discourse-ai/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-ai/config/locales/client.pl_PL.yml
@@ -14,7 +14,6 @@ pl_PL:
               search: "Umożliwia wyszukiwanie AI"
               stream_completion: "Umożliwia strumieniowe uzupełnianie osobowości AI"
               update_personas: "Umożliwia aktualizację osobowości AI"
-              manage_artifacts: "Umożliwia zarządzanie artefaktami AI (listowanie, przeglądanie, tworzenie, aktualizowanie, usuwanie)"
       site_settings:
         categories:
           discourse_ai: "Discourse AI"
@@ -45,9 +44,6 @@ pl_PL:
             create_ai_embedding: "Utwórz osadzanie AI"
             update_ai_embedding: "Zaktualizuj osadzanie AI"
             delete_ai_embedding: "Usuń osadzanie AI"
-            create_ai_secret: "Utwórz sekret AI"
-            update_ai_secret: "Zaktualizuj sekret AI"
-            delete_ai_secret: "Usuń sekret AI"
             update_ai_spam_settings: "Zaktualizuj ustawienia spamu AI"
   js:
     discourse_automation:
@@ -229,9 +225,6 @@ pl_PL:
       default_llm:
         title: "Domyślny model LLM"
         description: "Domyślny model LLM do użycia dla wszystkich funkcji AI. Będzie on używany, jeśli w konfiguracji funkcji lub osobowości nie określono modelu LLM. Jeśli nie określono domyślnego modelu LLM, użyty zostanie ostatnio utworzony model LLM."
-      llm_selector:
-        none: "Brak"
-        saved: "Domyślny model LLM został pomyślnie zaktualizowany"
       features:
         short_title: "Cechy"
         description: "Są to funkcje AI dostępne dla odwiedzających Twoją witrynę. Można je skonfigurować do korzystania z określonych person i LLM, a dostęp do nich może być kontrolowany przez grupy."
@@ -332,7 +325,6 @@ pl_PL:
           image_caption: "Obrazy z podpisami"
           translator: "Tłumacz"
           post_illustrator: "Ilustrator postów"
-          chat_thread_titles: "Tytuły wątków czatu"
           setting_groups:
             access_permissions: "Dostęp i uprawnienia"
             enabled_features: "Włączone funkcje"
@@ -524,7 +516,6 @@ pl_PL:
         overwrite: "Zastąp"
         description: "Opis"
         no_llm_selected: "Nie wybrano modelu językowego"
-        use_parent_llm: "Użyj modelu językowego persony"
         max_context_posts: "Maksymalny kontekst postów"
         max_context_posts_help: "Maksymalna liczba postów do wykorzystania jako kontekst dla sztucznej inteligencji podczas odpowiadania użytkownikowi. (domyślnie puste)"
         vision_enabled: Wizja włączona
@@ -661,14 +652,7 @@ pl_PL:
         parameter_description: "Opis parametru"
         enum_value: "Wartość enum"
         add_enum_value: "Dodaj wartość enum"
-        secret_alias: "Alias poświadczeń"
-        secret_alias_help: "Alias odwoływany ze skryptów za pomocą secrets.get(\"alias_name\"). Użyj liter, cyfr i podkreśleń."
-        secret_credential: "Poświadczenie"
-        add_secret_contract: "Dodaj poświadczenie"
-        remove_secret_contract: "Usuń poświadczenie"
-        credential_not_set: "(nie ustawiono)"
         edit: "Edytuj"
-        test: "Sprawdź"
         delete: "Usuń"
         saved: "Narzędzie zapisane"
         confirm_delete: "Czy na pewno chcesz usunąć to narzędzie?"
@@ -676,31 +660,6 @@ pl_PL:
           title: "Przetestuj narzędzie AI"
           run: "Przeprowadź test"
           result: "Wynik testu"
-      secrets:
-        short_title: "Poświadczenia"
-        description: "Zarządzaj poświadczeniami uwierzytelniania współdzielonymi przez LLM, osadzenia i narzędzia."
-        name: "Nazwa"
-        secret: "Wartość"
-        select_secret: "Wybierz poświadczenie..."
-        create_new: "Nowe poświadczenie"
-        add_secret: "Dodaj poświadczenie"
-        saved: "Zapisano poświadczenie"
-        confirm_delete: "Czy na pewno chcesz usunąć to poświadczenie?"
-        delete_failed_in_use: "To poświadczenie jest obecnie używane i nie można go usunąć."
-        no_secrets: "Brak jeszcze poświadczeń"
-        new_title: "Nowe poświadczenie"
-        edit_title: "Edytuj poświadczenie"
-        back: "Poprzednia"
-        save: "Zapisz"
-        edit: "Edytuj"
-        delete: "Usuń"
-        used_by: "Używane przez"
-        not_used: "Nieużywane"
-        embedding: "Osadzanie"
-        cannot_delete_in_use: "Tego poświadczenia nie można usunąć, ponieważ jest ono używane przez:"
-        tool: "Narzędzie"
-        modal:
-          title: "Utwórz nowe poświadczenie"
       llms:
         short_title: "LLMs"
         no_llms: "Nie ma jeszcze LLM"
@@ -768,20 +727,8 @@ pl_PL:
           other: "Ten model jest obecnie używany przez: %{settings}. W przypadku nieprawidłowej konfiguracji funkcje nie będą działać zgodnie z oczekiwaniami. "
         model_description:
           none: "Ogólne ustawienia, które działają dla większości modeli językowych"
-          anthropic-claude-opus-4-6: "Najbardziej inteligentny model Anthropic"
-          anthropic-claude-sonnet-4-6: "Optymalna równowaga między szybkością a kosztami"
           anthropic-claude-haiku-4-5: "Szybki i opłacalny"
           google-gemini-3-pro: "Najinteligentniejszy model Google"
-          google-gemini-3-flash: "Szybki i ekonomiczny dzięki rozumowaniu multimodalnemu"
-          open_ai-gpt-5-2: "Flagowy model OpenAI, doskonale nadający się do rozwiązywania problemów w różnych domenach"
-          open_ai-gpt-5-mini: "Zapewnia równowagę między inteligencją, szybkością i kosztami"
-          open_ai-gpt-5-nano: "Najszybszy i najbardziej ekonomiczny model GPT-5"
-          open_router-deepseek-deepseek-v3-2: "Najnowszy, wysokowydajny model firmy DeepSeek"
-          open_router-moonshotai-kimi-k2-5: "Multimodalny model Moonshot z funkcjami wizyjnymi"
-          open_router-x-ai-grok-4-fast: "Flagowy model xAI z wizją"
-          open_router-minimax-minimax-m2-5: "Multimodalny model MiniMax z dużym kontekstem"
-          open_router-z-ai-glm-5: "Multimodalny model Z-AI z wizją"
-          open_router-arcee-ai-trinity-large-preview-free: "Darmowy model open-source od Arcee AI"
         preseeded_model_description: "Wstępnie skonfigurowany model open-source wykorzystujący %{model}"
         configured:
           title: "Skonfigurowane LLM"
@@ -836,7 +783,6 @@ pl_PL:
           disable_system_prompt: "Wyłącz wiadomość systemową w promptach"
           enable_native_tool: "Włącz obsługę natywnych narzędzi"
           disable_native_tools: "Wyłącz obsługę narzędzi natywnych (użyj narzędzi opartych na XML)"
-          disable_native_structured_output: "Wyłącz natywne, strukturalne wyjście (zamiast tego użyj funkcji wstępnego wypełniania wiadomości asystenta, wymaganej w przypadku Claude 3.x i starszych wersji)"
           provider_order: "Kolejność dostawców (lista rozdzielona przecinkami)"
           provider_quantizations: "Kolejność kwantyzacji dostawców (lista rozdzielona przecinkami, np.: fp16,fp8)"
           disable_streaming: "Wyłącz uzupełnianie strumieniowania (zmień żądania strumieniowe na żądania niestrumieniowe)"
@@ -851,7 +797,6 @@ pl_PL:
           prompt_caching_never: "Nigdy – nie używaj buforowania błyskawicznego"
           prompt_caching_tool_results: "Wyniki narzędzi – pamięć podręczna, gdy dostępne są wyniki narzędzi (zalecane)"
           prompt_caching_always: "Zawsze – zawsze używaj szybkiego buforowania"
-          effort: "Poziom wysiłku"
       related_topics:
         title: "Powiązane tematy"
         pill: "Powiązane"
@@ -966,14 +911,11 @@ pl_PL:
           model_name: "Nazwa modelu"
         semantic_search: "Tematy (semantyczne)"
         semantic_search_results:
-          toggle: "Wyniki AI"
           unavailable: "Wyniki AI są niedostępne"
           zero_results_expanded: "Znaleziono zero wyników, pokazano %{count} wyników AI"
         semantic_search_tooltips:
           results_explanation: "Po włączeniu tej opcji poniżej zostaną dodane dodatkowe wyniki wyszukiwania AI."
           invalid_sort: "Aby wyświetlić wyniki AI, wyniki wyszukiwania muszą być sortowane według trafności"
-          not_submitted: "Prześlij wyszukiwanie, aby włączyć wyniki AI"
-          no_results: "Nie znaleziono wyników AI dla tego wyszukiwania"
         semantic_search_unavailable_tooltip: "Aby wyświetlić wyniki AI, wyniki wyszukiwania muszą być sortowane według trafności"
         ai_generated_result: "Wynik wyszukiwania znaleziony przy użyciu AI"
         quick_search:
diff --git a/plugins/discourse-ai/config/locales/client.pt.yml b/plugins/discourse-ai/config/locales/client.pt.yml
index 783b223c74fe6..049cb94befc46 100644
--- a/plugins/discourse-ai/config/locales/client.pt.yml
+++ b/plugins/discourse-ai/config/locales/client.pt.yml
@@ -69,8 +69,6 @@ pt:
       title: "IA"
       default_llm:
         title: "Modelo de LLM Predefinido"
-      llm_selector:
-        none: "Nenhuma"
       features:
         short_title: "Funcionalidades"
         back: "Voltar"
@@ -205,19 +203,8 @@ pt:
         save: "Guardar"
         remove_parameter: "Remover"
         parameter_required: "Necessário"
-        credential_not_set: "(não definido)"
         edit: "Editar"
-        test: "Testar"
         delete: "Eliminar"
-      secrets:
-        short_title: "Credenciais"
-        name: "Nome"
-        secret: "Valor"
-        back: "Anterior"
-        save: "Guardar"
-        edit: "Editar"
-        delete: "Eliminar"
-        embedding: "Incorporação"
       llms:
         display_name: "Nome"
         provider: "Provedor"
@@ -239,8 +226,6 @@ pt:
         usage:
           ai_summarization: "Resumir"
           ai_spam: "Spam"
-        model_description:
-          anthropic-claude-opus-4-6: "O modelo mais inteligente da Anthropic"
         next:
           title: "Próximo"
         tests:
diff --git a/plugins/discourse-ai/config/locales/client.pt_BR.yml b/plugins/discourse-ai/config/locales/client.pt_BR.yml
index 3a62711e0f40f..a122667d1871e 100644
--- a/plugins/discourse-ai/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-ai/config/locales/client.pt_BR.yml
@@ -185,8 +185,6 @@ pt_BR:
       default_llm:
         title: "Modelo de LLM padrão"
         description: "O modelo de LLM padrão a ser usado para todos os recursos de IA. Será usado se nenhum LLM for especificado na persona ou configuração de recurso. Se nenhum LLM for especificado, será usado o LLM criado mais recentemente."
-      llm_selector:
-        none: "Nenhum"
       features:
         short_title: "Recursos"
         description: "Estes recursos de IA estão disponíveis para quem acessar o seu site. Podem ser configurados para usar LLMs e personas específicas, além de poder ter o acesso controlado por grupos."
@@ -551,9 +549,7 @@ pt_BR:
         parameter_description: "Descrição do parâmetro"
         enum_value: "Valor da enumeração"
         add_enum_value: "Adicionar valor da enumeração"
-        credential_not_set: "(não configurado)"
         edit: "Editar"
-        test: "Testar"
         delete: "Excluir"
         saved: "Ferramenta salva"
         confirm_delete: "Tem certeza de que deseja excluir esta ferramenta?"
@@ -561,16 +557,6 @@ pt_BR:
           title: "Ferramenta de IA de teste"
           run: "Executar teste"
           result: "Resultado do teste"
-      secrets:
-        short_title: "Credenciais"
-        name: "Nome"
-        secret: "Valor"
-        back: "Voltar"
-        save: "Salvar"
-        edit: "Editar"
-        delete: "Excluir"
-        embedding: "Incorporar"
-        tool: "Ferramenta"
       llms:
         short_title: "LLMs"
         no_llms: "Nenhum LLM ainda"
@@ -628,10 +614,7 @@ pt_BR:
           other: "Este modelo é usado atualmente por %{settings}. Se for configurado incorretamente, os recursos não funcionarão como esperado. "
         model_description:
           none: "Configurações gerais que funcionam com a maioria dos modelos de linguagens"
-          anthropic-claude-opus-4-6: "Modelo mais inteligente da Anthropic"
-          anthropic-claude-sonnet-4-6: "Equilíbrio ideal entre custo e velocidade"
           anthropic-claude-haiku-4-5: "Rápido e econômico"
-          open_ai-gpt-5-nano: "O modelo do GPT-5 mais rápido e econômico"
         preseeded_model_description: "Modelo de código aberto pré-configurado que utiliza %{model}"
         configured:
           title: "LLMs configurados"
diff --git a/plugins/discourse-ai/config/locales/client.ro.yml b/plugins/discourse-ai/config/locales/client.ro.yml
index a48f73e20879d..4619516d6cb85 100644
--- a/plugins/discourse-ai/config/locales/client.ro.yml
+++ b/plugins/discourse-ai/config/locales/client.ro.yml
@@ -57,8 +57,6 @@ ro:
       default_llm:
         title: "Model LLM implicit"
         description: "Modelul LLM implicit de utilizat pentru toate funcțiile IA. Acesta va fi utilizat dacă nu este specificat niciun LLM în configurația funcționalității sau în personaj. Dacă nu este specificat niciun LLM implicit, se va utiliza ultimul LLM creat."
-      llm_selector:
-        none: "Nimic"
       features:
         back: "Înapoi"
         disabled: "(dezactivat)"
@@ -163,19 +161,9 @@ ro:
         remove_parameter: "Elimină"
         parameter_required: "Necesare"
         edit: "Editează"
-        test: "Test"
         delete: "Șterge"
         test_modal:
           run: "Rulează test"
-      secrets:
-        short_title: "Date de conectare"
-        name: "Nume"
-        secret: "Valoare"
-        back: "Înapoi"
-        save: "Salvează"
-        edit: "Editează"
-        delete: "Șterge"
-        embedding: "Înglobare"
       llms:
         display_name: "Nume"
         provider: "Furnizor"
@@ -199,9 +187,6 @@ ro:
           ai_helper: "Ajutor (%{persona})"
           ai_summarization: "Rezumat"
           ai_spam: "Spam"
-        model_description:
-          anthropic-claude-opus-4-6: "Cel mai inteligent model de la Anthropic"
-          open_ai-gpt-5-nano: "Cel mai rapid și mai rentabil model GPT-5"
         next:
           title: "Următorul"
         tests:
diff --git a/plugins/discourse-ai/config/locales/client.ru.yml b/plugins/discourse-ai/config/locales/client.ru.yml
index b9c7f5cc0f988..520c355875d50 100644
--- a/plugins/discourse-ai/config/locales/client.ru.yml
+++ b/plugins/discourse-ai/config/locales/client.ru.yml
@@ -212,8 +212,6 @@ ru:
       default_llm:
         title: "Модель LLM по умолчанию"
         description: "Модель LLM по умолчанию для всех AI-функций. Используется, если в настройке функции или персоны не указана конкретная модель LLM. При отсутствии модели по умолчанию используется последняя добавленная LLM."
-      llm_selector:
-        none: "Нет"
       features:
         short_title: "Функции"
         description: "Это AI-функции, доступные посетителям вашего сайта. Для них можно задать конкретные персоны и LLM, а также регулировать доступ к ним через группы."
@@ -580,9 +578,7 @@ ru:
         parameter_description: "Описание параметра"
         enum_value: "Значение перечисления"
         add_enum_value: "Добавить значение перечисления"
-        credential_not_set: "(не установлено)"
         edit: "Изменить"
-        test: "Тест"
         delete: "Удалить"
         saved: "Инструмент сохранен"
         confirm_delete: "Действительно удалить этот инструмент?"
@@ -590,16 +586,6 @@ ru:
           title: "Тест AI-инструмента"
           run: "Выполнить тест"
           result: "Результат теста"
-      secrets:
-        short_title: "Учётные данные"
-        name: "Название"
-        secret: "Значение"
-        back: "Назад"
-        save: "Сохранить"
-        edit: "Изменить"
-        delete: "Удалить"
-        embedding: "Встраивание"
-        tool: "Инструмент"
       llms:
         short_title: "Большие языковые модели"
         no_llms: "Еще нет LLM"
@@ -659,10 +645,7 @@ ru:
           other: "Эта модель сейчас используется в следующих параметрах: %{settings}. В случае неправильной настройки функции не будут работать должным образом. "
         model_description:
           none: "Общие настройки, подходящие для большинства языковых моделей"
-          anthropic-claude-opus-4-6: "Самая интеллектуальная модель Anthropic"
-          anthropic-claude-sonnet-4-6: "Оптимальный баланс скорости и стоимости"
           anthropic-claude-haiku-4-5: "Быстрая и экономически эффективная модель"
-          open_ai-gpt-5-nano: "Самая быстрая и экономичная модель GPT-5"
         preseeded_model_description: "Предварительно настроенная модель с открытым исходным кодом, использующая %{model}"
         configured:
           title: "Настроенные LLM"
diff --git a/plugins/discourse-ai/config/locales/client.sk.yml b/plugins/discourse-ai/config/locales/client.sk.yml
index e7bbe077e29f4..9125a8ef55ee5 100644
--- a/plugins/discourse-ai/config/locales/client.sk.yml
+++ b/plugins/discourse-ai/config/locales/client.sk.yml
@@ -172,8 +172,6 @@ sk:
               description: "Ak je zadané, nastavuje hornú hranicu maximálneho počtu tokenov, ktoré môže model vygenerovať. Rešpektuje limit maximálneho počtu výstupných tokenov LLM."
     discourse_ai:
       title: "AI"
-      llm_selector:
-        none: "Žiadny"
       features:
         short_title: "Funkcie"
         description: "Ide o funkcie AI, ktoré sú k dispozícii návštevníkom vášho webu. Možno ich nakonfigurovať tak, aby používali konkrétne persóny a LLM, a prístup k nim možno riadiť podľa skupín."
@@ -525,9 +523,7 @@ sk:
         parameter_description: "Popis parametra"
         enum_value: "Hodnota enumu"
         add_enum_value: "Pridať enum hodnotu"
-        credential_not_set: "(nie je nastavené)"
         edit: "Upraviť"
-        test: "Test"
         delete: "Odstrániť"
         saved: "Nástroj uložený"
         confirm_delete: "Naozaj chcete tento nástroj odstrániť?"
@@ -535,16 +531,6 @@ sk:
           title: "Testovací nástroj AI"
           run: "Spustiť test"
           result: "Výsledok testu"
-      secrets:
-        short_title: "Poverenia"
-        name: "Meno"
-        secret: "Hodnota"
-        back: "Späť"
-        save: "Uložiť"
-        edit: "Upraviť"
-        delete: "Odstrániť"
-        embedding: "Vkladám"
-        tool: "Nástroj"
       llms:
         short_title: "LLM"
         no_llms: "Zatiaľ žiadne LLM"
@@ -603,10 +589,7 @@ sk:
           other: "Tento model momentálne používa nasledovné %{settings}. Ak je nesprávne nakonfigurovaný, funkcia nebude fungovať podľa očakávania. "
         model_description:
           none: "Všeobecné nastavenia, ktoré fungujú pre väčšinu jazykových modelov"
-          anthropic-claude-opus-4-6: "Najinteligentnejší model spoločnosti Anthropic"
-          anthropic-claude-sonnet-4-6: "Optimálna rovnováha medzi rýchlosťou a cenou"
           anthropic-claude-haiku-4-5: "Rýchle a cenovo výhodné"
-          open_ai-gpt-5-nano: "Najrýchlejší, cenovo najefektívnejší model GPT-5"
         preseeded_model_description: "Predkonfigurovaný model s otvoreným zdrojovým kódom využívajúci %{model}"
         configured:
           title: "Nakonfigurované LLM"
diff --git a/plugins/discourse-ai/config/locales/client.sl.yml b/plugins/discourse-ai/config/locales/client.sl.yml
index ee3a98d405d73..4ad139a391f01 100644
--- a/plugins/discourse-ai/config/locales/client.sl.yml
+++ b/plugins/discourse-ai/config/locales/client.sl.yml
@@ -34,8 +34,6 @@ sl:
             canned_reply:
               label: "Odgovori"
     discourse_ai:
-      llm_selector:
-        none: "Brez"
       features:
         back: "Nazaj"
         disabled: "(onemogočeno)"
@@ -126,18 +124,8 @@ sl:
         save: "Shrani"
         remove_parameter: "Odstrani"
         parameter_required: "Zahtevano"
-        credential_not_set: "(ni nastavljeno)"
         edit: "Uredi"
         delete: "Izbriši"
-      secrets:
-        short_title: "Poverilnice"
-        name: "Ime"
-        secret: "Stanje"
-        back: "Nazaj"
-        save: "Shrani"
-        edit: "Uredi"
-        delete: "Izbriši"
-        embedding: "Vdelovanje"
       llms:
         display_name: "Ime"
         save: "Shrani"
diff --git a/plugins/discourse-ai/config/locales/client.sq.yml b/plugins/discourse-ai/config/locales/client.sq.yml
index 6cd15361b1f55..13783fd7e71d0 100644
--- a/plugins/discourse-ai/config/locales/client.sq.yml
+++ b/plugins/discourse-ai/config/locales/client.sq.yml
@@ -34,8 +34,6 @@ sq:
             canned_reply:
               label: "Përgjigju"
     discourse_ai:
-      llm_selector:
-        none: "Asnjë"
       features:
         back: "Kthehu mbrapa"
         disabled: "(e çaktivizuar)"
@@ -111,18 +109,8 @@ sq:
         save: "Ruani"
         remove_parameter: "Hiq"
         parameter_required: "E nevojshme"
-        credential_not_set: "(nuk është vendosur)"
         edit: "Redaktoni"
         delete: "Fshij"
-      secrets:
-        short_title: "Kredencialet"
-        name: "Emri"
-        secret: "Vlera"
-        back: "Kthehu mbrapa"
-        save: "Ruani"
-        edit: "Redaktoni"
-        delete: "Fshij"
-        embedding: "Embedding"
       llms:
         display_name: "Emri"
         save: "Ruani"
diff --git a/plugins/discourse-ai/config/locales/client.sr.yml b/plugins/discourse-ai/config/locales/client.sr.yml
index af9f8d590c2e9..11dc861c37328 100644
--- a/plugins/discourse-ai/config/locales/client.sr.yml
+++ b/plugins/discourse-ai/config/locales/client.sr.yml
@@ -34,8 +34,6 @@ sr:
             canned_reply:
               label: "Odgovori"
     discourse_ai:
-      llm_selector:
-        none: "Ništa"
       features:
         back: "Nazad"
         disabled: "(isključeno)"
@@ -112,15 +110,6 @@ sr:
         parameter_required: "Potrebno"
         edit: "Izmeni"
         delete: "Obriši"
-      secrets:
-        short_title: "Kredencijali"
-        name: "Ime foruma"
-        secret: "Vriednost"
-        back: "Nazad"
-        save: "Sačuvaj"
-        edit: "Izmeni"
-        delete: "Obriši"
-        embedding: "Ugrađivanje"
       llms:
         display_name: "Ime foruma"
         save: "Sačuvaj"
diff --git a/plugins/discourse-ai/config/locales/client.sv.yml b/plugins/discourse-ai/config/locales/client.sv.yml
index f842143349378..ab769fe852a95 100644
--- a/plugins/discourse-ai/config/locales/client.sv.yml
+++ b/plugins/discourse-ai/config/locales/client.sv.yml
@@ -36,8 +36,6 @@ sv:
             canned_reply:
               label: "Svara"
     discourse_ai:
-      llm_selector:
-        none: "Ingen"
       features:
         back: "Tillbaka"
         disabled: "(inaktiverad)"
@@ -123,19 +121,8 @@ sv:
         save: "Spara"
         remove_parameter: "Ta bort"
         parameter_required: "Krävs"
-        credential_not_set: "(inte inställd)"
         edit: "Redigera"
-        test: "Testa"
         delete: "Ta bort"
-      secrets:
-        short_title: "Kontouppgifter"
-        name: "Namn"
-        secret: "Värde"
-        back: "Tillbaka"
-        save: "Spara"
-        edit: "Redigera"
-        delete: "Radera"
-        embedding: "Inbäddning"
       llms:
         display_name: "Namn"
         provider: "Leverantör"
diff --git a/plugins/discourse-ai/config/locales/client.sw.yml b/plugins/discourse-ai/config/locales/client.sw.yml
index 40a3abbf00c3e..f22621c11f52c 100644
--- a/plugins/discourse-ai/config/locales/client.sw.yml
+++ b/plugins/discourse-ai/config/locales/client.sw.yml
@@ -34,8 +34,6 @@ sw:
             canned_reply:
               label: "Jibu"
     discourse_ai:
-      llm_selector:
-        none: "Hakuna"
       features:
         back: "Iliyopita"
         disabled: "(imezuiwa)"
@@ -103,16 +101,7 @@ sw:
         remove_parameter: "Ondoa"
         parameter_required: "Muhimu na Inahitajika"
         edit: "Hariri"
-        test: "Majaribio"
         delete: "Futa"
-      secrets:
-        name: "Jina"
-        secret: "Thamani"
-        back: "Iliyopita"
-        save: "Hifadhi"
-        edit: "Hariri"
-        delete: "Futa"
-        embedding: "Ambatanisha"
       llms:
         display_name: "Jina"
         provider: "Mkimu"
diff --git a/plugins/discourse-ai/config/locales/client.te.yml b/plugins/discourse-ai/config/locales/client.te.yml
index 9f5b755684a53..50a1531c02040 100644
--- a/plugins/discourse-ai/config/locales/client.te.yml
+++ b/plugins/discourse-ai/config/locales/client.te.yml
@@ -36,8 +36,6 @@ te:
             canned_reply:
               label: "ప్రత్యుత్తరం ఇవ్వండి"
     discourse_ai:
-      llm_selector:
-        none: "ఏదీ లేదు"
       features:
         back: "వెనుకకు"
         no_persona: "సెట్ చేయబడలేదు"
@@ -109,17 +107,7 @@ te:
         remove_parameter: "తీసివేయండి"
         parameter_required: "అవసరం"
         edit: "సవరించండి"
-        test: "పరీక్షించండి"
         delete: "తొలగించండి"
-      secrets:
-        short_title: "ఆధారాలు"
-        name: "పేరు"
-        secret: "విలువ"
-        back: "వెనుకకు"
-        save: "సేవ్ చేయండి"
-        edit: "సవరించండి"
-        delete: "తొలగించు"
-        embedding: "పొందుపరచడం"
       llms:
         display_name: "పేరు"
         save: "సేవ్ చేయండి"
diff --git a/plugins/discourse-ai/config/locales/client.th.yml b/plugins/discourse-ai/config/locales/client.th.yml
index 6c110970ed0b9..f0896d0ed402c 100644
--- a/plugins/discourse-ai/config/locales/client.th.yml
+++ b/plugins/discourse-ai/config/locales/client.th.yml
@@ -34,8 +34,6 @@ th:
             canned_reply:
               label: "ตอบ"
     discourse_ai:
-      llm_selector:
-        none: "ไม่มี"
       features:
         back: "กลับ"
         disabled: "(ปิดใช้งานแล้ว)"
@@ -100,14 +98,6 @@ th:
         parameter_required: "ต้องการ"
         edit: "แก้ไข"
         delete: "ลบ"
-      secrets:
-        name: "ชื่อ"
-        secret: "ค่า"
-        back: "กลับ"
-        save: "บันทึก"
-        edit: "แก้ไข"
-        delete: "ลบ"
-        embedding: "ฝั่ง"
       llms:
         display_name: "ชื่อ"
         save: "บันทึก"
diff --git a/plugins/discourse-ai/config/locales/client.tr_TR.yml b/plugins/discourse-ai/config/locales/client.tr_TR.yml
index 054e194dcaa81..71ba1b40c8c06 100644
--- a/plugins/discourse-ai/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-ai/config/locales/client.tr_TR.yml
@@ -176,8 +176,6 @@ tr_TR:
       default_llm:
         title: "Varsayılan LLM modeli"
         description: "Tüm YZ özellikleri için kullanılacak varsayılan LLM modeli. Özellik yapılandırmasında veya kişilikte herhangi bir LLM belirtilmemişse bu model kullanılır. Varsayılan bir LLM belirtilmemişse en son oluşturulan LLM modeli kullanılır."
-      llm_selector:
-        none: "Hiçbiri"
       features:
         short_title: "Özellikler"
         description: "Bunlar, sitenizdeki ziyaretçilerin kullanımına sunulan YZ özellikleridir. Bunlar, belirli kişileri ve LLM'leri kullanacak şekilde yapılandırılabilir ve gruplar tarafından erişim kontrolü sağlanabilir."
@@ -520,9 +518,7 @@ tr_TR:
         parameter_description: "Parametre açıklaması"
         enum_value: "Numaralandırma değeri"
         add_enum_value: "Numaralandırma değeri ekle"
-        credential_not_set: "(ayarlanmamış)"
         edit: "Düzenle"
-        test: "Test"
         delete: "Sil"
         saved: "Araç kaydedildi"
         confirm_delete: "Bu aracı silmek istediğinizden emin misiniz?"
@@ -530,16 +526,6 @@ tr_TR:
           title: "YZ aracını test edin"
           run: "Testi çalıştır"
           result: "Test sonucu"
-      secrets:
-        short_title: "Kimlik bilgileri"
-        name: "Ad"
-        secret: "Değer"
-        back: "Geri"
-        save: "Kaydet"
-        edit: "Düzenle"
-        delete: "Sil"
-        embedding: "Gömme"
-        tool: "Araç"
       llms:
         short_title: "LLM'ler"
         no_llms: "Henüz LLM yok"
@@ -597,10 +583,7 @@ tr_TR:
           other: "Bu model şu anda şunlar tarafından kullanılıyor: %{settings}. Yanlış yapılandırılırsa özellikler beklendiği gibi çalışmaz. "
         model_description:
           none: "Çoğu dil modeli için çalışan genel ayarlar"
-          anthropic-claude-opus-4-6: "Antropic'in en akıllı modeli"
-          anthropic-claude-sonnet-4-6: "Hız ve maliyetin optimum dengesi"
           anthropic-claude-haiku-4-5: "Hızlı ve uygun maliyetli"
-          open_ai-gpt-5-nano: "En hızlı ve en uygun maliyetli GPT-5 modeli"
         preseeded_model_description: "%{model} kullanan önceden yapılandırılmış açık kaynaklı model"
         configured:
           title: "Yapılandırılmış LLM'ler"
diff --git a/plugins/discourse-ai/config/locales/client.ug.yml b/plugins/discourse-ai/config/locales/client.ug.yml
index d3b97c1d3d222..212d4c4e7f58f 100644
--- a/plugins/discourse-ai/config/locales/client.ug.yml
+++ b/plugins/discourse-ai/config/locales/client.ug.yml
@@ -46,8 +46,6 @@ ug:
             canned_reply:
               label: "جاۋاب"
     discourse_ai:
-      llm_selector:
-        none: "يوق"
       features:
         back: "كەينى"
         disabled: "(چەكلەندى)"
@@ -134,21 +132,10 @@ ug:
         save: "ساقلا"
         remove_parameter: "چىقىرىۋەت"
         parameter_required: "زۆرۈر"
-        credential_not_set: "(تەڭشەلمىدى)"
         edit: "تەھرىر"
-        test: "سىنا"
         delete: "ئۆچۈر"
         test_modal:
           run: "سىناقنى ئىجرا قىل"
-      secrets:
-        short_title: "ئىسپاتنامە"
-        name: "ئىسمى"
-        secret: "قىممەت"
-        back: "كەينى"
-        save: "ساقلا"
-        edit: "تەھرىر"
-        delete: "ئۆچۈر"
-        embedding: "سىڭدۈرمە"
       llms:
         display_name: "ئىسمى"
         save: "ساقلا"
diff --git a/plugins/discourse-ai/config/locales/client.uk.yml b/plugins/discourse-ai/config/locales/client.uk.yml
index a826af8c00620..6028ff0bd8ba8 100644
--- a/plugins/discourse-ai/config/locales/client.uk.yml
+++ b/plugins/discourse-ai/config/locales/client.uk.yml
@@ -14,7 +14,6 @@ uk:
               search: "Дозволяє пошук за допомогою штучного інтелекту"
               stream_completion: "Дозволяє потокову передачу завершених персонажів ШІ"
               update_personas: "Дозволяє оновлювати персони ШІ"
-              manage_artifacts: "Дозволяє керувати артефактами ШІ (список, перегляд, створення, оновлення, видалення)"
       site_settings:
         categories:
           discourse_ai: "Дискурс ШІ"
@@ -45,9 +44,6 @@ uk:
             create_ai_embedding: "Створіть вбудовування ШІ"
             update_ai_embedding: "Оновлення вбудовування ШІ"
             delete_ai_embedding: "Видалити вбудовування ШІ"
-            create_ai_secret: "Створіть секрет ШІ"
-            update_ai_secret: "Оновити секрет ШІ"
-            delete_ai_secret: "Видалити секрет ШІ"
             update_ai_spam_settings: "Оновити налаштування спаму ШІ"
   js:
     discourse_automation:
@@ -229,9 +225,6 @@ uk:
       default_llm:
         title: "Модель LLM за замовчуванням"
         description: "Модель LLM за замовчуванням, яка використовуватиметься для всіх функцій ШІ. Вона використовуватиметься, якщо в конфігурації функції або персоні не вказано LLM. Якщо LLM за замовчуванням не вказано, буде використано останню створену LLM."
-      llm_selector:
-        none: "Немає"
-        saved: "Модель LLM за замовчуванням успішно оновлено"
       features:
         short_title: "Особливості"
         description: "Це функції штучного інтелекту, доступні відвідувачам вашого сайту. Їх можна налаштувати для використання певних персон та LLM, а також контролювати доступ до них за групами."
@@ -332,7 +325,6 @@ uk:
           image_caption: "Зображення підписів"
           translator: "Перекладач"
           post_illustrator: "Ілюстратор постів"
-          chat_thread_titles: "Назви тем чату"
           setting_groups:
             access_permissions: "Доступ та дозволи"
             enabled_features: "Увімкнені функції"
@@ -660,14 +652,7 @@ uk:
         parameter_description: "Опис параметра"
         enum_value: "Значення переліку"
         add_enum_value: "Додати значення переліку"
-        secret_alias: "Псевдонім облікових даних"
-        secret_alias_help: "Псевдонім, на який посилаються зі скриптів через secrets.get(\"alias_name\"). Використовуйте літери, цифри та символи підкреслення."
-        secret_credential: "Облікові дані"
-        add_secret_contract: "Додати облікові дані"
-        remove_secret_contract: "Видалити облікові дані"
-        credential_not_set: "(не встановлено)"
         edit: "Редагувати"
-        test: "Тест"
         delete: "Видалити"
         saved: "Інструмент збережено"
         confirm_delete: "Ви впевнені, що хочете видалити цей інструмент?"
@@ -675,31 +660,6 @@ uk:
           title: "Тест інструменту ШІ"
           run: "Запустити тест"
           result: "Результат тесту"
-      secrets:
-        short_title: "Дані доступу"
-        description: "Керуйте обліковими даними автентифікації, що спільно використовуються в LLM, вбудованих системах та інструментах."
-        name: "Імʼя"
-        secret: "Значення"
-        select_secret: "Виберіть обліковий запис..."
-        create_new: "Нові облікові дані"
-        add_secret: "Додати облікові дані"
-        saved: "Облікові дані збережено"
-        confirm_delete: "Ви впевнені, що хочете видалити ці облікові дані?"
-        delete_failed_in_use: "Ці облікові дані наразі використовуються та не можуть бути видалені."
-        no_secrets: "Поки що немає облікових даних"
-        new_title: "Нові облікові дані"
-        edit_title: "Редагувати облікові дані"
-        back: "Назад"
-        save: "Зберегти"
-        edit: "Редагувати"
-        delete: "Видалити"
-        used_by: "Використовується"
-        not_used: "Не використовується"
-        embedding: "Взаємодія"
-        cannot_delete_in_use: "Ці облікові дані не можна видалити, оскільки вони використовуються:"
-        tool: "Інструмент"
-        modal:
-          title: "Створити нові облікові дані"
       llms:
         short_title: "LLMs"
         no_llms: "Ще немає LLM"
@@ -767,20 +727,8 @@ uk:
           other: "Ця модель зараз використовується: %{settings}. У разі неправильного налаштування функція не працюватиме належним чином. "
         model_description:
           none: "Загальні налаштування, що працюють для більшості мовних моделей"
-          anthropic-claude-opus-4-6: "Найрозумніша модель Anthropic"
-          anthropic-claude-sonnet-4-6: "Оптимальний баланс швидкості та витрат"
           anthropic-claude-haiku-4-5: "Швидко та економічно ефективно"
           google-gemini-3-pro: "Найрозумніша модель Google"
-          google-gemini-3-flash: "Швидко та економічно ефективно з мультимодальним мисленням"
-          open_ai-gpt-5-2: "Флагманська модель OpenAI, добре підходить для вирішення проблем у різних доменах"
-          open_ai-gpt-5-mini: "Забезпечує баланс між інтелектом, швидкістю та вартістю"
-          open_ai-gpt-5-nano: "Найшвидша та найекономічніша модель GPT-5"
-          open_router-deepseek-deepseek-v3-2: "Остання високопродуктивна модель DeepSeek"
-          open_router-moonshotai-kimi-k2-5: "Мультимодальна модель Moonshot з можливостями технічного зору"
-          open_router-x-ai-grok-4-fast: "Флагманська модель xAI з функцією бачення"
-          open_router-minimax-minimax-m2-5: "Мультимодальна модель MiniMax з широким контекстом"
-          open_router-z-ai-glm-5: "Мультимодальна модель Z-AI із баченням"
-          open_router-arcee-ai-trinity-large-preview-free: "Безкоштовна модель з відкритим вихідним кодом від Arcee AI"
         preseeded_model_description: "Попередньо налаштована модель з відкритим кодом, що використовує %{model}"
         configured:
           title: "Налаштовані LLM"
@@ -849,7 +797,6 @@ uk:
           prompt_caching_never: "Ніколи – не використовувати кешування запитів"
           prompt_caching_tool_results: "Результати інструментів – кешувати, коли результати інструментів присутні (рекомендовано)"
           prompt_caching_always: "Завжди – завжди використовувати кешування запитів"
-          effort: "Рівень зусиль"
       related_topics:
         title: "Пов'язані теми"
         pill: "Пов'язані"
@@ -964,14 +911,11 @@ uk:
           model_name: "Назва моделі"
         semantic_search: "Теми (семантикв)"
         semantic_search_results:
-          toggle: "Результати ШІ"
           unavailable: "Результати ШІ недоступні"
           zero_results_expanded: "Не знайдено жодного результату, показано %{count} результатів ШІ"
         semantic_search_tooltips:
           results_explanation: "Якщо увімкнено, нижче будуть додані додаткові результати пошуку ШІ."
           invalid_sort: "Результати пошуку повинні бути відсортовані за релевантністю для відображення результатів ШІ"
-          not_submitted: "Надішліть пошуковий запит, щоб увімкнути результати штучного інтелекту"
-          no_results: "За цим пошуковим запитом не знайдено результатів ШІ"
         semantic_search_unavailable_tooltip: "Результати пошуку повинні бути відсортовані за релевантністю для відображення результатів ШІ"
         ai_generated_result: "Результат пошуку знайдено за допомогою ШІ"
         quick_search:
diff --git a/plugins/discourse-ai/config/locales/client.ur.yml b/plugins/discourse-ai/config/locales/client.ur.yml
index 9261d180dcccf..6daaa61167878 100644
--- a/plugins/discourse-ai/config/locales/client.ur.yml
+++ b/plugins/discourse-ai/config/locales/client.ur.yml
@@ -62,8 +62,6 @@ ur:
             hide_topic:
               label: "موضوع چھپائیں"
     discourse_ai:
-      llm_selector:
-        none: "کوئی نہیں"
       features:
         back: "واپس"
         disabled: "(غیر فعال)"
@@ -157,19 +155,8 @@ ur:
         save: "محفوظ کریں"
         remove_parameter: "خارج کریں"
         parameter_required: "درکار"
-        credential_not_set: "(سیٹ نہیں)"
         edit: "ترمیم کریں"
-        test: "ٹیسٹ"
         delete: "مٹائیں"
-      secrets:
-        short_title: "شہادت"
-        name: "نام"
-        secret: "وَیلِیو"
-        back: "واپس"
-        save: "محفوظ"
-        edit: "ترمیم کریں"
-        delete: "مٹائیں"
-        embedding: "اَیمبَیڈ کرنا"
       llms:
         display_name: "نام"
         provider: "پرووَائیڈر"
diff --git a/plugins/discourse-ai/config/locales/client.vi.yml b/plugins/discourse-ai/config/locales/client.vi.yml
index 4f8d4c802dae5..b47f345247814 100644
--- a/plugins/discourse-ai/config/locales/client.vi.yml
+++ b/plugins/discourse-ai/config/locales/client.vi.yml
@@ -34,8 +34,6 @@ vi:
             canned_reply:
               label: "Trả lời"
     discourse_ai:
-      llm_selector:
-        none: "Không"
       features:
         back: "Quay lại"
         disabled: "(vô hiệu hóa)"
@@ -121,19 +119,8 @@ vi:
         save: "Lưu lại"
         remove_parameter: "Xóa"
         parameter_required: "Bắt buộc"
-        credential_not_set: "(chưa đặt)"
         edit: "Sửa"
-        test: "Kiểm tra"
         delete: "Xóa"
-      secrets:
-        short_title: "Thông tin đăng nhập"
-        name: "Tên"
-        secret: "Giá trị"
-        back: "Quay lại"
-        save: "Lưu lại"
-        edit: "Sửa"
-        delete: "Xóa"
-        embedding: "Nhúng"
       llms:
         display_name: "Tên"
         save: "Lưu lại"
diff --git a/plugins/discourse-ai/config/locales/client.zh_CN.yml b/plugins/discourse-ai/config/locales/client.zh_CN.yml
index 7a1e739e55769..a47ada3e0b538 100644
--- a/plugins/discourse-ai/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-ai/config/locales/client.zh_CN.yml
@@ -14,7 +14,6 @@ zh_CN:
               search: "允许 AI 搜索"
               stream_completion: "允许流式 AI 角色补全"
               update_personas: "允许更新 AI 角色"
-              manage_artifacts: "允许管理 AI 工件（列表、查看、创建、更新、删除）"
       site_settings:
         categories:
           discourse_ai: "Discourse AI"
@@ -45,9 +44,6 @@ zh_CN:
             create_ai_embedding: "创建 AI 嵌入向量"
             update_ai_embedding: "更新 AI 嵌入向量"
             delete_ai_embedding: "删除 AI 嵌入向量"
-            create_ai_secret: "创建 AI 密钥"
-            update_ai_secret: "更新 AI 密钥"
-            delete_ai_secret: "删除 AI 密钥"
             update_ai_spam_settings: "更新 AI 垃圾信息设置"
   js:
     discourse_automation:
@@ -229,9 +225,6 @@ zh_CN:
       default_llm:
         title: "默认 LLM 模型"
         description: "所有 AI 功能使用的默认 LLM 模型。如果功能配置或角色中未指定 LLM，将使用此模型。如果未指定默认 LLM，将使用最后创建的 LLM。"
-      llm_selector:
-        none: "无"
-        saved: "默认LLM模型已成功更新"
       features:
         short_title: "功能"
         description: "这些是您网站的访客可以使用的 AI 功能。可以将这些功能配置为使用特定的角色和 LLM，并按群组控制访问权限。"
@@ -323,7 +316,6 @@ zh_CN:
           image_caption: "标题图片"
           translator: "翻译器"
           post_illustrator: "帖子插图创建器"
-          chat_thread_titles: "聊天主题标题"
           setting_groups:
             access_permissions: "访问与权限"
             enabled_features: "启用的功能"
@@ -630,10 +622,7 @@ zh_CN:
         parameter_description: "参数描述"
         enum_value: "枚举值"
         add_enum_value: "添加枚举值"
-        add_secret_contract: "添加凭证"
-        credential_not_set: "(未设置)"
         edit: "编辑"
-        test: "测试"
         delete: "删除"
         saved: "工具已保存"
         confirm_delete: "确定要删除此工具吗？"
@@ -641,30 +630,6 @@ zh_CN:
           title: "测试 AI 工具"
           run: "运行测试"
           result: "测试结果"
-      secrets:
-        short_title: "凭据"
-        name: "名称"
-        secret: "值"
-        select_secret: "选择凭证..."
-        create_new: "新凭证"
-        add_secret: "添加凭证"
-        saved: "凭证已保存"
-        confirm_delete: "您确定要删除此凭证吗？"
-        delete_failed_in_use: "此凭证当前正在使用中，无法删除。"
-        no_secrets: "暂无凭证"
-        new_title: "新凭证"
-        edit_title: "编辑凭证"
-        back: "返回"
-        save: "保存"
-        edit: "编辑"
-        delete: "删除"
-        used_by: "用于"
-        not_used: "未使用"
-        embedding: "嵌入"
-        cannot_delete_in_use: "此凭证无法删除，因为它正被以下用户使用："
-        tool: "工具"
-        modal:
-          title: "创建新凭证"
       llms:
         short_title: "LLM"
         no_llms: "暂无 LLM"
@@ -729,20 +694,8 @@ zh_CN:
           other: "此模型目前的使用者为 %{settings}。如果配置错误，功能将无法按预期运行。"
         model_description:
           none: "适用于大多数语言模型的常规设置"
-          anthropic-claude-opus-4-6: "Anthropic 最智能的模型"
-          anthropic-claude-sonnet-4-6: "速度与成本的最佳平衡"
           anthropic-claude-haiku-4-5: "快速、经济高效"
           google-gemini-3-pro: "Google 最智能的模型"
-          google-gemini-3-flash: "快速高效且经济实惠，并具备多模态推理能力"
-          open_ai-gpt-5-2: "OpenAI 的旗舰模型，非常适合跨领域问题解决"
-          open_ai-gpt-5-mini: "在智能、速度和成本之间取得平衡"
-          open_ai-gpt-5-nano: "最快、最具成本效益的 GPT-5 模型。"
-          open_router-deepseek-deepseek-v3-2: "DeepSeek 最新高性能模型"
-          open_router-moonshotai-kimi-k2-5: "具有视觉功能的 Moonshot 多模态模型"
-          open_router-x-ai-grok-4-fast: "xAI 的旗舰视觉模型"
-          open_router-minimax-minimax-m2-5: "MiniMax 带大上下文的多模态模型"
-          open_router-z-ai-glm-5: "Z-AI 的多模态视觉模型"
-          open_router-arcee-ai-trinity-large-preview-free: "来自 Arcee AI 的免费开源模型"
         preseeded_model_description: "利用 %{model} 的预配置开源模型"
         configured:
           title: "配置的 LLM"
diff --git a/plugins/discourse-ai/config/locales/client.zh_TW.yml b/plugins/discourse-ai/config/locales/client.zh_TW.yml
index 1621f127d681a..935e7a306b691 100644
--- a/plugins/discourse-ai/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-ai/config/locales/client.zh_TW.yml
@@ -36,8 +36,6 @@ zh_TW:
             canned_reply:
               label: "回覆"
     discourse_ai:
-      llm_selector:
-        none: "無"
       features:
         back: "上一步"
         disabled: "(停用)"
@@ -114,21 +112,10 @@ zh_TW:
         save: "儲存"
         remove_parameter: "移除"
         parameter_required: "必要設定"
-        credential_not_set: "(未設定)"
         edit: "編輯"
-        test: "測試"
         delete: "刪除"
         test_modal:
           run: "執行測試"
-      secrets:
-        short_title: "憑證"
-        name: "名稱"
-        secret: "價值"
-        back: "上一步"
-        save: "儲存"
-        edit: "編輯"
-        delete: "刪除"
-        embedding: "嵌入"
       llms:
         display_name: "名稱"
         save: "儲存"
diff --git a/plugins/discourse-ai/config/locales/server.de.yml b/plugins/discourse-ai/config/locales/server.de.yml
index d3fe478caa8ee..36cc35538d19f 100644
--- a/plugins/discourse-ai/config/locales/server.de.yml
+++ b/plugins/discourse-ai/config/locales/server.de.yml
@@ -97,7 +97,6 @@ de:
     ai_helper_enabled_features: "Wähle die Funktionen aus, die im KI-Helfer aktiviert werden sollen."
     post_ai_helper_allowed_groups: "Benutzergruppen, die auf KI-Helfer-Funktionen in Beiträgen zugreifen dürfen"
     ai_helper_post_illustrator_persona: "Die Persona, die für die Funktion „Beitrag illustrieren“ des KI-Helfers verwendet werden soll. Hinweis: Du musst auch ein Tool zur Bilderzeugung erstellen (Administration > Plug-ins > KI > Tools), damit diese Funktion funktioniert."
-    ai_helper_chat_thread_title_persona: "Die Persona, die zum Generieren von Chat-Thread-Titeln verwendet wird."
     ai_embeddings_selected_model: "Verwende das ausgewählte Modell für die Erzeugung von Einbettungen."
     ai_embeddings_generate_for_pms: "Erstelle Einbettungen für persönliche Nachrichten."
     ai_embeddings_semantic_related_topics_enabled: "Verwende die semantische Suche für verwandte Themen."
@@ -117,7 +116,6 @@ de:
     ai_summary_backfill_maximum_topics_per_hour: "Anzahl der Themenzusammenfassungen, die pro Stunde nachgeholt werden."
     ai_bot_enabled: "Aktiviere das KI-Bot-Modul."
     ai_bot_enabled_llms: "LLMs zur Auswahl für KI-Bot-Unterhaltungen"
-    ai_bot_enable_chat_warning: "Zeigt eine Warnung an, wenn der PN-Chat initiiert wird. Kann durch Bearbeiten der Übersetzungszeichenfolge überschrieben werden: discourse_ai.ai_bot.pm_warning"
     ai_bot_allowed_groups: "Wenn der GPT-Bot Zugriff auf die PN hat, wird er den Mitgliedern dieser Gruppen antworten."
     ai_bot_debugging_allowed_groups: "Erlaube diesen Gruppen, eine Debug-Schaltfläche in Beiträgen zu sehen, der die rohe KI-Anfrage und -Antwort anzeigt."
     ai_bot_public_sharing_allowed_groups: "Erlaube diesen Gruppen, persönliche KI-Nachrichten über einen eindeutigen, öffentlich zugänglichen Link mit der Öffentlichkeit zu teilen. Hinweis: Wenn für deine Website eine Anmeldung erforderlich ist, ist auch zum Ansehen des geteilten Inhalts eine Anmeldung erforderlich."
@@ -278,14 +276,6 @@ de:
           name: "Von vorne beginnen …"
       name:
         characters: "darf nur Zahlen, Buchstaben und Unterstriche enthalten"
-      secret_bindings:
-        secret_not_found: "Die ausgewählten Anmeldedaten existieren nicht."
-      secret_runtime:
-        alias_not_declared: "Der Alias „%{alias}“ ist für dieses Tool nicht definiert."
-        missing_binding: "Der Alias „%{alias}“ ist erforderlich, aber nicht mit Anmeldedaten verknüpft."
-        missing_required_aliases: "Für folgende Aliase fehlen erforderliche Verknüpfungen zu Anmeldedaten: %{aliases}."
-        secret_not_found: "Der Alias \"%{alias}\" ist mit nicht vorhandenen Anmeldedaten verknüpft."
-        unknown_error: "Die angeforderte Anmeldedaten konnten nicht ermittelt werden."
     ai_helper:
       errors:
         completion_request_failed: "Beim Versuch, Vorschläge zu machen, ist etwas schiefgelaufen. Bitte versuche es noch einmal."
@@ -320,7 +310,6 @@ de:
       flag_reason: "Als Spam gemeldet von <a href='%{url}'>Discourse KI</a>"
       silence_reason: "Benutzer automatisch stummgeschaltet durch <a href='%{url}'>Discourse KI</a>"
       invalid_error_type: "Ungültiger Fehlertyp angegeben"
-      unexpected: "Ein unerwarteter Fehler ist aufgetreten"
       bot_user_update_failed: "Aktualisierung des Spam-Scan-Bot-Benutzers fehlgeschlagen"
       configuration_missing: "Die Konfiguration der KI-Spamerkennung fehlt. Füge die Konfiguration in „Administration > Plug-ins > Discourse KI > Spam“ hinzu, bevor du sie aktivierst."
       logging_subject: "Spam-Erkennung"
@@ -435,9 +424,6 @@ de:
         discover:
           name: "Entdecken"
           description: "Standard-Persona, die in der Entdeckungsfunktion verwendet wird (ergänzende Suche)"
-        chat_thread_titler:
-          name: "Chat-Thread-Titelgenerator"
-          description: "Standard-Persona für die automatische Generierung von Chat-Thread-Titeln"
       topic_not_found: "Zusammenfassung nicht verfügbar, Thema nicht gefunden!"
       summarizing: "Thema zusammenfassen"
       searching: "Suche nach: „%{query}“"
@@ -638,7 +624,6 @@ de:
         invalid_seeded_model: "Du kannst dieses Modell nicht mit dieser Funktion verwenden"
         invalid_persona_response_format: "Die ausgewählte Persona muss ein Antwortformat mit einem booleschen Feld namens „spam“ haben."
         must_select_model: "Du musst zuerst ein LLM auswählen"
-        invalid_llm_id: "Das ausgewählte LLM-Modell ist nicht gültig"
       endpoints:
         not_configured: "%{display_name} (nicht konfiguriert)"
         configuration_hint:
@@ -653,18 +638,12 @@ de:
     embeddings:
       delete_failed: "Dieses Modell wird derzeit verwendet. Aktualisiere zuerst `ai embeddings selected model`."
       cannot_edit_builtin: "Du kannst ein integriertes Modell nicht bearbeiten."
-      secret_required: "Es müssen Anmeldedaten gewählt werden"
-      secret_not_found: "Die ausgewählten Anmeldedaten existieren nicht"
       configuration:
         disable_embeddings: "Du musst zuerst „KI-Einbettungen aktiviert“ deaktivieren."
         choose_model: "Lege zuerst „ausgewähltes KI-Einbettungsmodell“ fest."
         model_test_failed: "Es ist uns nicht gelungen, mit diesem Modell eine Testeinbettung zu generieren. Überprüfe, ob es richtig konfiguriert ist."
-    secrets:
-      delete_failed_in_use: "Diese Anmeldedaten werden derzeit von einem oder mehreren LLM, Einbettungen oder Tools verwendet und können nicht gelöscht werden."
     llm_models:
       missing_provider_param: "%{param} darf nicht leer sein"
-      secret_required: "Es müssen Anmeldedaten gewählt werden"
-      secret_not_found: "Die ausgewählten Anmeldedaten existieren nicht"
       bedrock_invalid_url: "Bitte fülle alle Felder aus, um dieses Modell zu verwenden."
       bedrock_missing_auth: "Für AWS Bedrock muss entweder die Zugangsschlüssel-ID oder die Rollen ARN konfiguriert werden"
     ai_staff_action_logger:
@@ -689,13 +668,6 @@ de:
       persona_disabled: Die angegebene Persona ist deaktiviert. Überprüfe die Parameter persona_name oder persona_id.
       no_default_llm: Die Persona muss eine default_llm definiert haben.
       user_not_allowed: Der Benutzer darf nicht am Thema teilnehmen.
-      custom_tool_definition_too_large: "Jede benutzerdefinierte Werkzeugdefinition darf höchstens %{max} Bytes groß sein."
-      invalid_stream_param: "Der Parameter %{key} ist ungültig: %{details}"
-      expected_array: "erwartet ein Array"
-      expected_object: "erwartet ein Objekt"
-      stream_reply_max_resume_rounds_reached: Die maximale Anzahl an Wiederholungsrunden mit benutzerdefinierten Werkzeugen wurde erreicht (%{max}).
-      stream_reply_state_too_large: "Der Stream-Zustand ist zu groß, um ihn zu behalten (maximal %{max} Bytes)."
-      stream_reply_unexpected_error: Beim Streaming der Antwort ist ein unerwarteter Fehler aufgetreten.
       prompt_message_length: Die Nachricht %{idx} hat die 1000-Zeichen-Grenze überschritten.
       persona_already_exists: Eine Persona mit dem Namen %{name} existiert bereits.
       custom_tool_exists:
diff --git a/plugins/discourse-ai/config/locales/server.pl_PL.yml b/plugins/discourse-ai/config/locales/server.pl_PL.yml
index c59405a81ebf1..60f3ee487a1d4 100644
--- a/plugins/discourse-ai/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-ai/config/locales/server.pl_PL.yml
@@ -99,7 +99,6 @@ pl_PL:
     ai_helper_enabled_features: "Wybierz funkcje, które chcesz włączyć w pomocniku AI."
     post_ai_helper_allowed_groups: "Grupy użytkowników uprawnione do dostępu do funkcji pomocnika AI w postach"
     ai_helper_post_illustrator_persona: "Osobowość do wykorzystania w funkcji ilustrowania wpisów przez pomocnika AI. Uwaga: aby ta funkcja działała, musisz również utworzyć narzędzie do generowania obrazów (Administrator > Wtyczki > Discourse AI > Narzędzia)."
-    ai_helper_chat_thread_title_persona: "Persona używana do generowania tytułów wątków czatu."
     ai_embeddings_selected_model: "Użyj wybranego modelu do generowania osadzeń."
     ai_embeddings_generate_for_pms: "Generuj osadzenia dla wiadomości osobistych."
     ai_embeddings_semantic_related_topics_enabled: "Użyj wyszukiwania semantycznego dla powiązanych tematów."
@@ -119,7 +118,6 @@ pl_PL:
     ai_summary_backfill_maximum_topics_per_hour: "Liczba podsumowań tematów do uzupełnienia na godzinę."
     ai_bot_enabled: "Włącz moduł bota AI."
     ai_bot_enabled_llms: "Dostępne do wyboru LLM-y do rozmów z botami AI"
-    ai_bot_enable_chat_warning: "Wyświetl ostrzeżenie po zainicjowaniu czatu PW. Można to pominąć, edytując ciąg tłumaczenia: discourse_ai.ai_bot.pm_warning"
     ai_bot_allowed_groups: "Gdy bot GPT uzyska dostęp do PW, odpowie członkom tych grup."
     ai_bot_debugging_allowed_groups: "Zezwól tym grupom na wyświetlanie przycisku debugowania w postach, który wyświetla surowe żądanie i odpowiedź AI"
     ai_bot_public_sharing_allowed_groups: "Zezwól tym grupom na udostępnianie osobistych wiadomości AI publicznie za pośrednictwem unikalnego, publicznie dostępnego linku. Uwaga: jeśli Twoja witryna wymaga logowania, udostępnianie również będzie wymagało logowania."
@@ -282,23 +280,6 @@ pl_PL:
           name: "Zacznij od zera..."
       name:
         characters: "może zawierać tylko cyfry, litery i podkreślenia"
-      secret_contracts:
-        invalid_payload: "Sekretne kontrakty muszą być tablicą."
-        invalid_contract: "Sekretny kontrakt o indeksie %{index} jest nieprawidłowy."
-        alias_required: "Sekretny kontrakt o indeksie %{index} musi zawierać alias."
-        alias_too_long: "Sekretny alias `%{alias}` jest za długi."
-        alias_invalid: "Sekretny alias `%{alias}` może zawierać tylko cyfry, litery i podkreślenia."
-        alias_not_unique: "Sekretny alias `%{alias}` jest zduplikowany."
-      secret_bindings:
-        invalid_payload: "Sekretne powiązania muszą być tablicą."
-        secret_not_found: "Wybrane poświadczenie nie istnieje."
-        alias_not_declared: "Alias `%{alias}` nie jest zadeklarowany w tym narzędziu."
-      secret_runtime:
-        alias_not_declared: "Alias poświadczeń `%{alias}` nie jest zadeklarowany dla tego narzędzia."
-        missing_binding: "Alias poświadczeń `%{alias}` jest wymagany, ale nie jest powiązany."
-        missing_required_aliases: "Brak wymaganych powiązań poświadczeń dla aliasów: %{aliases}."
-        secret_not_found: "Alias poświadczeń `%{alias}` jest powiązany z brakującymi poświadczeniami."
-        unknown_error: "Nie można rozwiązać żądanego poświadczenia."
     ai_helper:
       errors:
         completion_request_failed: "Coś poszło nie tak podczas próby przedstawienia sugestii. Spróbuj ponownie."
@@ -333,7 +314,6 @@ pl_PL:
       flag_reason: "Oznaczono jako spam przez <a href='%{url}'>Discourse AI</a>"
       silence_reason: "Użytkownik wyciszony automatycznie przez <a href='%{url}'>Discourse AI</a>"
       invalid_error_type: "Podano nieprawidłowy typ błędu"
-      unexpected: "Wystąpił nieoczekiwany błąd"
       bot_user_update_failed: "Nie udało się zaktualizować użytkownika bota skanującego spam"
       configuration_missing: "Brakuje konfiguracji wykrywania spamu przez AI. Dodaj konfigurację w sekcji „Administrator > Wtyczki > Discourse AI > Spam” przed włączeniem."
       logging_subject: "Wykrywanie spamu"
@@ -448,9 +428,6 @@ pl_PL:
         discover:
           name: "Odkrywaj"
           description: "Domyślna osobowość używana w funkcji odkrywania (bezpłatne wyszukiwanie)"
-        chat_thread_titler:
-          name: "Tytułowanie wątku czatu"
-          description: "Domyślna persona umożliwiająca automatyczne generowanie tytułów wątków czatu"
       topic_not_found: "Podsumowanie niedostępne, nie znaleziono tematu!"
       summarizing: "Podsumowanie tematu"
       searching: "Wyszukiwanie: '%{query}'"
@@ -669,7 +646,6 @@ pl_PL:
         invalid_seeded_model: "Nie można używać tego modelu z tą funkcją"
         invalid_persona_response_format: "Wybrana osoba musi mieć format odpowiedzi z polem logicznym o nazwie „spam”"
         must_select_model: "Najpierw musisz wybrać LLM"
-        invalid_llm_id: "Wybrany model LLM jest nieprawidłowy"
       endpoints:
         not_configured: "%{display_name} (nie skonfigurowano)"
         configuration_hint:
@@ -688,18 +664,12 @@ pl_PL:
     embeddings:
       delete_failed: "Ten model jest obecnie używany. Najpierw zaktualizuj „wybrany model osadzania sztucznej inteligencji”."
       cannot_edit_builtin: "Nie możesz edytować wbudowanego modelu."
-      secret_required: "Należy wybrać poświadczenie"
-      secret_not_found: "Wybrane poświadczenie nie istnieje"
       configuration:
         disable_embeddings: "Najpierw musisz wyłączyć opcję „włączone osadzanie sztucznej inteligencji”."
         choose_model: "Najpierw ustaw „osadzenia sztucznej inteligencji wybrane modele”."
         model_test_failed: "Nie udało nam się wygenerować testowego osadzenia z tym modelem. Sprawdź, czy jest poprawnie skonfigurowany."
-    secrets:
-      delete_failed_in_use: "To poświadczenie jest obecnie używane przez jedno lub więcej LLM, osadzeń lub narzędzi i nie może zostać usunięte."
     llm_models:
       missing_provider_param: "%{param} nie może być pusty"
-      secret_required: "Należy wybrać poświadczenie"
-      secret_not_found: "Wybrane poświadczenie nie istnieje"
       bedrock_invalid_url: "Wypełnij wszystkie pola, aby korzystać z tego modelu."
       bedrock_missing_auth: "AWS Bedrock wymaga skonfigurowania Access Key ID lub Role ARN"
     ai_staff_action_logger:
@@ -724,26 +694,6 @@ pl_PL:
       persona_disabled: Podana osobowość jest wyłączona. Sprawdź parametry persona_name lub persona_id.
       no_default_llm: Osobowość musi mieć zdefiniowany parametr default_llm.
       user_not_allowed: Użytkownik nie ma prawa brać udziału w dyskusji na ten temat.
-      invalid_stream_resume_token: Token resume_token jest nieprawidłowy lub wygasł.
-      no_tool_results_specified: Parametr tool_results jest wymagany przy wznawianiu strumienia.
-      invalid_custom_tools: "Parametr custom_tools jest nieprawidłowy: %{details}"
-      duplicate_custom_tools: "Parametr custom_tools zawiera zduplikowane nazwy narzędzi: %{names}"
-      too_many_custom_tools: "Parametr custom_tools może zawierać maksymalnie %{max} narzędzi."
-      custom_tool_definition_too_large: "Każda definicja narzędzia niestandardowego może mieć maksymalnie %{max} bajtów."
-      invalid_stream_param: "Parametr %{key} jest nieprawidłowy: %{details}"
-      expected_array: "oczekiwano tablicy"
-      expected_object: "oczekiwano obiektu"
-      ambiguous_tool_results: "Podaj albo tool_results albo tool_result, nie obydwa."
-      invalid_tool_results: "Parametr tool_results jest nieprawidłowy: %{details}"
-      too_many_tool_results: "Parametr tool_results może zawierać maksymalnie %{max} elementów."
-      no_pending_tool_calls: Nie ma żadnych oczekujących wywołań narzędzi dla tego tokena CV.
-      missing_tool_results: "Brak wyników wyszukiwania dla identyfikatorów wywołań narzędzi: %{ids}"
-      unexpected_tool_results: "Nieoczekiwane wyniki narzędzia dla identyfikatorów wywołań narzędzia: %{ids}"
-      invalid_tool_result_content: "Wynik narzędzia dla %{id} musi zawierać treść"
-      tool_result_content_too_large: "Każdy ładunek zawartości wyniku narzędzia musi mieć maksymalnie %{max} bajtów."
-      stream_reply_max_resume_rounds_reached: Osiągnięto maksymalną liczbę rund wznawiania używania niestandardowych narzędzi (%{max}).
-      stream_reply_state_too_large: "Stan strumienia jest zbyt duży, aby go zachować (maks. %{max} bajtów)."
-      stream_reply_unexpected_error: Podczas przesyłania odpowiedzi wystąpił nieoczekiwany błąd.
       prompt_message_length: Wiadomość %{idx} przekracza limit 1000 znaków.
       persona_already_exists: Osobowość o nazwie %{name} już istnieje.
       custom_tool_exists:
diff --git a/plugins/discourse-ai/config/locales/server.uk.yml b/plugins/discourse-ai/config/locales/server.uk.yml
index 383c080c73d00..9336d22d9a36b 100644
--- a/plugins/discourse-ai/config/locales/server.uk.yml
+++ b/plugins/discourse-ai/config/locales/server.uk.yml
@@ -99,7 +99,6 @@ uk:
     ai_helper_enabled_features: "Оберіть функції для активації в ШІ-помічнику."
     post_ai_helper_allowed_groups: "Групи користувачів, яким дозволено доступ до функцій ШІ-помічника в публікаціях"
     ai_helper_post_illustrator_persona: "Персона, яка використовуватиметься для функції ілюстрації публікацій помічника ШІ. Примітка: для роботи цієї функції також потрібно створити інструмент генерації зображень (Адміністратор > Плагіни > Discourse AI > Інструменти)."
-    ai_helper_chat_thread_title_persona: "Персона, яка використовується для створення заголовків гілок чату."
     ai_embeddings_selected_model: "Використовуйте обрану модель для генерації вбудовувань."
     ai_embeddings_generate_for_pms: "Створюйте вбудовування для особистих повідомлень."
     ai_embeddings_semantic_related_topics_enabled: "Використовуйте семантичний пошук для пов’язаних тем."
@@ -119,7 +118,6 @@ uk:
     ai_summary_backfill_maximum_topics_per_hour: "Кількість підсумків тем для заповнення на годину."
     ai_bot_enabled: "Увімкніть модуль AI Bot."
     ai_bot_enabled_llms: "LLM доступні для вибору для бесід з AI-ботами"
-    ai_bot_enable_chat_warning: "Відображати попередження, коли ініційовано чат особистих повідомлень. Можна змінити, відредагувавши рядок перекладу: discourse_ai.ai_bot.pm_warning"
     ai_bot_allowed_groups: "Коли GPT-бот отримає доступ до ПП, він відповідатиме членам цих груп."
     ai_bot_debugging_allowed_groups: "Дозвольте цим групам бачити кнопку налагодження в публікаціях, яка відображає необроблений запит і відповідь ШІ"
     ai_bot_public_sharing_allowed_groups: "Дозвольте цим групам ділитися особистими повідомленнями ШІ з громадськістю за унікальним загальнодоступним посиланням. Примітка: якщо ваш сайт вимагає входу, то для доступу до публікацій також потрібно буде ввійти."
@@ -282,16 +280,6 @@ uk:
           name: "Почніть з чистого аркуша..."
       name:
         characters: "повинні містити тільки цифри, літери та підкреслення"
-      secret_contracts:
-        invalid_payload: "Таємні контракти повинні бути масивом."
-        invalid_contract: "Секретний контракт за індексом %{index} недійсний."
-        alias_required: "Секретний контракт за індексом %{index} повинен містити псевдонім."
-        alias_too_long: "Секретний псевдонім `%{alias}` занадто довгий."
-        alias_invalid: "Секретний псевдонім `%{alias}` має містити лише цифри, літери та символи підкреслення."
-        alias_not_unique: "Секретний псевдонім `%{alias}` дублюється."
-      secret_bindings:
-        invalid_payload: "Секретні зв'язки повинні бути масивом."
-        secret_not_found: "Вибраний обліковий запис не існує."
     ai_helper:
       errors:
         completion_request_failed: "Щось пішло не так під час спроби надати пропозиції. Будь ласка, спробуйте ще раз."
@@ -326,7 +314,6 @@ uk:
       flag_reason: "Позначено як спам за допомогою <a href='%{url}'>Discourse AI</a>"
       silence_reason: "Користувач автоматично заблокований <a href='%{url}'>Discourse AI</a>"
       invalid_error_type: "Наданий невірний тип помилки"
-      unexpected: "Сталась непередбачена помилка"
       bot_user_update_failed: "Не вдалося оновити користувача бота для сканування спаму"
       configuration_missing: "Конфігурація виявлення спаму AI відсутня. Додайте конфігурацію в розділі «Адміністратор > Плагіни > Discourse AI > Спам» перед увімкненням."
       logging_subject: "Виявлення спаму"
@@ -441,9 +428,6 @@ uk:
         discover:
           name: "Відкриття"
           description: "Персона за замовчуванням, що використовується у функції «Відкриття» (безкоштовний пошук)"
-        chat_thread_titler:
-          name: "Заголовок теми чату"
-          description: "Персона за замовчуванням, що забезпечує автоматичне створення заголовків тем чату"
       topic_not_found: "Всього недоступно, тема не знайдена!"
       summarizing: "Підведення підсумків теми"
       searching: "Пошук: '%{query}'"
@@ -662,7 +646,6 @@ uk:
         invalid_seeded_model: "Ви не можете використовувати цю модель із цією функцією"
         invalid_persona_response_format: "Вибрана персона повинна мати формат відповіді з логічними назвами полів «спам»"
         must_select_model: "Спочатку ви повинні вибрати LLM"
-        invalid_llm_id: "Обрана модель LLM недійсна"
       endpoints:
         not_configured: "%{display_name} (не налаштовано)"
         configuration_hint:
@@ -681,16 +664,12 @@ uk:
     embeddings:
       delete_failed: "Ця модель наразі використовується. Спочатку оновіть `ai embeddings selected model`."
       cannot_edit_builtin: "Ви не можете редагувати вбудовану модель."
-      secret_required: "Необхідно вибрати обліковий запис"
-      secret_not_found: "Вибраний обліковий запис не існує"
       configuration:
         disable_embeddings: "Спершу потрібно вимкнути функцію «AI embeddings enabled»."
         choose_model: "Спочатку встановіть 'ai embeddings selected model'."
         model_test_failed: "Нам не вдалося створити тестове вбудовування з цією моделлю. Перевірте, чи правильно налаштовано."
     llm_models:
       missing_provider_param: "%{param} не може бути пустим"
-      secret_required: "Необхідно вибрати обліковий запис"
-      secret_not_found: "Вибраний обліковий запис не існує"
       bedrock_invalid_url: "Будь ласка, заповніть усі поля, щоб використовувати цю модель."
       bedrock_missing_auth: "AWS Bedrock вимагає налаштування або ідентифікатора ключа доступу, або ARN ролі"
     ai_staff_action_logger:
diff --git a/plugins/discourse-ai/config/locales/server.zh_CN.yml b/plugins/discourse-ai/config/locales/server.zh_CN.yml
index acdf809bc1cf1..d05792e68029d 100644
--- a/plugins/discourse-ai/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-ai/config/locales/server.zh_CN.yml
@@ -96,7 +96,6 @@ zh_CN:
     ai_helper_enabled_features: "选择要在 AI 助手中启用的功能。"
     post_ai_helper_allowed_groups: "能够在帖子中访问 AI 助手功能的用户群组"
     ai_helper_post_illustrator_persona: "用于 AI 助手的帖子插图功能的角色。注意：要使此功能正常运行，您还必须创建一个图片生成工具（管理员 > 插件 > Discourse AI > 工具）。"
-    ai_helper_chat_thread_title_persona: "用于生成聊天主题标题的角色。"
     ai_embeddings_selected_model: "使用所选模型生成嵌入向量。"
     ai_embeddings_generate_for_pms: "为个人消息生成嵌入向量。"
     ai_embeddings_semantic_related_topics_enabled: "将语义搜索用于相关话题。"
@@ -116,7 +115,6 @@ zh_CN:
     ai_summary_backfill_maximum_topics_per_hour: "每小时回填的话题摘要数。"
     ai_bot_enabled: "启用 AI 机器人模块。"
     ai_bot_enabled_llms: "用于选择 AI 机器人对话的 LLM"
-    ai_bot_enable_chat_warning: "启动私信聊天时显示警告。可以通过编辑翻译字符串进行覆盖：discourse_ai.ai_bot.pm_warning"
     ai_bot_allowed_groups: "当 GPT 机器人可以访问私信时，它将回复这些群组的成员。"
     ai_bot_debugging_allowed_groups: "允许这些群组在帖子上看到显示原始 AI 请求和回答的调试按钮"
     ai_bot_public_sharing_allowed_groups: "允许这些群组通过唯一的公开链接与公众分享 AI 个人消息。注意：如果您的站点需要登录，分享时也需要登录。"
@@ -276,8 +274,6 @@ zh_CN:
           name: "从空白开始…"
       name:
         characters: "只能包含数字、字母和下划线"
-      secret_bindings:
-        secret_not_found: "所选凭证不存在."
     ai_helper:
       errors:
         completion_request_failed: "尝试提供建议时出错。请重试。"
@@ -312,7 +308,6 @@ zh_CN:
       flag_reason: "被 <a href='%{url}'>Discourse AI</a> 标记为垃圾信息"
       silence_reason: "用户被 <a href='%{url}'>Discourse AI</a> 自动禁言"
       invalid_error_type: "提供的错误类型无效"
-      unexpected: "发生意外错误"
       bot_user_update_failed: "无法更新垃圾信息扫描机器人用户"
       configuration_missing: "缺少 AI 垃圾信息检测配置。请先在“管理 > 插件 > Discourse AI > 垃圾信息”中添加配置，然后再启用。"
       logging_subject: "垃圾信息检测"
@@ -427,9 +422,6 @@ zh_CN:
         discover:
           name: "发现"
           description: "发现功能中使用的默认角色（免费搜索）"
-        chat_thread_titler:
-          name: "聊天主题标题"
-          description: "自动生成聊天主题标题的默认角色"
       topic_not_found: "总结不可用，找不到话题！"
       summarizing: "正在总结话题"
       searching: "搜索：'%{query}'"
@@ -621,7 +613,6 @@ zh_CN:
         invalid_seeded_model: "您无法在此模型中使用此功能"
         invalid_persona_response_format: "所选角色必须具有带有布尔字段名称“spam”的回答格式"
         must_select_model: "必须先选择一个 LLM"
-        invalid_llm_id: "所选的LLM模型无效"
       endpoints:
         not_configured: "%{display_name}（未配置）"
         configuration_hint:
@@ -634,16 +625,12 @@ zh_CN:
     embeddings:
       delete_failed: "此模型目前正在使用中。请先更新 `ai embeddings selected model`。"
       cannot_edit_builtin: "您无法编辑内置模型。"
-      secret_required: "必须选择一种凭证。"
-      secret_not_found: "所选凭证不存在"
       configuration:
         disable_embeddings: "您必须先禁用 'ai embeddings enabled'。"
         choose_model: "首先设置 'ai embeddings selected model'。"
         model_test_failed: "我们无法使用此模型生成测试嵌入向量。请检查配置是否正确。"
     llm_models:
       missing_provider_param: "%{param}不能为空"
-      secret_required: "必须选择一种凭证。"
-      secret_not_found: "所选凭证不存在"
       bedrock_invalid_url: "请填写所有字段以使用此模型。"
       bedrock_missing_auth: "AWS Bedrock 需要配置访问密钥 ID 或角色 ARN。"
     ai_staff_action_logger:
diff --git a/plugins/discourse-assign/config/locales/client.cs.yml b/plugins/discourse-assign/config/locales/client.cs.yml
index 17f007756f166..35423795f76b8 100644
--- a/plugins/discourse-assign/config/locales/client.cs.yml
+++ b/plugins/discourse-assign/config/locales/client.cs.yml
@@ -129,8 +129,6 @@ cs:
       web_hooks:
         assign_event:
           group_name: "Události přidělení"
-          assigned: "Když uživatel přidělí téma"
-          unassigned: "Když uživatel zruší přidělení tématu"
     search:
       advanced:
         in:
diff --git a/plugins/discourse-assign/config/locales/client.de.yml b/plugins/discourse-assign/config/locales/client.de.yml
index 3ee29fdf2a808..4c83cf03937b5 100644
--- a/plugins/discourse-assign/config/locales/client.de.yml
+++ b/plugins/discourse-assign/config/locales/client.de.yml
@@ -129,8 +129,6 @@ de:
       web_hooks:
         assign_event:
           group_name: "Ereignisse zuordnen"
-          assigned: "Wenn ein Benutzer ein Thema zuordnet"
-          unassigned: "Wenn ein Benutzer die Zuordnung eines Themas aufhebt"
     search:
       advanced:
         in:
diff --git a/plugins/discourse-assign/config/locales/client.pl_PL.yml b/plugins/discourse-assign/config/locales/client.pl_PL.yml
index 7183d77818053..c2d6b19d9c690 100644
--- a/plugins/discourse-assign/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-assign/config/locales/client.pl_PL.yml
@@ -129,8 +129,6 @@ pl_PL:
       web_hooks:
         assign_event:
           group_name: "Przypisz wydarzenia"
-          assigned: "Gdy użytkownik przypisuje temat"
-          unassigned: "Kiedy użytkownik anuluje przypisanie tematu"
     search:
       advanced:
         in:
diff --git a/plugins/discourse-assign/config/locales/client.uk.yml b/plugins/discourse-assign/config/locales/client.uk.yml
index 147a271588c4d..c2ec422842e61 100644
--- a/plugins/discourse-assign/config/locales/client.uk.yml
+++ b/plugins/discourse-assign/config/locales/client.uk.yml
@@ -129,8 +129,6 @@ uk:
       web_hooks:
         assign_event:
           group_name: "Призначити події"
-          assigned: "Коли користувач призначає тему"
-          unassigned: "Коли користувач скасовує призначення теми"
     search:
       advanced:
         in:
diff --git a/plugins/discourse-assign/config/locales/client.zh_CN.yml b/plugins/discourse-assign/config/locales/client.zh_CN.yml
index c08faf033971d..395cc4427caa5 100644
--- a/plugins/discourse-assign/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-assign/config/locales/client.zh_CN.yml
@@ -129,8 +129,6 @@ zh_CN:
       web_hooks:
         assign_event:
           group_name: "指定事件"
-          assigned: "当用户指定主题时"
-          unassigned: "当用户取消指定主题时"
     search:
       advanced:
         in:
diff --git a/plugins/discourse-calendar/config/locales/server.ar.yml b/plugins/discourse-calendar/config/locales/server.ar.yml
index 294aa557c5f69..693b059ed523d 100644
--- a/plugins/discourse-calendar/config/locales/server.ar.yml
+++ b/plugins/discourse-calendar/config/locales/server.ar.yml
@@ -77,7 +77,6 @@ ar:
       ongoing_event_reminder: "%{title} جارٍ."
     errors:
       bulk_invite:
-        max_invitees: "تم إنشاء أول %{max_invitees} من المدعوين. جرِّب تقسيم الملف إلى أجزاء أصغر."
         error: "حدث خطأ في تحميل هذا الملف. يُرجى إعادة المحاولة لاحقًا."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.cs.yml b/plugins/discourse-calendar/config/locales/server.cs.yml
index b4543743e543e..24e5008b54fd7 100644
--- a/plugins/discourse-calendar/config/locales/server.cs.yml
+++ b/plugins/discourse-calendar/config/locales/server.cs.yml
@@ -77,7 +77,6 @@ cs:
       ongoing_event_reminder: "%{title} probíhá."
     errors:
       bulk_invite:
-        max_invitees: "Bylo vytvořeno prvních %{max_invitees} pozvánek. Zkuste soubor rozdělit na menší části."
         error: "Nastala chyba při nahrávání souboru. Prosím opakujte akci později."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.da.yml b/plugins/discourse-calendar/config/locales/server.da.yml
index 85c915190aea1..f153fa0b8e228 100644
--- a/plugins/discourse-calendar/config/locales/server.da.yml
+++ b/plugins/discourse-calendar/config/locales/server.da.yml
@@ -54,7 +54,6 @@ da:
       ongoing_event_reminder: "%{title} er i gang."
     errors:
       bulk_invite:
-        max_invitees: "De første %{max_invitees} inviterede er oprettet. Prøv at opdele filen i mindre dele."
         error: "Der opstod en fejl under overførsel af filen. Prøv venligst igen senere."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.de.yml b/plugins/discourse-calendar/config/locales/server.de.yml
index 8c3a86dac93aa..e00ac343f3ab0 100644
--- a/plugins/discourse-calendar/config/locales/server.de.yml
+++ b/plugins/discourse-calendar/config/locales/server.de.yml
@@ -8,7 +8,6 @@ de:
   reports:
     currently_away:
       title: Derzeit abwesende Benutzer
-      description: "Benutzer, die aktuell im Urlaub oder abwesend sind. Diese können nach Gruppenmitgliedschaft gefiltert werden."
       labels:
         username: Benutzername
   discourse_automation:
@@ -78,7 +77,6 @@ de:
       ongoing_event_reminder: "%{title} ist im Gange."
     errors:
       bulk_invite:
-        max_invitees: "Die ersten %{max_invitees} eingeladenen Personen wurden erstellt. Versuche, die Datei in kleinere Teile aufzuteilen."
         error: "Beim Hochladen dieser Datei ist ein Fehler aufgetreten. Bitte versuche es später noch einmal."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.es.yml b/plugins/discourse-calendar/config/locales/server.es.yml
index 19c728796dcf8..d77a20b90ac68 100644
--- a/plugins/discourse-calendar/config/locales/server.es.yml
+++ b/plugins/discourse-calendar/config/locales/server.es.yml
@@ -75,7 +75,6 @@ es:
       ongoing_event_reminder: "%{title} está en curso."
     errors:
       bulk_invite:
-        max_invitees: "Las primeras %{max_invitees} invitaciones se han enviado. Intenta dividir el archivo en partes más pequeñas."
         error: "Se produjo un error al subir este archivo. Inténtalo de nuevo más tarde."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.fi.yml b/plugins/discourse-calendar/config/locales/server.fi.yml
index f3a6761c56a20..87366623490ed 100644
--- a/plugins/discourse-calendar/config/locales/server.fi.yml
+++ b/plugins/discourse-calendar/config/locales/server.fi.yml
@@ -75,7 +75,6 @@ fi:
       ongoing_event_reminder: "%{title} on käynnissä."
     errors:
       bulk_invite:
-        max_invitees: "Ensimmäiset %{max_invitees} kutsuttua on luotu. Kokeile jakaa tiedosto pienempiin osiin."
         error: "Tiedoston lataus epäonnistui. Yritä myöhemmin uudelleen."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.fr.yml b/plugins/discourse-calendar/config/locales/server.fr.yml
index c0b40dea4b681..249a48e645824 100644
--- a/plugins/discourse-calendar/config/locales/server.fr.yml
+++ b/plugins/discourse-calendar/config/locales/server.fr.yml
@@ -75,7 +75,6 @@ fr:
       ongoing_event_reminder: "L'événement %{title} est en cours."
     errors:
       bulk_invite:
-        max_invitees: "Les %{max_invitees} premières invitations ont été créées. Essayez de diviser le fichier en plus petites parties."
         error: "Une erreur s'est produite lors du téléversement du fichier. Veuillez réessayer plus tard."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.he.yml b/plugins/discourse-calendar/config/locales/server.he.yml
index ae95ca9120044..c8718bd87510c 100644
--- a/plugins/discourse-calendar/config/locales/server.he.yml
+++ b/plugins/discourse-calendar/config/locales/server.he.yml
@@ -76,7 +76,6 @@ he:
       ongoing_event_reminder: "%{title} מתרחש כרגע."
     errors:
       bulk_invite:
-        max_invitees: "%{max_invitees} המוזמנים הראשונים נוצרו. עדיף לנסות לפצל את הקובץ לחלקים קטנים יותר."
         error: "אירעה שגיאה בשליחת הקובץ. נא לנסות שוב מאוחר יותר."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.hu.yml b/plugins/discourse-calendar/config/locales/server.hu.yml
index 3ba5bb3ce7566..72b2aa8b54b32 100644
--- a/plugins/discourse-calendar/config/locales/server.hu.yml
+++ b/plugins/discourse-calendar/config/locales/server.hu.yml
@@ -46,7 +46,6 @@ hu:
       ongoing_event_reminder: "A(z) %{title} folyamatban van."
     errors:
       bulk_invite:
-        max_invitees: "Az első %{max_invitees} meghívott lett létrehozva. Próbálja meg a fájlt kisebb részekre osztani."
         error: "Hiba történt a fájl feltöltése során. Próbálja újra később."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.it.yml b/plugins/discourse-calendar/config/locales/server.it.yml
index 176bbac64c310..6e187bff4cd46 100644
--- a/plugins/discourse-calendar/config/locales/server.it.yml
+++ b/plugins/discourse-calendar/config/locales/server.it.yml
@@ -68,7 +68,6 @@ it:
       ongoing_event_reminder: "%{title} è in corso."
     errors:
       bulk_invite:
-        max_invitees: "I primi %{max_invitees} inviti sono stati creati. Prova a dividere il file in parti più piccole."
         error: "Si è verificato un errore durante il caricamento del file. Riprova più tardi."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.ja.yml b/plugins/discourse-calendar/config/locales/server.ja.yml
index 12055e7d9a4f3..f97598bf91634 100644
--- a/plugins/discourse-calendar/config/locales/server.ja.yml
+++ b/plugins/discourse-calendar/config/locales/server.ja.yml
@@ -77,7 +77,6 @@ ja:
       ongoing_event_reminder: "%{title} は進行中です。"
     errors:
       bulk_invite:
-        max_invitees: "最初の %{max_invitees} 人の招待者が作成されました。ファイルをより小さく分割してください。"
         error: "そのファイルをアップロード中にエラーが発生しました。後でもう一度お試しください。"
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.nl.yml b/plugins/discourse-calendar/config/locales/server.nl.yml
index 42ea3fbb4e5ae..7e82b5f4e1bfe 100644
--- a/plugins/discourse-calendar/config/locales/server.nl.yml
+++ b/plugins/discourse-calendar/config/locales/server.nl.yml
@@ -75,7 +75,6 @@ nl:
       ongoing_event_reminder: "%{title} is gaande."
     errors:
       bulk_invite:
-        max_invitees: "De eerste %{max_invitees} genodigden zijn gemaakt. Probeer het bestand op te splitsen in kleinere delen."
         error: "Er is een fout opgetreden bij het uploaden van het bestand. Probeer het later opnieuw."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.pl_PL.yml b/plugins/discourse-calendar/config/locales/server.pl_PL.yml
index 3967ef3f894a4..5cc18e03db13f 100644
--- a/plugins/discourse-calendar/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-calendar/config/locales/server.pl_PL.yml
@@ -8,7 +8,6 @@ pl_PL:
   reports:
     currently_away:
       title: Użytkownicy aktualnie nieobecni
-      description: "Użytkownicy, którzy aktualnie są na urlopie lub nie mają urlopu, można ich filtrować według grup."
       labels:
         username: Nazwa użytkownika
   discourse_automation:
@@ -78,7 +77,6 @@ pl_PL:
       ongoing_event_reminder: "%{title} trwa."
     errors:
       bulk_invite:
-        max_invitees: "Pierwsze %{max_invitees} osób zostało utworzonych. Spróbuj podzielić plik na mniejsze części."
         error: "Wystąpił błąd podczas wgrywania tego pliku. Spróbuj ponownie później."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.pt_BR.yml b/plugins/discourse-calendar/config/locales/server.pt_BR.yml
index 8db1f6755e842..c4bdb68896f14 100644
--- a/plugins/discourse-calendar/config/locales/server.pt_BR.yml
+++ b/plugins/discourse-calendar/config/locales/server.pt_BR.yml
@@ -75,7 +75,6 @@ pt_BR:
       ongoing_event_reminder: "%{title} está em andamento."
     errors:
       bulk_invite:
-        max_invitees: "Os primeiros %{max_invitees} convites foram enviados. Tente dividir o arquivo em partes menores."
         error: "Houve um erro ao tentar enviar este arquivo. Tente novamente mais tarde."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.ru.yml b/plugins/discourse-calendar/config/locales/server.ru.yml
index 402ad194778e1..db98c4517f1af 100644
--- a/plugins/discourse-calendar/config/locales/server.ru.yml
+++ b/plugins/discourse-calendar/config/locales/server.ru.yml
@@ -76,7 +76,6 @@ ru:
       ongoing_event_reminder: "Мероприятие «%{title}» продолжается."
     errors:
       bulk_invite:
-        max_invitees: "Были созданы первые приглашения (%{max_invitees}). Попробуйте разделить файл на более мелкие части."
         error: "Произошла ошибка при загрузке файла. Повторите попытку позже."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.sk.yml b/plugins/discourse-calendar/config/locales/server.sk.yml
index 831d705842f99..504a40862e30b 100644
--- a/plugins/discourse-calendar/config/locales/server.sk.yml
+++ b/plugins/discourse-calendar/config/locales/server.sk.yml
@@ -75,7 +75,6 @@ sk:
       ongoing_event_reminder: "%{title} práve prebieha."
     errors:
       bulk_invite:
-        max_invitees: "Prvých %{max_invitees} pozvaných bolo vytvorených. Skúste súbor rozdeliť na menšie časti."
         error: "Počas nahrávanie súboru sa vyskytla chyba. Prosím, vyskúšajte ho nahraď znovu neskôr."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.sl.yml b/plugins/discourse-calendar/config/locales/server.sl.yml
index 2722962d8481f..d67c6a165cec3 100644
--- a/plugins/discourse-calendar/config/locales/server.sl.yml
+++ b/plugins/discourse-calendar/config/locales/server.sl.yml
@@ -53,7 +53,6 @@ sl:
       ongoing_event_reminder: "%{title} je v teku."
     errors:
       bulk_invite:
-        max_invitees: "Ustvarjenih je bilo prvih %{max_invitees} povabljencev. Poskusite razbiti datoteko na manjše dele."
         error: "Pri nalaganju te datoteke je prišlo do napake. Prosimo, poskusite ponovno."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.sv.yml b/plugins/discourse-calendar/config/locales/server.sv.yml
index 8566d7b520c92..16afced0e8081 100644
--- a/plugins/discourse-calendar/config/locales/server.sv.yml
+++ b/plugins/discourse-calendar/config/locales/server.sv.yml
@@ -62,7 +62,6 @@ sv:
       ongoing_event_reminder: "%{title} pågår."
     errors:
       bulk_invite:
-        max_invitees: "De första %{max_invitees} inbjudningarna har skickats ut. Prova att dela upp filen i mindre delar."
         error: "Det uppstod ett problem när filen skulle laddas upp. Vi ber dig försöka igen senare."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.tr_TR.yml b/plugins/discourse-calendar/config/locales/server.tr_TR.yml
index b735cecd2cf05..0ca0c63e51f9e 100644
--- a/plugins/discourse-calendar/config/locales/server.tr_TR.yml
+++ b/plugins/discourse-calendar/config/locales/server.tr_TR.yml
@@ -75,7 +75,6 @@ tr_TR:
       ongoing_event_reminder: "%{title} devam ediyor."
     errors:
       bulk_invite:
-        max_invitees: "İlk %{max_invitees} davetli oluşturuldu. Dosyayı daha küçük parçalara bölmeyi deneyin."
         error: "Bu dosya yüklenirken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.uk.yml b/plugins/discourse-calendar/config/locales/server.uk.yml
index accfab747b3e8..5bb18a4617216 100644
--- a/plugins/discourse-calendar/config/locales/server.uk.yml
+++ b/plugins/discourse-calendar/config/locales/server.uk.yml
@@ -77,7 +77,6 @@ uk:
       ongoing_event_reminder: "%{title} триває."
     errors:
       bulk_invite:
-        max_invitees: "Створено перші %{max_invitees} запрошених. Спробуйте розбити файл на менші частини."
         error: "Під час завантаження цього файлу сталася помилка. Будь ласка, спробуйте пізніше."
       models:
         event:
diff --git a/plugins/discourse-calendar/config/locales/server.zh_CN.yml b/plugins/discourse-calendar/config/locales/server.zh_CN.yml
index 29ffe50d1e35d..c98b846a686de 100644
--- a/plugins/discourse-calendar/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-calendar/config/locales/server.zh_CN.yml
@@ -77,7 +77,6 @@ zh_CN:
       ongoing_event_reminder: "%{title} 正在进行。"
     errors:
       bulk_invite:
-        max_invitees: "前 %{max_invitees} 位受邀者已创建。尝试将文件拆分成更小的部分。"
         error: "上传文件时出错。请稍后再试。"
       models:
         event:
diff --git a/plugins/discourse-chat-integration/config/locales/client.cs.yml b/plugins/discourse-chat-integration/config/locales/client.cs.yml
index 0da88d5655282..d476b185f7883 100644
--- a/plugins/discourse-chat-integration/config/locales/client.cs.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.cs.yml
@@ -8,7 +8,6 @@ cs:
   js:
     chat_integration:
       settings: "Nastavení"
-      channel_exception: "Při posledním odeslání zprávy do tohoto kanálu došlo k neznámé chybě."
       choose_group: "(vyberte skupinu)"
       all_categories: "(všechny kategorie)"
       all_tags: "(všechny štítky)"
@@ -18,7 +17,6 @@ cs:
       test_modal:
         topic: "Téma"
         close: "Zavřít"
-        error: "Při odesílání zprávy došlo k neznámé chybě. Další informace naleznete v protokolech webu."
       type:
         normal: Normální
       filter:
diff --git a/plugins/discourse-chat-integration/config/locales/client.de.yml b/plugins/discourse-chat-integration/config/locales/client.de.yml
index 764ac515ce9a8..c8348e27d45bd 100644
--- a/plugins/discourse-chat-integration/config/locales/client.de.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.de.yml
@@ -16,7 +16,6 @@ de:
       settings: "Einstellungen"
       no_providers: "Du musst Provider in den Plug-in-Einstellungen aktivieren"
       channels_with_errors: "Das letzte Versenden von Nachrichten ist bei einigen Kanälen dieses Providers fehlgeschlagen. Klicke auf das/die Fehlersymbol(e), um mehr zu erfahren."
-      channel_exception: "Ein unbekannter Fehler ist aufgetreten, als zuletzt eine Nachricht an diesen Kanal gesendet wurde."
       group_mention_template: "Erwähnungen von: @%{name}"
       group_message_template: "Nachrichten an: @%{name}"
       choose_group: "(wähle eine Gruppe)"
@@ -33,7 +32,6 @@ de:
         topic: "Thema"
         send: "Test-Nachricht senden"
         close: "Schließen"
-        error: "Ein unbekannter Fehler ist beim Senden der Nachricht aufgetreten. Bitte überprüfe die Website-Protokolle für weitere Informationen."
         success: "Nachricht erfolgreich versendet"
       type:
         normal: Normal
diff --git a/plugins/discourse-chat-integration/config/locales/client.pl_PL.yml b/plugins/discourse-chat-integration/config/locales/client.pl_PL.yml
index 4cbfa11d56985..0ce18ce298457 100644
--- a/plugins/discourse-chat-integration/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.pl_PL.yml
@@ -16,7 +16,6 @@ pl_PL:
       settings: "Ustawień"
       no_providers: "Musisz włączyć niektórych dostawców w ustawieniach wtyczki"
       channels_with_errors: "Niektóre kanały dla tego dostawcy nie powiodły się, gdy zostały wysłane ostatnie wiadomości. Kliknij ikonę błędu, aby dowiedzieć się więcej."
-      channel_exception: "Podczas ostatniego wysyłania wiadomości do tego kanału wystąpił nieznany błąd."
       group_mention_template: "Wzmianki o: @%{name}"
       group_message_template: "Wiadomości do: @%{name}"
       choose_group: "(wybierz grupę)"
@@ -33,7 +32,6 @@ pl_PL:
         topic: "Temat"
         send: "Wyślij wiadomość testową"
         close: "Zamknij"
-        error: "Podczas wysyłania wiadomości wystąpił nieznany błąd. Sprawdź dzienniki witryny, aby uzyskać więcej informacji."
         success: "Wiadomość wysłana poprawnie"
       type:
         normal: Normalny
diff --git a/plugins/discourse-chat-integration/config/locales/client.uk.yml b/plugins/discourse-chat-integration/config/locales/client.uk.yml
index 9fd9c221c99cc..ce6242971aefe 100644
--- a/plugins/discourse-chat-integration/config/locales/client.uk.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.uk.yml
@@ -16,7 +16,6 @@ uk:
       settings: "Налаштування"
       no_providers: "Потрібно включити деяких постачальників у налаштуваннях плагіна"
       channels_with_errors: "Деякі канали цього провайдера не вдавалися, коли останній раз надсилалися повідомлення. Клацніть піктограму помилок, щоб дізнатися більше."
-      channel_exception: "Невідома помилка сталася під час останнього надсилання повідомлення на цей канал."
       group_mention_template: "Згадки про: @%{name}"
       group_message_template: "Повідомлення до: @ %{name}"
       choose_group: "(виберіть групу)"
@@ -33,7 +32,6 @@ uk:
         topic: "Тема"
         send: "Надіслати тестове повідомлення"
         close: "Закрити"
-        error: "Під час надсилання повідомлення сталася невідома помилка. Перегляньте журнали сайту для отримання додаткової інформації."
         success: "Повідомлення успішно надіслано"
       type:
         normal: Нормальний
diff --git a/plugins/discourse-chat-integration/config/locales/client.zh_CN.yml b/plugins/discourse-chat-integration/config/locales/client.zh_CN.yml
index 1984b5d23773e..5edef4f5a84cf 100644
--- a/plugins/discourse-chat-integration/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-chat-integration/config/locales/client.zh_CN.yml
@@ -16,7 +16,6 @@ zh_CN:
       settings: "设置"
       no_providers: "您需要在插件设置中启用一些提供商"
       channels_with_errors: "上次发送消息时，此提供商的一些频道失败。点击错误图标了解详情。"
-      channel_exception: "上次向此频道发送消息时发生未知错误。"
       group_mention_template: "提及：@%{name}"
       group_message_template: "发送消息给：@%{name}"
       choose_group: "（选择一个群组）"
@@ -33,7 +32,6 @@ zh_CN:
         topic: "话题"
         send: "发送测试信息"
         close: "关闭"
-        error: "发送消息时遇到未知错误。检查站点日志了解详情。"
         success: "消息已成功发送"
       type:
         normal: 正常
diff --git a/plugins/discourse-chat-integration/config/locales/server.de.yml b/plugins/discourse-chat-integration/config/locales/server.de.yml
index 3be97e3905806..71b1d9504af12 100644
--- a/plugins/discourse-chat-integration/config/locales/server.de.yml
+++ b/plugins/discourse-chat-integration/config/locales/server.de.yml
@@ -51,8 +51,6 @@ de:
     chat_integration_flowdock_excerpt_length: "Auszugslänge für Flowdock-Beiträge"
     chat_integration_groupme_enabled: "Aktiviere den Chat-Integration-Provider für Groupme"
     chat_integration_groupme_excerpt_length: "Auszugslänge für Groupme-Beiträge"
-    chat_integration_groupme_bot_ids: "*erforderlich* Bot-IDs getrennt durch „,“ (Komma), falls mehrere vorhanden sind"
-    chat_integration_groupme_instance_names: " *erforderlich* Name des GroupMe-Chats getrennt durch „,“ (Komma), falls mehrere vorhanden sind (gleiche Reihenfolge wie Bot-IDs)"
     chat_integration_teams_enabled: "Aktiviere den Chat-Integration-Provider für Microsoft Teams"
     chat_integration_teams_excerpt_length: "Auszugslänge für „Microsoft Teams“-Beiträge"
     chat_integration_powerautomate_enabled: "„Microsoft Power Automate“-Integrationsanbieter aktivieren"
@@ -93,10 +91,8 @@ de:
         create:
           created: "Regel erfolgreich erstellt"
           updated: "Regel erfolgreich aktualisiert"
-          error: "Entschuldige, ein Fehler ist beim Erstellen dieser Regel aufgetreten."
         delete:
           success: "Regel erfolgreich gelöscht"
-          error: "Leider ist beim Löschen dieser Regel ein Fehler aufgetreten. Führe `/discourse status` aus, um eine Liste der Regeln einzusehen."
         not_found:
           tag: "Das Schlagwort *%{name}* kann nicht gefunden werden."
           category: "Die Kategorie *%{name}* kann nicht gefunden werden. Verfügbare Kategorien: *%{list}*"
@@ -158,10 +154,8 @@ de:
         create:
           created: "Regel erfolgreich erstellt"
           updated: "Regel erfolgreich aktualisiert"
-          error: "Entschuldige, ein Fehler ist beim Erstellen dieser Regel aufgetreten."
         delete:
           success: "Regel erfolgreich gelöscht"
-          error: "Entschuldige, ein Fehler ist beim Löschen dieser Regel aufgetreten. Führe <code>/status</code> aus für eine Liste der Regeln."
         not_found:
           tag: "Das Schlagwort <b>%{name}</b> kann nicht gefunden werden."
           category: "Die Kategorie <b>%{name}</b> kann nicht gefunden werden. Verfügbare Kategorien: <b>%{list}</b>"
@@ -192,10 +186,8 @@ de:
         create:
           created: "Regel erfolgreich erstellt"
           updated: "Regel erfolgreich aktualisiert"
-          error: "Entschuldige, ein Fehler ist beim Erstellen dieser Regel aufgetreten."
         delete:
           success: "Regel erfolgreich gelöscht"
-          error: "Leider ist beim Löschen dieser Regel ein Fehler aufgetreten. Führe `/discourse status` aus, um eine Liste der Regeln einzusehen."
         not_found:
           tag: "Das Schlagwort *%{name}* kann nicht gefunden werden."
           category: "Die Kategorie *%{name}* kann nicht gefunden werden. Verfügbare Kategorien: *%{list}*"
diff --git a/plugins/discourse-chat-integration/config/locales/server.pl_PL.yml b/plugins/discourse-chat-integration/config/locales/server.pl_PL.yml
index 8aabea539a010..804f9c39ad91c 100644
--- a/plugins/discourse-chat-integration/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-chat-integration/config/locales/server.pl_PL.yml
@@ -51,8 +51,6 @@ pl_PL:
     chat_integration_flowdock_excerpt_length: "Długość skrótu wpisu na Flowdock"
     chat_integration_groupme_enabled: "Włącz integrację z GroupMe"
     chat_integration_groupme_excerpt_length: "Długość fragmentu postu GroupMe"
-    chat_integration_groupme_bot_ids: "*wymagane* Identyfikatory bota, rozdzielone przecinkiem, jeśli jest ich wiele"
-    chat_integration_groupme_instance_names: " *wymagane* Nazwa czatu GroupMe, oddzielona przecinkiem, jeśli jest ich więcej (w tej samej kolejności, co identyfikatory botów)"
     chat_integration_teams_enabled: "Włącz integrację z Microsoft Teams"
     chat_integration_teams_excerpt_length: "Długość fragmentu postu Microsoft Team"
     chat_integration_powerautomate_enabled: "Włącz dostawcę integracji Microsoft Power Automate"
@@ -93,10 +91,8 @@ pl_PL:
         create:
           created: "Reguła utworzona z powodzeniem"
           updated: "Reguła zaktualizowana z powodzeniem"
-          error: "Przepraszamy, wystąpił błąd podczas tworzenia tej reguły."
         delete:
           success: "Reguła usunięta"
-          error: "Przepraszamy, wystąpił błąd podczas usuwania tej reguły. Uruchom `/discourse status`, aby wyświetlić listę reguł."
         not_found:
           tag: "Tag o nazwie *%{name}* nie może zostać znaleziony."
           category: "Kategoria o nazwie *%{name}* nie może zostać znaleziona. Dostępne kategorie: *%{list}*"
@@ -158,10 +154,8 @@ pl_PL:
         create:
           created: "Reguła utworzona z powodzeniem"
           updated: "Reguła zaktualizowana z powodzeniem"
-          error: "Przepraszamy, wystąpił błąd podczas tworzenia tej reguły."
         delete:
           success: "Reguła usunięta"
-          error: "Przepraszamy, wystąpił błąd podczas usuwania tej reguły. Uruchom polecenie <code>/status</code> , aby wyświetlić listę reguł."
         not_found:
           tag: "Tag <b>%{name}</b> nie może zostać znaleziony."
           category: "Kategoria <b>%{name}</b> nie może zostać znaleziona. Dostępne kategorie: <b>%{list}</b>"
@@ -192,10 +186,8 @@ pl_PL:
         create:
           created: "Reguła utworzona z powodzeniem"
           updated: "Reguła zaktualizowana z powodzeniem"
-          error: "Przepraszamy, wystąpił błąd podczas tworzenia tej reguły."
         delete:
           success: "Reguła usunięta"
-          error: "Przepraszamy, wystąpił błąd podczas usuwania tej reguły. Uruchom `/discourse status`, aby wyświetlić listę reguł."
         not_found:
           tag: "Tag o nazwie *%{name}* nie może zostać znaleziony."
           category: "Kategoria o nazwie *%{name}* nie może zostać znaleziona. Dostępne kategorie: *%{list}*"
diff --git a/plugins/discourse-chat-integration/config/locales/server.uk.yml b/plugins/discourse-chat-integration/config/locales/server.uk.yml
index 9ed417960cd59..7a62455582389 100644
--- a/plugins/discourse-chat-integration/config/locales/server.uk.yml
+++ b/plugins/discourse-chat-integration/config/locales/server.uk.yml
@@ -51,8 +51,6 @@ uk:
     chat_integration_flowdock_excerpt_length: "Довжина уривку публікації Flowdock"
     chat_integration_groupme_enabled: "Увімкнути постачальника інтеграції чату Groupme"
     chat_integration_groupme_excerpt_length: "Довжина уривку допису в Groupme"
-    chat_integration_groupme_bot_ids: "*обов’язково* Ідентифікатори ботів, розділені символом ',' якщо їх декілька"
-    chat_integration_groupme_instance_names: " *обов’язково* Ім’я чату GroupMe, розділене символом ',' якщо їх декілька (у тому ж порядку, що й ідентифікатори ботів)"
     chat_integration_teams_enabled: "Увімкніть постачальника інтеграції чату Microsoft Teams"
     chat_integration_teams_excerpt_length: "Довжина фрагмента допису в Microsoft Team"
     chat_integration_powerautomate_enabled: "Увімкніть постачальника інтеграції Microsoft Power Automate"
@@ -93,10 +91,8 @@ uk:
         create:
           created: "Правило створено успішно"
           updated: "Правило успішно оновлено"
-          error: "На жаль, під час створення цього правила сталася помилка."
         delete:
           success: "Правило успішно видалено"
-          error: "Вибачте, сталася помилка при видаленні цього правила. Запустіть `/discourse status` для отримання списку правил."
         not_found:
           tag: "Тег *%{name}* не знайдено."
           category: "Не вдалося знайти категорію *%{name}*. Доступні категорії: *%{list}*"
@@ -158,10 +154,8 @@ uk:
         create:
           created: "Правило створено успішно"
           updated: "Правило успішно оновлено"
-          error: "На жаль, під час створення цього правила сталася помилка."
         delete:
           success: "Правило успішно видалено"
-          error: "На жаль, під час видалення цього правила сталася помилка. Виконайте команду <code>/status</code> , щоб переглянути список правил."
         not_found:
           tag: "Тег <b>%{name}</b> не знайдено."
           category: "Категорію <b>%{name}</b> неможливо знайти. Доступні категорії: <b>%{list}</b>"
@@ -192,10 +186,8 @@ uk:
         create:
           created: "Правило створено успішно"
           updated: "Правило успішно оновлено"
-          error: "На жаль, під час створення цього правила сталася помилка."
         delete:
           success: "Правило успішно видалено"
-          error: "Вибачте, сталася помилка при видаленні цього правила. Запустіть `/discourse status` для отримання списку правил."
         not_found:
           tag: "Тег *%{name}* не знайдено."
           category: "Не вдалося знайти категорію *%{name}*. Доступні категорії: *%{list}*"
diff --git a/plugins/discourse-chat-integration/config/locales/server.zh_CN.yml b/plugins/discourse-chat-integration/config/locales/server.zh_CN.yml
index df70b4a13e933..f36afa16f79dc 100644
--- a/plugins/discourse-chat-integration/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-chat-integration/config/locales/server.zh_CN.yml
@@ -51,8 +51,6 @@ zh_CN:
     chat_integration_flowdock_excerpt_length: "Flowdock 帖子摘要长度"
     chat_integration_groupme_enabled: "启用 Groupme 聊天集成提供程序"
     chat_integration_groupme_excerpt_length: "GroupMe 帖子摘要长度"
-    chat_integration_groupme_bot_ids: "*必填* 机器人 ID，有多个时使用 ',' 分隔"
-    chat_integration_groupme_instance_names: "*必填* GroupMe 聊天的名称，有多个时使用 ',' 分隔（与机器人 ID 的顺序相同）"
     chat_integration_teams_enabled: "启用 Microsoft Teams 聊天集成提供程序"
     chat_integration_teams_excerpt_length: "Microsoft Team 帖子摘要长度"
     chat_integration_powerautomate_enabled: "启用 Microsoft Power Automate 集成提供程序"
@@ -93,10 +91,8 @@ zh_CN:
         create:
           created: "规则成功创建"
           updated: "规则成功更新"
-          error: "抱歉，创建该规则时出错。"
         delete:
           success: "规则成功删除"
-          error: "抱歉，删除该规则时出错。运行 `/discourse help` 获取规则列表。"
         not_found:
           tag: "找不到标签 *%{name}*"
           category: "找不到类别*%{name}*。可用类别：*%{list}*"
@@ -158,10 +154,8 @@ zh_CN:
         create:
           created: "规则成功创建"
           updated: "规则成功更新"
-          error: "抱歉，创建该规则时出错。"
         delete:
           success: "规则成功删除"
-          error: "抱歉，删除该规则时出错。运行 <code>/status</code> 获取规则列表。"
         not_found:
           tag: "找不到标签 <b>%{name}</b>"
           category: "找不到类别<b>%{name}</b>。可用类别：<b>%{list}</b>"
@@ -192,10 +186,8 @@ zh_CN:
         create:
           created: "规则成功创建"
           updated: "规则成功更新"
-          error: "抱歉，创建该规则时出错。"
         delete:
           success: "规则成功删除"
-          error: "抱歉，删除该规则时出错。运行 `/discourse help` 获取规则列表。"
         not_found:
           tag: "找不到标签 *%{name}*"
           category: "找不到类别*%{name}*。可用类别：*%{list}*"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ar.yml b/plugins/discourse-data-explorer/config/locales/client.ar.yml
index e11fc4f9cd966..40c7bab129659 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ar.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ar.yml
@@ -11,12 +11,10 @@ ar:
         no_semicolons: "أزِل الفواصل المنقوطة من الاستعلام."
         dirty: "يجب عليك حفظ الاستعلام قبل التشغيل."
     explorer:
-      default_query: "افتراضي"
       or: "أو"
       admins_only: "مستكشف البيانات متاح للمسؤولين فقط."
       allow_groups: "السماح للمجموعات بالوصول إلى هذا الاستعلام"
       title: "مستكشف البيانات"
-      create: "إنشاء"
       create_placeholder: "اسم الاستعلام..."
       description_placeholder: "أدخِل وصفًا هنا"
       import:
@@ -37,10 +35,7 @@ ar:
           null_: "فارغ"
       export: "تصدير"
       view_json: "عرض JSON"
-      view: "اعرض"
-      save: "حفظ التغييرات"
       run: "تشغيل"
-      undo: "تجاهل التغييرين"
       edit: "تعديل"
       delete: "حذف"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.be.yml b/plugins/discourse-data-explorer/config/locales/client.be.yml
index 748a3cea14ea2..e96627ec70d27 100644
--- a/plugins/discourse-data-explorer/config/locales/client.be.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.be.yml
@@ -7,9 +7,7 @@
 be:
   js:
     explorer:
-      default_query: "Прадвызначаная"
       or: "або"
-      create: "стварыць"
       types:
         bool:
           yes: "Так"
diff --git a/plugins/discourse-data-explorer/config/locales/client.bg.yml b/plugins/discourse-data-explorer/config/locales/client.bg.yml
index fde1dc28571b4..4c46044e73a65 100644
--- a/plugins/discourse-data-explorer/config/locales/client.bg.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.bg.yml
@@ -7,9 +7,7 @@
 bg:
   js:
     explorer:
-      default_query: "По подразбиране"
       or: "или"
-      create: "Създай"
       import:
         label: "Импорт"
       help:
diff --git a/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml b/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml
index a4d0f0972493f..756f1e2a8065f 100644
--- a/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.bs_BA.yml
@@ -7,9 +7,7 @@
 bs_BA:
   js:
     explorer:
-      default_query: "Uobičajen"
       or: "ili"
-      create: "napravi"
       help:
         label: "Pomoć"
       schema:
diff --git a/plugins/discourse-data-explorer/config/locales/client.ca.yml b/plugins/discourse-data-explorer/config/locales/client.ca.yml
index 71e8c2464ee66..217aafafb94af 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ca.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ca.yml
@@ -11,11 +11,9 @@ ca:
         no_semicolons: "Elimina els punts i coma de la consulta."
         dirty: "Cal desar la consulta abans d'executar-la"
     explorer:
-      default_query: "Per defecte"
       or: "o"
       admins_only: "L'explorador de dades sols és disponible per a administradors."
       title: "Explorador de dades"
-      create: "Crea"
       create_placeholder: "Nom de consulta..."
       description_placeholder: "Introduïu una descripció aquí"
       import:
diff --git a/plugins/discourse-data-explorer/config/locales/client.cs.yml b/plugins/discourse-data-explorer/config/locales/client.cs.yml
index 090469939facb..0dc74f1cae92c 100644
--- a/plugins/discourse-data-explorer/config/locales/client.cs.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.cs.yml
@@ -7,9 +7,7 @@
 cs:
   js:
     explorer:
-      default_query: "Výchozí"
       or: "nebo"
-      create: "Vytvořit"
       import:
         label: "Import"
       help:
@@ -22,9 +20,6 @@ cs:
           no: "Ne"
           null_: "Null"
       export: "Export"
-      view: "Zobrazit"
-      save: "Uložit změny"
-      undo: "Zahodit změny"
       edit: "Upravit"
       delete: "Smazat"
       download_json: "JSON"
@@ -40,9 +35,5 @@ cs:
       query_user: "Vytvořil/a"
       reset_params: "obnovit výchozí"
       search_placeholder: "Hledat…"
-      form:
-        errors:
-          invalid_date: "%{date} je neplatné datum"
-          invalid_time: "%{time} je neplatný čas"
     group:
       reports: "Sestav"
diff --git a/plugins/discourse-data-explorer/config/locales/client.da.yml b/plugins/discourse-data-explorer/config/locales/client.da.yml
index b7fe9d49b897a..eeaf69f6a7525 100644
--- a/plugins/discourse-data-explorer/config/locales/client.da.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.da.yml
@@ -11,12 +11,10 @@ da:
         no_semicolons: "Fjern semikoloner fra forespørgslen."
         dirty: "Du skal gemme forespørgslen, før du kører den."
     explorer:
-      default_query: "Standard"
       or: "eller"
       admins_only: "Data explorer er kun tilgængelige for administratorer."
       allow_groups: "Tillad grupper at få adgang til denne forespørgsel"
       title: "Data Udforsker"
-      create: "Opret"
       create_placeholder: "Navn på forespørgsel..."
       description_placeholder: "Indtast en beskrivelse her"
       import:
@@ -33,7 +31,6 @@ da:
           no: "Nej"
           null_: "Null"
       export: "Eksporter"
-      save: "Gem ændringer"
       run: "Kør"
       edit: "Rediger"
       delete: "Slet"
diff --git a/plugins/discourse-data-explorer/config/locales/client.de.yml b/plugins/discourse-data-explorer/config/locales/client.de.yml
index e05c676ea1385..0c5757c3785de 100644
--- a/plugins/discourse-data-explorer/config/locales/client.de.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.de.yml
@@ -11,15 +11,10 @@ de:
         no_semicolons: "Entferne die Semikolons aus der Anfrage."
         dirty: "Du musst die Anfrage vor der Ausführung speichern."
     explorer:
-      default_query: "Standard"
-      default_query_notice: "Dies ist eine Standardabfrage, deren SQL-Code nicht bearbeitet werden kann. Erstelle eine neue Abfrage, um den SQL-Code zu bearbeiten."
-      queries: "Anfragen"
-      query_created: "Anfrage erstellt!"
       or: "oder"
       admins_only: "Der Daten-Explorer ist nur für Administratoren verfügbar."
       allow_groups: "Gruppen erlauben, auf diese Anfrage zuzugreifen"
       title: "Daten-Explorer"
-      create: "Erstellen"
       create_placeholder: "Name der Anfrage …"
       description_placeholder: "Hier bitte eine Beschreibung eingeben"
       import:
@@ -29,10 +24,6 @@ de:
       help:
         label: "Hilfe"
         modal_title: "Daten-Explorer-Hilfe"
-        auto_resolution: "<h2>Automatische Auflösung von Entitäten</h2> <p>Wenn deine Anfrage eine Entitäts-ID zurückgibt, kann der Daten-Explorer diese automatisch durch den Entitätsnamen und andere nützliche Informationen in den Anfrageergebnissen ersetzen. Die automatische Auflösung ist verfügbar für <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> und <i><b>badge_id</b></i>. Um dies auszuprobieren, führe diese Anfrage aus:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Benutzerdefinierte Parameter erstellen</h2> <p>Um benutzerdefinierte Parameter für deine Anfragen zu erstellen, füge Folgendes am Anfang deiner Anfrage ein und befolge das Format:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Hinweis: Die erste Zeile mit [params] ist erforderlich, zusammen mit zwei Bindestrichen davor und jedem benutzerdefinierten Parameter, den du deklarieren möchtest.</i></p>"
-        default_values: "<h3>Standardwerte</h3> <p>Du kannst Parameter mit oder ohne Standardwerte deklarieren. Die Standardwerte werden in einem Textfeld unter dem Anfrage-Editor angezeigt, das du beliebig bearbeiten kannst. Bei Parametern, die ohne Standardwerte angegeben werden, erscheint zwar immer noch ein Textfeld, aber es ist leer und rot markiert.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
-        data_types: "<h3>Datentypen</h3> <p>Hier sind gängige Datentypen, die du verwenden kannst:</p> <ul> <li><b>Ganzzahl</b> - vorzeichenbehaftete Vier-Byte-Ganzzahl</li> <li><b>Text</b> - Zeichenkette mit variabler Länge</li> <li><b>Boolean</b> – wahr/falsch</li> <li><b>Datum</b> - Kalenderdatum (Jahr, Monat, Tag)</li> <li><b>current_user_id</b> - ID des anfragenden Benutzers (automatisch eingefügt, nützlich bei mit Gruppen geteilten Berichten)</li> </ul> <p>Weitere Informationen über Datentypen findest du auf <a href='http://www.postgresql.org/docs/9.3/static/datatype.html#DATATYPE-TABLE' target='_blank'>dieser Website</a>.</p>"
       schema:
         title: "Datenbank-Schema"
         filter: "Suche …"
@@ -44,14 +35,9 @@ de:
           null_: "Null"
       export: "Exportieren"
       view_json: "JSON anzeigen"
-      view: "Ansehen"
-      save: "Änderungen speichern"
-      saverun: "Änderungen speichern und ausführen"
       run: "Ausführen"
-      undo: "Änderungen verwerfen"
       edit: "Bearbeiten"
       delete: "Löschen"
-      recover: "Anfrage wiederherstellen"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabelle"
@@ -73,7 +59,6 @@ de:
       query_user: "Erstellt von"
       column: "Spalte %{number}"
       explain_label: "Anfrageplan einbeziehen?"
-      save_params: "Standards festlegen"
       reset_params: "Zurücksetzen"
       search_placeholder: "Suche …"
       no_search_results: "Leider konnten wir keine Ergebnisse finden, die deinem Text entsprechen."
@@ -82,8 +67,6 @@ de:
           invalid: "Ungültig"
           no_such_category: "Keine solche Kategorie"
           no_such_group: "Keine solche Gruppe"
-          invalid_date: "%{date} ist ein ungültiges Datum"
-          invalid_time: "%{time} ist eine ungültige Zeitangabe"
     group:
       reports: "Berichte"
     admin:
diff --git a/plugins/discourse-data-explorer/config/locales/client.el.yml b/plugins/discourse-data-explorer/config/locales/client.el.yml
index 735a435cc59e4..871859d2f9475 100644
--- a/plugins/discourse-data-explorer/config/locales/client.el.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.el.yml
@@ -7,9 +7,7 @@
 el:
   js:
     explorer:
-      default_query: "Προεπιλογή"
       or: "ή"
-      create: "Δημιουργία"
       description_placeholder: "Εισάγετε εδώ μια περιγραφή"
       import:
         label: "Εισαγωγή"
@@ -22,9 +20,6 @@ el:
           yes: "Ναι "
           no: "Όχι"
       export: "Εξαγωγή"
-      view: "Προβολή"
-      save: "Αποθήκευση αλλαγών"
-      undo: "Απόρριψη αλλαγών"
       edit: "Επεξεργασία"
       delete: "Σβήσιμο"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.es.yml b/plugins/discourse-data-explorer/config/locales/client.es.yml
index 29fb641778cee..fa10f451c25c1 100644
--- a/plugins/discourse-data-explorer/config/locales/client.es.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.es.yml
@@ -11,12 +11,10 @@ es:
         no_semicolons: "Eliminar los punto y coma de la consulta."
         dirty: "Debes guardar la consulta antes de ejecutarla."
     explorer:
-      default_query: "Por defecto"
       or: "o"
       admins_only: "El explorador de datos solo esta disponible para administradores."
       allow_groups: "Permitir a los grupos acceder a esta consulta"
       title: "Explorador de datos"
-      create: "Crear"
       create_placeholder: "Nombre de la consulta..."
       description_placeholder: "Escribe una descripción aquí"
       import:
@@ -37,10 +35,7 @@ es:
           null_: "Nulo"
       export: "Exportar"
       view_json: "Ver JSON"
-      view: "Ver"
-      save: "Guardar cambios"
       run: "Ejecutar"
-      undo: "Descartar cambios"
       edit: "Editar"
       delete: "Eliminar"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.et.yml b/plugins/discourse-data-explorer/config/locales/client.et.yml
index 460f1c63ab305..84d9cc925faac 100644
--- a/plugins/discourse-data-explorer/config/locales/client.et.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.et.yml
@@ -7,10 +7,8 @@
 et:
   js:
     explorer:
-      default_query: "Vaikimisi"
       or: "või"
       title: "Andmete eksportija"
-      create: "Loo"
       create_placeholder: "Päringu nimi..."
       import:
         label: "Impordi"
diff --git a/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml b/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml
index bc5f60c751267..0e9df36f79693 100644
--- a/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.fa_IR.yml
@@ -7,9 +7,7 @@
 fa_IR:
   js:
     explorer:
-      default_query: "پیش‌فرض"
       or: "یا"
-      create: "ایجاد"
       import:
         label: "ورود داده‌ها"
       help:
@@ -21,7 +19,6 @@ fa_IR:
           yes: "بله"
           no: "خیر"
       export: "خروجی گرفتن"
-      save: "ذخیر تغییرات"
       run: "اجرا"
       edit: "ویرایش"
       delete: "حذف"
diff --git a/plugins/discourse-data-explorer/config/locales/client.fi.yml b/plugins/discourse-data-explorer/config/locales/client.fi.yml
index 6d004e941739c..fe8635ceaa0e3 100644
--- a/plugins/discourse-data-explorer/config/locales/client.fi.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.fi.yml
@@ -11,12 +11,10 @@ fi:
         no_semicolons: "Poista puolipisteet kyselystä."
         dirty: "Kysely täytyy tallentaa ennen suorittamista."
     explorer:
-      default_query: "Oletus"
       or: "tai"
       admins_only: "Dataselain on vain ylläpitäjille."
       allow_groups: "Salli ryhmien käyttää tätä kyselyä"
       title: "Dataselain"
-      create: "Luo"
       create_placeholder: "Kyselyn nimi..."
       description_placeholder: "Kirjoita kuvaus tähän"
       import:
@@ -37,9 +35,7 @@ fi:
           null_: "Tyhjä"
       export: "Vie"
       view_json: "Näytä JSON"
-      save: "Tallenna muutokset"
       run: "Suorita"
-      undo: "Hylkää muutokset"
       edit: "Muokkaa"
       delete: "Poista"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.fr.yml b/plugins/discourse-data-explorer/config/locales/client.fr.yml
index 959cae93d831f..513a635364b05 100644
--- a/plugins/discourse-data-explorer/config/locales/client.fr.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.fr.yml
@@ -11,12 +11,10 @@ fr:
         no_semicolons: "Supprimez les points-virgules de la requête."
         dirty: "Vous devez enregistrer la requête avant de l'exécuter."
     explorer:
-      default_query: "Par défaut"
       or: "ou"
       admins_only: "L'explorateur de données n'est disponible que pour les administrateurs."
       allow_groups: "Autoriser les groupes à accéder à cette requête"
       title: "Explorateur de données"
-      create: "Créer"
       create_placeholder: "Nom de la requête…"
       description_placeholder: "Saisissez une description ici"
       import:
@@ -37,9 +35,7 @@ fr:
           null_: "Nul"
       export: "Exporter"
       view_json: "Afficher JSON"
-      save: "Enregistrer les modifications"
       run: "Exécuter"
-      undo: "Annuler les modifications"
       edit: "Modifier"
       delete: "Supprimer"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.gl.yml b/plugins/discourse-data-explorer/config/locales/client.gl.yml
index 8314c66c1c298..263d069d85f7f 100644
--- a/plugins/discourse-data-explorer/config/locales/client.gl.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.gl.yml
@@ -7,9 +7,7 @@
 gl:
   js:
     explorer:
-      default_query: "Predeterminado"
       or: "ou"
-      create: "Crear"
       import:
         label: "Importar"
       help:
diff --git a/plugins/discourse-data-explorer/config/locales/client.he.yml b/plugins/discourse-data-explorer/config/locales/client.he.yml
index 5de8253d91aab..560a8a82ef3b1 100644
--- a/plugins/discourse-data-explorer/config/locales/client.he.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.he.yml
@@ -11,12 +11,10 @@ he:
         no_semicolons: "הסרת הנקודה פסיק מהשאילתה."
         dirty: "עליך לשמור את השאילתה בטרם ההרצה."
     explorer:
-      default_query: "ברירת מחדל"
       or: "או"
       admins_only: "דפדפן הנתונים זמין למנהלים בלבד."
       allow_groups: "לאפשר לקבוצות לגשת לשאילתה הזאת"
       title: "דפדפן נתונים"
-      create: "יצירה"
       create_placeholder: "שם השאילתה…"
       description_placeholder: "יש להקליד תיאור כאן"
       import:
@@ -37,10 +35,7 @@ he:
           null_: "ריק"
       export: "ייצוא"
       view_json: "הצגת JSON"
-      view: "תצוגה"
-      save: "שמירת השינויים"
       run: "הרצה"
-      undo: "התעלמות מהשינויים"
       edit: "עריכה"
       delete: "מחיקה"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.hr.yml b/plugins/discourse-data-explorer/config/locales/client.hr.yml
index 24b9f43109416..62aba364b8a56 100644
--- a/plugins/discourse-data-explorer/config/locales/client.hr.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.hr.yml
@@ -7,9 +7,7 @@
 hr:
   js:
     explorer:
-      default_query: "Zadano"
       or: "ili"
-      create: "Stvorite"
       help:
         label: "Pomoć"
       schema:
@@ -19,7 +17,6 @@ hr:
           yes: "Da"
           no: "Ne"
       export: "Izvoz"
-      save: "Zabilježi promjene"
       edit: "Uredi"
       delete: "Izbriši"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.hu.yml b/plugins/discourse-data-explorer/config/locales/client.hu.yml
index f6f263563add4..f953c728b184c 100644
--- a/plugins/discourse-data-explorer/config/locales/client.hu.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.hu.yml
@@ -11,12 +11,10 @@ hu:
         no_semicolons: "Pontosvesszők eltávolítása a lekérdezésből."
         dirty: "Futtatás előtt el kell mentenie a lekérdezést."
     explorer:
-      default_query: "Alapértelmezett"
       or: "vagy"
       admins_only: "Az adatfelfedező csak az adminok számára érhető el."
       allow_groups: "Engedélyezés csoportok számára, hogy hozzáférjenek ehhez a lekérdezéshez"
       title: "Adatfelfedező"
-      create: "Létrehozás"
       create_placeholder: "Lekérdezés neve…"
       description_placeholder: "Adjon meg egy leírást"
       import:
@@ -36,10 +34,7 @@ hu:
           no: "Nem"
           null_: "Null"
       export: "Exportálás"
-      view: "Megtekintés"
-      save: "Módosítások mentése"
       run: "Futtatás"
-      undo: "Változások elvetése"
       edit: "Szerkesztés"
       delete: "Törlés"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.hy.yml b/plugins/discourse-data-explorer/config/locales/client.hy.yml
index 72666020daa02..17095c240da5e 100644
--- a/plugins/discourse-data-explorer/config/locales/client.hy.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.hy.yml
@@ -11,11 +11,9 @@ hy:
         no_semicolons: "Հեռացրեք կետ-ստորակատերերը հարցումից"
         dirty: "Դուք պետք է պահպանեք հարցումը գործարկելուց առաջ"
     explorer:
-      default_query: "Լռելյայն"
       or: "կամ"
       admins_only: "Տվյալների ուսումնասիրումը հասանելի է միասյն ադմիններին:"
       title: "Տվյալների Ուսումնասիրում"
-      create: "Ստեղծել"
       create_placeholder: "Հարցման անուն..."
       description_placeholder: "Մուտքագրեք նկարագրություն այստեղ"
       import:
diff --git a/plugins/discourse-data-explorer/config/locales/client.id.yml b/plugins/discourse-data-explorer/config/locales/client.id.yml
index d5bf715dde877..33a6c0692a8b0 100644
--- a/plugins/discourse-data-explorer/config/locales/client.id.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.id.yml
@@ -7,9 +7,7 @@
 id:
   js:
     explorer:
-      default_query: "Asal"
       or: "atau"
-      create: "Buat"
       help:
         label: "Bantuan"
       schema:
diff --git a/plugins/discourse-data-explorer/config/locales/client.it.yml b/plugins/discourse-data-explorer/config/locales/client.it.yml
index c8aac30c45d56..f2aed87094479 100644
--- a/plugins/discourse-data-explorer/config/locales/client.it.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.it.yml
@@ -11,12 +11,10 @@ it:
         no_semicolons: "Rimuovi i punti e virgola dalla query."
         dirty: "È necessario salvare la query prima di eseguirla."
     explorer:
-      default_query: "Predefinito"
       or: "o"
       admins_only: "Data explorer è disponibile solo per gli amministratori."
       allow_groups: "Consenti ai gruppi di accedere a questa query"
       title: "Data Explorer"
-      create: "Crea"
       create_placeholder: "Nome query..."
       description_placeholder: "Inserisci una descrizione qui"
       import:
@@ -37,9 +35,7 @@ it:
           null_: "Null"
       export: "Esporta"
       view_json: "Visualizza JSON"
-      save: "Salva le modifiche"
       run: "Esegui"
-      undo: "Annulla modifiche"
       edit: "Modifica"
       delete: "Elimina"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ja.yml b/plugins/discourse-data-explorer/config/locales/client.ja.yml
index f8fcac90e2d90..12b8d19a87349 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ja.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ja.yml
@@ -11,12 +11,10 @@ ja:
         no_semicolons: "クエリからセミコロンを削除します。"
         dirty: "クエリは保存してから実行する必要があります。"
     explorer:
-      default_query: "デフォルト"
       or: "または"
       admins_only: "データエクスプローラーは管理者のみが利用できます。"
       allow_groups: "このクエリへのアクセスをグループに許可する"
       title: "データエクスプローラー"
-      create: "作成"
       create_placeholder: "クエリ名..."
       description_placeholder: "説明をここに入力"
       import:
@@ -37,10 +35,7 @@ ja:
           null_: "Null"
       export: "エクスポート"
       view_json: "JSON を表示"
-      view: "表示"
-      save: "変更を保存"
       run: "実行"
-      undo: "変更を破棄"
       edit: "編集"
       delete: "削除"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ko.yml b/plugins/discourse-data-explorer/config/locales/client.ko.yml
index 6b97458302a5d..6d5c50dfab25a 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ko.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ko.yml
@@ -11,12 +11,10 @@ ko:
         no_semicolons: "쿼리에서 세미콜론을 제거하십시오."
         dirty: "실행하기 전에 쿼리를 저장해야합니다."
     explorer:
-      default_query: "기본"
       or: "또는"
       admins_only: "데이터 탐색기는 관리자 만 사용할 수 있습니다."
       allow_groups: "그룹이이 쿼리에 액세스하도록 허용"
       title: "데이터 탐색기"
-      create: "만들기"
       create_placeholder: "검색어 이름 ..."
       description_placeholder: "여기에 설명을 입력하세요"
       import:
diff --git a/plugins/discourse-data-explorer/config/locales/client.lt.yml b/plugins/discourse-data-explorer/config/locales/client.lt.yml
index 1320d49cda62e..ac5420edbb73d 100644
--- a/plugins/discourse-data-explorer/config/locales/client.lt.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.lt.yml
@@ -7,9 +7,7 @@
 lt:
   js:
     explorer:
-      default_query: "Numatytasis"
       or: "arba"
-      create: "Sukurti"
       import:
         label: "Importuoti"
       help:
@@ -21,7 +19,6 @@ lt:
           yes: "Taip"
           no: "Ne"
       export: "Eksportuoti"
-      save: "Išsaugoti pakeitimus"
       edit: "Redaguoti"
       delete: "Pašalinti"
       show_table: "Lentelė"
diff --git a/plugins/discourse-data-explorer/config/locales/client.lv.yml b/plugins/discourse-data-explorer/config/locales/client.lv.yml
index 2867cf2daf9cb..12aca87c74894 100644
--- a/plugins/discourse-data-explorer/config/locales/client.lv.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.lv.yml
@@ -7,9 +7,7 @@
 lv:
   js:
     explorer:
-      default_query: "Noklusējums"
       or: "vai"
-      create: "Izveidot"
       import:
         label: "Importēt"
       help:
diff --git a/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml b/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml
index 07e61032f887b..06f6f295a3250 100644
--- a/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.nb_NO.yml
@@ -11,11 +11,9 @@ nb_NO:
         no_semicolons: "Fjern semikolonene fra spørringen."
         dirty: "Du må lagre spørringen før du kjører den."
     explorer:
-      default_query: "Forvalg"
       or: "eller"
       admins_only: "Datautforskeren er kun tilgjengelig for administratorer."
       title: "Datautforsker"
-      create: "Opprett"
       create_placeholder: "Spørringsnavn…"
       import:
         label: "Importer"
diff --git a/plugins/discourse-data-explorer/config/locales/client.nl.yml b/plugins/discourse-data-explorer/config/locales/client.nl.yml
index 11f402c5233dd..14a8a893934a0 100644
--- a/plugins/discourse-data-explorer/config/locales/client.nl.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.nl.yml
@@ -11,12 +11,10 @@ nl:
         no_semicolons: "Verwijder de puntkomma's uit de query."
         dirty: "Je moet de query opslaan voordat je deze uitvoert."
     explorer:
-      default_query: "Standaard"
       or: "of"
       admins_only: "De gegevensverkenner is alleen beschikbaar voor beheerders."
       allow_groups: "Groepen hebben toegang tot deze query"
       title: "Gegevensverkenner"
-      create: "Maken"
       create_placeholder: "Querynaam..."
       description_placeholder: "Voer hier een beschrijving in"
       import:
@@ -37,9 +35,7 @@ nl:
           null_: "Null"
       export: "Exporteren"
       view_json: "JSON weergeven"
-      save: "Wijzigingen opslaan"
       run: "Uitvoeren"
-      undo: "Wijzigingen negeren"
       edit: "Bewerken"
       delete: "Verwijderen"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml b/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml
index 3521320a1e3c7..22df559486005 100644
--- a/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.pl_PL.yml
@@ -11,15 +11,10 @@ pl_PL:
         no_semicolons: "Usuń średniki z zapytania."
         dirty: "Musisz zapisać zapytanie zanim je wykonasz."
     explorer:
-      default_query: "Domyślny"
-      default_query_notice: "To jest zapytanie domyślne, którego nie można edytować. Aby edytować zapytanie SQL, utwórz nowe zapytanie."
-      queries: "Zapytania"
-      query_created: "Zapytanie utworzone!"
       or: "lub"
       admins_only: "Eksplorator danych jest dostępny wyłącznie dla administratorów."
       allow_groups: "Zezwól grupom na dostęp do tego zapytania"
       title: "Eksplorator danych"
-      create: "Utwórz"
       create_placeholder: "Nazwa zapytania…"
       description_placeholder: "Wprowadź opis zapytania"
       import:
@@ -29,10 +24,6 @@ pl_PL:
       help:
         label: "Pomoc"
         modal_title: "Pomoc eksploratora danych"
-        auto_resolution: "<h2>Automatyczne rozpoznawanie encji</h2> <p>Gdy zapytanie zwróci identyfikator encji, Data Explorer może automatycznie zastąpić go nazwą encji i innymi przydatnymi informacjami w wynikach zapytania. Automatyczne rozwiązanie jest dostępne dla <i><b>user_id</b></i>, <i><b>group_id</b></i>, <i><b>topic_id</b></i>, <i><b>category_id</b></i> i <i><b>badge_id</b></i>Aby to wypróbować, uruchom następujące zapytanie:</p> <pre><code>SELECT user_id\nFROM posts</code></pre>"
-        custom_params: "<h2>Tworzenie parametrów niestandardowych</h2> <p>Aby utworzyć parametry niestandardowe dla zapytań, umieść to na górze zapytania i postępuj zgodnie z formatem:</p> <pre><code>-- [params]\n-- int :num = 1\n\nSELECT :num</code></pre> <p><i>Uwaga: wymagany jest pierwszy wiersz z [params], wraz z dwoma poprzedzającymi go myślnikami i każdym parametrem niestandardowym, który chcesz zadeklarować.</i></p>"
-        default_values: "<h3>Wartości domyślne</h3> <p>Parametry można deklarować z wartościami domyślnymi lub bez nich. Wartości domyślne pojawią się w polu tekstowym poniżej edytora zapytań, które można edytować według własnych potrzeb. Parametry zadeklarowane bez wartości domyślnych nadal wygenerują pole tekstowe, ale będą puste i podświetlone na czerwono.</p> <pre><code>-- [params]\n-- text :username = my_username\n-- int :age</code></pre>"
-        data_types: "<h3>Typy danych</h3> <p>Oto popularne typy danych, których możesz używać:</p> <ul> <li><b>liczba całkowita</b> - czterobajtowa liczba całkowita ze znakiem</li> <li><b>tekst</b> - ciąg znaków o zmiennej długości</li> <li><b>wartość logiczna</b> – prawda/fałsz</li> <li><b>data</b> - data kalendarzowa (rok, miesiąc, dzień)</li> <li><b>current_user_id</b> - ID użytkownika uruchamiającego zapytanie (wstrzykiwane automatycznie, przydatne w raportach grupowych)</li> </ul> <p>Aby uzyskać więcej informacji na temat typów danych, odwiedź <a href='http://www.postgresql.org/docs/9.3/static/datatype.html#DATATYPE-TABLE' target='_blank'>tę witrynę</a>.</p>"
       schema:
         title: "Schemat bazy danych"
         filter: "Wyszukiwanie..."
@@ -44,14 +35,9 @@ pl_PL:
           null_: "Null"
       export: "Eksport"
       view_json: "Wyświetl JSON"
-      view: "Widok"
-      save: "Zapisz zmiany"
-      saverun: "Zapisz zmiany i uruchom"
       run: "Wykonaj"
-      undo: "Odrzuć zmiany"
       edit: "Edytuj"
       delete: "Usuń"
-      recover: "Cofnij usunięcie zapytania"
       download_json: "JSON"
       download_csv: "CSV"
       show_table: "Tabela"
@@ -77,7 +63,6 @@ pl_PL:
       query_user: "Stworzone przez"
       column: "Kolumna %{number}"
       explain_label: "Dołączyć plan zapytania?"
-      save_params: "Ustaw wartości domyślne"
       reset_params: "Przywróć"
       search_placeholder: "Wyszukiwanie..."
       no_search_results: "Nie znaleziono żadnych wyników."
@@ -86,8 +71,6 @@ pl_PL:
           invalid: "Nieprawidłowy"
           no_such_category: "Nie ma takiej kategorii"
           no_such_group: "Nie ma takiej grupy"
-          invalid_date: "%{date} jest nieprawidłową datą"
-          invalid_time: "%{time} to nieprawidłowy godzina"
     group:
       reports: "Zgłoszeń"
     admin:
diff --git a/plugins/discourse-data-explorer/config/locales/client.pt.yml b/plugins/discourse-data-explorer/config/locales/client.pt.yml
index 2a7e266807a9a..5c3c7b749a5a9 100644
--- a/plugins/discourse-data-explorer/config/locales/client.pt.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.pt.yml
@@ -11,11 +11,9 @@ pt:
         no_semicolons: "Remova os pontos e vírgulas da consulta."
         dirty: "Deve guardar a consulta antes de executar."
     explorer:
-      default_query: "Predefinição"
       or: "ou"
       admins_only: "O explorador de dados está disponível apenas para os administradores."
       title: "Explorador de Dados"
-      create: "Criar"
       create_placeholder: "Nome da consulta..."
       import:
         label: "Importar"
diff --git a/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml b/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml
index 4cbdc741ddcc9..462b2d5311ebf 100644
--- a/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.pt_BR.yml
@@ -11,12 +11,10 @@ pt_BR:
         no_semicolons: "Remover os pontos e vírgulas da consulta."
         dirty: "Você precisa salvar a consulta antes de executar."
     explorer:
-      default_query: "Padrão"
       or: "ou"
       admins_only: "O explorador de dados só está disponível para administradores."
       allow_groups: "Permitir que grupos acessem esta consulta"
       title: "Explorador de Dados"
-      create: "Criar"
       create_placeholder: "Nome da consulta…"
       description_placeholder: "Insira uma descrição aqui"
       import:
@@ -37,9 +35,7 @@ pt_BR:
           null_: "Nulo"
       export: "Exportar"
       view_json: "Visualizar JSON"
-      save: "Salvar alterações"
       run: "Executar"
-      undo: "Descartar alterações"
       edit: "Editar"
       delete: "Excluir"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ro.yml b/plugins/discourse-data-explorer/config/locales/client.ro.yml
index cd7e84714bd0a..c8f787cda185e 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ro.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ro.yml
@@ -7,9 +7,7 @@
 ro:
   js:
     explorer:
-      default_query: "Implicit"
       or: "sau"
-      create: "Creează"
       import:
         label: "Importă"
       help:
@@ -21,8 +19,6 @@ ro:
           yes: "Da"
           no: "Nu"
       export: "Exportă"
-      save: "Salvează modificări"
-      undo: "Renunță la modificări"
       edit: "Editează"
       delete: "Șterge"
       query_groups: "Grupuri"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ru.yml b/plugins/discourse-data-explorer/config/locales/client.ru.yml
index e7b36043a99f4..f3ebf7cb4e00c 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ru.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ru.yml
@@ -11,12 +11,10 @@ ru:
         no_semicolons: "Удалите точку с запятой из запроса."
         dirty: "Вы должны сохранить запрос перед его выполнением."
     explorer:
-      default_query: "Домашнюю страницу"
       or: "или"
       admins_only: "Исследование данных доступно только для администраторов."
       allow_groups: "Разрешить группам доступ к этому запросу"
       title: "Проводник данных"
-      create: "Создать"
       create_placeholder: "Имя запроса..."
       description_placeholder: "Введите описание"
       import:
@@ -37,10 +35,7 @@ ru:
           null_: "Null"
       export: "Экспорт"
       view_json: "Просмотреть JSON"
-      view: "Вид"
-      save: "Сохранить изменения"
       run: "Выполнить запрос"
-      undo: "Отменить изменения"
       edit: "Изменить"
       delete: "Удалить"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.sk.yml b/plugins/discourse-data-explorer/config/locales/client.sk.yml
index 868884cab29f1..baea177e34fcd 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sk.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sk.yml
@@ -11,12 +11,10 @@ sk:
         no_semicolons: "Odstráňte z dotazu bodkočiarky."
         dirty: "Pred spustením musíte dotaz uložiť."
     explorer:
-      default_query: "Predvolené"
       or: "alebo"
       admins_only: "Prieskumník údajov je dostupný iba administrátorom."
       allow_groups: "Povolenie prístupu skupín k tomuto dotazu"
       title: "Prieskumník údajov"
-      create: "Vytvoriť"
       create_placeholder: "Názov dotazu..."
       description_placeholder: "Sem zadajte popis"
       import:
@@ -37,9 +35,7 @@ sk:
           null_: "Null"
       export: "Exportovať"
       view_json: "Zobraziť JSON"
-      save: "Uloženie zmien"
       run: "Spustiť"
-      undo: "Zahodenie zmien"
       edit: "Upraviť"
       delete: "Odstrániť"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.sl.yml b/plugins/discourse-data-explorer/config/locales/client.sl.yml
index a3a6da0c540e3..a1f4ee8a4f6d9 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sl.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sl.yml
@@ -11,12 +11,10 @@ sl:
         no_semicolons: "Odstranite podpičja iz poizvedbe."
         dirty: "Pred zagonom morate poizvedbo shraniti."
     explorer:
-      default_query: "Privzeto"
       or: "ali"
       admins_only: "Raziskovalec podatkov je na voljo samo skrbnikom."
       allow_groups: "Dovoli skupinam dostop do te poizvedbe"
       title: "Raziskovalec podatkov"
-      create: "Ustvari"
       create_placeholder: "Ime poizvedbe..."
       description_placeholder: "Vnesite opis tukaj"
       import:
diff --git a/plugins/discourse-data-explorer/config/locales/client.sq.yml b/plugins/discourse-data-explorer/config/locales/client.sq.yml
index 4aa50878c490b..63193c132cccf 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sq.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sq.yml
@@ -7,9 +7,7 @@
 sq:
   js:
     explorer:
-      default_query: "Paracaktuar"
       or: "ose"
-      create: "Krijo"
       import:
         label: "Importo"
       help:
diff --git a/plugins/discourse-data-explorer/config/locales/client.sr.yml b/plugins/discourse-data-explorer/config/locales/client.sr.yml
index 95dff48160b41..1c0fa9f125246 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sr.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sr.yml
@@ -7,9 +7,7 @@
 sr:
   js:
     explorer:
-      default_query: "Подразумевано"
       or: "ili"
-      create: "Kreiraj"
       types:
         bool:
           yes: "Da"
diff --git a/plugins/discourse-data-explorer/config/locales/client.sv.yml b/plugins/discourse-data-explorer/config/locales/client.sv.yml
index ac1d19689d5c3..afd2b49386d95 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sv.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sv.yml
@@ -11,12 +11,10 @@ sv:
         no_semicolons: "Ta bort semikolon från sökningen."
         dirty: "Du måste spara sökningen innan du kör."
     explorer:
-      default_query: "Standard"
       or: "eller"
       admins_only: "Datautforskaren är endast tillgänglig för administratörer."
       allow_groups: "Tillåt att grupper går till denna sökning"
       title: "Datautforskaren"
-      create: "Skapa"
       create_placeholder: "Sökningsnamn..."
       description_placeholder: "Ange en beskrivning här"
       import:
@@ -36,7 +34,6 @@ sv:
           no: "Nej"
           null_: "Tomt"
       export: "Exportera"
-      save: "Spara ändringar"
       run: "Kör"
       edit: "Redigera"
       delete: "Ta bort"
diff --git a/plugins/discourse-data-explorer/config/locales/client.sw.yml b/plugins/discourse-data-explorer/config/locales/client.sw.yml
index 8811cee9f2788..ab34be353b568 100644
--- a/plugins/discourse-data-explorer/config/locales/client.sw.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.sw.yml
@@ -11,11 +11,9 @@ sw:
         no_semicolons: "Ondoa alama ya mkato kwenye swali."
         dirty: "Lazima uhifadhi taarifa kabla ya kutekeleza."
     explorer:
-      default_query: "Halisi"
       or: "au"
       admins_only: "Uwezo wa kupitia taarifa zote unapatikana kwa viongozi tu."
       title: "Utafiti wa Taarifa"
-      create: "Tengeneza"
       create_placeholder: "Jina la ulizo..."
       description_placeholder: "Andika maelezo hapa"
       import:
diff --git a/plugins/discourse-data-explorer/config/locales/client.te.yml b/plugins/discourse-data-explorer/config/locales/client.te.yml
index 1da11f4b6eda9..9aff8fcbf7d26 100644
--- a/plugins/discourse-data-explorer/config/locales/client.te.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.te.yml
@@ -7,9 +7,7 @@
 te:
   js:
     explorer:
-      default_query: "అప్రమేయ"
       or: "లేదా"
-      create: "సృష్టించండి"
       help:
         label: "సహాయం"
       types:
diff --git a/plugins/discourse-data-explorer/config/locales/client.th.yml b/plugins/discourse-data-explorer/config/locales/client.th.yml
index 9702791020689..7759c01d0a397 100644
--- a/plugins/discourse-data-explorer/config/locales/client.th.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.th.yml
@@ -7,9 +7,7 @@
 th:
   js:
     explorer:
-      default_query: "ค่าเริ่มต้น"
       or: "หรือ"
-      create: "สร้าง"
       help:
         label: "ช่วยเหลือ"
       schema:
diff --git a/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml b/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml
index 34b72a5b9bf27..92259109d28f9 100644
--- a/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.tr_TR.yml
@@ -11,12 +11,10 @@ tr_TR:
         no_semicolons: "Noktalı virgülleri sorgudan kaldırın."
         dirty: "Çalıştırmadan önce sorguyu kaydetmeniz gerekir."
     explorer:
-      default_query: "Varsayılan"
       or: "veya"
       admins_only: "Veri gezgini yalnızca yöneticiler tarafından kullanılabilir."
       allow_groups: "Grupların bu sorguya erişmesine izin ver"
       title: "Veri Gezgini"
-      create: "Oluştur"
       create_placeholder: "Sorgu adı ..."
       description_placeholder: "Buraya bir açıklama girin"
       import:
@@ -37,9 +35,7 @@ tr_TR:
           null_: "Boş"
       export: "Dışa Aktar"
       view_json: "JSON'u görüntüle"
-      save: "Değişiklikleri kaydet"
       run: "Çalıştır"
-      undo: "Değişiklikleri sil"
       edit: "Düzenle"
       delete: "Sil"
       download_json: "JSON"
diff --git a/plugins/discourse-data-explorer/config/locales/client.ug.yml b/plugins/discourse-data-explorer/config/locales/client.ug.yml
index 8319c4c547572..eea36af6e9d1d 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ug.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ug.yml
@@ -7,9 +7,7 @@
 ug:
   js:
     explorer:
-      default_query: "كۆڭۈلدىكى"
       or: "ياكى"
-      create: "قۇر"
       help:
         label: "ياردەم"
       types:
@@ -17,9 +15,6 @@ ug:
           yes: "ھەئە"
           no: "ياق"
       export: "چىقار"
-      view: "كۆرۈنۈش"
-      save: "ئۆزگەرتىشنى ساقلا"
-      undo: "ئۆزگەرتىشنى تاشلىۋەت"
       edit: "تەھرىر"
       delete: "ئۆچۈر"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.uk.yml b/plugins/discourse-data-explorer/config/locales/client.uk.yml
index 527ac39dccc83..32199bd9c8bef 100644
--- a/plugins/discourse-data-explorer/config/locales/client.uk.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.uk.yml
@@ -11,12 +11,10 @@ uk:
         no_semicolons: "Вилучіть крапки з комою з запиту."
         dirty: "Ви повинні зберегти запит перед запуском."
     explorer:
-      default_query: "Стандартна"
       or: "або"
       admins_only: "Data explorer доступний лише адміністраторам."
       allow_groups: "Дозволити групам доступ до цього запиту"
       title: "Data Explorer"
-      create: "Створити"
       create_placeholder: "Назва запиту..."
       description_placeholder: "Введіть тут опис"
       import:
@@ -37,10 +35,7 @@ uk:
           null_: "Null"
       export: "Експорт"
       view_json: "Переглянути JSON"
-      view: "Вигляд"
-      save: "Зберегти зміни"
       run: "Запуск"
-      undo: "Скасувати зміни"
       edit: "Редагувати"
       delete: "Видалити"
       download_json: "JSON"
@@ -76,8 +71,6 @@ uk:
           invalid: "Недійсний"
           no_such_category: "Немає такої категорії"
           no_such_group: "Немає такої групи"
-          invalid_date: "%{date} – недійсна дата"
-          invalid_time: "%{time} – недійсний час"
     group:
       reports: "Звіти"
     admin:
diff --git a/plugins/discourse-data-explorer/config/locales/client.ur.yml b/plugins/discourse-data-explorer/config/locales/client.ur.yml
index fff79ed00c340..57d3b8496f8fc 100644
--- a/plugins/discourse-data-explorer/config/locales/client.ur.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.ur.yml
@@ -11,11 +11,9 @@ ur:
         no_semicolons: "کمانڈ سے semicolons ہٹا دیں۔"
         dirty: "چلانے سے پہلے آپ کا کمانڈ کو محفوظ کرنا لازمی ہے۔"
     explorer:
-      default_query: "ڈِیفالٹ"
       or: "یا"
       admins_only: "ڈیٹا ایکسپلورر صرف منتظمین کو دستیاب ہے۔"
       title: "ڈیٹا ایکسپلورر"
-      create: "بنائیں"
       create_placeholder: "ڈیٹا کمانڈ کا نام..."
       description_placeholder: "یہاں تفصیل درج کریں"
       import:
@@ -32,8 +30,6 @@ ur:
           no: "نہیں"
           null_: "خالی"
       export: "برآمد"
-      view: "مشاهده"
-      save: "تبدیلیاں محفوظ کریں"
       run: "چلائیں"
       edit: "ترمیم کریں"
       delete: "مٹائیں"
diff --git a/plugins/discourse-data-explorer/config/locales/client.vi.yml b/plugins/discourse-data-explorer/config/locales/client.vi.yml
index 0bf2b9b607cf0..6e1e4f1efd0ee 100644
--- a/plugins/discourse-data-explorer/config/locales/client.vi.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.vi.yml
@@ -7,9 +7,7 @@
 vi:
   js:
     explorer:
-      default_query: "Mặc định"
       or: "hoặc"
-      create: "Tạo"
       import:
         label: "Nhập"
       help:
@@ -21,9 +19,6 @@ vi:
           yes: "Đồng ý"
           no: "Không"
       export: "Xuất"
-      view: "Xem"
-      save: "Lưu thay đổi"
-      undo: "Hủy bỏ các thay đổi"
       edit: "Sửa"
       delete: "Xóa"
       result_count:
diff --git a/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml b/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml
index 1e8d346a5c63d..fe1ff95cd1034 100644
--- a/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.zh_CN.yml
@@ -11,12 +11,10 @@ zh_CN:
         no_semicolons: "从查询中移除分号。"
         dirty: "您必须先保存查询，然后才能运行。"
     explorer:
-      default_query: "默认"
       or: "或者"
       admins_only: "数据资源管理器仅供管理员使用。"
       allow_groups: "允许群组访问此查询"
       title: "数据资源管理器"
-      create: "创建"
       create_placeholder: "查询名称…"
       description_placeholder: "在此处输入描述"
       import:
@@ -37,10 +35,7 @@ zh_CN:
           null_: "空"
       export: "导出"
       view_json: "查看 JSON"
-      view: "查看"
-      save: "保存更改"
       run: "运行"
-      undo: "舍弃更改"
       edit: "编辑"
       delete: "删除"
       download_json: "JSON"
@@ -70,8 +65,6 @@ zh_CN:
           invalid: "无效"
           no_such_category: "没有此类类别"
           no_such_group: "没有此类群组"
-          invalid_date: "%{date} 是无效日期"
-          invalid_time: "%{time} 是无效时间"
     group:
       reports: "报告"
     admin:
diff --git a/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml b/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml
index 28e76f6716919..167d6b824d546 100644
--- a/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-data-explorer/config/locales/client.zh_TW.yml
@@ -7,9 +7,7 @@
 zh_TW:
   js:
     explorer:
-      default_query: "預設"
       or: "或"
-      create: "創建"
       import:
         label: "匯入"
       help:
diff --git a/plugins/discourse-data-explorer/config/locales/server.de.yml b/plugins/discourse-data-explorer/config/locales/server.de.yml
index 4f1f161cca502..914ef59f1b86c 100644
--- a/plugins/discourse-data-explorer/config/locales/server.de.yml
+++ b/plugins/discourse-data-explorer/config/locales/server.de.yml
@@ -5,8 +5,6 @@
 # https://translate.discourse.org/
 
 de:
-  site_settings:
-    data_explorer_enabled: "Daten-Explorer aktivieren"
   discourse_automation:
     scriptables:
       recurring_data_explorer_result_pm:
@@ -20,26 +18,4 @@ de:
     report_generator:
       private_message:
         title: "Geplanter Bericht für %{query_name}"
-        body: |
-          Hallo %{recipient_name}, dein Daten-Explorer-Bericht ist fertig.
-
-          Anfragename:
-          %{query_name}
-
-          Hier sind die Ergebnisse:
-          %{table}
-
-          <a href='%{base_url}/admin/plugins/discourse-data-explorer/queries/%{query_id}'>Abfrage im Daten-Explorer anzeigen</a>
-
-          Bericht erstellt um %{created_at} (%{timezone})
-      post:
-        body: |
-          ### Geplanter Bericht für %{query_name}
-
-          Hier sind die Ergebnisse:
-          %{table}
-
-          <a href='%{base_url}/admin/plugins/discourse-data-explorer/queries/%{query_id}'>Abfrage im Daten-Explorer anzeigen</a>
-
-          Bericht erstellt um %{created_at} (%{timezone})
       upload_appendix: "Anhang: [%{filename}|attachment](%{short_url})"
diff --git a/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml b/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml
index 892a6868915b5..ba578d17b07db 100644
--- a/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-data-explorer/config/locales/server.pl_PL.yml
@@ -5,8 +5,6 @@
 # https://translate.discourse.org/
 
 pl_PL:
-  site_settings:
-    data_explorer_enabled: "Włącz eksplorator danych"
   discourse_automation:
     scriptables:
       recurring_data_explorer_result_pm:
@@ -20,26 +18,4 @@ pl_PL:
     report_generator:
       private_message:
         title: "Zaplanowany raport dla %{query_name}"
-        body: |
-          Cześć, %{recipient_name}. Twój raport eksploratora danych jest gotowy.
-
-          Nazwa zapytania:
-          %{query_name}
-
-          Oto wyniki:
-          %{table}
-
-          <a href='%{base_url}/admin/plugins/discourse-data-explorer/queries/%{query_id}'>Wyświetl zapytanie w eksploratorze danych</a>
-
-          Raport utworzony o %{created_at} (%{timezone})
-      post:
-        body: |
-          ### Zaplanowany raport dla %{query_name}
-
-          Oto wyniki:
-          %{table}
-
-          <a href='%{base_url}/admin/plugins/discourse-data-explorer/queries/%{query_id}'>Wyświetl zapytanie w eksploratorze danych</a>
-
-          Raport utworzony o %{created_at} (%{timezone})
       upload_appendix: "Dodatek: [%{filename}|załącznik](%{short_url})"
diff --git a/plugins/discourse-data-explorer/config/locales/server.uk.yml b/plugins/discourse-data-explorer/config/locales/server.uk.yml
index 5fab456c620a2..46f87727d2efc 100644
--- a/plugins/discourse-data-explorer/config/locales/server.uk.yml
+++ b/plugins/discourse-data-explorer/config/locales/server.uk.yml
@@ -18,26 +18,4 @@ uk:
     report_generator:
       private_message:
         title: "Запланований звіт для %{query_name}"
-        body: |
-          Привіт %{recipient_name}, ваш звіт Data Explorer готовий.
-
-          Ім’я запиту:
-          %{query_name}
-
-          Ось результати:
-          %{table}
-
-          <a href='%{base_url}/admin/plugins/explorer/queries/%{query_id}'>Перегляд запиту в Data Explorer</a>
-
-          Звіт створено о %{created_at} (%{timezone})
-      post:
-        body: |
-          ### Запланований звіт для %{query_name}
-
-          Ось результати:
-          %{table}
-
-          <a href='%{base_url}/admin/plugins/discourse-data-explorer/queries/%{query_id}'>Перегляд запиту в Data Explorer</a>
-
-          Звіт створено за адресою %{created_at} (%{timezone})
       upload_appendix: "Додаток: [%{filename}|вкладення](%{short_url})"
diff --git a/plugins/discourse-local-dates/config/locales/server.de.yml b/plugins/discourse-local-dates/config/locales/server.de.yml
index 77241a3d7f861..932241a31f2a8 100644
--- a/plugins/discourse-local-dates/config/locales/server.de.yml
+++ b/plugins/discourse-local-dates/config/locales/server.de.yml
@@ -6,7 +6,6 @@
 
 de:
   site_settings:
-    discourse_local_dates_enabled: "Das \"Discourse Lokale Daten\" Plug-in aktivieren. Dadurch können Benutzer „[date]“ in Beiträgen verwenden, um Lesern das Datum in ihrer lokalen Zeitzone anzuzeigen."
     discourse_local_dates_default_formats: "Häufig verwendete Datums- und Zeitformate, siehe: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
     discourse_local_dates_default_timezones: "Standard-Liste der Zeitzonen. Es müssen gültige <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>Zeitzonen</a> sein."
     discourse_local_dates_email_format: "Format, das verwendet wird, um ein Datum in E-Mails anzuzeigen. Beispiele: 'LLLL', 'llll' oder 'YYYY-MM-DDTHH:mm:ss[Z]'. Siehe: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>momentjs string format</a>"
diff --git a/plugins/discourse-local-dates/config/locales/server.pl_PL.yml b/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
index 718e279c9da42..2770474fad4a8 100644
--- a/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-local-dates/config/locales/server.pl_PL.yml
@@ -6,7 +6,6 @@
 
 pl_PL:
   site_settings:
-    discourse_local_dates_enabled: "Włącz wtyczkę „discourse-local-dates”. Dzięki temu użytkownicy będą mogli używać „[data]” we wpisach, aby wyświetlać czytelnikom daty w ich lokalnej strefie czasowej."
     discourse_local_dates_default_formats: "Najczęściej używane formaty dat, zobacz: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>format linii w momentjs</a>"
     discourse_local_dates_default_timezones: "Domyślna lista stref czasowych, musi być prawidłową <a target='_blank' rel='noopener' href='https://en.wikipedia.org/wiki/List_of_tz_database_time_zones'>strefą</a>"
     discourse_local_dates_email_format: "Format używany do wyświetlania daty w wiadomościach e-mail, przykłady: „LLLL”, „llll” lub „RRRR-MM-DDTHH:mm:ss[Z]”. Zobacz: <a target='_blank' rel='noopener' href='https://momentjs.com/docs/#/parsing/string-format/'>format ciągu momentjs</a>"
diff --git a/plugins/discourse-narrative-bot/config/locales/server.el.yml b/plugins/discourse-narrative-bot/config/locales/server.el.yml
index 210ea93740997..1fb75f143d407 100644
--- a/plugins/discourse-narrative-bot/config/locales/server.el.yml
+++ b/plugins/discourse-narrative-bot/config/locales/server.el.yml
@@ -133,6 +133,7 @@ el:
 
           `@%{discobot_username} %{magic_8_ball_trigger}`
           > :crystal_ball: Μπορείτε να βασιστείτε σε αυτό
+        discobot_disabled: Με έχετε απενεργοποιήσει στις προτιμήσεις σας. Πρέπει να επιτρέψετε στις συμβουλές ενσωμάτωσης νέων χρηστών να αλληλεπιδρούν μαζί μου.
       do_not_understand:
         first_response: |-
           Έι, ευχαριστώ για την απάντηση!
diff --git a/plugins/discourse-openid-connect/config/locales/server.de.yml b/plugins/discourse-openid-connect/config/locales/server.de.yml
index 13b77f34ae26f..9b576ea87d225 100644
--- a/plugins/discourse-openid-connect/config/locales/server.de.yml
+++ b/plugins/discourse-openid-connect/config/locales/server.de.yml
@@ -13,7 +13,6 @@ de:
     openid_connect_authorize_scope: "Die Bereiche, die an den Autorisierungsendpunkt gesendet werden. Muss „openid“ enthalten."
     openid_connect_rp_initiated_logout: "Leitet den Benutzer nach der Abmeldung zum end_session_endpoint um. Muss von deinem Identitätsanbieter unterstützt werden und im Discovery-Dokument enthalten sein."
     openid_connect_rp_initiated_logout_redirect: "(Optional) Die post_logout_redirect_uri, die an den Abmeldungsendpunkt übergeben wird. Wenn sie angegeben wird, muss sie beim Identitätsanbieter registriert sein."
-    openid_connect_rp_initiated_logout_include_client_id: "(optional) Füge die client_id (Einstellung openid_connect_client_id) als Abfrageparameter an den Logout-Endpunkt an"
     openid_connect_token_scope: "Die Bereiche, die bei der Anforderung des Token-Endpunkts gesendet werden. Die offizielle Spezifikation erfordert dies nicht."
     openid_connect_error_redirects: "Wenn der Callback error_reason den ersten Parameter enthält, wird der Benutzer zu der URL im zweiten Parameter umgeleitet"
     openid_connect_allow_association_change: "Erlaube es Benutzern, ihre Discourse-Konten vom OpenID-Connect-Anbieter zu trennen und wieder mit diesem zu verbinden"
diff --git a/plugins/discourse-openid-connect/config/locales/server.pl_PL.yml b/plugins/discourse-openid-connect/config/locales/server.pl_PL.yml
index ff6ce304c667b..babb40fa33e3a 100644
--- a/plugins/discourse-openid-connect/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-openid-connect/config/locales/server.pl_PL.yml
@@ -13,7 +13,6 @@ pl_PL:
     openid_connect_authorize_scope: "Zakresy wysyłane do punktu końcowego autoryzacji. Musi obejmować „openid”."
     openid_connect_rp_initiated_logout: "Przekieruj użytkownika do end_session_endpoint po wylogowaniu. Musi być obsługiwane przez dostawcę tożsamości i uwzględnione w dokumencie odkrycia."
     openid_connect_rp_initiated_logout_redirect: "(opcjonalnie) Parametr post_logout_redirect_uri, który zostanie przekazany do punktu końcowego wylogowania. Jeśli zostanie podany, musi zostać zarejestrowany u dostawcy tożsamości."
-    openid_connect_rp_initiated_logout_include_client_id: "(opcjonalnie) Dołącz client_id (ustawienie openid_connect_client_id) jako parametr zapytania do punktu końcowego wylogowania"
     openid_connect_token_scope: "Zakresy wysyłane podczas żądania punktu końcowego tokena. Oficjalna specyfikacja tego nie wymaga."
     openid_connect_error_redirects: "Jeżeli wywołanie zwrotne error_reason zawiera pierwszy parametr, użytkownik zostanie przekierowany do adresu URL podanego w drugim parametrze"
     openid_connect_allow_association_change: "Zezwalaj użytkownikom na odłączanie i ponowne łączenie swoich kont Discourse z dostawcą OpenID Connect"
diff --git a/plugins/discourse-openid-connect/config/locales/server.uk.yml b/plugins/discourse-openid-connect/config/locales/server.uk.yml
index 0f1dda7cd2015..5c85a07cd126a 100644
--- a/plugins/discourse-openid-connect/config/locales/server.uk.yml
+++ b/plugins/discourse-openid-connect/config/locales/server.uk.yml
@@ -13,7 +13,6 @@ uk:
     openid_connect_authorize_scope: "Області видимості, надіслані до кінцевої точки авторизації. Вони повинні містити «openid»."
     openid_connect_rp_initiated_logout: "Перенаправляти користувача до end_session_endpoint після виходу з системи. Має підтримуватися вашим постачальником ідентифікаційних даних та бути включеним до документа виявлення."
     openid_connect_rp_initiated_logout_redirect: "(необов’язково) post_logout_redirect_uri, який буде передано кінцевій точці виходу з системи. Якщо його надано, його потрібно зареєструвати у постачальника ідентифікаційних даних."
-    openid_connect_rp_initiated_logout_include_client_id: "(необов’язково) Додайте client_id (параметр openid_connect_client_id) як параметр запиту до кінцевої точки виходу з системи"
     openid_connect_token_scope: "Області видимості, що надсилаються під час запиту кінцевої точки токена. Офіційна специфікація цього не вимагає."
     openid_connect_error_redirects: "Якщо error_reason містить перший параметр, користувач буде перенаправлений на URL-адресу в другому параметрі"
     openid_connect_allow_association_change: "Дозволити користувачам відключати та повторно підключати свої облікові записи Discourse від постачальника OpenID Connect"
diff --git a/plugins/discourse-openid-connect/config/locales/server.zh_CN.yml b/plugins/discourse-openid-connect/config/locales/server.zh_CN.yml
index 69125bf6707e5..9c830c86368c2 100644
--- a/plugins/discourse-openid-connect/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-openid-connect/config/locales/server.zh_CN.yml
@@ -13,7 +13,6 @@ zh_CN:
     openid_connect_authorize_scope: "发送到授权端点的范围。必须包含“openid”。"
     openid_connect_rp_initiated_logout: "退出登录后将用户重定向到 end_session_endpoint。必须受到您的身份提供商的支持并附于发现文档中。"
     openid_connect_rp_initiated_logout_redirect: "（可选）将被传递到退出登录端点的 post_logout_redirect_uri。如果提供，则必须向身份提供商注册。"
-    openid_connect_rp_initiated_logout_include_client_id: "（可选）将 client_id（openid_connect_client_id 设置）作为查询参数附加到注销端点"
     openid_connect_token_scope: "请求令牌端点时发送的范围。官方规范不需要。"
     openid_connect_error_redirects: "如果回调 error_reason 包含第一个参数，用户将被重定向到第二个参数中的 URL"
     openid_connect_allow_association_change: "允许用户从 OpenID Connect 提供商断开并重新连接其 Discourse 帐户"
diff --git a/plugins/discourse-policy/config/locales/server.el.yml b/plugins/discourse-policy/config/locales/server.el.yml
index 8711eeba49fd1..d8d4070b4d2ca 100644
--- a/plugins/discourse-policy/config/locales/server.el.yml
+++ b/plugins/discourse-policy/config/locales/server.el.yml
@@ -5,6 +5,9 @@
 # https://translate.discourse.org/
 
 el:
+  discourse_policy:
+    error:
+      no_permission: "Μη εξουσιοδοτημένο"
   reports:
     unaccepted-policies:
       labels:
diff --git a/plugins/discourse-rewind/config/locales/client.ar.yml b/plugins/discourse-rewind/config/locales/client.ar.yml
index b0eb7a3ad33d0..f8e4d208880cb 100644
--- a/plugins/discourse-rewind/config/locales/client.ar.yml
+++ b/plugins/discourse-rewind/config/locales/client.ar.yml
@@ -16,10 +16,6 @@ ar:
       title: Rewind
       loading: "جارٍ تجهيز الشبكات.."
       viewing_other_user: "أنت تشاهد تقرير <strong>%{username}</strong> في ميزة Discourse Rewind."
-      cannot_view_rewind_gibberish: >
-        [تم رفض الوصول:: فشل روتين إعادة تشغيل النظام الرئيسي]<br><br> جارٍ تهيئة سجل الشذوذ...<br><br> &nbsp;&nbsp;>> نقص في سعة المخزن المؤقت الكمي ⧛<br> &nbsp;&nbsp;>> انحراف التكافؤ بين العقد (Δ=004.33)<br> &nbsp;&nbsp;>> جزء من الحزمة ϟ عند الإزاحة ∇47<br> &nbsp;&nbsp;>> انتهت مهلة مصافحة قناة التدفق<br><br>
-      cannot_view_rewind: >
-        لا يتوفر عرض تقرير Discourse Rewind هذا. قد يكون المالك لم يشارك التقرير للجمهور؟<br><br>$> _<br><br>
       preferences:
         enable_rewind: "فعّل ميزة Discourse Rewind. سيعرض هذا ملخص نشاطك السنوي في ملفك الشخصي وعلى صورتك الرمزية."
         share_publicly: "شارك ملخص نشاطك السنوي في Discourse Rewind مع أعضاء المنتدى الآخرين. سيتمكّن أي عضو من الاطلاع على ملخصك."
diff --git a/plugins/discourse-rewind/config/locales/client.cs.yml b/plugins/discourse-rewind/config/locales/client.cs.yml
index 8a80b0bf7d371..7998ac9c9eb52 100644
--- a/plugins/discourse-rewind/config/locales/client.cs.yml
+++ b/plugins/discourse-rewind/config/locales/client.cs.yml
@@ -16,10 +16,6 @@ cs:
       title: Ohlédnutí
       loading: "Probíhá výpočet, nepropadejte panice..."
       viewing_other_user: "Prohlížíte si zprávu <strong>%{username}od</strong> Discourse Ohlédnutí."
-      cannot_view_rewind_gibberish: >
-        [PŘÍSTUP ZAMÍTNUT::NÁVRATOVÁ SMYČKA JÁDRA SELHALA]<br><br> Inicializační protokol anomálií…<br><br> &nbsp;&nbsp;>> kvantový buffer se vyprázdnil příliš brzy<br> &nbsp;&nbsp;>> uzlová parita se rozchází (Δ=004.33)<br> &nbsp;&nbsp;>> paket ϟ se rozpadl na offsetu ∇47<br> &nbsp;&nbsp;>> handshake tokového kanálu nedorazil včas<br><br>
-      cannot_view_rewind: >
-        Tuto zprávu Discourse Ohlédnutí si nemůžete prohlédnout. Možná ji vlastník nesdílel veřejně?<br><br> $> _<br><br>
       preferences:
         enable_rewind: "Povolit Diskuse Ohlédnutí. To zobrazuje shrnutí aktivity na konci roku ve vašem profilu a na vašem avataru."
         share_publicly: "Sdílejte shrnutí Discourse Ohlédnutí s ostatními členy fóra. Vaše shrnutí Discourse Ohlédnutí si bude moci prohlédnout kterýkoli člen fóra."
@@ -105,8 +101,6 @@ cs:
         chat_usage:
           title: Aktivita chatu
           total_messages: Celkem zpráv
-          dm_messages: Soukromé zprávy
-          unique_dm_channels: Konverzace v soukromých zprávách
           reactions_received: Přijaté reakce
           avg_message_length: Průměrná délka zprávy
           favorite_channels: Oblíbené kanály
diff --git a/plugins/discourse-rewind/config/locales/client.de.yml b/plugins/discourse-rewind/config/locales/client.de.yml
index 423d2be5c9eaa..73095ca4d615d 100644
--- a/plugins/discourse-rewind/config/locales/client.de.yml
+++ b/plugins/discourse-rewind/config/locales/client.de.yml
@@ -19,7 +19,7 @@ de:
       cannot_view_rewind_gibberish: >
         [ACCESS DENIED::REWIND MAINFRAME SUBROUTINE FAILURE]<br><br> Bootstrapping anomaly log...<br><br> &nbsp;&nbsp;>> quantum buffer underrun ⧛<br> &nbsp;&nbsp;>> cross-node parity drift (Δ=004.33)<br> &nbsp;&nbsp;>> packet ϟ fragment at offset ∇47<br> &nbsp;&nbsp;>> flux conduit handshake TIMED OUT<br><br>
       cannot_view_rewind: >
-        Du kannst diesen Discourse-Rückblick-Bericht nicht anzeigen.  Vielleicht hat der Eigentümer ihn nicht öffentlich freigegeben?<br><br> $> _<br><br>
+        Du kannst diesen Discourse-Rückblick-Bericht nicht anzeigen. Vielleicht hat der Eigentümer ihn nicht öffentlich freigegeben?<br><br> $> _<br><br>
       preferences:
         enable_rewind: "Discourse-Rückblick aktivieren. Dadurch wird die Jahresübersicht deiner Aktivitäten in deinem Profil und auf deinem Avatar angezeigt."
         share_publicly: "Discourse-Rückblick mit anderen Forenmitgliedern teilen. Jedes Forenmitglied kann deinen Discourse-Rückblick ansehen."
@@ -115,8 +115,6 @@ de:
         chat_usage:
           title: Chat-Aktivität
           total_messages: Nachrichten gesamt
-          dm_messages: Direktnachrichten
-          unique_dm_channels: Unterhaltungen in Direktnachrichten
           reactions_received: Erhaltene Reaktionen
           avg_message_length: Ø Nachrichtenlänge
           favorite_channels: Lieblingskanäle
diff --git a/plugins/discourse-rewind/config/locales/client.el.yml b/plugins/discourse-rewind/config/locales/client.el.yml
index 8642b767f3d14..fc41771b80a6d 100644
--- a/plugins/discourse-rewind/config/locales/client.el.yml
+++ b/plugins/discourse-rewind/config/locales/client.el.yml
@@ -18,8 +18,6 @@ el:
         chat_usage:
           title: Δραστηριότητα Συνομιλίας
           total_messages: Συνολικά Μηνύματα
-          dm_messages: Άμεσα Μηνύματα
-          unique_dm_channels: Συνομιλίες Άμεσων Μηνυμάτων
           reactions_received: Ληφθείσες Αντιδράσεις
           avg_message_length: Μέσο Μήκος Μηνύματος
           favorite_channels: Αγαπημένα Κανάλια
diff --git a/plugins/discourse-rewind/config/locales/client.es.yml b/plugins/discourse-rewind/config/locales/client.es.yml
index a9ba79a25167d..ce468575aca78 100644
--- a/plugins/discourse-rewind/config/locales/client.es.yml
+++ b/plugins/discourse-rewind/config/locales/client.es.yml
@@ -16,8 +16,6 @@ es:
       title: Rebobinar
       loading: "Reticulando splines..."
       viewing_other_user: "Estás viendo el informe de Discourse Rebobina de <strong>%{username}</strong> ."
-      cannot_view_rewind: >
-        No puedes ver este reporte de Discourse Rebobina. Quizás su propietario no lo ha compartido públicamente? <br><br> $> _<br><br>
       preferences:
         enable_rewind: "Activa Discourse Rebobina. Esto muestra el resumen de actividades de fin de año en tu perfil y en tu avatar."
         share_publicly: "Comparte el resumen de Discourse Rebobina con otros miembros del foro. Cualquier miembro del foro podrá ver tu resumen de Discourse Rebobina."
diff --git a/plugins/discourse-rewind/config/locales/client.hu.yml b/plugins/discourse-rewind/config/locales/client.hu.yml
index 735b25972826c..ecfda48de6cdc 100644
--- a/plugins/discourse-rewind/config/locales/client.hu.yml
+++ b/plugins/discourse-rewind/config/locales/client.hu.yml
@@ -7,6 +7,8 @@
 hu:
   js:
     discourse_rewind:
+      cannot_view_rewind: >
+        Nem tekintheted meg ezt a Discourse Rewind jelentést. Lehet, hogy a tulajdonos nem osztotta meg nyilvánosan?<br><br> $> _<br><br>
       share:
         toggle_label:
           private: "Privát"
diff --git a/plugins/discourse-rewind/config/locales/client.ja.yml b/plugins/discourse-rewind/config/locales/client.ja.yml
index 365e2e6663c6c..bcc1222fcd68d 100644
--- a/plugins/discourse-rewind/config/locales/client.ja.yml
+++ b/plugins/discourse-rewind/config/locales/client.ja.yml
@@ -16,10 +16,6 @@ ja:
       title: Rewind
       loading: "網目状のスプライン..."
       viewing_other_user: "<strong>%{username}</strong> の Discourse Rewind レポートを表示中です。"
-      cannot_view_rewind_gibberish: >
-        [ACCESS DENIED::REWIND MAINFRAME SUBROUTINE FAILURE]<br><br> Bootstrapping anomaly log...<br><br> &nbsp;&nbsp;>> quantum buffer underrun ⧛<br> &nbsp;&nbsp;>> cross-node parity drift (Δ=004.33)<br> &nbsp;&nbsp;>> packet ϟ fragment at offset ∇47<br> &nbsp;&nbsp;>> flux conduit handshake TIMED OUT<br><br>
-      cannot_view_rewind: >
-        この Discourse Rewind レポートを表示できません。オーナーが公開していない可能性があります。<br><br> $> _<br><br>
       preferences:
         enable_rewind: "Discourse Rewind を有効にする。これにより、プロフィールとアバターに年末のアクティビティの要約が表示されます。"
         share_publicly: "Discourse Rewind サマリーを他のフォーラムメンバーを共有する。すべてのフォーラムメンバーがあなたの Discourse Rewind サマリーを閲覧できるようになります。"
diff --git a/plugins/discourse-rewind/config/locales/client.pl_PL.yml b/plugins/discourse-rewind/config/locales/client.pl_PL.yml
index 5996604995254..1db9ee3a613ab 100644
--- a/plugins/discourse-rewind/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-rewind/config/locales/client.pl_PL.yml
@@ -135,8 +135,6 @@ pl_PL:
         chat_usage:
           title: Aktywność czatu
           total_messages: Łączna liczba wiadomości
-          dm_messages: Wiadomości bezpośrednie
-          unique_dm_channels: Rozmowy z wiadomościami bezpośrednimi
           reactions_received: Otrzymane reakcje
           avg_message_length: Średnia długość wiadomości
           favorite_channels: Ulubione kanały
diff --git a/plugins/discourse-rewind/config/locales/client.ru.yml b/plugins/discourse-rewind/config/locales/client.ru.yml
index c4295a425fa5a..61552786190d6 100644
--- a/plugins/discourse-rewind/config/locales/client.ru.yml
+++ b/plugins/discourse-rewind/config/locales/client.ru.yml
@@ -15,8 +15,6 @@ ru:
       placeholder: Перемотка Discourse
       title: Rewind
       viewing_other_user: "Вы просматриваете отчет <strong>%{username}'s</strong> Discourse Rewind."
-      cannot_view_rewind: >
-        Вы не можете просмотреть этот отчет Discourse Rewind. Возможно, владелец не опубликовал его публично?<br><br> $> _<br><br>
       preferences:
         enable_rewind: "Включите функцию Discourse Rewind. Это позволит отображать сводку событий за конец года в вашем профиле и на вашем аватаре."
         share_publicly: "Поделитесь сводкой Discourse Rewind с другими участниками форума. Любой участник форума сможет просмотреть вашу сводку Discourse Rewind."
diff --git a/plugins/discourse-rewind/config/locales/client.uk.yml b/plugins/discourse-rewind/config/locales/client.uk.yml
index 30d6ad9b8c854..bd0405af0b181 100644
--- a/plugins/discourse-rewind/config/locales/client.uk.yml
+++ b/plugins/discourse-rewind/config/locales/client.uk.yml
@@ -17,9 +17,9 @@ uk:
       loading: "Збирання сплайнів..."
       viewing_other_user: "Ви переглядаєте <strong>%{username}</strong> звіт \"Перемотування дискурсу\"."
       cannot_view_rewind_gibberish: >
-        [ДОСТУП ВІДМОВЛЕНО::ЗБІЙ ПІДПРОГРАМИ REWIND МЕЙНФРЕЙМУ]<br><br> Журнал аномалій завантаження...<br><br> &nbsp;&nbsp;>> недоповнення квантового буфера ⧛<br> &nbsp;&nbsp;>> міжвузловий дрейф парності (Δ=004.33)<br> &nbsp;&nbsp;>> фрагмент пакету ϟ зі зміщенням ∇47<br> &nbsp;&nbsp;>> Час очікування для відповідей на запити Flux Conduit<br><br>
+        [ACCESS DENIED::REWIND MAINFRAME SUBROUTINE FAILURE]<br><br> Журнал аномалій завантаження...<br><br> &nbsp;&nbsp;>> недоповнення квантового буфера ⧛<br> &nbsp;&nbsp;>> міжвузловий дрейф парності (Δ=004.33)<br> &nbsp;&nbsp;>> фрагмент пакету ϟ зі зміщенням ∇47<br> &nbsp;&nbsp;>> Час очікування для відповідей на запити Flux Conduit<br><br>
       cannot_view_rewind: >
-        Ви не можете переглянути цей звіт "Перемотування дискурсу". Можливо, власник не поділився ним публічно?<br><br> $> _<br><br>
+        Ви не можете переглянути цей звіт Discourse Rewind. Можливо, власник не опублікував його?<br><br> $> _<br><br>
       preferences:
         enable_rewind: "Увімкнути перемотування дискусії. Це відображає зведення активності за кінець року у вашому профілі та на вашому аватарі."
         share_publicly: "Поділіться підсумковим звітом \"Перемотування дискурсу\" з іншими учасниками форуму. Будь-який учасник форуму зможе переглянути ваш звіт \"Перемотування дискурсу\"."
@@ -135,8 +135,6 @@ uk:
         chat_usage:
           title: Активність в чаті
           total_messages: Всього повідомлень
-          dm_messages: Прямі повідомлення
-          unique_dm_channels: Розмови в прямих повідомленнях
           reactions_received: Отримані реакції
           avg_message_length: Середня довжина повідомлення
           favorite_channels: Улюблені канали
diff --git a/plugins/discourse-rewind/config/locales/client.zh_CN.yml b/plugins/discourse-rewind/config/locales/client.zh_CN.yml
index df911cf69a485..3097d0c9b04f9 100644
--- a/plugins/discourse-rewind/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-rewind/config/locales/client.zh_CN.yml
@@ -17,9 +17,9 @@ zh_CN:
       loading: "正在重构样条曲线…"
       viewing_other_user: "您正在查看 <strong>%{username}</strong> 的 Discourse 回顾。"
       cannot_view_rewind_gibberish: >
-        [ACCESS DENIED::REWIND MAINFRAME SUBROUTINE FAILURE]<br><br> Bootstrapping anomaly log...<br><br> &nbsp;&nbsp;>> quantum buffer underrun ⧛<br> &nbsp;&nbsp;>> cross-node parity drift (Δ=004.33)<br> &nbsp;&nbsp;>> packet ϟ fragment at offset ∇47<br> &nbsp;&nbsp;>> flux conduit handshake TIMED OUT<br><br>
+        [访问被拒绝:: REWIND 运行失败]<br><br> 引导异常日志...<br><br> &nbsp;&nbsp;>> quantum buffer underrun ⧛<br> &nbsp;&nbsp;>> cross-node parity drift (Δ=004.33)<br> &nbsp;&nbsp;>> packet ϟ fragment at offset ∇47<br> &nbsp;&nbsp;>> flux conduit handshake TIMED OUT<br><br>
       cannot_view_rewind: >
-        您无法查看此 Discourse 回顾报告。也许所有者尚未公开分享？<br><br> $> _<br><br>
+        您无法查看此 Discourse Rewind 报告。也许所有者尚未公开分享？<br><br> $> _<br><br>
       preferences:
         enable_rewind: "启用 Discourse 回顾。这将在您的个人资料中和您的头像上显示年终活动总结。"
         share_publicly: "与其他论坛成员分享 Discourse 回顾总结。任何论坛成员都可以查看您的 Discourse 回顾总结。"
@@ -105,8 +105,6 @@ zh_CN:
         chat_usage:
           title: 聊天活动
           total_messages: 消息总数
-          dm_messages: 直接消息
-          unique_dm_channels: 直接消息对话
           reactions_received: 收到的回应
           avg_message_length: 平均消息长度
           favorite_channels: 最喜欢的频道
diff --git a/plugins/discourse-solved/config/locales/client.ar.yml b/plugins/discourse-solved/config/locales/client.ar.yml
index 9bfbaf2a4b5b0..2a47505003c8e 100644
--- a/plugins/discourse-solved/config/locales/client.ar.yml
+++ b/plugins/discourse-solved/config/locales/client.ar.yml
@@ -44,9 +44,6 @@ ar:
       no_solved_topics_title_others: "لم يحل %{username} أي موضوعات حتى الآن"
       no_solved_topics_body: "عندما تقدِّم ردًا مفيدًا على أحد الموضوعات، فقد يحدِّد مالك الموضوع أو فريق العمل ردك على أنه الحل."
       marked_solved_by: "تم وضع علامة \"تم الحل\" بواسطة %{user}"
-      move_post_cancel: "ألغِ"
-      confirm_solved_removal_confirm: "تأكيد"
-      confirm_solved_removal_cancel: "ألغِ"
       no_answer:
         title: هل تمت الإجابة على سؤالك؟
         description: "ميِّز الإجابة وساعد الآخرين عن طريق استخدام زر الحل أسفل الرد الصحيح."
diff --git a/plugins/discourse-solved/config/locales/client.be.yml b/plugins/discourse-solved/config/locales/client.be.yml
index 235f9e7ea61ea..94714072912ea 100644
--- a/plugins/discourse-solved/config/locales/client.be.yml
+++ b/plugins/discourse-solved/config/locales/client.be.yml
@@ -9,8 +9,6 @@ be:
     solved:
       topic_status_filter:
         all: "усе"
-      move_post_cancel: "Скасаваць"
-      confirm_solved_removal_cancel: "Скасаваць"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.bg.yml b/plugins/discourse-solved/config/locales/client.bg.yml
index 60ad92ac62d71..40858bf9b4893 100644
--- a/plugins/discourse-solved/config/locales/client.bg.yml
+++ b/plugins/discourse-solved/config/locales/client.bg.yml
@@ -16,8 +16,6 @@ bg:
       accepted_answer_post_number: "публикация %{post_number} "
       topic_status_filter:
         all: "всички подкатегории"
-      move_post_cancel: "Отмени"
-      confirm_solved_removal_cancel: "Отмени"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.bs_BA.yml b/plugins/discourse-solved/config/locales/client.bs_BA.yml
index 7ad65b0438e46..6e5edeb636de2 100644
--- a/plugins/discourse-solved/config/locales/client.bs_BA.yml
+++ b/plugins/discourse-solved/config/locales/client.bs_BA.yml
@@ -28,8 +28,6 @@ bs_BA:
         all: "sve"
         solved: "riješeno"
         unsolved: "nije riješeno"
-      move_post_cancel: "Odustani"
-      confirm_solved_removal_cancel: "Odustani"
     topic_statuses:
       solved:
         help: "Ova tema ima riješenje"
diff --git a/plugins/discourse-solved/config/locales/client.ca.yml b/plugins/discourse-solved/config/locales/client.ca.yml
index 6ac41ee4cafa5..51ec795330d48 100644
--- a/plugins/discourse-solved/config/locales/client.ca.yml
+++ b/plugins/discourse-solved/config/locales/client.ca.yml
@@ -28,9 +28,6 @@ ca:
         all: "tots"
         solved: "resolt"
         unsolved: "no resolt"
-      move_post_cancel: "Cancel·la"
-      confirm_solved_removal_confirm: "Confirma"
-      confirm_solved_removal_cancel: "Cancel·la"
     topic_statuses:
       solved:
         help: "Aquest tema té una solució"
diff --git a/plugins/discourse-solved/config/locales/client.cs.yml b/plugins/discourse-solved/config/locales/client.cs.yml
index b1791c664df7b..76ac984953421 100644
--- a/plugins/discourse-solved/config/locales/client.cs.yml
+++ b/plugins/discourse-solved/config/locales/client.cs.yml
@@ -42,22 +42,6 @@ cs:
       no_solved_topics_title_others: "%{username} zatím nevyřešil/a žádná témata"
       no_solved_topics_body: "Pokud na téma poskytnete užitečnou odpověď, vaše odpověď může být zvolena jako řešení vlastníkem tématu nebo redakcí."
       marked_solved_by: "Označeno jako vyřešené uživatelem %{user}"
-      confirm_move_solution_title: "Přesunout příspěvek s řešením"
-      confirm_move_solution:
-        one: "Vybraný příspěvek je označen jako řešení tohoto tématu. Pokud jej přesunete, téma bude aktualizováno na nevyřešené."
-        few: "Jeden z vybraných příspěvků je označen jako řešení tohoto tématu. Pokud jej přesunete, téma bude aktualizováno na nevyřešené."
-        many: "Jeden z vybraných příspěvků je označen jako řešení tohoto tématu. Pokud jej přesunete, téma bude aktualizováno na nevyřešené."
-        other: "Jeden z vybraných příspěvků je označen jako řešení tohoto tématu. Pokud jej přesunete, téma bude aktualizováno na nevyřešené."
-      move_post_confirm:
-        one: "Přesunout příspěvek"
-        few: "Přesunout příspěvky"
-        many: "Přesunout příspěvky"
-        other: "Přesunout příspěvky"
-      move_post_cancel: "Zrušit"
-      dont_show_again: "Rozumím, už mi to nezobrazujte."
-      confirm_solved_removal_title: "Řešení bude odstraněno"
-      confirm_solved_removal_confirm: "Potvrdit"
-      confirm_solved_removal_cancel: "Zrušit"
       no_answer:
         title: Byla vaše otázka zodpovězena?
         description: "Pomozte ostatním tím, že zvýrazníte odpověď použitím tlačítka Řešení pod správnou odpovědí."
diff --git a/plugins/discourse-solved/config/locales/client.da.yml b/plugins/discourse-solved/config/locales/client.da.yml
index f1920cf46d3a6..6cb21e6990a70 100644
--- a/plugins/discourse-solved/config/locales/client.da.yml
+++ b/plugins/discourse-solved/config/locales/client.da.yml
@@ -32,9 +32,6 @@ da:
       no_solved_topics_title_others: "%{username} har endnu ikke løst nogen emner"
       no_solved_topics_body: "Når du giver et nyttigt svar på et emne, kan dit svar blive udvalgt som løsningen af emneejeren eller personalet."
       marked_solved_by: "Markeret som løst af %{user}"
-      move_post_cancel: "Annuller"
-      confirm_solved_removal_confirm: "Bekræft"
-      confirm_solved_removal_cancel: "Annuller"
       no_answer:
         title: Er dit spørgsmål blevet besvaret?
         description: "Fremhæv svaret og hjælp andre ved at bruge løsningsknappen under det korrekte svar."
diff --git a/plugins/discourse-solved/config/locales/client.de.yml b/plugins/discourse-solved/config/locales/client.de.yml
index 50d5a1087f778..14a42e13b1c7e 100644
--- a/plugins/discourse-solved/config/locales/client.de.yml
+++ b/plugins/discourse-solved/config/locales/client.de.yml
@@ -40,19 +40,6 @@ de:
       no_solved_topics_title_others: "%{username} hat noch keine Themen gelöst"
       no_solved_topics_body: "Wenn du eine hilfreiche Antwort auf ein Thema gibst, kann es sein, dass deine Antwort vom Themenersteller oder einem Team-Mitglied als Lösung ausgewählt wird."
       marked_solved_by: "Als gelöst markiert von %{user}"
-      confirm_move_solution_title: "Lösungsbeitrag verschieben"
-      confirm_move_solution:
-        one: "Der Beitrag ist als Lösung für dieses Thema ausgewählt. Wenn du ihn verschiebst, wird das Thema wieder als ungelöst markiert."
-        other: "Einer der Beiträge ist als Lösung für dieses Thema ausgewählt. Wenn du ihn verschiebst, wird das Thema wieder als ungelöst markiert."
-      move_post_confirm:
-        one: "Beitrag verschieben"
-        other: "Beiträge verschieben"
-      move_post_cancel: "Abbrechen"
-      dont_show_again: "Verstanden, zeig mir das nicht nochmal"
-      confirm_solved_removal_title: "Die Lösung wird entfernt"
-      confirm_solved_removal: "Durch diese Änderung werden Lösungen für dieses Thema deaktiviert und die akzeptierte Lösung entfernt."
-      confirm_solved_removal_confirm: "Bestätigen"
-      confirm_solved_removal_cancel: "Abbrechen"
       no_answer:
         title: Wurde deine Frage beantwortet?
         description: "Hebe die Antwort hervor und hilf anderen, indem du die Lösungsschaltfläche unter der richtigen Antwort verwendest."
diff --git a/plugins/discourse-solved/config/locales/client.el.yml b/plugins/discourse-solved/config/locales/client.el.yml
index 8d184e323a6fe..7321e0c117e48 100644
--- a/plugins/discourse-solved/config/locales/client.el.yml
+++ b/plugins/discourse-solved/config/locales/client.el.yml
@@ -33,9 +33,6 @@ el:
       no_solved_topics_title: "Δεν έχετε λύσει κανένα θέμα ακόμη"
       no_solved_topics_title_others: "Ο χρήστης %{username} δεν έχει λύσει κανένα θέμα ακόμη"
       marked_solved_by: "Σημάνθηκε ως λυμένο από %{user}"
-      move_post_cancel: "Άκυρο"
-      confirm_solved_removal_confirm: "Επιβεβαίωση"
-      confirm_solved_removal_cancel: "Άκυρο"
       no_answer:
         title: Έχει απαντηθεί η ερώτηση σας;
         description: "Επισημάνετε την απάντηση και βοηθήστε άλλους χρησιμοποιώντας το κουμπί λύσης κάτω από τη σωστή απάντηση."
diff --git a/plugins/discourse-solved/config/locales/client.es.yml b/plugins/discourse-solved/config/locales/client.es.yml
index 1ae5a79c854a1..71ccc12633498 100644
--- a/plugins/discourse-solved/config/locales/client.es.yml
+++ b/plugins/discourse-solved/config/locales/client.es.yml
@@ -38,9 +38,6 @@ es:
       no_solved_topics_title: "Todavía no has resuelto ningún tema"
       no_solved_topics_title_others: "%{username} no ha resuelto ningún tema todavía"
       no_solved_topics_body: "Cuando proporcionas una respuesta útil a un tema, el propietario del tema o el personal pueden seleccionar tu respuesta como la solución."
-      move_post_cancel: "Cancelar"
-      confirm_solved_removal_confirm: "Confirmar"
-      confirm_solved_removal_cancel: "Cancelar"
       no_answer:
         title: '¿Se ha respondido a tu pregunta?'
         description: "Destaca la respuesta y ayuda a los demás utilizando el botón de solución que hay debajo de la respuesta correcta."
diff --git a/plugins/discourse-solved/config/locales/client.et.yml b/plugins/discourse-solved/config/locales/client.et.yml
index 88fec0fd21bcc..bbeaf068a1617 100644
--- a/plugins/discourse-solved/config/locales/client.et.yml
+++ b/plugins/discourse-solved/config/locales/client.et.yml
@@ -22,8 +22,6 @@ et:
       topic_status_filter:
         all: "kõik"
         solved: "lahendatud"
-      move_post_cancel: "Loobu"
-      confirm_solved_removal_cancel: "Loobu"
     topic_statuses:
       solved:
         help: "ellel teemal on lahendus"
diff --git a/plugins/discourse-solved/config/locales/client.fa_IR.yml b/plugins/discourse-solved/config/locales/client.fa_IR.yml
index 99fd20d45c4f6..8ed2f7eebbe30 100644
--- a/plugins/discourse-solved/config/locales/client.fa_IR.yml
+++ b/plugins/discourse-solved/config/locales/client.fa_IR.yml
@@ -28,9 +28,6 @@ fa_IR:
         solved: "حل شده"
         unsolved: "حل نشده"
       no_solved_topics_title_others: "%{username} هنوز هیچ موضوعی را حل نکرده است"
-      move_post_cancel: "لغو"
-      confirm_solved_removal_confirm: "تایید"
-      confirm_solved_removal_cancel: "لغو"
       notification:
         title: "نوشته شما به عنوان راه حل مشخص شد"
     topic_statuses:
diff --git a/plugins/discourse-solved/config/locales/client.fi.yml b/plugins/discourse-solved/config/locales/client.fi.yml
index 8aefd538043cc..05150eeb3d934 100644
--- a/plugins/discourse-solved/config/locales/client.fi.yml
+++ b/plugins/discourse-solved/config/locales/client.fi.yml
@@ -38,9 +38,6 @@ fi:
       no_solved_topics_title: "Et ole vielä ratkaissut ketjuja"
       no_solved_topics_title_others: "%{username} ei ole vielä ratkaissut ketjuja"
       no_solved_topics_body: "Kun annat hyödyllisen vastauksen ketjuun, aiheen omistaja tai henkilökunta saattaa valita vastauksesi ratkaisuksi."
-      move_post_cancel: "Peruuta"
-      confirm_solved_removal_confirm: "Vahvista"
-      confirm_solved_removal_cancel: "Peruuta"
       no_answer:
         title: Onko kysymykseesi vastattu?
         description: "Korosta vastaus ja auta muita käyttämällä oikean vastauksen alla olevaa ratkaisupainiketta."
diff --git a/plugins/discourse-solved/config/locales/client.fr.yml b/plugins/discourse-solved/config/locales/client.fr.yml
index 0cb93c05729f7..779353730f5b3 100644
--- a/plugins/discourse-solved/config/locales/client.fr.yml
+++ b/plugins/discourse-solved/config/locales/client.fr.yml
@@ -38,9 +38,6 @@ fr:
       no_solved_topics_title: "Vous n'avez encore résolu aucun sujet"
       no_solved_topics_title_others: "%{username} n'a encore résolu aucun sujet."
       no_solved_topics_body: "Lorsque vous fournissez une réponse utile à un sujet, votre réponse peut être sélectionnée comme solution par le ou la propriétaire ou responsable du sujet."
-      move_post_cancel: "Annuler"
-      confirm_solved_removal_confirm: "Confirmer"
-      confirm_solved_removal_cancel: "Annuler"
       no_answer:
         title: Votre question a-t-elle reçu une réponse ?
         description: "Mettez la réponse en surbrillance et aidez les autres utilisateurs en utilisant le bouton de solution sous la réponse adéquate."
diff --git a/plugins/discourse-solved/config/locales/client.gl.yml b/plugins/discourse-solved/config/locales/client.gl.yml
index e84729a8d15f3..6ae1d27e87ec8 100644
--- a/plugins/discourse-solved/config/locales/client.gl.yml
+++ b/plugins/discourse-solved/config/locales/client.gl.yml
@@ -14,9 +14,6 @@ gl:
       accepted_answer_post_number: "publicación %{post_number}"
       topic_status_filter:
         all: "todo"
-      move_post_cancel: "Cancelar"
-      confirm_solved_removal_confirm: "Confirmar"
-      confirm_solved_removal_cancel: "Cancelar"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.he.yml b/plugins/discourse-solved/config/locales/client.he.yml
index 8e8370e75f058..a648544074163 100644
--- a/plugins/discourse-solved/config/locales/client.he.yml
+++ b/plugins/discourse-solved/config/locales/client.he.yml
@@ -42,9 +42,6 @@ he:
       no_solved_topics_title_others: "אין נושאים שנפתרו על ידי %{username} עדיין"
       no_solved_topics_body: "לאחר שכתבת תגובה מועילה לנושא, התגובה שלך עשויה להיבחר כפתרון על ידי בעלי הנושא או הסגל."
       marked_solved_by: "סומן כפתור על ידי %{user}"
-      move_post_cancel: "ביטול"
-      confirm_solved_removal_confirm: "אישור"
-      confirm_solved_removal_cancel: "ביטול"
       no_answer:
         title: התשובה שלך נענתה?
         description: "ניתן להדגיש את התשובה ולסייע לאחרים על ידי לחיצה על כפתור הפתרון שלהלן מתחת לתגובה הנכונה."
diff --git a/plugins/discourse-solved/config/locales/client.hr.yml b/plugins/discourse-solved/config/locales/client.hr.yml
index dac85c9a26fa4..6aaffad5302e4 100644
--- a/plugins/discourse-solved/config/locales/client.hr.yml
+++ b/plugins/discourse-solved/config/locales/client.hr.yml
@@ -25,9 +25,6 @@ hr:
         all: "sve"
         solved: "riješeno"
       no_solved_topics_title_others: "%{username} još nije riješio/la nijednu temu"
-      move_post_cancel: "Odustani"
-      confirm_solved_removal_confirm: "Potvrdi"
-      confirm_solved_removal_cancel: "Odustani"
       no_answer:
         title: Je li odgovoreno na vaše pitanje?
         description: "Označite odgovor i pomozite drugima pomoću gumba za rješenje ispod točnog odgovora."
diff --git a/plugins/discourse-solved/config/locales/client.hu.yml b/plugins/discourse-solved/config/locales/client.hu.yml
index 074f3d9570b57..3a11172f3abb8 100644
--- a/plugins/discourse-solved/config/locales/client.hu.yml
+++ b/plugins/discourse-solved/config/locales/client.hu.yml
@@ -40,9 +40,6 @@ hu:
       no_solved_topics_title_others: "%{username} még nem oldott meg témát"
       no_solved_topics_body: "Ha hasznos választ ad egy témára, előfordulhat, hogy a téma tulajdonosa vagy a stáb az Ön válaszát választják megoldásként."
       marked_solved_by: "%{user} felhasználó megoldottnak jelölte"
-      move_post_cancel: "Mégse"
-      confirm_solved_removal_confirm: "Megerősítés"
-      confirm_solved_removal_cancel: "Mégse"
       no_answer:
         title: Megválaszolták a kérdését?
         description: "Emelje ki a választ, és segítsen másoknak is a helyes válasz alatti megoldás gomb segítségével."
diff --git a/plugins/discourse-solved/config/locales/client.hy.yml b/plugins/discourse-solved/config/locales/client.hy.yml
index 42921b471fb59..41c2f6c315002 100644
--- a/plugins/discourse-solved/config/locales/client.hy.yml
+++ b/plugins/discourse-solved/config/locales/client.hy.yml
@@ -26,9 +26,6 @@ hy:
         all: "բոլոր"
         solved: "լուծված"
         unsolved: "չլուծված"
-      move_post_cancel: "Չեղարկել"
-      confirm_solved_removal_confirm: "Հաստատել"
-      confirm_solved_removal_cancel: "Չեղարկել"
     topic_statuses:
       solved:
         help: "Այս թեման ունի լուծում:"
diff --git a/plugins/discourse-solved/config/locales/client.id.yml b/plugins/discourse-solved/config/locales/client.id.yml
index 1e02ea9d36c48..96b54687b962d 100644
--- a/plugins/discourse-solved/config/locales/client.id.yml
+++ b/plugins/discourse-solved/config/locales/client.id.yml
@@ -20,9 +20,6 @@ id:
         other: "Solusi"
       topic_status_filter:
         all: "Semua"
-      move_post_cancel: "Batal"
-      confirm_solved_removal_confirm: "Konfirmasi"
-      confirm_solved_removal_cancel: "Batal"
     topic_statuses:
       solved:
         help: "Topik ini memiliki solusi"
diff --git a/plugins/discourse-solved/config/locales/client.it.yml b/plugins/discourse-solved/config/locales/client.it.yml
index b40f03b6a2955..3c39b8a2190b3 100644
--- a/plugins/discourse-solved/config/locales/client.it.yml
+++ b/plugins/discourse-solved/config/locales/client.it.yml
@@ -38,9 +38,6 @@ it:
       no_solved_topics_title: "Non hai ancora risolto nessun argomento"
       no_solved_topics_title_others: "%{username} non ha ancora risolto nessun argomento"
       no_solved_topics_body: "Quando fornisci una risposta utile a un argomento, la tua risposta potrà essere selezionata come soluzione dal proprietario dell'argomento o dallo staff."
-      move_post_cancel: "Annulla"
-      confirm_solved_removal_confirm: "Conferma"
-      confirm_solved_removal_cancel: "Annulla"
       no_answer:
         title: La tua domanda ha avuto risposta?
         description: "Evidenzia la risposta e aiuta gli altri utilizzando il pulsante della soluzione sotto la risposta corretta."
diff --git a/plugins/discourse-solved/config/locales/client.ja.yml b/plugins/discourse-solved/config/locales/client.ja.yml
index 59d065dc74faa..225403afefa0b 100644
--- a/plugins/discourse-solved/config/locales/client.ja.yml
+++ b/plugins/discourse-solved/config/locales/client.ja.yml
@@ -39,9 +39,6 @@ ja:
       no_solved_topics_title_others: "%{username} はまだトピックを解決していません"
       no_solved_topics_body: "トピックに有益な返信を提供すると、その返信がトピックオーナーまたはスタッフによって解決策として選択される場合があります。"
       marked_solved_by: "%{user} が解決済みに指定"
-      move_post_cancel: "キャンセル"
-      confirm_solved_removal_confirm: "確認"
-      confirm_solved_removal_cancel: "キャンセル"
       no_answer:
         title: 質問の回答は得られましたか？
         description: "適切な返信の下にある解決策ボタンを使って回答をハイライトし、他のユーザーを助けましょう。"
diff --git a/plugins/discourse-solved/config/locales/client.ko.yml b/plugins/discourse-solved/config/locales/client.ko.yml
index 76ee5604cbc11..7f6fab7ef01b1 100644
--- a/plugins/discourse-solved/config/locales/client.ko.yml
+++ b/plugins/discourse-solved/config/locales/client.ko.yml
@@ -26,9 +26,6 @@ ko:
         all: "모두"
         solved: "해결됨"
         unsolved: "미해결"
-      move_post_cancel: "취소"
-      confirm_solved_removal_confirm: "확인"
-      confirm_solved_removal_cancel: "취소"
     topic_statuses:
       solved:
         help: "이 토픽에는 해결책이 있습니다"
diff --git a/plugins/discourse-solved/config/locales/client.lt.yml b/plugins/discourse-solved/config/locales/client.lt.yml
index a8c2a64801267..f109949dc3be6 100644
--- a/plugins/discourse-solved/config/locales/client.lt.yml
+++ b/plugins/discourse-solved/config/locales/client.lt.yml
@@ -16,9 +16,6 @@ lt:
       topic_status_filter:
         all: "visi"
         solved: "išspresta"
-      move_post_cancel: "Atšaukti"
-      confirm_solved_removal_confirm: "Patvirtinti"
-      confirm_solved_removal_cancel: "Atšaukti"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.lv.yml b/plugins/discourse-solved/config/locales/client.lv.yml
index aa35ebab650a0..93672a4fe3553 100644
--- a/plugins/discourse-solved/config/locales/client.lv.yml
+++ b/plugins/discourse-solved/config/locales/client.lv.yml
@@ -14,8 +14,6 @@ lv:
       accepted_answer_post_number: "ieraksts %{post_number}"
       topic_status_filter:
         all: "Viss"
-      move_post_cancel: "Atcelt"
-      confirm_solved_removal_cancel: "Atcelt"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.nb_NO.yml b/plugins/discourse-solved/config/locales/client.nb_NO.yml
index 2e85e69d75d06..63846d06f37d8 100644
--- a/plugins/discourse-solved/config/locales/client.nb_NO.yml
+++ b/plugins/discourse-solved/config/locales/client.nb_NO.yml
@@ -23,9 +23,6 @@ nb_NO:
       topic_status_filter:
         all: "alle"
         solved: "løst"
-      move_post_cancel: "Avbryt"
-      confirm_solved_removal_confirm: "Bekreft"
-      confirm_solved_removal_cancel: "Avbryt"
     topic_statuses:
       solved:
         help: "Dette emnet har en løsning"
diff --git a/plugins/discourse-solved/config/locales/client.nl.yml b/plugins/discourse-solved/config/locales/client.nl.yml
index d4ed062394778..f7e58e131647b 100644
--- a/plugins/discourse-solved/config/locales/client.nl.yml
+++ b/plugins/discourse-solved/config/locales/client.nl.yml
@@ -38,9 +38,6 @@ nl:
       no_solved_topics_title: "Je hebt nog geen topics opgelost"
       no_solved_topics_title_others: "%{username} heeft nog geen topics opgelost"
       no_solved_topics_body: "Als je een nuttig antwoord geeft op een topic, kan je antwoord door de eigenaar van het topic of door een medewerker als oplossing worden gekozen."
-      move_post_cancel: "Annuleren"
-      confirm_solved_removal_confirm: "Bevestigen"
-      confirm_solved_removal_cancel: "Annuleren"
       no_answer:
         title: Is je vraag beantwoord?
         description: "Markeer het antwoord en help anderen door de oplossingsknop onder het juiste antwoord te gebruiken."
diff --git a/plugins/discourse-solved/config/locales/client.pl_PL.yml b/plugins/discourse-solved/config/locales/client.pl_PL.yml
index d9190be78b3c1..0d86a5e103274 100644
--- a/plugins/discourse-solved/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-solved/config/locales/client.pl_PL.yml
@@ -42,23 +42,6 @@ pl_PL:
       no_solved_topics_title_others: "%{username} nie rozwiązał jeszcze żadnych tematów"
       no_solved_topics_body: "Gdy udzielisz pomocnej odpowiedzi na dany temat, Twoja odpowiedź może zostać wybrana jako rozwiązanie przez właściciela tematu lub personel."
       marked_solved_by: "Oznaczono jako rozwiązane przez %{user}"
-      confirm_move_solution_title: "Przenieś wpis z rozwiązaniem"
-      confirm_move_solution:
-        one: "Wybrany wpis jest oznaczony jako rozwiązanie tego tematu. Jeśli go przeniesiesz, temat zostanie zaktualizowany do nierozwiązanego."
-        few: "Jeden z wybranych wpisów jest oznaczony jako rozwiązanie tego tematu. Jeśli je przeniesiesz, temat zostanie zaktualizowany do nierozwiązanego."
-        many: "Jeden z wybranych wpisów jest oznaczony jako rozwiązanie tego tematu. Jeśli je przeniesiesz, temat zostanie zaktualizowany do nierozwiązanego."
-        other: "Jeden z wybranych wpisów jest oznaczony jako rozwiązanie tego tematu. Jeśli je przeniesiesz, temat zostanie zaktualizowany do nierozwiązanego."
-      move_post_confirm:
-        one: "Przenieś wpis"
-        few: "Przenieś wpisy"
-        many: "Przenieś wpisy"
-        other: "Przenieś wpisy"
-      move_post_cancel: "Anuluj"
-      dont_show_again: "Rozumiem, nie pokazuj mi tego ponownie"
-      confirm_solved_removal_title: "Rozwiązanie zostanie usunięte"
-      confirm_solved_removal: "Ta zmiana spowoduje wyłączenie rozwiązań dla tego tematu i usunięcie zaakceptowanego rozwiązania."
-      confirm_solved_removal_confirm: "Potwierdź"
-      confirm_solved_removal_cancel: "Anuluj"
       no_answer:
         title: Czy odpowiedź na twoje pytanie została udzielona?
         description: "Podświetl odpowiedź i pomóż innym, korzystając z przycisku rozwiązania pod prawidłową odpowiedzią."
diff --git a/plugins/discourse-solved/config/locales/client.pt.yml b/plugins/discourse-solved/config/locales/client.pt.yml
index 43d63858d8d3b..e789fcb875bce 100644
--- a/plugins/discourse-solved/config/locales/client.pt.yml
+++ b/plugins/discourse-solved/config/locales/client.pt.yml
@@ -27,9 +27,6 @@ pt:
       topic_status_filter:
         all: "todos"
         solved: "resolvido"
-      move_post_cancel: "Cancelar"
-      confirm_solved_removal_confirm: "Confirmar"
-      confirm_solved_removal_cancel: "Cancelar"
     topic_statuses:
       solved:
         help: "Este tópico tem uma solução"
diff --git a/plugins/discourse-solved/config/locales/client.pt_BR.yml b/plugins/discourse-solved/config/locales/client.pt_BR.yml
index da5f2146f7a61..e84976c1c2df5 100644
--- a/plugins/discourse-solved/config/locales/client.pt_BR.yml
+++ b/plugins/discourse-solved/config/locales/client.pt_BR.yml
@@ -40,9 +40,6 @@ pt_BR:
       no_solved_topics_title_others: "%{username} ainda não respondeu a nenhum tópico"
       no_solved_topics_body: "Quando você fornecer uma resposta útil a um tópico, ela poderá ser selecionada como uma solução pelo(a) proprietário(a) ou equipe do tópico."
       marked_solved_by: "Marcado como resolvido por %{user}"
-      move_post_cancel: "Cancelar"
-      confirm_solved_removal_confirm: "Confirmar"
-      confirm_solved_removal_cancel: "Cancelar"
       no_answer:
         title: Sua pergunta foi respondida?
         description: "Destaque a resposta e ajude as outras pessoas ao usar o botão de solução abaixo para responder corretamente."
diff --git a/plugins/discourse-solved/config/locales/client.ro.yml b/plugins/discourse-solved/config/locales/client.ro.yml
index ea784328f3acb..6f61b6b677231 100644
--- a/plugins/discourse-solved/config/locales/client.ro.yml
+++ b/plugins/discourse-solved/config/locales/client.ro.yml
@@ -30,8 +30,6 @@ ro:
         all: "tot"
         solved: "rezolvat"
         unsolved: "nerezolvat"
-      move_post_cancel: "Anulează"
-      confirm_solved_removal_cancel: "Anulează"
     topic_statuses:
       solved:
         help: "Acest subiect are o soluție"
diff --git a/plugins/discourse-solved/config/locales/client.ru.yml b/plugins/discourse-solved/config/locales/client.ru.yml
index e8bab8cb907a9..f52b334e0f63c 100644
--- a/plugins/discourse-solved/config/locales/client.ru.yml
+++ b/plugins/discourse-solved/config/locales/client.ru.yml
@@ -42,9 +42,6 @@ ru:
       no_solved_topics_title_others: "У пользователя %{username} ещё нет тем, содержащих решённые вопросы"
       no_solved_topics_body: "Когда вы даете в теме полезный ответ, он может быть отмечен в качестве решения владельцем темы или сотрудниками."
       marked_solved_by: "Отмечено как решенное пользователем %{user}"
-      move_post_cancel: "Нет"
-      confirm_solved_removal_confirm: "Подтвердить"
-      confirm_solved_removal_cancel: "Нет"
       no_answer:
         title: Вопрос был решён?
         description: "Выделите ответ и помогите другим пользователям, нажав на кнопку 'Вопрос решён' под правильным ответом."
diff --git a/plugins/discourse-solved/config/locales/client.sk.yml b/plugins/discourse-solved/config/locales/client.sk.yml
index abcf6039997bf..edcdf1c11c514 100644
--- a/plugins/discourse-solved/config/locales/client.sk.yml
+++ b/plugins/discourse-solved/config/locales/client.sk.yml
@@ -40,9 +40,6 @@ sk:
       no_solved_topics_title: "Ešte ste nevyriešili žiadnu tému"
       no_solved_topics_title_others: "%{username} zatiaľ nevyriešil žiadne témy"
       no_solved_topics_body: "Keď poskytnete užitočnú odpoveď na tému, môže byť vaša odpoveď vybraná ako riešenie vlastníkom témy alebo zamestnancami."
-      move_post_cancel: "Zrušiť"
-      confirm_solved_removal_confirm: "Potvrďte"
-      confirm_solved_removal_cancel: "Zrušiť"
       no_answer:
         title: Bola vaša otázka zodpovedaná?
         description: "Zvýraznite odpoveď a pomôžte ostatným pomocou tlačidla riešenia pod správnou odpoveďou."
diff --git a/plugins/discourse-solved/config/locales/client.sl.yml b/plugins/discourse-solved/config/locales/client.sl.yml
index e946e8b6b9f9f..86fa266cb210f 100644
--- a/plugins/discourse-solved/config/locales/client.sl.yml
+++ b/plugins/discourse-solved/config/locales/client.sl.yml
@@ -35,9 +35,6 @@ sl:
       no_solved_topics_title: "Rešili niste še nobene teme"
       no_solved_topics_title_others: "%{username} še ni rešil nobene teme"
       no_solved_topics_body: "Ko podate koristen odgovor na temo, lahko lastnik teme ali osebje izbere vaš odgovor kot rešitev."
-      move_post_cancel: "Prekliči"
-      confirm_solved_removal_confirm: "Potrdi"
-      confirm_solved_removal_cancel: "Prekliči"
       no_answer:
         title: Ste dobili odgovor na vaše vprašanje?
         description: "Z izbiro gumba za potrditev pod ustrezno objavo izpostavite odgovor in s tem pomagajte drugim."
diff --git a/plugins/discourse-solved/config/locales/client.sq.yml b/plugins/discourse-solved/config/locales/client.sq.yml
index 89559cccb67f1..48535f5da6b0e 100644
--- a/plugins/discourse-solved/config/locales/client.sq.yml
+++ b/plugins/discourse-solved/config/locales/client.sq.yml
@@ -14,9 +14,6 @@ sq:
       accepted_answer_post_number: "postimi %{post_number}"
       topic_status_filter:
         all: "të gjitha"
-      move_post_cancel: "Anulo"
-      confirm_solved_removal_confirm: "Konfirmoni"
-      confirm_solved_removal_cancel: "Anulo"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.sr.yml b/plugins/discourse-solved/config/locales/client.sr.yml
index 47e42e52f4db2..474be89432df2 100644
--- a/plugins/discourse-solved/config/locales/client.sr.yml
+++ b/plugins/discourse-solved/config/locales/client.sr.yml
@@ -14,8 +14,6 @@ sr:
       accepted_answer_post_number: "poruka %{post_number}"
       topic_status_filter:
         all: "sve"
-      move_post_cancel: "Odustani"
-      confirm_solved_removal_cancel: "Odustani"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.sv.yml b/plugins/discourse-solved/config/locales/client.sv.yml
index 734f9b14fbe7c..7dc971f67a821 100644
--- a/plugins/discourse-solved/config/locales/client.sv.yml
+++ b/plugins/discourse-solved/config/locales/client.sv.yml
@@ -33,9 +33,6 @@ sv:
       no_solved_topics_title: "Du har inte löst några ämnen än"
       no_solved_topics_title_others: "%{username} har inte löst några ämnen ännu"
       no_solved_topics_body: "När du ger ett användbart svar på ett ämne kan ditt svar väljas som lösningen av ämnesägaren eller personalen."
-      move_post_cancel: "Avbryt"
-      confirm_solved_removal_confirm: "Bekräfta"
-      confirm_solved_removal_cancel: "Avbryt"
       no_answer:
         title: Har din fråga besvarats?
         description: "Markera svaret och hjälp andra genom att använda lösningsknappen under det korrekta svaret."
diff --git a/plugins/discourse-solved/config/locales/client.sw.yml b/plugins/discourse-solved/config/locales/client.sw.yml
index 7d7c229a56053..96ec57873c02f 100644
--- a/plugins/discourse-solved/config/locales/client.sw.yml
+++ b/plugins/discourse-solved/config/locales/client.sw.yml
@@ -21,8 +21,6 @@ sw:
       topic_status_filter:
         all: "Zote"
         solved: "imetatuliwa"
-      move_post_cancel: "Batili"
-      confirm_solved_removal_cancel: "Batili"
     topic_statuses:
       solved:
         help: "Hii mada ina suluhisho"
diff --git a/plugins/discourse-solved/config/locales/client.te.yml b/plugins/discourse-solved/config/locales/client.te.yml
index 763bd5cb96ac6..76b6d16bfbf1a 100644
--- a/plugins/discourse-solved/config/locales/client.te.yml
+++ b/plugins/discourse-solved/config/locales/client.te.yml
@@ -14,9 +14,6 @@ te:
       accepted_answer_post_number: "పోస్ట్ %{post_number}"
       topic_status_filter:
         all: "అన్నీ"
-      move_post_cancel: "రద్దుచేయండి"
-      confirm_solved_removal_confirm: "నిర్ధారించండి"
-      confirm_solved_removal_cancel: "రద్దుచేయండి"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.th.yml b/plugins/discourse-solved/config/locales/client.th.yml
index bf3c5e64d9607..f4b6dd185399b 100644
--- a/plugins/discourse-solved/config/locales/client.th.yml
+++ b/plugins/discourse-solved/config/locales/client.th.yml
@@ -25,8 +25,6 @@ th:
       topic_status_filter:
         all: "ทั้งหมด"
         solved: "แก้ไขแล้ว"
-      move_post_cancel: "ยกเลิก"
-      confirm_solved_removal_cancel: "ยกเลิก"
     discourse_automation:
       triggerables:
         first_accepted_solution:
diff --git a/plugins/discourse-solved/config/locales/client.tr_TR.yml b/plugins/discourse-solved/config/locales/client.tr_TR.yml
index 359743e9b9466..5452b47b1d42e 100644
--- a/plugins/discourse-solved/config/locales/client.tr_TR.yml
+++ b/plugins/discourse-solved/config/locales/client.tr_TR.yml
@@ -38,9 +38,6 @@ tr_TR:
       no_solved_topics_title: "Henüz hiçbir konuyu çözmediniz"
       no_solved_topics_title_others: "%{username} henüz hiçbir konuyu çözmedi"
       no_solved_topics_body: "Bir konuya yararlı bir yanıt verdiğinizde, yanıtınız konu sahibi veya personel tarafından çözüm olarak seçilebilir."
-      move_post_cancel: "İptal et"
-      confirm_solved_removal_confirm: "Onayla"
-      confirm_solved_removal_cancel: "İptal et"
       no_answer:
         title: Sorunuz yanıtlandı mı?
         description: "Yanıtı vurgulayın ve doğru cevabın altındaki çözüm düğmesini kullanarak başkalarına yardımcı olun."
diff --git a/plugins/discourse-solved/config/locales/client.ug.yml b/plugins/discourse-solved/config/locales/client.ug.yml
index 63ec00d81c681..f092284ac5d9f 100644
--- a/plugins/discourse-solved/config/locales/client.ug.yml
+++ b/plugins/discourse-solved/config/locales/client.ug.yml
@@ -14,9 +14,6 @@ ug:
       accepted_answer_post_number: "%{post_number} يازما"
       topic_status_filter:
         all: "ھەممىسى"
-      move_post_cancel: "ۋاز كەچ"
-      confirm_solved_removal_confirm: "جەزملە"
-      confirm_solved_removal_cancel: "ۋاز كەچ"
     topic_statuses:
       solved:
         help: "بۇ تېمىنىڭ ھەل قىلىش چارىسى بار"
diff --git a/plugins/discourse-solved/config/locales/client.uk.yml b/plugins/discourse-solved/config/locales/client.uk.yml
index a1de529bdcb2a..c995f865627aa 100644
--- a/plugins/discourse-solved/config/locales/client.uk.yml
+++ b/plugins/discourse-solved/config/locales/client.uk.yml
@@ -42,23 +42,6 @@ uk:
       no_solved_topics_title_others: "%{username} ще не вирішив жодної теми"
       no_solved_topics_body: "Коли ви надаєте корисну відповідь на тему, ваша відповідь може бути обрана як рішення власником теми або співробітниками."
       marked_solved_by: "Позначено як вирішене користувачем %{user}"
-      confirm_move_solution_title: "Переміщення рішення"
-      confirm_move_solution:
-        one: "Вибране вами повідомлення позначене як рішення для цієї теми. Якщо ви перемістите його, тему буде оновлено до невирішеної."
-        few: "Одне з вибраних вами повідомлень позначене як рішення для цієї теми. Якщо ви перемістите його, тему буде оновлено до невирішеної."
-        many: "Одне з вибраних вами повідомлень позначене як рішення для цієї теми. Якщо ви перемістите його, тему буде оновлено до невирішеної."
-        other: "Одне з вибраних вами повідомлень позначене як рішення для цієї теми. Якщо ви перемістите його, тему буде оновлено до невирішеної."
-      move_post_confirm:
-        one: "Перемістити пост"
-        few: "Перемістити дописи"
-        many: "Перемістити дописи"
-        other: "Перемістити дописи"
-      move_post_cancel: "Скасувати"
-      dont_show_again: "Зрозуміло, більше не показувати."
-      confirm_solved_removal_title: "Розчин буде видалено"
-      confirm_solved_removal: "Ця зміна вимкне рішення для цієї теми і видалить прийняте рішення."
-      confirm_solved_removal_confirm: "Підтвердити"
-      confirm_solved_removal_cancel: "Скасувати"
       no_answer:
         title: Чи було отримано відповідь на ваше запитання?
         description: "Виділіть відповідь та допоможіть іншим, використовуючи кнопку рішення під правильною відповіддю."
diff --git a/plugins/discourse-solved/config/locales/client.ur.yml b/plugins/discourse-solved/config/locales/client.ur.yml
index 1314875a88790..f41c9af3ff917 100644
--- a/plugins/discourse-solved/config/locales/client.ur.yml
+++ b/plugins/discourse-solved/config/locales/client.ur.yml
@@ -31,9 +31,6 @@ ur:
         unsolved: "غیر حل شدہ"
       no_solved_topics_title: "آپ نے ابھی تک کسی موضوع کو حل نہیں کیا ہے"
       no_solved_topics_body: "جب آپ کسی موضوع پر مددگار جواب فراہم کرتے ہیں، تو آپ کے جواب کو حاملِ موضوع یا عملے کی طرف سے حل کے طور پر منتخب کیا جا سکتا ہے۔"
-      move_post_cancel: "منسوخ کریں"
-      confirm_solved_removal_confirm: "تصدیق کریں"
-      confirm_solved_removal_cancel: "منسوخ کریں"
     topic_statuses:
       solved:
         help: "اِس ٹاپک کا حل ہے"
diff --git a/plugins/discourse-solved/config/locales/client.vi.yml b/plugins/discourse-solved/config/locales/client.vi.yml
index 6bc575e0ac895..eee9e7f395a18 100644
--- a/plugins/discourse-solved/config/locales/client.vi.yml
+++ b/plugins/discourse-solved/config/locales/client.vi.yml
@@ -39,9 +39,6 @@ vi:
       no_solved_topics_title_others: "%{username} chưa giải quyết chủ đề nào"
       no_solved_topics_body: "Khi bạn đưa ra câu trả lời hữu ích cho một chủ đề, câu trả lời của bạn có thể được người tạo chủ đề hoặc BQT chọn làm giải pháp."
       marked_solved_by: "Xác nhận bởi %{user}"
-      move_post_cancel: "Hủy"
-      confirm_solved_removal_confirm: "Xác nhận"
-      confirm_solved_removal_cancel: "Hủy"
       no_answer:
         title: Câu hỏi của bạn đã được giải đáp chưa?
         description: "Hãy đánh dấu câu trả lời và giúp đỡ người khác bằng cách sử dụng nút \"Giải pháp\" bên dưới câu trả lời đúng."
diff --git a/plugins/discourse-solved/config/locales/client.zh_CN.yml b/plugins/discourse-solved/config/locales/client.zh_CN.yml
index d2edc7ee63000..a1495c8a29f8b 100644
--- a/plugins/discourse-solved/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-solved/config/locales/client.zh_CN.yml
@@ -39,16 +39,6 @@ zh_CN:
       no_solved_topics_title_others: "%{username} 还没有解决任何话题"
       no_solved_topics_body: "当您对某个话题提供有用的回复时，您的回复可能会被话题所有者或管理人员选为解决方案。"
       marked_solved_by: "由 %{user} 标记为已解决"
-      confirm_move_solution_title: "移动解决方案帖子"
-      confirm_move_solution:
-        other: "您选择的其中一篇文章被标记为该话题的解决方案。如果你移动它们，话题将更新为未解决。"
-      move_post_confirm:
-        other: "移动帖子"
-      move_post_cancel: "取消"
-      dont_show_again: "明白了，别再给我看这个了。"
-      confirm_solved_removal_title: "解决方案将被删除"
-      confirm_solved_removal_confirm: "确认"
-      confirm_solved_removal_cancel: "取消"
       no_answer:
         title: 您的问题是否已被解答？
         description: "在正确回复下方使用解决方案按钮高亮显示回答并帮助他人。"
diff --git a/plugins/discourse-solved/config/locales/client.zh_TW.yml b/plugins/discourse-solved/config/locales/client.zh_TW.yml
index 589644417cb4f..530c54cf8643a 100644
--- a/plugins/discourse-solved/config/locales/client.zh_TW.yml
+++ b/plugins/discourse-solved/config/locales/client.zh_TW.yml
@@ -31,9 +31,6 @@ zh_TW:
       no_solved_topics_title: "您還沒有解決過任何主題"
       no_solved_topics_title_others: "%{username} 尚未解決任何主題"
       no_solved_topics_body: "當您對某個主題提供有用的回覆時，主題擁有者或工作人員可能會選取您的回覆作為解決方案。"
-      move_post_cancel: "取消"
-      confirm_solved_removal_confirm: "確認"
-      confirm_solved_removal_cancel: "取消"
       no_answer:
         title: 您的問題已得到解答嗎？
         description: "在正確的回覆下方按下解答按鈕以突顯解決方案來幫助他人。"
diff --git a/plugins/discourse-solved/config/locales/server.cs.yml b/plugins/discourse-solved/config/locales/server.cs.yml
index 8da265b1092b3..98c9e181f3447 100644
--- a/plugins/discourse-solved/config/locales/server.cs.yml
+++ b/plugins/discourse-solved/config/locales/server.cs.yml
@@ -9,7 +9,6 @@ cs:
   site_settings:
     solved_enabled: "Zapnout plugin \"vyřešeno\", povolit uživatelům zvolit řešení témat"
     allow_solved_on_all_topics: "Povolit uživatelům výběr řešení pro všechna témata (pokud není zaškrtnuto, lze povolit řešení pro jednotlivé kategorie nebo štítky)."
-    allow_solved_in_groups: "Povolit označování řešení ve skupinových zprávách pro tyto skupiny."
     accept_all_solutions_trust_level: "Minimální důvěryhodnost požadovaná pro schválení řešení jakéhokoliv tématu (i když není OP)"
     accept_all_solutions_allowed_groups: "Skupiny, které mohou přijímat řešení na jakékoli téma (i když nejsou OP). Správci a moderátoři jsou vždy povoleni."
     empty_box_on_unsolved: "Zobrazit prázdný box vedle nevyřešených témat"
diff --git a/plugins/discourse-solved/config/locales/server.de.yml b/plugins/discourse-solved/config/locales/server.de.yml
index ead89bc0715f7..3ce46bc23fe33 100644
--- a/plugins/discourse-solved/config/locales/server.de.yml
+++ b/plugins/discourse-solved/config/locales/server.de.yml
@@ -9,7 +9,6 @@ de:
   site_settings:
     solved_enabled: "Aktiviere das solved-Plug-in; erlaubt Benutzern, Lösungen für Themen auszuwählen"
     allow_solved_on_all_topics: "Benutzern erlauben, Lösungen für alle Themen auszuwählen (wenn diese Option nicht aktiviert ist, können Lösungen nach Kategorie oder Schlagwort aktiviert werden)"
-    allow_solved_in_groups: "Erlaube das Auswählen von Lösungen in Gruppennachrichten für diese Gruppen."
     accept_all_solutions_trust_level: "Minimale Vertrauensstufe, die das Akzeptieren von Lösungen in jedem Thema erlaubt (auch wenn nicht selbst erstellt)"
     accept_all_solutions_allowed_groups: "Gruppen, die Lösungen zu jedem Thema akzeptieren dürfen (auch wenn sie nicht Ersteller des Themas sind). Administratoren und Moderatoren haben diese Befugnis grundsätzlich."
     empty_box_on_unsolved: "Zeige eine leere Box neben ungelösten Themen"
@@ -31,7 +30,6 @@ de:
   reports:
     accepted_solutions:
       title: "Akzeptierte Lösungen"
-      description: "Anzahl der pro Tag als gelöst markierten Themen innerhalb eines ausgewählten Datumsbereichs, optional nach Kategorie gefiltert, einschließlich eines 30-Tage-Vergleichswerts."
       xaxis: "Tag"
       yaxis: "Gesamt"
   solved:
diff --git a/plugins/discourse-solved/config/locales/server.pl_PL.yml b/plugins/discourse-solved/config/locales/server.pl_PL.yml
index 3bc572cf4a38a..9a7343b570344 100644
--- a/plugins/discourse-solved/config/locales/server.pl_PL.yml
+++ b/plugins/discourse-solved/config/locales/server.pl_PL.yml
@@ -9,7 +9,6 @@ pl_PL:
   site_settings:
     solved_enabled: "Aktywuj wtyczkę solved, zezwól użytkownikom wybierać rozwiązania w tematach"
     allow_solved_on_all_topics: "Zezwalaj użytkownikom na wybieranie rozwiązań dotyczących wszystkich tematów (jeśli to pole nie jest zaznaczone, rozwiązania można włączać dla poszczególnych kategorii lub tagów)"
-    allow_solved_in_groups: "Zezwól na oznaczanie rozwiązań w wiadomościach grupowych dla tych grup."
     accept_all_solutions_trust_level: "Minimalny poziom zaufania wymagany do zaakceptowania rozwiązania w każdym temacie (nawet jeśli nie jest się jego autorem)"
     accept_all_solutions_allowed_groups: "Grupy, które mogą przyjmować rozwiązania na dowolny temat (nawet jeśli nie są OP). Administratorzy i moderatorzy są zawsze dozwoleni."
     empty_box_on_unsolved: "Wyświetl puste pole obok nierozwiązanych tematów"
@@ -31,7 +30,6 @@ pl_PL:
   reports:
     accepted_solutions:
       title: "Zaakceptowane rozwiązania"
-      description: "Ile tematów miało zaakceptowane rozwiązanie dziennie w określonym przedziale dat, z opcjonalnym filtrem kategorii i 30-dniowym porównaniem całkowitych wyników."
       xaxis: "Dzień"
       yaxis: "Wszystkie"
   solved:
diff --git a/plugins/discourse-solved/config/locales/server.uk.yml b/plugins/discourse-solved/config/locales/server.uk.yml
index be4d235a37954..19aff03a4f790 100644
--- a/plugins/discourse-solved/config/locales/server.uk.yml
+++ b/plugins/discourse-solved/config/locales/server.uk.yml
@@ -9,7 +9,6 @@ uk:
   site_settings:
     solved_enabled: "Увімкнути плагін рішення, дозволити користувачам обирати рішення для тем"
     allow_solved_on_all_topics: "Дозволити користувачам вибирати рішення з усіх тем (якщо прапорець знято, рішення можна вмикати для кожної категорії або тегу)"
-    allow_solved_in_groups: "Дозволити позначати рішення в групових повідомленнях для цих груп."
     accept_all_solutions_trust_level: "Мінімальний рівень довіри, необхідний для прийняття рішень в будь-якій темі (навіть коли це не ОП)"
     accept_all_solutions_allowed_groups: "Групи, яким дозволено приймати рішення на будь-які теми (навіть якщо вони не є ОП). Адміни та модератори завжди мають доступ."
     empty_box_on_unsolved: "Показуйте порожнє поле поруч із невирішеними темами"
diff --git a/plugins/discourse-solved/config/locales/server.zh_CN.yml b/plugins/discourse-solved/config/locales/server.zh_CN.yml
index 0889bc31171c8..7e0bcf61077dc 100644
--- a/plugins/discourse-solved/config/locales/server.zh_CN.yml
+++ b/plugins/discourse-solved/config/locales/server.zh_CN.yml
@@ -9,7 +9,6 @@ zh_CN:
   site_settings:
     solved_enabled: "启用“已解决”插件，允许用户为话题选择解决方案"
     allow_solved_on_all_topics: "允许用户选择所有话题的解决方案（未选中时，可以按类别或标签启用解决方案）"
-    allow_solved_in_groups: "允许在这些群组的群组消息中标记解决方案。"
     accept_all_solutions_trust_level: "在任何话题中接受解决方案所需的最小信任级别（即使不是 OP）"
     accept_all_solutions_allowed_groups: "能够接受任何话题解决方案的群组（即使不是 OP 时）。管理员和版主始终可以。"
     empty_box_on_unsolved: "在未解决的话题旁显示一个空框"
diff --git a/plugins/discourse-topic-voting/config/locales/client.cs.yml b/plugins/discourse-topic-voting/config/locales/client.cs.yml
index 48b2162121a99..1aa3352b6b075 100644
--- a/plugins/discourse-topic-voting/config/locales/client.cs.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.cs.yml
@@ -10,8 +10,6 @@ cs:
       sort_options:
         votes: "Hlasy"
     topic_voting:
-      notification_label:
-        vote_released: "Hlas vrácen"
       title: "Hlasování o tématu"
       reached_limit: "Došly vám hlasy. Odeberte jiný hlas."
       list_votes: "Seznam vašich hlasů"
diff --git a/plugins/discourse-topic-voting/config/locales/client.de.yml b/plugins/discourse-topic-voting/config/locales/client.de.yml
index 16caa197e44e3..6584a6e14552d 100755
--- a/plugins/discourse-topic-voting/config/locales/client.de.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.de.yml
@@ -10,8 +10,6 @@ de:
       sort_options:
         votes: "Stimmen"
     topic_voting:
-      notification_label:
-        vote_released: "Stimme zurückgegeben"
       title: "Themenabstimmung"
       reached_limit: "Du hast keine Stimmen mehr. Entferne eine bestehende Stimme!"
       list_votes: "Deine Stimmen auflisten"
diff --git a/plugins/discourse-topic-voting/config/locales/client.pl_PL.yml b/plugins/discourse-topic-voting/config/locales/client.pl_PL.yml
index 6644304786ea9..2c7b1a31d2a0a 100644
--- a/plugins/discourse-topic-voting/config/locales/client.pl_PL.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.pl_PL.yml
@@ -10,8 +10,6 @@ pl_PL:
       sort_options:
         votes: "Głosy"
     topic_voting:
-      notification_label:
-        vote_released: "Głos zwrócony"
       title: "Głosowanie na temat"
       reached_limit: "Oddałeś już maksymalną liczbę głosów!"
       list_votes: "Lista twoich głosów"
diff --git a/plugins/discourse-topic-voting/config/locales/client.uk.yml b/plugins/discourse-topic-voting/config/locales/client.uk.yml
index a0ac06c047fd9..f96224658ff37 100644
--- a/plugins/discourse-topic-voting/config/locales/client.uk.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.uk.yml
@@ -10,8 +10,6 @@ uk:
       sort_options:
         votes: "Голоси"
     topic_voting:
-      notification_label:
-        vote_released: "Голос повернуто"
       title: "Голосування за тему"
       reached_limit: "У вас немає голосів, видаліть існуюче голосування!"
       list_votes: "Список своїх голосів"
diff --git a/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml b/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml
index 86a018320ee4e..b2a25e9d94bb1 100644
--- a/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml
+++ b/plugins/discourse-topic-voting/config/locales/client.zh_CN.yml
@@ -10,8 +10,6 @@ zh_CN:
       sort_options:
         votes: "投票"
     topic_voting:
-      notification_label:
-        vote_released: "投票已返还"
       title: "投票话题"
       reached_limit: "您无法再投票了，请移除现有投票！"
       list_votes: "列出您的投票"

From 1fd259accf033ed9d9ffd24db91fda094df6cbc6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Feb 2026 11:28:01 +0100
Subject: [PATCH 137/168] UX: Correct setting description (#38110)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The setting description was incorrect as it doesn’t hide user directory.
To disable user directory the recommended way at the moment is to
disable: `enable_user_directory`.
---
 config/locales/server.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 7f478035f9b1e..565be4c9d8dc1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2437,7 +2437,7 @@ en:
     anonymous_posting_allowed_groups: "Groups that are allowed to enable anonymous posting. This setting requires the `allow anonymous mode` setting to be enabled."
     anonymous_account_duration_minutes: "To protect anonymity create a new anonymous account every N minutes for each user. Example: if set to 600, as soon as 600 minutes elapse from last post AND user switches to anon, a new anonymous account is created."
 
-    hide_user_profiles_from_public: "Disable user cards, user profiles and user directory for anonymous users."
+    hide_user_profiles_from_public: "Disable user cards and user profiles for anonymous users. Aggregated stats will still be available in the user directory."
     hide_new_user_profiles: "Hide trust level 1 or lower user profiles from the public and trust level 1 users until they post for the first time. This feature is disabled unconditionally on must_approve_users and invite_only sites."
     allow_users_to_hide_profile: "Allow users to hide their profile and presence"
     hide_user_activity_tab: "Hide the activity tab on user profiles except for Admin and self."

From b826de40bad9e580ffe0fef33c040d47c7057ad9 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 27 Feb 2026 10:38:28 +0000
Subject: [PATCH 138/168] DEV: Improve automated backport script (#38103)

When backports fail, the PR comment will now include the actual stderr
output from the `cherry-pick` command, and will include instructions for
reproducing locally.
---
 script/backport.rb | 169 ++++++++++++++++++++++-----------------------
 1 file changed, 83 insertions(+), 86 deletions(-)

diff --git a/script/backport.rb b/script/backport.rb
index 7f8a1d55023f1..1e3aadaf4935e 100644
--- a/script/backport.rb
+++ b/script/backport.rb
@@ -3,13 +3,15 @@
 require "json"
 require "open3"
 
+RunResult = Data.define(:success, :stdout, :stderr)
+
 def run(*cmd, allow_failure: false)
   puts "Running: #{cmd.join(" ")}"
   stdout, stderr, status = Open3.capture3(*cmd)
   puts stdout unless stdout.empty?
   puts stderr unless stderr.empty?
   raise "Command failed: #{cmd.join(" ")}\n#{stderr}" unless status.success? || allow_failure
-  [stdout.strip, status.success?]
+  RunResult.new(success: status.success?, stdout: stdout.strip, stderr: stderr.strip)
 end
 
 def gh(*args, allow_failure: false)
@@ -19,8 +21,7 @@ def gh(*args, allow_failure: false)
 pr_number = ENV.fetch("PR_NUMBER")
 
 # Get PR details (title, body, base branch)
-pr_json, = gh("pr", "view", pr_number, "--json", "title,body,baseRefName")
-pr = JSON.parse(pr_json)
+pr = JSON.parse(gh("pr", "view", pr_number, "--json", "title,body,baseRefName").stdout)
 
 pr_title = pr["title"]
 pr_body = pr["body"] || ""
@@ -37,28 +38,12 @@ def gh(*args, allow_failure: false)
 run("git", "fetch", "origin", base_branch)
 
 # Find merge base between PR head and base branch
-merge_base, = run("git", "merge-base", "pr-head", "origin/#{base_branch}")
+merge_base = run("git", "merge-base", "pr-head", "origin/#{base_branch}").stdout
+pr_head = run("git", "rev-parse", "pr-head").stdout
 puts "Merge base: #{merge_base}"
 
-# Get commits from merge base to PR head (in chronological order)
-commits_output, = run("git", "rev-list", "--reverse", "#{merge_base}..pr-head")
-commits_to_pick = commits_output.split("\n").reject(&:empty?)
-
-if commits_to_pick.empty?
-  puts "No commits to backport"
-  gh("pr", "comment", pr_number, "--body", "No commits found to backport.")
-  exit 0
-end
-
-puts "Found #{commits_to_pick.length} commit(s) to cherry-pick:"
-commits_to_pick.each do |sha|
-  subject, = run("git", "log", "-1", "--pretty=%s", sha)
-  puts "  - #{sha[0..7]}: #{subject}"
-end
-
 # Read versions.json from main branch to find backport targets
-versions_content, = run("git", "show", "origin/main:versions.json")
-versions = JSON.parse(versions_content)
+versions = JSON.parse(run("git", "show", "origin/main:versions.json").stdout)
 
 # Find versions that are both supported and released
 backport_versions =
@@ -90,8 +75,7 @@ def gh(*args, allow_failure: false)
   puts "\n--- Backporting to #{release_branch} ---"
 
   # Check if release branch exists
-  branch_exists, = run("git", "ls-remote", "--heads", "origin", release_branch)
-  if !branch_exists.include?(release_branch)
+  if !run("git", "ls-remote", "--heads", "origin", release_branch).stdout.include?(release_branch)
     puts "Release branch #{release_branch} does not exist, skipping"
     results << { version: version, success: false, error: "Release branch does not exist" }
     next
@@ -104,72 +88,68 @@ def gh(*args, allow_failure: false)
   run("git", "checkout", "-B", backport_branch, "origin/#{release_branch}")
 
   # Cherry-pick the commits
-  cherry_pick_success = true
-  error_message = nil
-
-  commits_to_pick.each do |sha|
-    puts "Cherry-picking #{sha}..."
-    _, success = run("git", "cherry-pick", sha, allow_failure: true)
-    unless success
-      cherry_pick_success = false
-      # Get the conflict details
-      status_output, = run("git", "status", "--short", allow_failure: true)
-      error_message = "Cherry-pick of #{sha} failed with conflicts:\n```\n#{status_output}\n```"
-      run("git", "cherry-pick", "--abort", allow_failure: true)
-      break
-    end
+  cherry_pick_range = "#{merge_base}..#{pr_head}"
+  puts "Cherry-picking #{cherry_pick_range}..."
+  result = run("git", "cherry-pick", cherry_pick_range, allow_failure: true)
+
+  unless result.success
+    puts "Failed to backport to #{version}:\n#{result.stderr}"
+    results << {
+      version: version,
+      success: false,
+      error: result.stderr,
+      release_branch: release_branch,
+      backport_branch: backport_branch,
+      cherry_pick_range: cherry_pick_range,
+    }
+    run("git", "cherry-pick", "--abort", allow_failure: true)
+    run("git", "checkout", "main", allow_failure: true)
+    next
   end
 
-  if cherry_pick_success
-    # Push the backport branch
-    run("git", "push", "-f", "origin", backport_branch)
-
-    # Create or update PR
-    backport_title = "#{pr_title} [backport #{version}]"
-    backport_body = <<~BODY
-      Backport of ##{pr_number} to #{release_branch}.
-
-      ---
-
-      #{pr_body}
-    BODY
-
-    # Try to create the PR
-    _, created =
-      gh(
-        "pr",
-        "create",
-        "--base",
-        release_branch,
-        "--head",
-        backport_branch,
-        "--title",
-        backport_title,
-        "--body",
-        backport_body,
-        allow_failure: true,
-      )
-
-    if created
-      # Get the PR URL for the newly created PR
-      pr_url_output, = gh("pr", "view", backport_branch, "--json", "url", "-q", ".url")
-      pr_url = pr_url_output.strip
-      puts "Created PR: #{pr_url}"
-    else
-      # PR already exists, update it
-      puts "PR already exists, updating..."
-      gh("pr", "edit", backport_branch, "--title", backport_title, "--body", backport_body)
-      pr_url_output, = gh("pr", "view", backport_branch, "--json", "url", "-q", ".url")
-      pr_url = pr_url_output.strip
-      puts "Updated PR: #{pr_url}"
-    end
-
-    results << { version: version, success: true, pr_url: pr_url }
+  # Push the backport branch
+  run("git", "push", "-f", "origin", backport_branch)
+
+  # Create or update PR
+  backport_title = "#{pr_title} [backport #{version}]"
+  backport_body = <<~BODY
+    Backport of ##{pr_number} to #{release_branch}.
+
+    ---
+
+    #{pr_body}
+  BODY
+
+  # Try to create the PR
+  created =
+    gh(
+      "pr",
+      "create",
+      "--base",
+      release_branch,
+      "--head",
+      backport_branch,
+      "--title",
+      backport_title,
+      "--body",
+      backport_body,
+      allow_failure: true,
+    ).success
+
+  if created
+    # Get the PR URL for the newly created PR
+    pr_url = gh("pr", "view", backport_branch, "--json", "url", "-q", ".url").stdout.strip
+    puts "Created PR: #{pr_url}"
   else
-    puts "Failed to backport to #{version}: #{error_message}"
-    results << { version: version, success: false, error: error_message }
+    # PR already exists, update it
+    puts "PR already exists, updating..."
+    gh("pr", "edit", backport_branch, "--title", backport_title, "--body", backport_body)
+    pr_url = gh("pr", "view", backport_branch, "--json", "url", "-q", ".url").stdout.strip
+    puts "Updated PR: #{pr_url}"
   end
 
+  results << { version: version, success: true, pr_url: pr_url }
+
   # Return to main branch for next iteration
   run("git", "checkout", "main", allow_failure: true)
 end
@@ -188,7 +168,24 @@ def gh(*args, allow_failure: false)
 
 if failed.any?
   comment_lines << "### Failed backports"
-  failed.each { |r| comment_lines << "- **#{r[:version]}**: #{r[:error]}" }
+  failed.each do |r|
+    if r[:cherry_pick_range]
+      comment_lines << <<~MSG
+        #### #{r[:version]}
+        ```
+        #{r[:error]}
+        ```
+
+        To resolve manually:
+        ```bash
+        git checkout -B #{r[:backport_branch]} origin/#{r[:release_branch]}
+        git cherry-pick #{r[:cherry_pick_range]}
+        ```
+      MSG
+    else
+      comment_lines << "- **#{r[:version]}**: #{r[:error]}"
+    end
+  end
 end
 
 comment_lines << "No backports were attempted." if successful.empty? && failed.empty?

From 05811ad1276a6f5a25693023c1c61a262ecfca60 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Fri, 27 Feb 2026 10:25:19 -0300
Subject: [PATCH 139/168] DEV: Bump discourse_ai-tokenizers to 0.4.2 (#38114)

Bump discourse_ai-tokenizers from 0.4.1 to 0.4.2.
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c22b114304154..a86beec6710a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,7 +143,7 @@ GEM
     discourse-seed-fu (2.3.12)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    discourse_ai-tokenizers (0.4.1)
+    discourse_ai-tokenizers (0.4.2)
       activesupport (>= 6.0)
       tiktoken_ruby (~> 0.0.15)
       tokenizers (~> 0.6.3)
@@ -978,7 +978,7 @@ CHECKSUMS
   discourse-emojis (1.0.44) sha256=63425a32379fb471d58f5eac9a1e931fc5a94efb7d327f71f1580af4dfe4edb3
   discourse-fonts (0.0.19) sha256=78d4ddd671615908303a675427039d8d787c935e6deae184c6e143c18c6e0033
   discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4
-  discourse_ai-tokenizers (0.4.1) sha256=54ea2224c9dba6e3da96f7f1fe1ae269566df5975568e4919dddae8a55f41610
+  discourse_ai-tokenizers (0.4.2) sha256=61c2f254582a3ae69255115b2b072904361003612b5b0f52aa64773817aae413
   discourse_dev_assets (0.0.6) sha256=4dfe7946927aa3d61a4ba89b5aef39d6daaeb70e35d7125dc481806a5c0aea4e
   discourse_math_bundle (1.0.1) sha256=c7d82fa65c9680cab2f77daeba32c1b89e500faccd2269e050ab27d5e1bc8337
   docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e

From 1499ab07410b74af8cc377da85e6081fd16d8f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 27 Feb 2026 14:46:37 +0100
Subject: [PATCH 140/168] FIX: Pass tag name instead of id to composer in
 Horizon sidebar button (#38112)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The sidebar "New Topic" button in Horizon was passing `this.tag?.id` (a
numeric ID) to `composer.openNewTopic()`, which expects a
comma-separated string of tag names. This caused two issues:

- For non-staff users, `filterTags()` tried to access `.content` on a
number, throwing "Cannot read properties of undefined (reading
'filter')" and preventing the composer from opening entirely.
- For staff users, `filterTags()` passed the number through, resulting
in the numeric ID being displayed as the tag name in the composer.

Switching to `this.tag?.name` aligns with the pattern used by the
discovery list controller and the composer's expected API.

Also adds a system spec covering the tag page → new topic flow.

Ref - t/178629
---
 .../components/sidebar-new-topic-button.gjs         |  2 +-
 .../spec/system/sidebar_topic_button_spec.rb        | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/themes/horizon/javascripts/discourse/components/sidebar-new-topic-button.gjs b/themes/horizon/javascripts/discourse/components/sidebar-new-topic-button.gjs
index b9bf54ba94863..7894a7a40b29e 100644
--- a/themes/horizon/javascripts/discourse/components/sidebar-new-topic-button.gjs
+++ b/themes/horizon/javascripts/discourse/components/sidebar-new-topic-button.gjs
@@ -55,7 +55,7 @@ export default class SidebarNewTopicButton extends Component {
   createNewTopic() {
     this.composer.openNewTopic({
       category: this.createTopicTargetCategory,
-      tags: this.tag?.id,
+      tags: this.tag?.name,
     });
   }
 
diff --git a/themes/horizon/spec/system/sidebar_topic_button_spec.rb b/themes/horizon/spec/system/sidebar_topic_button_spec.rb
index 54c2155e56566..cde1e7df3ade5 100644
--- a/themes/horizon/spec/system/sidebar_topic_button_spec.rb
+++ b/themes/horizon/spec/system/sidebar_topic_button_spec.rb
@@ -34,6 +34,19 @@
       expect(page).to have_css(".sidebar-new-topic-button__wrapper .topic-drafts-menu-trigger")
     end
 
+    it "opens the composer with the tag pre-filled when on a tag page" do
+      tag = Fabricate(:tag)
+      Fabricate(:topic, tags: [tag])
+
+      visit("/tag/#{tag.slug}/#{tag.id}")
+      find(".sidebar-new-topic-button").click
+
+      expect(page).to have_css("#reply-title")
+
+      tag_chooser = PageObjects::Components::SelectKit.new(".mini-tag-chooser")
+      expect(tag_chooser).to have_selected_name(tag.name)
+    end
+
     it "does not disable button when visiting read-only category" do
       visit("/c/#{private_category.slug}/#{private_category.id}")
 

From 490bf4470b5e7f6e315f23805f53743fdcb2e49b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 27 Feb 2026 15:38:49 +0100
Subject: [PATCH 141/168] FIX: SQL Injection via `pg_function` AI (#38117)

An admin could set `pg_function` to an arbitrary SQL fragment that would be string-interpolated into raw SQL queries in`DiscourseAi::Embeddings::Schema`.
---
 .../app/models/embedding_definition.rb            |  3 ++-
 .../spec/models/embedding_definition_spec.rb      | 15 +++++++++++++++
 .../admin/ai_embeddings_controller_spec.rb        | 10 ++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/plugins/discourse-ai/app/models/embedding_definition.rb b/plugins/discourse-ai/app/models/embedding_definition.rb
index 85e3af9f49dfb..ab8188be7c507 100644
--- a/plugins/discourse-ai/app/models/embedding_definition.rb
+++ b/plugins/discourse-ai/app/models/embedding_definition.rb
@@ -129,7 +129,8 @@ def presets
   validates :provider, presence: true, inclusion: provider_names
   validates :display_name, presence: true, length: { maximum: 100 }
   validates :tokenizer_class, presence: true, inclusion: tokenizer_names
-  validates :url, :dimensions, :max_sequence_length, :pg_function, presence: true
+  validates :url, :dimensions, :max_sequence_length, presence: true
+  validates :pg_function, presence: true, inclusion: distance_functions
   validate :api_key_or_secret_present
 
   after_create :create_indexes
diff --git a/plugins/discourse-ai/spec/models/embedding_definition_spec.rb b/plugins/discourse-ai/spec/models/embedding_definition_spec.rb
index ceec53eb75e71..35f815a50b108 100644
--- a/plugins/discourse-ai/spec/models/embedding_definition_spec.rb
+++ b/plugins/discourse-ai/spec/models/embedding_definition_spec.rb
@@ -4,6 +4,21 @@
   fab!(:embedding_definition, :open_ai_embedding_def)
   fab!(:gemini_embedding_definition, :gemini_embedding_def)
 
+  describe "validations" do
+    it "allows valid pg_function values" do
+      EmbeddingDefinition.distance_functions.each do |fn|
+        embedding_definition.pg_function = fn
+        expect(embedding_definition).to be_valid
+      end
+    end
+
+    it "rejects invalid pg_function values" do
+      embedding_definition.pg_function = "'; DROP TABLE users; --"
+      expect(embedding_definition).not_to be_valid
+      expect(embedding_definition.errors[:pg_function]).to be_present
+    end
+  end
+
   describe "#prepare_query_text" do
     let(:text) { "test query" }
 
diff --git a/plugins/discourse-ai/spec/requests/admin/ai_embeddings_controller_spec.rb b/plugins/discourse-ai/spec/requests/admin/ai_embeddings_controller_spec.rb
index a0da7a94823ae..aad3b1f70b455 100644
--- a/plugins/discourse-ai/spec/requests/admin/ai_embeddings_controller_spec.rb
+++ b/plugins/discourse-ai/spec/requests/admin/ai_embeddings_controller_spec.rb
@@ -104,6 +104,16 @@
 
         expect(created_def).to be_nil
       end
+
+      it "rejects a SQL injection payload in pg_function" do
+        post "/admin/plugins/discourse-ai/ai-embeddings.json",
+             params: {
+               ai_embedding: valid_attrs.merge(pg_function: "'; DROP TABLE users; --"),
+             }
+
+        expect(response.status).to eq(422)
+        expect(EmbeddingDefinition.last).to be_nil
+      end
     end
   end
 

From 04aeb92188e7dfe52ca9c56fec6826fcbd878920 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Feb 2026 14:01:49 +0100
Subject: [PATCH 142/168] WIP

---
 .../common/components/filter-input.scss       |    6 +
 .../stylesheets/common/float-kit/_index.scss  |    6 +
 .../common/float-kit/bottom-sheet.scss        |   56 +
 .../stylesheets/common/float-kit/d-card.scss  |   18 +
 .../common/float-kit/d-default-toast.scss     |  178 +-
 .../common/float-kit/d-scroll.scss            |  228 ++
 .../common/float-kit/d-sheet-header.scss      |   28 +
 .../stylesheets/common/float-kit/d-sheet.scss |  891 +++++++
 .../stylesheets/common/float-kit/d-stack.scss |   28 +
 .../common/float-kit/d-toasts.scss            |  120 +-
 .../common/form-kit/_control-textarea.scss    |   10 +
 .../common/form-kit/_form-kit.scss            |    2 +-
 .../stylesheets/common/foundation/base.scss   |    2 +-
 config/locales/client.en.yml                  |    1 +
 .../components/fk/control/textarea.gjs        |    6 +-
 .../app/form-kit/components/fk/form.gjs       |    5 +-
 frontend/discourse/app/lib/utilities.js       |   15 +
 .../discourse/app/services/capabilities.js    |   59 +
 .../float-kit/components/d-bottom-sheet.gjs   |  265 ++
 .../discourse/float-kit/components/d-card.gjs |  102 +
 .../float-kit/components/d-default-toast.gjs  |  187 +-
 .../float-kit/components/d-scroll.js          |   63 +
 .../float-kit/components/d-scroll/content.gjs |   20 +
 .../components/d-scroll/controller.js         |  371 +++
 .../components/d-scroll/focus-scroll-utils.js |   83 +
 .../d-scroll/gesture-trap-handler.js          |  293 +++
 .../components/d-scroll/is-text-input.js      |   48 +
 .../d-scroll/keyboard-focus-handler.js        |  263 ++
 .../native-focus-scroll-prevention.js         |  225 ++
 .../float-kit/components/d-scroll/root.gjs    |   26 +
 .../components/d-scroll/safe-area-handler.js  |  339 +++
 .../float-kit/components/d-scroll/trigger.gjs |   62 +
 .../float-kit/components/d-scroll/view.gjs    |  628 +++++
 .../float-kit/components/d-sheet-stack.gjs    |   44 +
 .../discourse/float-kit/components/d-sheet.js |   93 +
 .../components/d-sheet/animation-travel.js    |  384 +++
 .../float-kit/components/d-sheet/animation.js |  418 +++
 .../float-kit/components/d-sheet/backdrop.gjs |  128 +
 .../d-sheet/bleeding-background.gjs           |   21 +
 .../components/d-sheet/config-normalizer.js   |  158 ++
 .../float-kit/components/d-sheet/content.gjs  |  140 +
 .../components/d-sheet/controller.js          | 2253 +++++++++++++++++
 .../float-kit/components/d-sheet/css-utils.js |   34 +
 .../components/d-sheet/description.gjs        |   18 +
 .../components/d-sheet/detent-manager.js      |  145 ++
 .../d-sheet/dimensions-calculator.js          |  633 +++++
 .../components/d-sheet/dom-attributes.js      |  178 ++
 .../components/d-sheet/focus-management.js    |  251 ++
 .../float-kit/components/d-sheet/handle.gjs   |   89 +
 .../float-kit/components/d-sheet/header.gjs   |   61 +
 .../components/d-sheet/observer-manager.js    |  233 ++
 .../d-sheet/outlet-animation-modifier.js      |  261 ++
 .../float-kit/components/d-sheet/outlet.gjs   |   25 +
 .../float-kit/components/d-sheet/portal.gjs   |   47 +
 .../float-kit/components/d-sheet/root.gjs     |  384 +++
 .../d-sheet/scroll-listener-modifier.js       |   51 +
 .../d-sheet/scroll-progress-calculator.js     |  209 ++
 .../d-sheet/scroll-trap-modifier.js           |  118 +
 .../components/d-sheet/sheet-action-base.js   |  143 ++
 .../d-sheet/special-wrapper/content.gjs       |   12 +
 .../d-sheet/special-wrapper/root.gjs          |   67 +
 .../components/d-sheet/stacking-adapter.js    |  257 ++
 .../components/d-sheet/state-helper.js        |  231 ++
 .../components/d-sheet/state-machine-group.js |  143 ++
 .../components/d-sheet/state-machine.js       | 1339 ++++++++++
 .../components/d-sheet/state/elements.js      |   51 +
 .../components/d-sheet/state/long-running.js  |   50 +
 .../components/d-sheet/state/openness.js      |  229 ++
 .../components/d-sheet/state/position.js      |  169 ++
 .../components/d-sheet/state/skip.js          |   74 +
 .../components/d-sheet/state/staging.js       |  166 ++
 .../components/d-sheet/state/stuck.js         |   95 +
 .../components/d-sheet/state/touch.js         |   50 +
 .../float-kit/components/d-sheet/states.js    |  443 ++++
 .../components/d-sheet/theme-color-adapter.js |  129 +
 .../components/d-sheet/timeout-manager.js     |   51 +
 .../float-kit/components/d-sheet/title.gjs    |   21 +
 .../components/d-sheet/touch-handler.js       |  168 ++
 .../float-kit/components/d-sheet/travel.js    |  762 ++++++
 .../float-kit/components/d-sheet/trigger.gjs  |   98 +
 .../float-kit/components/d-sheet/view.gjs     |  170 ++
 .../float-kit/components/d-stack.gjs          |  216 ++
 .../float-kit/components/d-toast.gjs          |  374 ++-
 .../float-kit/components/d-toasts.gjs         |   23 +-
 .../discourse/float-kit/helpers/effect.js     |   49 +
 .../discourse/float-kit/lib/action-utils.js   |   30 +
 .../float-kit/lib/behavior-handler.js         |   52 +
 .../float-kit/lib/d-toast-instance.js         |   40 +
 frontend/discourse/float-kit/lib/utils.js     |   10 +
 .../float-kit/modifiers/auto-close-toast.js   |  111 -
 .../float-kit/services/sheet-registry.js      |  680 +++++
 .../services/sheet-stack-registry.js          |  473 ++++
 .../float-kit/services/theme-color-manager.js |  416 +++
 .../discourse/float-kit/services/toasts.js    |   37 +-
 .../float-kit/d-bottom-sheet-test.gjs         |  178 ++
 .../components/float-kit/d-card-test.gjs      |  207 ++
 .../float-kit/d-default-toast-test.gjs        |   12 +-
 .../components/float-kit/d-stack-test.gjs     |  292 +++
 .../assign-topic-sheet/assignee-row.gjs       |   48 +
 .../assign-topic-sheet/assignees-list.gjs     |  103 +
 .../assign-topic-sheet/assignment-card.gjs    |   86 +
 .../assign-topic-sheet/assignment-form.gjs    |   41 +
 .../assign-topic-sheet/assignments-list.gjs   |   30 +
 .../components/assign-topic-sheet/index.gjs   |  165 ++
 .../components/modal/assign-user.gjs          |    1 +
 .../modal/edit-topic-assignments.gjs          |    1 +
 .../assign-topic-sheet.gjs                    |    7 +
 .../initializers/extend-for-assigns.js        |  106 +-
 .../discourse/models/assignment.js            |    3 +
 .../assets/stylesheets/assign-sheet.scss      |  128 +
 .../assets/stylesheets/assignment-card.scss   |   92 +
 .../assets/stylesheets/assignments-list.scss  |    7 +
 .../assets/stylesheets/assigns.scss           |    4 +
 .../config/locales/client.en.yml              |    3 +
 .../components/sections/molecules/sheets.gjs  |  786 ++++++
 .../components/sections/molecules/toasts.gjs  |   51 +-
 .../javascripts/discourse/lib/styleguide.js   |    2 +
 .../admin_color_palettes_config_area_spec.rb  |    2 +-
 spec/system/page_objects/components/toasts.rb |   12 +-
 119 files changed, 20367 insertions(+), 439 deletions(-)
 create mode 100644 app/assets/stylesheets/common/float-kit/bottom-sheet.scss
 create mode 100644 app/assets/stylesheets/common/float-kit/d-card.scss
 create mode 100644 app/assets/stylesheets/common/float-kit/d-scroll.scss
 create mode 100644 app/assets/stylesheets/common/float-kit/d-sheet-header.scss
 create mode 100644 app/assets/stylesheets/common/float-kit/d-sheet.scss
 create mode 100644 app/assets/stylesheets/common/float-kit/d-stack.scss
 create mode 100644 frontend/discourse/float-kit/components/d-bottom-sheet.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-card.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-scroll.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/content.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/controller.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/focus-scroll-utils.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/gesture-trap-handler.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/is-text-input.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/keyboard-focus-handler.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/native-focus-scroll-prevention.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/root.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/safe-area-handler.js
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/trigger.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-scroll/view.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet-stack.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/animation-travel.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/animation.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/config-normalizer.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/content.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/controller.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/css-utils.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/description.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/detent-manager.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/dom-attributes.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/focus-management.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/handle.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/header.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/observer-manager.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/outlet-animation-modifier.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/outlet.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/portal.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/root.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/scroll-listener-modifier.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/scroll-trap-modifier.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/special-wrapper/content.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state-helper.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state-machine-group.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state-machine.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/elements.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/long-running.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/openness.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/position.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/skip.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/staging.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/stuck.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state/touch.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/states.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/timeout-manager.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/title.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/touch-handler.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/travel.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/trigger.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/view.gjs
 create mode 100644 frontend/discourse/float-kit/components/d-stack.gjs
 create mode 100644 frontend/discourse/float-kit/helpers/effect.js
 create mode 100644 frontend/discourse/float-kit/lib/action-utils.js
 create mode 100644 frontend/discourse/float-kit/lib/behavior-handler.js
 create mode 100644 frontend/discourse/float-kit/lib/utils.js
 delete mode 100644 frontend/discourse/float-kit/modifiers/auto-close-toast.js
 create mode 100644 frontend/discourse/float-kit/services/sheet-registry.js
 create mode 100644 frontend/discourse/float-kit/services/sheet-stack-registry.js
 create mode 100644 frontend/discourse/float-kit/services/theme-color-manager.js
 create mode 100644 frontend/discourse/tests/integration/components/float-kit/d-bottom-sheet-test.gjs
 create mode 100644 frontend/discourse/tests/integration/components/float-kit/d-card-test.gjs
 create mode 100644 frontend/discourse/tests/integration/components/float-kit/d-stack-test.gjs
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignee-row.gjs
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignees-list.gjs
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-card.gjs
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-form.gjs
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignments-list.gjs
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/index.gjs
 create mode 100644 plugins/discourse-assign/assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-topic-sheet.gjs
 create mode 100644 plugins/discourse-assign/assets/stylesheets/assign-sheet.scss
 create mode 100644 plugins/discourse-assign/assets/stylesheets/assignment-card.scss
 create mode 100644 plugins/discourse-assign/assets/stylesheets/assignments-list.scss
 create mode 100644 plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs

diff --git a/app/assets/stylesheets/common/components/filter-input.scss b/app/assets/stylesheets/common/components/filter-input.scss
index 55d861ba848ef..fff3c00abfdc8 100644
--- a/app/assets/stylesheets/common/components/filter-input.scss
+++ b/app/assets/stylesheets/common/components/filter-input.scss
@@ -12,12 +12,18 @@
     @include default-focus;
   }
 
+  .d-icon + .filter-input {
+    padding-left: 0;
+  }
+
   .filter-input,
   .filter-input:focus {
     width: 100%;
     margin: 0;
     border: none;
     outline: none;
+    border-radius: 0;
+    clip-path: fill-box;
 
     @include viewport.from(md) {
       .chat-browse-view__actions & {
diff --git a/app/assets/stylesheets/common/float-kit/_index.scss b/app/assets/stylesheets/common/float-kit/_index.scss
index 6754da592bcc4..ca662b2d08c79 100644
--- a/app/assets/stylesheets/common/float-kit/_index.scss
+++ b/app/assets/stylesheets/common/float-kit/_index.scss
@@ -3,3 +3,9 @@
 @import "d-button-tooltip";
 @import "d-toasts";
 @import "d-default-toast";
+@import "d-sheet";
+@import "d-sheet-header";
+@import "d-scroll";
+@import "d-card";
+@import "d-stack";
+@import "bottom-sheet";
diff --git a/app/assets/stylesheets/common/float-kit/bottom-sheet.scss b/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
new file mode 100644
index 0000000000000..f684403fd37bd
--- /dev/null
+++ b/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
@@ -0,0 +1,56 @@
+.bottom-sheet__view {
+  height: calc(max(100dvh, 100lvh) + 60px);
+}
+
+.bottom-sheet__content {
+  box-sizing: border-box;
+  height: auto;
+  min-height: 100px;
+  max-width: 700px;
+  padding-bottom: max(
+    calc(env(safe-area-inset-bottom, 0px) + 12px),
+    var(--space-5)
+  );
+  display: grid;
+  justify-items: center;
+
+  &.--expandable {
+    height: calc(
+      max(100dvh, 100lvh) - max(env(safe-area-inset-top), var(--space-5))
+    );
+    padding-bottom: 0;
+    overflow: hidden;
+    grid-template-rows: auto 1fr;
+  }
+}
+
+.bottom-sheet__bleeding-background {
+  border-radius: var(--d-border-radius-large);
+  background-color: var(--secondary);
+  box-shadow: var(--shadow-card);
+}
+
+.bottom-sheet__handle {
+  width: 50px;
+  height: 6px;
+  border: 0;
+  border-radius: 9999px;
+  background-color: var(--primary-low-mid);
+  cursor: pointer;
+}
+
+.bottom-sheet__scroll-view {
+  width: 100%;
+  min-height: 0;
+}
+
+.bottom-sheet__scroll-content {
+  padding: var(--space-4);
+}
+
+.bottom-sheet__input {
+  box-sizing: border-box;
+  width: 100%;
+  height: 35px;
+  padding-inline: var(--space-4);
+}
diff --git a/app/assets/stylesheets/common/float-kit/d-card.scss b/app/assets/stylesheets/common/float-kit/d-card.scss
new file mode 100644
index 0000000000000..d42b1f3948925
--- /dev/null
+++ b/app/assets/stylesheets/common/float-kit/d-card.scss
@@ -0,0 +1,18 @@
+.d-card {
+  --card-border-radius: var(--d-border-radius);
+  --card-background: var(--secondary);
+  --card-box-shadow: var(--shadow-dropdown);
+  z-index: z("max");
+}
+
+.d-card-content {
+  box-sizing: border-box;
+  width: min(600px, calc(100% - 2 * 1rem));
+  box-shadow: var(--card-box-shadow);
+  border-radius: var(--card-border-radius);
+  background-color: var(--card-background);
+  height: auto;
+  max-width: 580px;
+  aspect-ratio: 8 / 10;
+  padding: var(--space-4);
+}
diff --git a/app/assets/stylesheets/common/float-kit/d-default-toast.scss b/app/assets/stylesheets/common/float-kit/d-default-toast.scss
index 0dd9adc0ac74b..483fed835395c 100644
--- a/app/assets/stylesheets/common/float-kit/d-default-toast.scss
+++ b/app/assets/stylesheets/common/float-kit/d-default-toast.scss
@@ -1,119 +1,135 @@
+@use "lib/viewport";
+
 .fk-d-default-toast {
   display: flex;
-  flex: 1 1 auto;
-  padding: 0.5rem;
-
-  &__close-container {
-    width: calc(40px - 0.5rem);
-    height: calc(1em + (2 * 0.65em));
+  align-items: center;
+  gap: var(--space-2);
+  padding: var(--space-2);
+  position: relative;
+  border-radius: var(--toast-border-radius);
+  background-color: var(--toast-background-color);
+  box-shadow: var(--toast-box-shadow);
+
+  &--has-progress {
+    padding-block-end: var(--space-4);
   }
 
-  &__icon-container {
-    flex: 1 0 auto;
+  &__close-btn {
+    position: absolute;
+    inset-block-start: 0;
+    inset-inline-end: 0;
+    transform: translate(45%, -45%);
     display: flex;
-    width: calc(40px - 0.5rem);
-    height: calc(1em + (2 * 0.65em));
-    align-items: center;
     justify-content: center;
-
-    &.alert-success {
-      background-color: var(--success-low);
-      color: var(--primary);
-    }
-
-    &.alert-error {
-      background-color: var(--danger-low);
-      color: var(--primary);
-    }
-
-    &.alert-warning {
-      background-color: var(--highlight-bg);
-      color: var(--primary);
+    align-items: center;
+    z-index: 1;
+    border-radius: 50%;
+    padding: var(--space-1);
+    font-size: var(--font-down-3);
+    color: var(--primary);
+    border: none;
+    background: var(--secondary-very-high);
+
+    @include viewport.until(sm) {
+      display: none;
     }
+  }
 
-    &.alert-info {
-      background-color: var(--tertiary-low);
-      color: var(--primary);
+  &__icon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    inline-size: 1rem;
+    block-size: 1rem;
+    flex-shrink: 0;
 
-      &.clickable {
-        color: var(--tertiary);
-        z-index: z("base");
-      }
+    .d-icon {
+      inline-size: 1rem;
+      block-size: 1rem;
     }
 
-    .-success & {
-      .d-icon {
-        color: var(--success);
-      }
+    .fk-d-default-toast--success & .d-icon {
+      color: var(--success);
     }
 
-    .-error & {
-      .d-icon {
-        color: var(--danger);
-      }
+    .fk-d-default-toast--error & .d-icon {
+      color: var(--danger);
     }
 
-    .-warning & {
-      .d-icon {
-        color: var(--highlight);
-      }
+    .fk-d-default-toast--warning & .d-icon {
+      color: var(--highlight);
     }
 
-    .-info & {
-      .d-icon {
-        color: var(--tertiary);
-      }
+    .fk-d-default-toast--info & .d-icon {
+      color: var(--tertiary);
     }
   }
 
-  &__main-container {
-    box-sizing: border-box;
+  &__content {
     display: flex;
     flex-direction: column;
-    width: 100%;
-    min-height: calc(1em + (2 * 0.65em));
+    flex: 1;
+    min-inline-size: 0;
   }
 
-  &__progress-bar {
-    width: 100%;
-    height: 5px;
-    top: 0;
-    left: 0;
-    position: absolute;
-    background-color: var(--success);
-    transform-origin: 0 0;
+  &__title {
+    font-weight: 500;
+    line-height: 1.5;
+    color: var(--primary);
   }
 
-  .fk-d-default-toast:has(&__progress-bar) {
-    padding-top: 15px;
+  &__description {
+    font-weight: 400;
+    line-height: 1.4;
+    color: var(--primary-high);
+    font-size: var(--font-down-1);
   }
 
-  &__texts {
-    min-height: inherit;
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
+  &__action-btn {
+    margin-inline-start: auto;
+    flex-shrink: 0;
   }
 
-  &__actions {
-    display: flex;
-    flex-wrap: wrap;
-    padding-top: 1rem;
-    margin-bottom: -0.5rem;
+  &__cancel-btn {
+    flex-shrink: 0;
+  }
 
-    .btn {
-      margin-right: 0.5rem;
-      margin-bottom: 0.5rem;
+  &__progress-wrapper {
+    position: absolute;
+    inset-block-end: 4px;
+    inset-inline: 8px;
+    block-size: 3px;
+    background: var(--primary-very-low);
+    border-radius: var(--d-border-radius-large);
+    overflow: hidden;
+    z-index: 1;
+    pointer-events: none;
+  }
+
+  &__progress-bar {
+    inline-size: 100%;
+    block-size: 100%;
+    background: var(--primary-low);
+    border-radius: inherit;
+    transform-origin: 0 0;
+    animation-name: d-toast-progress;
+    animation-timing-function: linear;
+    animation-fill-mode: forwards;
+
+    &.--hidden {
+      position: absolute;
+      visibility: hidden;
+      pointer-events: none;
     }
   }
+}
 
-  &__title {
-    display: flex;
-    font-weight: 700;
+@keyframes d-toast-progress {
+  from {
+    transform: scaleX(1);
   }
 
-  &__message {
-    display: flex;
-    color: var(--primary-high);
+  to {
+    transform: scaleX(0);
   }
 }
diff --git a/app/assets/stylesheets/common/float-kit/d-scroll.scss b/app/assets/stylesheets/common/float-kit/d-scroll.scss
new file mode 100644
index 0000000000000..9acdc76911379
--- /dev/null
+++ b/app/assets/stylesheets/common/float-kit/d-scroll.scss
@@ -0,0 +1,228 @@
+[data-d-scroll~="view"] {
+  display: grid;
+  position: relative;
+}
+
+[data-d-scroll~="view"] > * {
+  position: absolute !important;
+}
+
+[data-d-scroll~="view"][data-d-scroll~="scroll-ongoing"]
+  [contenteditable="true"],
+[data-d-scroll~="view"][data-d-scroll~="scroll-ongoing"] input,
+[data-d-scroll~="view"][data-d-scroll~="scroll-ongoing"] textarea {
+  caret-color: transparent !important;
+}
+
+[data-d-scroll~="scroll-container"] {
+  --grid-template: 0px max-content 0px max-content 0px max-content 0px !important;
+  scrollbar-color: inherit;
+  scrollbar-gutter: inherit;
+  outline: none !important;
+  padding: 0 !important;
+  display: grid !important;
+  position: relative !important;
+}
+
+[data-d-scroll~="scroll-container"]:focus {
+  outline: none;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="axis-y"] {
+  overflow-x: hidden !important;
+  overflow-y: auto !important;
+  grid-template-rows: var(--grid-template);
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="axis-x"] {
+  overflow-x: auto !important;
+  overflow-y: hidden !important;
+  grid-template-columns: var(--grid-template);
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="no-overshoot"] {
+  overscroll-behavior: none !important;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="trap-x"] {
+  overscroll-behavior-x: contain !important;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="trap-y"] {
+  overscroll-behavior-y: contain !important;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="no-scroll-gesture"] {
+  overflow-anchor: none;
+  overflow: hidden !important;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="scroll-skip"] {
+  scroll-behavior: auto;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="scroll-smooth"] {
+  scroll-behavior: smooth;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="scroll-auto"] {
+  scroll-behavior: smooth;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  [data-d-scroll~="scroll-container"][data-d-scroll~="scroll-auto"] {
+    scroll-behavior: auto;
+  }
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="no-anchoring"] {
+  overflow-anchor: none;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="snap-proximity"][data-d-scroll~="axis-y"] {
+  scroll-snap-type: y proximity;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="snap-proximity"][data-d-scroll~="axis-x"] {
+  scroll-snap-type: x proximity;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="snap-mandatory"][data-d-scroll~="axis-y"] {
+  scroll-snap-type: y mandatory;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="snap-mandatory"][data-d-scroll~="axis-x"] {
+  scroll-snap-type: x mandatory;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="no-scrollbar"] {
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="overflow-x"][data-d-scroll~="trap-x"][data-d-scroll~="trap-y"],
+[data-d-scroll~="scroll-container"][data-d-scroll~="overflow-y"][data-d-scroll~="trap-x"][data-d-scroll~="trap-y"] {
+  scrollbar-width: none !important;
+
+  &::-webkit-scrollbar {
+    display: none !important;
+  }
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="overflow-x"][data-d-scroll~="trap-x"][data-d-scroll~="trap-y"]::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 101%;
+  height: 1px;
+  user-select: none !important;
+  pointer-events: none !important;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="overflow-y"][data-d-scroll~="trap-x"][data-d-scroll~="trap-y"]::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 1px;
+  height: 101%;
+  user-select: none !important;
+  pointer-events: none !important;
+}
+
+[data-d-scroll~="spy"] {
+  width: 1px;
+  height: 1px;
+  margin-bottom: -1px;
+  margin-right: -1px;
+}
+
+[data-d-scroll~="spy"][data-d-scroll~="spy-start"][data-d-scroll~="axis-y"] {
+  grid-row: 1;
+}
+
+[data-d-scroll~="spy"][data-d-scroll~="spy-end"][data-d-scroll~="axis-y"] {
+  grid-row: -1;
+  margin-top: -2px;
+}
+
+[data-d-scroll~="spy"][data-d-scroll~="spy-start"][data-d-scroll~="axis-x"] {
+  grid-column: 1;
+}
+
+[data-d-scroll~="spy"][data-d-scroll~="spy-end"][data-d-scroll~="axis-x"] {
+  grid-column: -1;
+  margin-left: -2px;
+}
+
+[data-d-scroll~="start-spacer"][data-d-scroll~="axis-y"] {
+  width: 1px;
+  height: 0;
+  grid-row: 2;
+}
+
+[data-d-scroll~="start-spacer"][data-d-scroll~="axis-x"] {
+  width: 0;
+  height: 1px;
+  grid-column: 2;
+}
+
+[data-d-scroll~="end-spacer"][data-d-scroll~="axis-y"] {
+  width: 1px;
+  grid-row: 6;
+}
+
+[data-d-scroll~="end-spacer"][data-d-scroll~="axis-x"] {
+  height: 1px;
+  grid-column: 6;
+}
+
+[data-d-scroll~="content"] {
+  position: relative !important;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="axis-y"]
+  [data-d-scroll~="content"] {
+  grid-row: 4 !important;
+}
+
+[data-d-scroll~="scroll-container"][data-d-scroll~="axis-x"]
+  [data-d-scroll~="content"] {
+  grid-column: 4 !important;
+}
+
+[data-d-scroll~="content"][data-d-scroll~="no-overflow-x"][data-d-scroll~="trap-x"] {
+  position: sticky !important;
+  left: 0 !important;
+  right: 0 !important;
+}
+
+[data-d-scroll~="content"][data-d-scroll~="no-overflow-y"][data-d-scroll~="trap-y"] {
+  position: sticky !important;
+  top: 0 !important;
+  bottom: 0 !important;
+}
+
+[data-d-scroll~="trigger"] {
+  appearance: none;
+  background: transparent;
+  border: none;
+  padding: 0;
+  margin: 0;
+  font: inherit;
+  color: inherit;
+  cursor: pointer;
+
+  &:focus {
+    outline: none;
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--tertiary);
+    outline-offset: 2px;
+  }
+}
diff --git a/app/assets/stylesheets/common/float-kit/d-sheet-header.scss b/app/assets/stylesheets/common/float-kit/d-sheet-header.scss
new file mode 100644
index 0000000000000..a92ef3ee35090
--- /dev/null
+++ b/app/assets/stylesheets/common/float-kit/d-sheet-header.scss
@@ -0,0 +1,28 @@
+.d-sheet-header {
+  border-bottom: 1px solid var(--content-border-color);
+  position: relative;
+  display: grid;
+  grid-template-columns: 80px 1fr 80px;
+  align-items: center;
+  gap: var(--space-2);
+  height: 45px;
+  flex-shrink: 0;
+
+  &__title {
+    margin: 0;
+    justify-self: center;
+    text-box: trim-both cap alphabetic;
+    color: var(--primary);
+    font-size: var(--font-up-1);
+  }
+
+  &__left {
+    display: flex;
+    justify-self: start;
+  }
+
+  &__right {
+    display: flex;
+    justify-self: end;
+  }
+}
diff --git a/app/assets/stylesheets/common/float-kit/d-sheet.scss b/app/assets/stylesheets/common/float-kit/d-sheet.scss
new file mode 100644
index 0000000000000..0474c74fefef0
--- /dev/null
+++ b/app/assets/stylesheets/common/float-kit/d-sheet.scss
@@ -0,0 +1,891 @@
+[data-d-sheet],
+[data-d-sheet] * {
+  box-sizing: border-box;
+  min-width: 0;
+  min-height: 0;
+  margin: 0;
+  -webkit-tap-highlight-color: transparent;
+  text-size-adjust: 100%;
+}
+
+[data-d-sheet~="swipe-trap-both"] {
+  overscroll-behavior: contain !important;
+}
+
+:where([data-d-sheet~="scroll-trap-root"]:not([data-d-sheet~="fixed"])) {
+  --d-sheet-defaults: initial;
+  position: var(--d-sheet-defaults, relative);
+}
+
+[data-d-sheet~="scroll-trap-root"][data-d-sheet~="scroll-vertical"] {
+  overscroll-behavior-y: none !important;
+  overflow-x: hidden !important;
+  overflow-y: auto !important;
+}
+
+[data-d-sheet~="scroll-trap-root"][data-d-sheet~="scroll-horizontal"] {
+  overscroll-behavior-x: none !important;
+  overflow-y: hidden !important;
+  overflow-x: auto !important;
+}
+
+[data-d-sheet~="scroll-trap-root"][data-d-sheet~="scroll-both"] {
+  overscroll-behavior: none !important;
+  overflow: auto !important;
+}
+
+[data-d-sheet~="scroll-trap-root"] {
+  scrollbar-width: none !important;
+}
+
+[data-d-sheet~="scroll-trap-root"]::-webkit-scrollbar {
+  display: none !important;
+}
+
+[data-d-sheet~="scroll-trap-root"]::before {
+  content: "" !important;
+  width: calc(100% + 600px) !important;
+  height: calc(100% + 600px) !important;
+  position: absolute !important;
+  top: 0 !important;
+  left: 0 !important;
+}
+
+[data-d-sheet~="scroll-trap-root"][data-d-sheet~="scroll-trap-inactive"]::before {
+  display: none !important;
+}
+
+[data-d-sheet~="view"]:not([data-d-sheet~="staging-none"])
+  [data-d-sheet~="scroll-trap-root"][data-d-sheet~="scroll-trap-optimised"] {
+  overflow: clip !important;
+}
+
+[data-d-sheet~="view"]:not([data-d-sheet~="staging-none"])
+  [data-d-sheet~="scroll-trap-root"][data-d-sheet~="scroll-trap-optimised"]::before {
+  display: none !important;
+}
+
+[data-d-sheet~="view"]:not([data-d-sheet~="staging-none"])
+  [data-d-sheet~="scroll-container"][data-d-sheet] {
+  overflow: hidden;
+}
+
+[data-d-sheet~="view"][data-d-sheet~="animating"]
+  [data-d-sheet~="secondary-scroll-trap"][data-d-sheet~="no-pointer-events"] {
+  z-index: 1;
+  pointer-events: auto !important;
+}
+
+[data-d-sheet~="scroll-trap-stabilizer"] {
+  width: 100% !important;
+  height: 100% !important;
+  position: sticky !important;
+  top: 0 !important;
+  left: 0 !important;
+}
+
+:where([data-d-sheet~="view"]) {
+  --d-sheet-defaults: initial;
+  position: var(--d-sheet-defaults, fixed);
+  top: var(--d-sheet-defaults, var(--d-sheet-default-top, initial));
+  bottom: var(--d-sheet-defaults, var(--d-sheet-default-bottom, initial));
+  left: var(--d-sheet-defaults, var(--d-sheet-default-left, initial));
+  right: var(--d-sheet-defaults, var(--d-sheet-default-right, initial));
+  height: var(--d-sheet-defaults, 100%);
+  width: var(--d-sheet-defaults, 100%);
+  outline: none;
+
+  --x-collapsed-scrollbar-thickness: 0px;
+  --y-collapsed-scrollbar-thickness: 0px;
+}
+
+:where([data-d-sheet~="view"] > *) {
+  --d-sheet-default-top: initial;
+  --d-sheet-default-bottom: initial;
+  --d-sheet-default-left: initial;
+  --d-sheet-default-right: initial;
+}
+
+[data-d-sheet~="view"]:not([data-d-sheet~="staging-none"]) * {
+  caret-color: transparent;
+}
+
+:where([data-d-sheet~="view"][data-d-sheet~="bottom"]) {
+  --d-sheet-default-bottom: 0;
+  --d-sheet-default-left: 0;
+}
+
+:where([data-d-sheet~="view"][data-d-sheet~="top"]) {
+  --d-sheet-default-top: 0;
+  --d-sheet-default-left: 0;
+}
+
+:where([data-d-sheet~="view"][data-d-sheet~="left"]) {
+  --d-sheet-default-top: 0;
+  --d-sheet-default-left: 0;
+  height: 100%;
+  width: 100vw;
+}
+
+:where([data-d-sheet~="view"][data-d-sheet~="right"]) {
+  --d-sheet-default-top: 0;
+  --d-sheet-default-right: 0;
+  height: 100%;
+  width: 100vw;
+}
+
+[data-d-sheet~="view"] {
+  z-index: z("modal", "overlay");
+
+  --d-sheet-minimum-snap-distance: var(
+    --d-sheet-minimum-snap-distance-from-props,
+    1px
+  );
+  --d-sheet-viewport-height: 100vh;
+  --d-sheet-snap-accelerator: 1px;
+  --d-sheet-edge-padding: 10px;
+  --d-sheet-view-travel-axis: initial; // aD
+  --d-sheet-view-cross-axis: initial; // aE
+  --d-sheet-content-travel-axis: initial; // aF
+  --d-sheet-content-cross-axis: initial; // aG
+  --d-sheet-front-spacer: initial; // aH
+  --d-sheet-back-spacer: initial; // aI
+  --d-sheet-first-detent-size: initial; // aK
+  --d-sheet-travel-size: var(--d-sheet-view-travel-axis, 100%);
+  --d-sheet-cross-size: var(--d-sheet-view-cross-axis, 100%);
+  --d-sheet-max-overshoot-distance: min(300px, var(--d-sheet-travel-size));
+  --d-sheet-snap-margin: 2px;
+  --d-sheet-content-wrapper-overshoot-offset: calc(
+    -1 * (var(--d-sheet-max-overshoot-distance) - var(--d-sheet-snap-margin))
+  );
+  border-width: 0 !important;
+  overflow: clip !important;
+}
+
+[data-d-sheet~="view"][data-d-sheet~="hidden"] {
+  opacity: 0 !important;
+}
+
+[data-d-sheet~="view"][data-d-sheet~="closed"] {
+  /* stylelint-disable-next-line property-no-deprecated -- fallback for older browsers */
+  clip: rect(0 0 0 0) !important;
+  clip-path: inset(0) !important;
+  white-space: nowrap !important;
+  border: 0 !important;
+  width: 1px !important;
+  height: 1px !important;
+  margin: -1px !important;
+  padding: 0 !important;
+  position: fixed !important;
+  top: 0 !important;
+  left: 0 !important;
+  overflow: hidden !important;
+}
+
+[data-d-sheet~="view"][data-d-sheet~="no-pointer-events"] {
+  pointer-events: none !important;
+  user-select: none !important;
+}
+
+[data-d-sheet~="view"] > * {
+  position: absolute;
+}
+
+:where([data-d-sheet~="backdrop"]) {
+  --d-sheet-defaults: initial;
+  left: var(--d-sheet-defaults, 0);
+  right: var(--d-sheet-defaults, 0);
+  top: var(--d-sheet-defaults, 0);
+  bottom: var(--d-sheet-defaults, 0);
+  background-color: var(--d-sheet-defaults, #000);
+  opacity: var(--d-sheet-defaults, 0.5);
+}
+
+[data-d-sheet~="backdrop"] {
+  z-index: -1 !important;
+  position: absolute !important;
+  user-select: none;
+}
+
+[data-d-sheet~="backdrop"][data-d-sheet~="no-pointer-events"] {
+  pointer-events: none !important;
+  user-select: none !important;
+}
+
+:where([data-d-sheet~="content"]) {
+  --d-sheet-defaults: initial;
+  width: var(--d-sheet-defaults, var(--d-sheet-default-width, initial));
+  height: var(--d-sheet-defaults, var(--d-sheet-default-height, initial));
+  background-color: var(--d-sheet-defaults, #fff);
+}
+
+[data-d-sheet~="content"]:has(:where([data-d-sheet~="bleeding-background"])) {
+  background-color: initial;
+}
+
+:where([data-d-sheet~="bleeding-background"]) {
+  --d-sheet-defaults: initial;
+  border-radius: var(--d-sheet-defaults, inherit);
+  background-color: var(--d-sheet-defaults, #fff);
+}
+
+[data-d-sheet~="bleeding-background"] {
+  box-sizing: border-box !important;
+  z-index: -1 !important;
+  position: absolute !important;
+}
+
+[data-d-sheet~="bleeding-background"][data-d-sheet~="right"],
+[data-d-sheet~="bleeding-background"][data-d-sheet~="left"] {
+  width: calc(100% + var(--d-sheet-max-overshoot-distance)) !important;
+  height: 100% !important;
+}
+
+[data-d-sheet~="bleeding-background"][data-d-sheet~="right"] {
+  top: 0 !important;
+  right: 0 !important;
+}
+
+[data-d-sheet~="bleeding-background"][data-d-sheet~="left"],
+[data-d-sheet~="bleeding-background"][data-d-sheet~="center"][data-d-sheet~="horizontal"] {
+  top: 0 !important;
+  left: 0 !important;
+}
+
+[data-d-sheet~="bleeding-background"][data-d-sheet~="start"],
+[data-d-sheet~="bleeding-background"][data-d-sheet~="end"] {
+  height: calc(100% + var(--d-sheet-max-overshoot-distance)) !important;
+  width: 100% !important;
+}
+
+[data-d-sheet~="bleeding-background"][data-d-sheet~="start"] {
+  bottom: 0 !important;
+  left: 0 !important;
+}
+
+[data-d-sheet~="bleeding-background"][data-d-sheet~="end"],
+[data-d-sheet~="bleeding-background"][data-d-sheet~="center"][data-d-sheet~="vertical"] {
+  top: 0 !important;
+  left: 0 !important;
+}
+
+[data-d-sheet~="bleeding-background"][data-d-sheet~="center"] {
+  width: 100% !important;
+  height: 100% !important;
+}
+
+[data-d-sheet~="bleeding-background"]:not(
+    [data-d-sheet~="staging-none"]
+  )[data-d-sheet~="start"],
+[data-d-sheet~="bleeding-background"]:not(
+    [data-d-sheet~="staging-none"]
+  )[data-d-sheet~="end"] {
+  height: calc(100% + 50px) !important;
+}
+
+[data-d-sheet~="bleeding-background"]:not(
+    [data-d-sheet~="staging-none"]
+  )[data-d-sheet~="left"],
+[data-d-sheet~="bleeding-background"]:not(
+    [data-d-sheet~="staging-none"]
+  )[data-d-sheet~="right"] {
+  width: calc(100% + 50px) !important;
+}
+
+:where([data-d-sheet~="special-wrapper-root"]) {
+  --d-sheet-defaults: initial;
+  width: var(--d-sheet-defaults, 100%);
+  height: var(--d-sheet-defaults, 100%);
+}
+
+[data-d-sheet~="primary-scroll-trap"] {
+  position: absolute;
+}
+
+[data-d-sheet~="primary-scroll-trap"][data-d-sheet~="top"],
+[data-d-sheet~="primary-scroll-trap"][data-d-sheet~="bottom"],
+[data-d-sheet~="primary-scroll-trap"][data-d-sheet~="vertical"] {
+  width: var(--d-sheet-cross-size);
+  height: var(--d-sheet-travel-size);
+}
+
+[data-d-sheet~="primary-scroll-trap"][data-d-sheet~="left"],
+[data-d-sheet~="primary-scroll-trap"][data-d-sheet~="right"],
+[data-d-sheet~="primary-scroll-trap"][data-d-sheet~="horizontal"] {
+  height: var(--d-sheet-cross-size);
+  width: var(--d-sheet-travel-size);
+}
+
+[data-d-sheet~="primary-scroll-trap"][data-d-sheet~="pass-through"]
+  > [data-d-sheet~="scroll-trap-stabilizer"]
+  > * {
+  pointer-events: auto;
+  user-select: initial;
+}
+
+[data-d-sheet~="secondary-scroll-trap"] {
+  z-index: -1;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
+[data-d-sheet~="secondary-scroll-trap"][data-d-sheet~="no-pointer-events"] {
+  pointer-events: none !important;
+}
+
+[data-d-sheet~="scroll-container"] {
+  --d-sheet-scroll-container-height: calc(2 * var(--d-sheet-travel-size));
+  z-index: 1;
+  flex-wrap: nowrap;
+  place-items: center;
+  display: flex;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  scrollbar-width: none;
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="top"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="bottom"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="vertical"] {
+  height: var(--d-sheet-scroll-container-height);
+  scroll-snap-type: y mandatory;
+  flex-direction: column;
+  width: 100%;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="left"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="right"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="horizontal"] {
+  width: var(--d-sheet-scroll-container-height);
+  scroll-snap-type: x mandatory;
+  flex-direction: row;
+  height: 100%;
+  overflow-y: hidden;
+  overflow-x: auto;
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="top"] {
+  top: calc(-1 * var(--d-sheet-travel-size));
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="bottom"] {
+  bottom: calc(-1 * var(--d-sheet-travel-size));
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="left"] {
+  left: calc(-1 * var(--d-sheet-travel-size));
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="right"] {
+  right: calc(-1 * var(--d-sheet-travel-size));
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="horizontal"] {
+  left: calc(-0.5 * var(--d-sheet-travel-size));
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="vertical"] {
+  top: calc(-0.5 * var(--d-sheet-travel-size));
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="no-pointer-events"][data-d-sheet] {
+  pointer-events: none;
+  user-select: none;
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="overscroll-contain"] {
+  overscroll-behavior-y: contain;
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="top"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="bottom"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="vertical"] {
+  overscroll-behavior-y: none;
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="left"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="right"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="horizontal"] {
+  overscroll-behavior-x: none;
+}
+
+[data-d-sheet~="scroll-container"][data-d-sheet~="vertical"][data-d-sheet~="center"],
+[data-d-sheet~="scroll-container"][data-d-sheet~="horizontal"][data-d-sheet~="center"] {
+  justify-content: center;
+}
+
+[data-d-sheet~="scroll-container"]::-webkit-scrollbar {
+  display: none;
+}
+
+[data-d-sheet~="scroll-container"] > * {
+  --d-sheet-travel-size: var(--d-sheet-view-travel-axis, 50%);
+  flex-grow: 0;
+  flex-shrink: 0;
+}
+
+[data-d-sheet~="front-spacer"] {
+  user-select: none !important;
+  pointer-events: none !important;
+}
+
+[data-d-sheet~="front-spacer"][data-d-sheet~="top"],
+[data-d-sheet~="front-spacer"][data-d-sheet~="left"] {
+  scroll-snap-align: end;
+  order: 3;
+}
+
+[data-d-sheet~="front-spacer"][data-d-sheet~="bottom"],
+[data-d-sheet~="front-spacer"][data-d-sheet~="right"],
+[data-d-sheet~="front-spacer"][data-d-sheet~="horizontal"],
+[data-d-sheet~="front-spacer"][data-d-sheet~="vertical"] {
+  scroll-snap-align: start;
+  order: 1;
+}
+
+[data-d-sheet~="front-spacer"][data-d-sheet~="top"],
+[data-d-sheet~="front-spacer"][data-d-sheet~="bottom"] {
+  height: var(--d-sheet-front-spacer);
+  width: 1px;
+}
+
+[data-d-sheet~="front-spacer"][data-d-sheet~="left"],
+[data-d-sheet~="front-spacer"][data-d-sheet~="right"] {
+  width: var(--d-sheet-front-spacer);
+  height: 1px;
+}
+
+[data-d-sheet~="front-spacer"][data-d-sheet~="vertical"] {
+  height: var(--d-sheet-front-spacer);
+  width: 1px;
+}
+
+[data-d-sheet~="front-spacer"][data-d-sheet~="horizontal"] {
+  width: var(--d-sheet-front-spacer);
+  height: 1px;
+}
+
+[data-d-sheet~="content-wrapper"] {
+  z-index: 1;
+  pointer-events: none;
+  user-select: text;
+  order: 2;
+  display: flex;
+  position: sticky;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="center"][data-d-sheet~="horizontal"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="center"][data-d-sheet~="vertical"] {
+  position: relative;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="left"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="right"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="horizontal"] {
+  --d-sheet-content-wrapper-offset: calc(
+    var(--d-sheet-travel-size) - var(--d-sheet-content-travel-axis) - var(
+        --d-sheet-minimum-snap-distance
+      )
+  );
+  width: var(--d-sheet-travel-size);
+  align-items: center;
+  height: 100%;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="top"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="bottom"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="vertical"] {
+  --d-sheet-content-wrapper-offset: calc(
+    var(--d-sheet-travel-size) - var(--d-sheet-content-travel-axis) - var(
+        --d-sheet-minimum-snap-distance
+      )
+  );
+  height: var(--d-sheet-travel-size);
+  justify-content: center;
+  width: 100%;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="left"] {
+  justify-content: flex-start;
+  left: var(--d-sheet-content-wrapper-offset);
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="right"] {
+  justify-content: flex-end;
+  right: var(--d-sheet-content-wrapper-offset);
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="start"] {
+  top: var(--d-sheet-content-wrapper-offset);
+  align-items: flex-start;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="end"] {
+  bottom: var(--d-sheet-content-wrapper-offset);
+  align-items: flex-end;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="center"] {
+  justify-content: center;
+  align-items: center;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="top"][data-d-sheet~="center"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="bottom"][data-d-sheet~="center"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="left"][data-d-sheet~="center"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="right"][data-d-sheet~="center"] {
+  --d-sheet-content-wrapper-offset: calc(
+    (var(--d-sheet-travel-size) - var(--d-sheet-content-travel-axis)) /
+      2 - var(--d-sheet-minimum-snap-distance)
+  );
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="horizontal"],
+[data-d-sheet~="content-wrapper"][data-d-sheet~="vertical"] {
+  --d-sheet-content-wrapper-centered-offset: calc(
+    (var(--d-sheet-view-travel-axis) - var(--d-sheet-content-travel-axis)) /
+      2 - var(--d-sheet-view-travel-axis) /
+      2 - var(--d-sheet-minimum-snap-distance)
+  );
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="vertical"]:not(
+    [data-d-sheet~="center"]
+  ) {
+  top: var(--d-sheet-content-wrapper-centered-offset);
+  bottom: var(--d-sheet-content-wrapper-centered-offset);
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="horizontal"]:not(
+    [data-d-sheet~="center"]
+  ) {
+  left: var(--d-sheet-content-wrapper-centered-offset);
+  right: var(--d-sheet-content-wrapper-centered-offset);
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="left"] {
+  right: 0;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="right"] {
+  left: 0;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="top"] {
+  bottom: 0;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="bottom"] {
+  top: 0;
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="swipe-out-disabled"] {
+  --d-sheet-content-wrapper-offset: calc(
+    var(--d-sheet-travel-size) - var(--d-sheet-content-travel-axis) +
+      var(--d-sheet-first-detent-size)
+  );
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-active"][data-d-sheet~="left"] {
+  left: auto;
+  right: var(--d-sheet-content-wrapper-overshoot-offset);
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-active"][data-d-sheet~="right"] {
+  right: auto;
+  left: var(--d-sheet-content-wrapper-overshoot-offset);
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-active"][data-d-sheet~="top"] {
+  bottom: var(--d-sheet-content-wrapper-overshoot-offset);
+}
+
+[data-d-sheet~="content-wrapper"][data-d-sheet~="overshoot-active"][data-d-sheet~="bottom"] {
+  top: var(--d-sheet-content-wrapper-overshoot-offset);
+}
+
+[data-d-sheet~="touch-target-expander"] {
+  position: absolute;
+  pointer-events: auto;
+  user-select: none;
+}
+
+[data-d-sheet~="touch-target-expander"][data-d-sheet~="bottom"] {
+  top: -20px;
+  left: 0;
+  right: 0;
+  height: 40px;
+}
+
+[data-d-sheet~="touch-target-expander"][data-d-sheet~="top"] {
+  bottom: -20px;
+  left: 0;
+  right: 0;
+  height: 40px;
+}
+
+[data-d-sheet~="touch-target-expander"][data-d-sheet~="left"] {
+  right: -20px;
+  top: 0;
+  bottom: 0;
+  width: 40px;
+}
+
+[data-d-sheet~="touch-target-expander"][data-d-sheet~="right"] {
+  left: -20px;
+  top: 0;
+  bottom: 0;
+  width: 40px;
+}
+
+[data-d-sheet~="touch-target-expander"][data-d-sheet~="horizontal"] {
+  left: -20px;
+  right: -20px;
+  top: 0;
+  bottom: 0;
+}
+
+[data-d-sheet~="touch-target-expander"][data-d-sheet~="vertical"] {
+  top: -20px;
+  bottom: -20px;
+  left: 0;
+  right: 0;
+}
+
+[data-d-sheet~="content"][data-d-sheet~="start"],
+[data-d-sheet~="content"][data-d-sheet~="end"],
+[data-d-sheet~="content"][data-d-sheet~="center"][data-d-sheet~="top"],
+[data-d-sheet~="content"][data-d-sheet~="center"][data-d-sheet~="bottom"] {
+  --d-sheet-default-width: 100%;
+  --d-sheet-default-height: 50%;
+}
+
+[data-d-sheet~="content"][data-d-sheet~="center"][data-d-sheet~="vertical"] {
+  --d-sheet-default-width: 100%;
+  --d-sheet-default-height: 50%;
+}
+
+[data-d-sheet~="content"][data-d-sheet~="left"],
+[data-d-sheet~="content"][data-d-sheet~="right"] {
+  --d-sheet-default-width: 50%;
+  --d-sheet-default-height: 100%;
+}
+
+[data-d-sheet~="content"][data-d-sheet~="center"][data-d-sheet~="horizontal"] {
+  --d-sheet-default-width: 50%;
+  --d-sheet-default-height: 100%;
+}
+
+[data-d-sheet~="content"] {
+  user-select: initial;
+  user-select: auto;
+  box-sizing: border-box !important;
+  margin: 0 !important;
+  position: relative !important;
+  overflow: visible !important;
+  padding-bottom: env(safe-area-inset-bottom);
+}
+
+[data-d-sheet~="content"],
+[data-d-sheet~="content"][data-d-sheet~="no-pointer-events"] {
+  pointer-events: auto;
+}
+
+[data-d-sheet~="content"] > * {
+  --d-sheet-default-width: initial;
+  --d-sheet-default-height: initial;
+}
+
+[data-d-sheet~="back-spacer"] {
+  position: relative;
+  user-select: none !important;
+  pointer-events: none !important;
+}
+
+[data-d-sheet~="back-spacer"][data-d-sheet~="top"],
+[data-d-sheet~="back-spacer"][data-d-sheet~="left"] {
+  scroll-snap-align: start;
+  order: 1;
+}
+
+[data-d-sheet~="back-spacer"][data-d-sheet~="bottom"],
+[data-d-sheet~="back-spacer"][data-d-sheet~="right"],
+[data-d-sheet~="back-spacer"][data-d-sheet~="horizontal"],
+[data-d-sheet~="back-spacer"][data-d-sheet~="vertical"] {
+  scroll-snap-align: end;
+  order: 3;
+}
+
+[data-d-sheet~="back-spacer"][data-d-sheet~="top"],
+[data-d-sheet~="back-spacer"][data-d-sheet~="bottom"] {
+  height: var(--d-sheet-back-spacer);
+  width: 1px;
+}
+
+[data-d-sheet~="back-spacer"][data-d-sheet~="left"],
+[data-d-sheet~="back-spacer"][data-d-sheet~="right"] {
+  width: var(--d-sheet-back-spacer);
+  height: 1px;
+}
+
+[data-d-sheet~="back-spacer"][data-d-sheet~="vertical"] {
+  height: 0;
+  width: 1px;
+}
+
+[data-d-sheet~="back-spacer"][data-d-sheet~="horizontal"] {
+  width: 0;
+  height: 1px;
+}
+
+[data-d-sheet~="detent-marker"] {
+  --d-sheet-detent-marker-position: calc(
+    100% + var(--d-sheet-content-travel-axis) - var(--d-sheet-marker-current)
+  );
+  --d-sheet-detent-marker-scroll-margin: calc(
+    var(--d-sheet-travel-size) - var(--d-sheet-marker-current) +
+      var(--d-sheet-marker-prev)
+  );
+  place-items: center;
+  display: grid;
+  position: absolute;
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="top"],
+[data-d-sheet~="detent-marker"][data-d-sheet~="bottom"],
+[data-d-sheet~="detent-marker"][data-d-sheet~="vertical"] {
+  height: calc(var(--d-sheet-marker-current) - var(--d-sheet-marker-prev));
+  width: 1px;
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="left"],
+[data-d-sheet~="detent-marker"][data-d-sheet~="right"],
+[data-d-sheet~="detent-marker"][data-d-sheet~="horizontal"] {
+  width: calc(var(--d-sheet-marker-current) - var(--d-sheet-marker-prev));
+  height: 1px;
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="top"],
+[data-d-sheet~="detent-marker"][data-d-sheet~="left"] {
+  scroll-snap-align: end;
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="bottom"],
+[data-d-sheet~="detent-marker"][data-d-sheet~="right"] {
+  scroll-snap-align: start;
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="horizontal"],
+[data-d-sheet~="detent-marker"][data-d-sheet~="vertical"] {
+  scroll-snap-align: center;
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="top"] {
+  top: var(--d-sheet-detent-marker-position);
+  scroll-margin-bottom: var(--d-sheet-detent-marker-scroll-margin);
+  left: calc(var(--d-sheet-marker-index) * 10px);
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="bottom"] {
+  bottom: var(--d-sheet-detent-marker-position);
+  scroll-margin-top: var(--d-sheet-detent-marker-scroll-margin);
+  left: calc(var(--d-sheet-marker-index) * 10px);
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="left"] {
+  left: var(--d-sheet-detent-marker-position);
+  scroll-margin-right: var(--d-sheet-detent-marker-scroll-margin);
+  top: calc(var(--d-sheet-marker-index) * 10px);
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="right"] {
+  right: var(--d-sheet-detent-marker-position);
+  scroll-margin-left: var(--d-sheet-detent-marker-scroll-margin);
+  top: calc(var(--d-sheet-marker-index) * 10px);
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="horizontal"] {
+  right: calc(
+    100% + (var(--d-sheet-travel-size) - var(--d-sheet-marker-current)) / 2
+  );
+  top: calc(var(--d-sheet-marker-index) * 10px);
+}
+
+[data-d-sheet~="detent-marker"][data-d-sheet~="vertical"] {
+  bottom: calc(
+    100% + (var(--d-sheet-travel-size) - var(--d-sheet-marker-current)) / 2
+  );
+  left: calc(var(--d-sheet-marker-index) * 10px);
+}
+
+@supports not (scroll-margin-bottom: 1px) {
+  [data-d-sheet~="detent-marker"][data-d-sheet~="top"] {
+    scroll-margin-bottom: var(--d-sheet-detent-marker-scroll-margin);
+  }
+}
+
+@supports not (scroll-margin-top: 1px) {
+  [data-d-sheet~="detent-marker"][data-d-sheet~="bottom"] {
+    scroll-margin-top: var(--d-sheet-detent-marker-scroll-margin);
+  }
+}
+
+@supports not (scroll-margin-right: 1px) {
+  [data-d-sheet~="detent-marker"][data-d-sheet~="left"] {
+    scroll-margin-right: var(--d-sheet-detent-marker-scroll-margin);
+  }
+}
+
+@supports not (scroll-margin-left: 1px) {
+  [data-d-sheet~="detent-marker"][data-d-sheet~="right"] {
+    scroll-margin-left: var(--d-sheet-detent-marker-scroll-margin);
+  }
+}
+
+[data-d-sheet~="detent-marker"]:not(:only-child):last-child,
+[data-d-sheet~="detent-marker"][data-d-sheet~="top"]:only-child,
+[data-d-sheet~="detent-marker"][data-d-sheet~="bottom"]:only-child,
+[data-d-sheet~="detent-marker"][data-d-sheet~="left"]:only-child,
+[data-d-sheet~="detent-marker"][data-d-sheet~="right"]:only-child,
+[data-d-sheet~="detent-marker"][data-d-sheet~="swipe-out-disabled"]:first-child {
+  scroll-snap-align: none;
+}
+
+[data-d-sheet~="touch-target-expander"][data-d-sheet~="handle"] {
+  position: relative;
+
+  &::before {
+    content: "";
+    display: block;
+    position: absolute;
+    left: calc(-1 * max(100%, 48px) / 2 + 50%);
+    top: calc(-1 * max(100%, 48px) / 2 + 50%);
+    width: max(100%, 48px);
+    height: max(100%, 48px);
+  }
+}
+
+[data-d-sheet~="handle"] {
+  width: 50px;
+  height: 6px;
+  margin: var(--space-2) auto;
+  padding: 0;
+  border: 0;
+  border-radius: 9999px;
+  background-color: var(--primary-low-mid);
+  cursor: pointer;
+  user-select: none;
+
+  &:disabled {
+    cursor: default;
+    opacity: 0.5;
+  }
+}
diff --git a/app/assets/stylesheets/common/float-kit/d-stack.scss b/app/assets/stylesheets/common/float-kit/d-stack.scss
new file mode 100644
index 0000000000000..f3e1c3eff1dd7
--- /dev/null
+++ b/app/assets/stylesheets/common/float-kit/d-stack.scss
@@ -0,0 +1,28 @@
+.d-stack {
+  &__view {
+    z-index: z("max");
+  }
+
+  &__content {
+    box-sizing: border-box;
+    background-color: transparent;
+    padding: var(--space-2);
+    display: grid;
+
+    &[data-d-sheet~="right"] {
+      width: min(80%, 700px);
+      height: 100%;
+    }
+  }
+
+  &__inner-content {
+    box-sizing: border-box;
+    background-color: var(--secondary);
+    border-radius: var(--d-border-radius-large);
+    overflow: hidden;
+  }
+
+  &__backdrop {
+    background-color: rgb(0 0 0 / 50%);
+  }
+}
diff --git a/app/assets/stylesheets/common/float-kit/d-toasts.scss b/app/assets/stylesheets/common/float-kit/d-toasts.scss
index 75a4b436c4a08..a4f7eda5a9a30 100644
--- a/app/assets/stylesheets/common/float-kit/d-toasts.scss
+++ b/app/assets/stylesheets/common/float-kit/d-toasts.scss
@@ -1,58 +1,90 @@
-@keyframes d-toast-opening {
-  from {
-    transform: translateY(var(--transform-y, 10px));
-  }
-}
+@use "lib/viewport";
 
 .fk-d-toasts {
-  --transform-y: 0;
   position: fixed;
-  top: calc(var(--header-offset) + 0.33rem);
-  right: 5px;
-  z-index: z("max");
-  display: flex;
-  flex-direction: column;
-  gap: 5px 0;
-  flex: 1 1 auto;
-
-  .mobile-view & {
-    left: 5px;
-  }
+  z-index: calc(z("max") + 2);
 
-  .fk-d-toast {
-    box-sizing: border-box;
-    opacity: 1;
-    transition: opacity 0.5s;
-    border-radius: var(--d-border-radius);
-    overflow: hidden;
-    background-color: var(--secondary);
-    border: 1px solid var(--content-border-color);
-    box-shadow: var(--shadow-dropdown);
-    overflow-wrap: break-word;
-    display: flex;
-    animation: d-toast-opening 0.3s ease-in-out;
-    will-change: transform;
-
-    .desktop-view & {
-      margin-left: auto;
+  .d-toast {
+    --toast-padding-x: var(--space-3);
+    --toast-padding-top: var(--space-3);
+    --toast-padding-bottom: var(--space-6);
+    --toast-max-height: 90px;
+    --toast-content-height: calc(
+      max(env(safe-area-inset-top, 0px), var(--toast-padding-top)) +
+        var(--toast-max-height) + var(--toast-padding-bottom)
+    );
+    --toast-border-color: var(--content-border-color);
+    --toast-box-shadow: var(--shadow-card);
+    --toast-border-radius: var(--d-border-radius-large);
+    --toast-background-color: var(--secondary);
+    --toast-offset: 8px;
+    z-index: var(--z-index);
+
+    &--success {
+      --toast-background-color: var(--success-low);
+      --toast-border-color: var(--success);
     }
 
-    &:hover {
-      border-color: var(--primary-300);
+    &--error {
+      --toast-background-color: var(--danger-low);
+      --toast-border-color: var(--danger);
     }
 
-    &.-fade-out {
-      opacity: 0;
+    &--warning {
+      --toast-background-color: var(--highlight-low);
+      --toast-border-color: var(--highlight);
     }
 
-    & + .d-toast {
-      margin-top: 0.25rem;
+    &--info {
+      --toast-background-color: var(--tertiary-low);
+      --toast-border-color: var(--tertiary);
+    }
+
+    @media (width >= 1000px) {
+      --toast-padding-x: var(--space-4);
+      --toast-padding-top: var(--space-4);
+      height: var(--toast-content-height);
     }
-  }
-}
 
-@media (prefers-reduced-motion: no-preference) {
-  .fk-d-toasts {
-    --transform-y: 2vh;
+    &__content {
+      box-sizing: border-box;
+      width: 100%;
+      height: var(--toast-content-height);
+      background-color: transparent;
+      padding: var(--toast-padding-x);
+      padding-top: max(env(safe-area-inset-top), var(--toast-padding-top));
+      padding-bottom: var(--toast-padding-bottom);
+      display: grid;
+
+      @include viewport.from(sm) {
+        margin-left: auto !important;
+        max-width: 400px;
+      }
+    }
+
+    &__inner-content {
+      --scale: calc(1 - var(--distance-from-front) * 0.05);
+      --y-offset: calc(var(--distance-from-front) * -8px);
+      max-height: var(--toast-max-height);
+      opacity: 0;
+      transform: translateY(var(--y-offset)) scale(var(--scale));
+      transform-origin: bottom center;
+      transition:
+        transform 0.4s cubic-bezier(0.25, 1, 0.5, 1),
+        opacity 0.4s ease,
+        max-height 0.4s cubic-bezier(0.25, 1, 0.5, 1);
+
+      &[data-presented="true"] {
+        opacity: 1;
+      }
+
+      &[data-front="false"] {
+        filter: drop-shadow(0 3px 8px rgb(0, 0, 0, 0.25));
+
+        .fk-d-default-toast {
+          box-shadow: none;
+        }
+      }
+    }
   }
 }
diff --git a/app/assets/stylesheets/common/form-kit/_control-textarea.scss b/app/assets/stylesheets/common/form-kit/_control-textarea.scss
index 0432df5a36e13..450500278b468 100644
--- a/app/assets/stylesheets/common/form-kit/_control-textarea.scss
+++ b/app/assets/stylesheets/common/form-kit/_control-textarea.scss
@@ -1,3 +1,5 @@
+@use "lib/viewport";
+
 .form-kit__control-textarea {
   // prevents firefox/chrome to add spacing under textarea
   display: block;
@@ -8,4 +10,12 @@
     min-width: auto !important;
     padding: 0.5em !important;
   }
+
+  @include viewport.until(sm) {
+    height: 100px;
+  }
+
+  &.--no-resize {
+    resize: none;
+  }
 }
diff --git a/app/assets/stylesheets/common/form-kit/_form-kit.scss b/app/assets/stylesheets/common/form-kit/_form-kit.scss
index ce91b8d087e95..993c1dc843826 100644
--- a/app/assets/stylesheets/common/form-kit/_form-kit.scss
+++ b/app/assets/stylesheets/common/form-kit/_form-kit.scss
@@ -1,4 +1,4 @@
-.form-kit {
+.form-kit:not(.--no-layout) {
   display: flex;
   flex-direction: column;
   gap: 1.5em;
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 54999375c920b..d4376dec8a4ca 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -37,7 +37,7 @@ html {
   font-size: var(--base-font-size);
   line-height: var(--line-height-large);
   background-color: var(--secondary);
-  overflow-y: scroll;
+  scrollbar-gutter: stable;
   direction: ltr;
 
   &.text-size-smallest {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index bbad73483db32..bc88964844348 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -745,6 +745,7 @@ en:
     deleting: "Deleting…"
 
     save: "Save Changes"
+    short_save: "Save"
     saving: "Saving…"
     saved: "Saved!"
 
diff --git a/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs b/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs
index e4e8ea70ae400..c4b662c76efd4 100644
--- a/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs
@@ -3,6 +3,7 @@ import { on } from "@ember/modifier";
 import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 import { modifier as modifierFn } from "ember-modifier";
+import concatClass from "discourse/helpers/concat-class";
 import { escapeExpression } from "discourse/lib/utilities";
 
 export default class FKControlTextarea extends Component {
@@ -55,7 +56,10 @@ export default class FKControlTextarea extends Component {
 
   <template>
     <textarea
-      class="form-kit__control-textarea"
+      class={{concatClass
+        "form-kit__control-textarea"
+        (if @noResize "--no-resize")
+      }}
       style={{this.style}}
       disabled={{@field.disabled}}
       value={{@field.value}}
diff --git a/frontend/discourse/app/form-kit/components/fk/form.gjs b/frontend/discourse/app/form-kit/components/fk/form.gjs
index 855afa8146c7d..8ba9283eae520 100644
--- a/frontend/discourse/app/form-kit/components/fk/form.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/form.gjs
@@ -24,6 +24,7 @@ import FKSection from "discourse/form-kit/components/fk/section";
 import FKSubmit from "discourse/form-kit/components/fk/submit";
 import { VALIDATION_TYPES } from "discourse/form-kit/lib/constants";
 import FKFormData from "discourse/form-kit/lib/fk-form-data";
+import concatClass from "discourse/helpers/concat-class";
 import { headerOffset } from "discourse/lib/offset-calculator";
 import { i18n } from "discourse-i18n";
 
@@ -308,7 +309,7 @@ class FKForm extends Component {
   <template>
     <form
       novalidate
-      class="form-kit"
+      class={{concatClass "form-kit" (if @noLayout "--no-layout")}}
       ...attributes
       {{on "submit" this.onSubmit}}
       {{on "reset" this.onReset}}
@@ -347,6 +348,7 @@ class FKForm extends Component {
           InputGroup=(this.componentFor FKInputGroup)
           CheckboxGroup=(this.componentFor FKCheckboxGroup)
           set=this.set
+          submit=this.onSubmit
           setProperties=this.setProperties
           addItemToCollection=this.addItemToCollection
         )
@@ -366,6 +368,7 @@ const Form = <template>
       @onRegisterApi={{@onRegisterApi}}
       @onReset={{@onReset}}
       @onDirtyCheck={{@onDirtyCheck}}
+      @noLayout={{@noLayout}}
       ...attributes
       as |components draftData|
     >
diff --git a/frontend/discourse/app/lib/utilities.js b/frontend/discourse/app/lib/utilities.js
index 793c42f4966e5..49787f1ac7f3b 100644
--- a/frontend/discourse/app/lib/utilities.js
+++ b/frontend/discourse/app/lib/utilities.js
@@ -426,6 +426,21 @@ export function prefersReducedMotion() {
   return window.matchMedia("(prefers-reduced-motion: reduce)").matches;
 }
 
+export function isKeyboardVisible() {
+  const visualHeight = window.visualViewport?.height ?? window.innerHeight;
+  return window.innerHeight - 200 > visualHeight;
+}
+
+export function getScrollBehavior() {
+  if (prefersReducedMotion()) {
+    return "instant";
+  }
+  if (capabilities.isAndroid) {
+    return "instant";
+  }
+  return "smooth";
+}
+
 export function postRNWebviewMessage(prop, value) {
   if (window.ReactNativeWebView !== undefined) {
     window.ReactNativeWebView.postMessage(JSON.stringify({ [prop]: value }));
diff --git a/frontend/discourse/app/services/capabilities.js b/frontend/discourse/app/services/capabilities.js
index 7e2cdc9f256b1..62596db51a3f7 100644
--- a/frontend/discourse/app/services/capabilities.js
+++ b/frontend/discourse/app/services/capabilities.js
@@ -18,6 +18,7 @@ class Capabilities {
   isWinphone = ua.includes("Windows Phone");
   isIpadOS = ua.includes("Mac OS") && !/iPhone|iPod/.test(ua) && this.touch;
   isIOS = (/iPhone|iPod/.test(ua) || this.isIpadOS) && !window.MSStream;
+  isAppleMobile = this.isIOS || this.isIpadOS;
   isApple =
     APPLE_NAVIGATOR_PLATFORMS.test(navigator.platform) ||
     (navigator.userAgentData &&
@@ -36,6 +37,20 @@ class Capabilities {
         window.safari?.pushNotification?.toString() ===
           "[object SafariRemoteNotification]";
 
+  isChromium =
+    navigator.userAgentData?.brands?.some((b) => b.brand === "Chromium") ||
+    ua.includes("Chrome");
+
+  isWebKit = !this.isChromium && /Safari|iPhone/.test(ua);
+
+  browserEngine = this.isChromium
+    ? "chromium"
+    : this.isFirefox
+      ? "gecko"
+      : this.isWebKit
+        ? "webkit"
+        : "unknown";
+
   hasContactPicker = "contacts" in navigator && "ContactsManager" in window;
 
   canVibrate = "vibrate" in navigator;
@@ -133,6 +148,50 @@ class Capabilities {
       navigator.serviceWorker.controller.state === "activated"
     );
   }
+
+  get detectedPlatform() {
+    if (this.isIOS) {
+      return "ios";
+    }
+    if (this.isIpadOS) {
+      return "ipados";
+    }
+    if (this.isAndroid) {
+      return "android";
+    }
+    if (ua.includes("Macintosh")) {
+      return "macos";
+    }
+    return "unknown";
+  }
+
+  get isAndroidChromiumBrowser() {
+    return (
+      this.isAndroid &&
+      this.isChromium &&
+      !window.matchMedia(
+        "(display-mode: standalone), (display-mode: minimal-ui), (display-mode: fullscreen)"
+      ).matches
+    );
+  }
+
+  get isStandaloneWithBlackTranslucent() {
+    if (!window.navigator.standalone) {
+      return false;
+    }
+    const viewport = document.querySelector("meta[name='viewport']");
+    const webAppCapable = document.querySelector(
+      "meta[name='apple-mobile-web-app-capable']"
+    );
+    const statusBarStyle = document.querySelector(
+      "meta[name='apple-mobile-web-app-status-bar-style']"
+    );
+    return (
+      viewport?.content?.includes("viewport-fit=cover") &&
+      webAppCapable?.content === "yes" &&
+      statusBarStyle?.content === "black-translucent"
+    );
+  }
 }
 
 export const capabilities = new Capabilities();
diff --git a/frontend/discourse/float-kit/components/d-bottom-sheet.gjs b/frontend/discourse/float-kit/components/d-bottom-sheet.gjs
new file mode 100644
index 0000000000000..ee67e1566dfc7
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-bottom-sheet.gjs
@@ -0,0 +1,265 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { fn, hash } from "@ember/helper";
+import { action } from "@ember/object";
+import { guidFor } from "@ember/object/internals";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import DSheet from "discourse/float-kit/components/d-sheet";
+import concatClass from "discourse/helpers/concat-class";
+
+/** @type {string[]} Default detent stops for the bottom sheet view. */
+const DETENTS = ["66vh"];
+
+/**
+ * Scrollable area within a bottom sheet that adapts scroll behavior based on detent state.
+ *
+ * @component BottomSheetScrollArea
+ * @param {boolean} reachedLastDetent - Whether the sheet has expanded to its last detent position.
+ */
+const BottomSheetScrollArea = <template>
+  <DSheet.Scroll.Root as |controller|>
+    <DSheet.Scroll.View
+      class="bottom-sheet__scroll-view"
+      @scrollGesture={{if @reachedLastDetent "auto" false}}
+      @scrollGestureTrap={{hash yEnd=true}}
+      @safeArea="layout-viewport"
+      @onScrollStart={{hash dismissKeyboard=true}}
+      @controller={{controller}}
+    >
+      <DSheet.Scroll.Content
+        class="bottom-sheet__scroll-content"
+        @controller={{controller}}
+      >
+        {{yield}}
+      </DSheet.Scroll.Content>
+    </DSheet.Scroll.View>
+  </DSheet.Scroll.Root>
+</template>;
+
+/**
+ * View wrapper that manages expandable detent behavior and travel state for the bottom sheet.
+ *
+ * @component ExpandableView
+ * @param {Object} sheet - The DSheet instance controlling the sheet.
+ * @param {boolean} reachedLastDetent - Whether the sheet has expanded to its last detent position.
+ * @param {(value: boolean) => void} setReachedLastDetent - Callback to update the last detent state.
+ */
+class ExpandableView extends Component {
+  /** @type {HTMLElement | undefined} Reference to the view DOM element. */
+  view;
+
+  /**
+   * Resets the last detent state when travel moves outside the sheet.
+   *
+   * @param {string} status - The travel status identifier.
+   */
+  @action
+  handleTravelStatusChange(status) {
+    if (status === "idleOutside") {
+      this.args.setReachedLastDetent(false);
+    }
+  }
+
+  /**
+   * Sets the last detent state when travel range reaches the final detent.
+   *
+   * @param {{ start: number }} range - The travel range with start position index.
+   */
+  @action
+  handleTravelRangeChange(range) {
+    if (range.start === 2 && !this.args.reachedLastDetent) {
+      this.args.setReachedLastDetent(true);
+    }
+  }
+
+  /**
+   * Focuses the view element when travel progress is below threshold and focus is outside.
+   *
+   * @param {{ progress: number }} event - The travel event with progress value.
+   */
+  @action
+  handleTravel(event) {
+    if (event.progress < 0.999 && this.view) {
+      if (!this.view.contains(document.activeElement)) {
+        this.view.focus();
+      }
+    }
+  }
+
+  /**
+   * Stores a reference to the view DOM element on insert.
+   *
+   * @param {HTMLElement} element - The view DOM element.
+   */
+  @action
+  registerView(element) {
+    this.view = element;
+  }
+
+  <template>
+    <DSheet.View
+      class="bottom-sheet__view"
+      @sheet={{@sheet}}
+      @detents={{unless @reachedLastDetent DETENTS}}
+      @swipeOvershoot={{false}}
+      @onTravelStatusChange={{this.handleTravelStatusChange}}
+      @onTravelRangeChange={{this.handleTravelRangeChange}}
+      @onTravel={{this.handleTravel}}
+      {{didInsert this.registerView}}
+    >
+      {{yield}}
+    </DSheet.View>
+  </template>
+}
+
+/**
+ * Inner content layout for the bottom sheet including backdrop, handle, and bleeding background.
+ *
+ * @component BottomSheetInnerContent
+ * @param {Object} sheet - The DSheet instance controlling the sheet.
+ * @param {boolean} expandable - Whether the sheet supports expanding to additional detents.
+ * @param {string} handleAction - The handle action type ("dismiss" or "step").
+ */
+const BottomSheetInnerContent = <template>
+  <DSheet.Backdrop @sheet={{@sheet}} />
+  <DSheet.Content
+    class={{concatClass
+      "bottom-sheet__content"
+      (if @expandable "--expandable")
+    }}
+    @sheet={{@sheet}}
+  >
+    <DSheet.BleedingBackground
+      @sheet={{@sheet}}
+      class="bottom-sheet__bleeding-background"
+    />
+    <DSheet.Handle
+      class="bottom-sheet__handle"
+      @sheet={{@sheet}}
+      @action={{@handleAction}}
+    />
+    {{yield}}
+  </DSheet.Content>
+</template>;
+
+/**
+ * Content wrapper that renders either an expandable or fixed bottom sheet layout.
+ *
+ * @component BottomSheetContent
+ * @param {Object} sheet - The DSheet instance controlling the sheet.
+ * @param {boolean} expandable - Whether the sheet supports expanding to additional detents.
+ * @param {boolean} reachedLastDetent - Whether the sheet has expanded to its last detent position.
+ * @param {(value: boolean) => void} setReachedLastDetent - Callback to update the last detent state.
+ */
+const BottomSheetContent = <template>
+  <DSheet.Portal @sheet={{@sheet}}>
+    {{#if @expandable}}
+      <ExpandableView
+        @sheet={{@sheet}}
+        @reachedLastDetent={{@reachedLastDetent}}
+        @setReachedLastDetent={{@setReachedLastDetent}}
+      >
+        <BottomSheetInnerContent
+          @sheet={{@sheet}}
+          @expandable={{true}}
+          @handleAction={{if @reachedLastDetent "dismiss" "step"}}
+        >
+          {{yield
+            (hash
+              ScrollArea=(component
+                BottomSheetScrollArea reachedLastDetent=@reachedLastDetent
+              )
+              Trigger=(component DSheet.Trigger sheet=@sheet)
+              expand=(fn @sheet.stepToDetent 2)
+              isExpanded=@reachedLastDetent
+              dismiss=@sheet.close
+            )
+          }}
+        </BottomSheetInnerContent>
+      </ExpandableView>
+    {{else}}
+      <DSheet.View class="bottom-sheet__view" @sheet={{@sheet}}>
+        <BottomSheetInnerContent
+          @sheet={{@sheet}}
+          @expandable={{false}}
+          @handleAction="dismiss"
+        >
+          {{yield
+            (hash
+              ScrollArea=(component
+                BottomSheetScrollArea reachedLastDetent=false
+              )
+              Trigger=(component DSheet.Trigger sheet=@sheet)
+              dismiss=@sheet.close
+            )
+          }}
+        </BottomSheetInnerContent>
+      </DSheet.View>
+    {{/if}}
+  </DSheet.Portal>
+</template>;
+
+/**
+ * A mobile-friendly bottom sheet component that slides up from the bottom of the screen.
+ *
+ * @component DBottomSheet
+ * @param {string} [componentId] - Optional unique identifier for the sheet instance.
+ * @param {boolean} [defaultPresented] - Whether the sheet is presented by default.
+ * @param {boolean} [presented] - Controlled presentation state.
+ * @param {(presented: boolean) => void} [onPresentedChange] - Callback when presentation state changes.
+ * @param {() => void} [onClosed] - Callback when the sheet is closed.
+ * @param {boolean} [expandable] - Whether the sheet supports expanding to additional detents.
+ */
+export default class DBottomSheet extends Component {
+  /** @type {boolean} Whether the sheet has expanded to its last detent position. */
+  @tracked reachedLastDetent = false;
+
+  /**
+   * Unique identifier for the sheet, falling back to a generated GUID.
+   *
+   * @returns {string}
+   */
+  get componentId() {
+    return this.args.componentId ?? guidFor(this);
+  }
+
+  /**
+   * Updates the tracked state for whether the last detent has been reached.
+   *
+   * @param {boolean} value - The new reached last detent state.
+   */
+  @action
+  setReachedLastDetent(value) {
+    this.reachedLastDetent = value;
+  }
+
+  <template>
+    <DSheet.Root
+      class="bottom-sheet"
+      @componentId={{this.componentId}}
+      @defaultPresented={{@defaultPresented}}
+      @presented={{@presented}}
+      @onPresentedChange={{@onPresentedChange}}
+      @onClosed={{@onClosed}}
+      ...attributes
+      as |sheet|
+    >
+      {{yield
+        (hash
+          Trigger=(component
+            DSheet.Trigger forComponent=this.componentId sheet=sheet
+          )
+          Content=(component
+            BottomSheetContent
+            sheet=sheet
+            expandable=@expandable
+            reachedLastDetent=this.reachedLastDetent
+            setReachedLastDetent=this.setReachedLastDetent
+          )
+          present=sheet.open
+          dismiss=sheet.close
+        )
+      }}
+    </DSheet.Root>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-card.gjs b/frontend/discourse/float-kit/components/d-card.gjs
new file mode 100644
index 0000000000000..55bb87052f70a
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-card.gjs
@@ -0,0 +1,102 @@
+import Component from "@glimmer/component";
+import { array, hash } from "@ember/helper";
+import { action } from "@ember/object";
+import { guidFor } from "@ember/object/internals";
+import DSheet from "./d-sheet";
+
+/**
+ * Internal content component for DCard, renders the portal, view, backdrop, and content.
+ *
+ * @component DCardContent
+ * @param {Object} sheet - The sheet controller instance
+ */
+class DCardContent extends Component {
+  /**
+   * Computes backdrop opacity from travel progress, capped at 0.4.
+   *
+   * @param {number} progress - Travel progress value between 0 and 1
+   * @returns {number} Opacity value capped at 0.4
+   */
+  @action
+  backdropTravelAnimation(progress) {
+    return Math.min(0.4 * progress, 0.4);
+  }
+
+  <template>
+    <DSheet.Portal @sheet={{@sheet}}>
+      <DSheet.View
+        class="d-card"
+        @sheet={{@sheet}}
+        @contentPlacement="center"
+        @tracks="top"
+        @enteringAnimationSettings={{hash
+          easing="spring"
+          stiffness=260
+          damping=20
+          mass=1
+        }}
+      >
+        <DSheet.Backdrop
+          @travelAnimation={{this.backdropTravelAnimation}}
+          @themeColorDimming="auto"
+          @sheet={{@sheet}}
+        />
+        <DSheet.Content
+          @travelAnimation={{hash scale=(array 0.8 1)}}
+          class="d-card-content"
+          @sheet={{@sheet}}
+        >
+          {{yield
+            (hash
+              Trigger=(component DSheet.Trigger sheet=@sheet)
+              dismiss=@sheet.close
+            )
+          }}
+        </DSheet.Content>
+      </DSheet.View>
+    </DSheet.Portal>
+  </template>
+}
+
+/**
+ * Card component that wraps a sheet with centered content and a scaling entrance animation.
+ *
+ * @component DCard
+ * @param {string} [componentId] - Optional ID for forComponent lookups, defaults to guidFor(this)
+ * @param {boolean} [defaultPresented] - Whether the card is initially presented (uncontrolled mode)
+ * @param {boolean} [presented] - Controls the presented state (controlled mode)
+ * @param {Function} [onPresentedChange] - Callback when presented state changes (controlled mode)
+ * @param {Function} [onClosed] - Callback when the card has fully closed
+ */
+export default class DCard extends Component {
+  /**
+   * Resolved component ID, falling back to a generated GUID.
+   *
+   * @returns {string} The component ID
+   */
+  get componentId() {
+    return this.args.componentId ?? guidFor(this);
+  }
+
+  <template>
+    <DSheet.Root
+      @componentId={{this.componentId}}
+      @defaultPresented={{@defaultPresented}}
+      @presented={{@presented}}
+      @onPresentedChange={{@onPresentedChange}}
+      @onClosed={{@onClosed}}
+      as |sheet|
+    >
+      {{yield
+        (hash
+          Trigger=(component
+            DSheet.Trigger forComponent=this.componentId sheet=sheet
+          )
+          Content=(component DCardContent sheet=sheet)
+          present=sheet.open
+          dismiss=sheet.close
+        )
+      }}
+    </DSheet.Root>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-default-toast.gjs b/frontend/discourse/float-kit/components/d-default-toast.gjs
index 259dd35395e33..395e56b1eaf6e 100644
--- a/frontend/discourse/float-kit/components/d-default-toast.gjs
+++ b/frontend/discourse/float-kit/components/d-default-toast.gjs
@@ -1,68 +1,153 @@
-import { concat, fn, hash } from "@ember/helper";
-import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import Component from "@glimmer/component";
+import { concat } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 import DButton from "discourse/components/d-button";
 import concatClass from "discourse/helpers/concat-class";
 import icon from "discourse/helpers/d-icon";
 import { or } from "discourse/truth-helpers";
+import { i18n } from "discourse-i18n";
 
-const DDefaultToast = <template>
-  <div
-    class={{concatClass
-      "fk-d-default-toast"
-      (concat "-" (or @data.theme "default"))
-    }}
-    ...attributes
-  >
-    {{#if @showProgressBar}}
-      <div
-        class="fk-d-default-toast__progress-bar"
-        {{didInsert @onRegisterProgressBar}}
-      ></div>
-    {{/if}}
-    {{#if @data.icon}}
-      <div class="fk-d-default-toast__icon-container">
-        {{icon @data.icon}}
-      </div>
-    {{/if}}
-    <div class="fk-d-default-toast__main-container">
-      <div class="fk-d-default-toast__texts">
-        {{#if @data.title}}
+/**
+ * The default content component for a toast.
+ * Displays an icon, title, message, and action/cancel buttons.
+ *
+ * @component d-default-toast
+ * @param {DToastInstance} toast - The toast instance
+ * @param {Function} close - Callback to close the toast
+ * @param {boolean} isFront - Whether this toast is at the front
+ * @param {SafeString} progressBarStyle - The style to apply to the progress bar
+ * @param {Function} onProgressComplete - Callback when the progress animation completes
+ */
+export default class DDefaultToast extends Component {
+  /**
+   * Returns the primary action for the toast, handling both new and legacy formats.
+   *
+   * @returns {Object|null}
+   */
+  get primaryAction() {
+    const data = this.args.toast.options.data;
+
+    if (!data) {
+      return null;
+    }
+
+    if (data.action) {
+      return data.action;
+    }
+
+    const firstLegacyAction = data.actions?.[0];
+    if (firstLegacyAction) {
+      return {
+        label: firstLegacyAction.label,
+        onClick: () =>
+          firstLegacyAction.action({
+            data,
+            close: this.args.close,
+          }),
+      };
+    }
+
+    return null;
+  }
+
+  @action
+  handlePrimaryAction() {
+    this.args.close();
+    this.primaryAction?.onClick?.();
+  }
+
+  @action
+  handleCancelAction() {
+    this.args.close();
+    this.args.toast.options.data.cancel?.onClick?.();
+  }
+
+  <template>
+    <div
+      class={{concatClass
+        "fk-d-default-toast"
+        (if
+          @toast.options.data.theme
+          (concat "fk-d-default-toast--" @toast.options.data.theme)
+        )
+        (if @toast.options.showProgressBar "fk-d-default-toast--has-progress")
+      }}
+      ...attributes
+    >
+      {{#if @toast.options.autoClose}}
+        {{#if @toast.options.showProgressBar}}
+          <div class="fk-d-default-toast__progress-wrapper">
+            <div
+              class="fk-d-default-toast__progress-bar"
+              style={{@progressBarStyle}}
+              {{on "animationend" @onProgressComplete}}
+            ></div>
+          </div>
+        {{else}}
+          <div
+            class="fk-d-default-toast__progress-bar --hidden"
+            style={{@progressBarStyle}}
+            {{on "animationend" @onProgressComplete}}
+          ></div>
+        {{/if}}
+      {{/if}}
+
+      {{#if @isFront}}
+        <button
+          type="button"
+          {{on "click" @close}}
+          class="fk-d-default-toast__close-btn"
+          aria-label={{i18n "close"}}
+        >
+          {{icon "xmark"}}
+        </button>
+      {{/if}}
+
+      {{#if @toast.options.data.icon}}
+        <div class="fk-d-default-toast__icon">
+          {{icon @toast.options.data.icon}}
+        </div>
+      {{/if}}
+
+      <div class="fk-d-default-toast__content">
+        {{#if @toast.options.data.title}}
           <div class="fk-d-default-toast__title">
-            {{@data.title}}
+            {{@toast.options.data.title}}
           </div>
         {{/if}}
-        {{#if @data.message}}
-          <div class="fk-d-default-toast__message">
-            {{#if @data.isHtmlMessage}}
-              {{htmlSafe @data.message}}
+
+        {{#if (or @toast.options.data.message @toast.options.data.description)}}
+          <div class="fk-d-default-toast__description">
+            {{#if @toast.options.data.isHtmlMessage}}
+              {{htmlSafe
+                (or @toast.options.data.message @toast.options.data.description)
+              }}
             {{else}}
-              {{@data.message}}
+              {{or @toast.options.data.message @toast.options.data.description}}
             {{/if}}
           </div>
         {{/if}}
       </div>
 
-      {{#if @data.actions}}
-        <div class="fk-d-default-toast__actions">
-          {{#each @data.actions as |toastAction|}}
-            {{#if toastAction.action}}
-              <DButton
-                @icon={{toastAction.icon}}
-                @translatedLabel={{toastAction.label}}
-                @action={{fn toastAction.action (hash data=@data close=@close)}}
-                class={{toastAction.class}}
-                tabindex="0"
-              />
-            {{/if}}
-          {{/each}}
-        </div>
+      {{#if this.primaryAction}}
+        <DButton
+          class="fk-d-default-toast__action-btn btn-default btn-primary btn-small"
+          {{on "click" this.handlePrimaryAction}}
+        >
+          {{this.primaryAction.label}}
+        </DButton>
       {{/if}}
-    </div>
-    <div class="fk-d-default-toast__close-container">
-      <DButton class="btn-transparent" @icon="xmark" @action={{@close}} />
-    </div>
-  </div>
-</template>;
 
-export default DDefaultToast;
+      {{#if @toast.options.data.cancel}}
+        <DButton
+          class="fk-d-default-toast__cancel-btn btn-default btn-small"
+          {{on "click" this.handleCancelAction}}
+        >
+          {{or @toast.options.data.cancel.label (i18n "cancel")}}
+        </DButton>
+      {{/if}}
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll.js b/frontend/discourse/float-kit/components/d-scroll.js
new file mode 100644
index 0000000000000..4276a18ba89a5
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll.js
@@ -0,0 +1,63 @@
+import Content from "./d-scroll/content";
+import Root from "./d-scroll/root";
+import Trigger from "./d-scroll/trigger";
+import View from "./d-scroll/view";
+
+/**
+ * DScroll - Scroll component
+ *
+ * A primitive component for building advanced scrolling experiences.
+ * Provides extra features compared to normal scroll containers.
+ *
+ * Usage:
+ * ```hbs
+ * <DScroll.Root as |scroll|>
+ *   <scroll.View @axis="y" @scrollGestureTrap={{hash yEnd=true}}>
+ *     <scroll.Content>
+ *       ...your content...
+ *     </scroll.Content>
+ *   </scroll.View>
+ *
+ *   <DScroll.Trigger
+ *     @scroll={{scroll}}
+ *     @action={{hash type="scroll-to" progress=0}}
+ *   >
+ *     Scroll to Top
+ *   </DScroll.Trigger>
+ * </DScroll.Root>
+ * ```
+ *
+ * Imperative API (via yielded scroll object):
+ * - scroll.scrollTo({ progress?, distance?, animationSettings? })
+ * - scroll.scrollBy({ progress?, distance?, animationSettings? })
+ * - scroll.getProgress() - Returns 0-1
+ * - scroll.getDistance() - Returns pixels traveled
+ * - scroll.getAvailableDistance() - Returns total scrollable distance
+ *
+ * View Component Props:
+ * - @axis - "x" or "y" (default: "y")
+ * - @scrollGestureTrap - Trap scroll gestures at boundaries
+ * - @scrollGestureOvershoot - Allow visual overscroll (default: true)
+ * - @scrollGesture - Enable scroll gestures (default: "auto")
+ * - @onScroll - Callback on scroll
+ * - @onScrollStart - Callback on scroll start
+ * - @onScrollEnd - Callback on scroll end
+ * - @nativeFocusScrollPrevention - Prevent native focus scroll (default: true)
+ * - @onFocusInside - Callback when descendant receives focus
+ * - @scrollAnimationSettings - Animation settings
+ * - @pageScroll - Whether this is a page scroll container
+ * - @safeArea - Safe area: "none", "layout-viewport", "visual-viewport"
+ * - @scrollAnchoring - Enable scroll anchoring (default: true)
+ * - @scrollSnapType - CSS scroll-snap-type value
+ * - @scrollPadding - CSS scroll-padding value
+ * - @scrollTimelineName - CSS scroll-timeline-name value
+ * - @nativeScrollbar - Show native scrollbar (default: true)
+ */
+const DScroll = {
+  Root,
+  View,
+  Content,
+  Trigger,
+};
+
+export default DScroll;
diff --git a/frontend/discourse/float-kit/components/d-scroll/content.gjs b/frontend/discourse/float-kit/components/d-scroll/content.gjs
new file mode 100644
index 0000000000000..c8e49c3acaacc
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/content.gjs
@@ -0,0 +1,20 @@
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import concatClass from "discourse/helpers/concat-class";
+
+const DScrollContent = <template>
+  <div
+    data-d-scroll={{concatClass
+      "content"
+      (if @controller.overflowX "overflow-x" "no-overflow-x")
+      (if @controller.overflowY "overflow-y" "no-overflow-y")
+      (if @controller.scrollTrapX "trap-x")
+      (if @controller.scrollTrapY "trap-y")
+    }}
+    {{didInsert @controller.registerContent}}
+    ...attributes
+  >
+    {{yield}}
+  </div>
+</template>;
+
+export default DScrollContent;
diff --git a/frontend/discourse/float-kit/components/d-scroll/controller.js b/frontend/discourse/float-kit/components/d-scroll/controller.js
new file mode 100644
index 0000000000000..bd80285bde170
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/controller.js
@@ -0,0 +1,371 @@
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { prefersReducedMotion } from "discourse/lib/utilities";
+
+/**
+ * Scroll Controller - manages scroll state and provides imperative methods for programmatic scrolling.
+ *
+ * @class ScrollController
+ */
+export default class ScrollController {
+  /** @type {HTMLElement|null} */
+  @tracked viewElement = null;
+
+  /** @type {HTMLElement|null} */
+  @tracked contentElement = null;
+
+  /** @type {number} */
+  @tracked startSpacerHeight = 0;
+
+  /** @type {number} */
+  @tracked endSpacerHeight = 0;
+
+  /** @type {boolean} - Hides caret during scroll to avoid visual glitches */
+  @tracked scrollOngoing = false;
+
+  /** @type {boolean} - Whether content overflows on x-axis */
+  @tracked overflowX = false;
+
+  /** @type {boolean} - Whether content overflows on y-axis */
+  @tracked overflowY = false;
+
+  /** @type {boolean} - Whether x-axis scroll trap is active */
+  @tracked scrollTrapX = false;
+
+  /** @type {boolean} - Whether y-axis scroll trap is active */
+  @tracked scrollTrapY = false;
+
+  /** @type {HTMLElement|null} */
+  startSpacerElement = null;
+
+  /** @type {HTMLElement|null} */
+  endSpacerElement = null;
+
+  /** @type {string} */
+  axis = "y";
+
+  /** @type {string} */
+  safeArea = "visual-viewport";
+
+  /** @type {Object} */
+  scrollAnimationSettings = { skip: "auto" };
+
+  /** @type {boolean} */
+  pageScroll = false;
+
+  /** @type {Function|null} */
+  onScroll = null;
+
+  /** @type {Function|null} */
+  onScrollStart = null;
+
+  /** @type {Function|null} */
+  onScrollEnd = null;
+
+  /** @type {boolean} */
+  scrollingActive = false;
+
+  /** @type {number|null} */
+  scrollStartTime = null;
+
+  /** @type {number|null} */
+  scrollEndTimeout = null;
+
+  /** @type {ResizeObserver|null} */
+  resizeObserver = null;
+
+  /**
+   * @param {Object} options - Configuration options
+   */
+  constructor(options = {}) {
+    if (options.axis) {
+      this.axis = options.axis;
+    }
+    if (options.scrollAnimationSettings) {
+      this.scrollAnimationSettings = options.scrollAnimationSettings;
+    }
+    if (options.pageScroll !== undefined) {
+      this.pageScroll = options.pageScroll;
+    }
+  }
+
+  /**
+   * Whether to use window for scroll operations.
+   *
+   * @returns {boolean}
+   */
+  get usesWindowScroll() {
+    return this.pageScroll;
+  }
+
+  /**
+   * Get the scroll target element (window or viewElement).
+   *
+   * @returns {Window|HTMLElement|null}
+   */
+  get scrollTarget() {
+    return this.usesWindowScroll ? window : this.viewElement;
+  }
+
+  /**
+   * Register the view element.
+   *
+   * @param {HTMLElement} element
+   */
+  @action
+  registerView(element) {
+    this.viewElement = element;
+  }
+
+  /**
+   * Register the content element.
+   *
+   * @param {HTMLElement} element
+   */
+  @action
+  registerContent(element) {
+    this.contentElement = element;
+  }
+
+  /**
+   * Register the start spacer element.
+   *
+   * @param {HTMLElement|null} element
+   */
+  @action
+  registerStartSpacer(element) {
+    this.startSpacerElement = element;
+  }
+
+  /**
+   * Register the end spacer element.
+   *
+   * @param {HTMLElement|null} element
+   */
+  @action
+  registerEndSpacer(element) {
+    this.endSpacerElement = element;
+  }
+
+  /**
+   * Set up ResizeObserver to track overflow state.
+   */
+  @action
+  setupOverflowObserver() {
+    if (this.resizeObserver || !this.viewElement) {
+      return;
+    }
+
+    this.resizeObserver = new ResizeObserver(() => {
+      this.updateOverflowState();
+    });
+
+    this.resizeObserver.observe(this.viewElement);
+    if (this.contentElement) {
+      this.resizeObserver.observe(this.contentElement);
+    }
+
+    this.updateOverflowState();
+  }
+
+  /**
+   * Update overflow state based on current scroll dimensions.
+   */
+  @action
+  updateOverflowState() {
+    const el = this.viewElement;
+    if (!el) {
+      return;
+    }
+
+    if (this.axis === "y") {
+      this.overflowY = el.scrollHeight > el.clientHeight;
+    } else {
+      this.overflowX = el.scrollWidth > el.clientWidth;
+    }
+  }
+
+  /**
+   * Returns the scroll progress from 0 to 1.
+   *
+   * @returns {number}
+   */
+  @action
+  getProgress() {
+    return this.getDistance() / this.getAvailableDistance();
+  }
+
+  /**
+   * Returns the distance in pixels traveled by Content from its start position.
+   *
+   * @returns {number|undefined}
+   */
+  @action
+  getDistance() {
+    if (this.axis === "x") {
+      return this.usesWindowScroll
+        ? window.scrollX
+        : this.viewElement?.scrollLeft;
+    }
+    return this.usesWindowScroll ? window.scrollY : this.viewElement?.scrollTop;
+  }
+
+  /**
+   * Returns the total scrollable distance in pixels.
+   *
+   * @returns {number|undefined}
+   */
+  @action
+  getAvailableDistance() {
+    if (this.axis === "x") {
+      return this.usesWindowScroll
+        ? document.body.scrollWidth - window.innerWidth
+        : this.viewElement?.scrollWidth - this.viewElement?.offsetWidth;
+    }
+    return this.usesWindowScroll
+      ? document.body.scrollHeight - window.innerHeight
+      : this.viewElement?.scrollHeight - this.viewElement?.offsetHeight;
+  }
+
+  /**
+   * Make Content travel to the defined progress or distance.
+   *
+   * @param {Object} options - Scroll options
+   * @param {number} [options.progress] - Target progress (0-1)
+   * @param {number} [options.distance] - Target distance in pixels
+   * @param {Object} [options.animationSettings] - Animation settings { skip: "default" | "auto" | boolean }
+   */
+  @action
+  scrollTo(options = {}) {
+    const target = this.scrollTarget;
+    if (!target) {
+      return;
+    }
+
+    const { progress, distance, animationSettings } = options;
+
+    const targetDistance =
+      distance ??
+      (progress !== undefined ? progress * this.getAvailableDistance() : NaN);
+
+    if (Number.isNaN(targetDistance)) {
+      return;
+    }
+
+    const behavior = this.getScrollBehavior(animationSettings);
+
+    target.scrollTo({
+      [this.axis === "x" ? "left" : "top"]: targetDistance,
+      behavior,
+    });
+  }
+
+  /**
+   * Make Content travel by the defined progress or distance.
+   *
+   * @param {Object} options - Scroll options
+   * @param {number} [options.progress] - Progress delta to scroll by
+   * @param {number} [options.distance] - Distance delta in pixels to scroll by
+   * @param {Object} [options.animationSettings] - Animation settings { skip: "default" | "auto" | boolean }
+   */
+  @action
+  scrollBy(options = {}) {
+    const target = this.scrollTarget;
+    if (!target) {
+      return;
+    }
+
+    const { progress, distance, animationSettings } = options;
+
+    const deltaDistance =
+      distance ??
+      (progress !== undefined ? progress * this.getAvailableDistance() : NaN);
+
+    if (Number.isNaN(deltaDistance)) {
+      return;
+    }
+
+    const behavior = this.getScrollBehavior(animationSettings);
+
+    target.scrollBy({
+      [this.axis === "x" ? "left" : "top"]: deltaDistance,
+      behavior,
+    });
+  }
+
+  /**
+   * Get scroll behavior based on animation settings.
+   *
+   * @param {Object} animationSettings - { skip: "default" | "auto" | boolean }
+   * @returns {string} Scroll behavior: "instant", "smooth", or "auto"
+   */
+  getScrollBehavior(animationSettings) {
+    const skip = animationSettings?.skip ?? "default";
+
+    if (skip === true) {
+      return "instant";
+    }
+    if (skip === false) {
+      return "smooth";
+    }
+    if (skip === "default") {
+      return "auto";
+    }
+    return prefersReducedMotion() ? "instant" : "smooth";
+  }
+
+  /**
+   * Get current scroll state for event callbacks.
+   *
+   * @returns {{ progress: number, distance: number|undefined, availableDistance: number|undefined }}
+   */
+  @action
+  getScrollState() {
+    return {
+      progress: this.getProgress(),
+      distance: this.getDistance(),
+      availableDistance: this.getAvailableDistance(),
+    };
+  }
+
+  /**
+   * Clean up all resources.
+   */
+  @action
+  cleanup() {
+    if (this.scrollEndTimeout) {
+      clearTimeout(this.scrollEndTimeout);
+      this.scrollEndTimeout = null;
+    }
+    if (this.resizeObserver) {
+      this.resizeObserver.disconnect();
+      this.resizeObserver = null;
+    }
+    this.viewElement = null;
+    this.contentElement = null;
+    this.startSpacerElement = null;
+    this.endSpacerElement = null;
+    this.onScroll = null;
+    this.onScrollStart = null;
+    this.onScrollEnd = null;
+  }
+
+  /**
+   * Update spacer heights for safeArea feature.
+   *
+   * @param {number} startHeight - Height for start spacer
+   * @param {number} endHeight - Height for end spacer
+   */
+  @action
+  updateSpacerHeights(startHeight, endHeight) {
+    this.startSpacerHeight = startHeight;
+    this.endSpacerHeight = endHeight;
+
+    if (this.startSpacerElement) {
+      this.startSpacerElement.style.setProperty("height", startHeight + "px");
+    }
+    if (this.endSpacerElement) {
+      this.endSpacerElement.style.setProperty("height", endHeight + "px");
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll/focus-scroll-utils.js b/frontend/discourse/float-kit/components/d-scroll/focus-scroll-utils.js
new file mode 100644
index 0000000000000..ac01a5974d92d
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/focus-scroll-utils.js
@@ -0,0 +1,83 @@
+/**
+ * Focus scroll prevention utilities.
+ */
+
+/**
+ * Check if element is a color input or select.
+ *
+ * @param {Element} element
+ * @returns {boolean}
+ */
+export function isColorOrSelect(element) {
+  if (!element) {
+    return false;
+  }
+  if (element instanceof HTMLInputElement && element.type === "color") {
+    return true;
+  }
+  if (element instanceof HTMLSelectElement) {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Check if element is a password-related input.
+ *
+ * @param {Element} element
+ * @returns {boolean}
+ */
+export function isPasswordRelatedInput(element) {
+  if (!(element instanceof HTMLInputElement)) {
+    return false;
+  }
+  if (element.type === "password") {
+    return true;
+  }
+  if (element.type === "text" && element.autocomplete === "username") {
+    return true;
+  }
+  const form = element.closest("form");
+  if (form?.querySelector('input[type="password"]')) {
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Check if element is near the bottom of the visual viewport.
+ *
+ * @param {Element} element
+ * @returns {boolean}
+ */
+export function isNearViewportBottom(element) {
+  const rect = element.getBoundingClientRect();
+  const visualHeight = window.visualViewport?.height ?? 0;
+  const distanceToBottom = visualHeight - rect.bottom;
+  return (
+    distanceToBottom > -rect.height / 2 && distanceToBottom < rect.height + 32
+  );
+}
+
+/**
+ * Check if element is inside any scroll container with prevention enabled.
+ *
+ * @param {Element} element
+ * @returns {boolean}
+ */
+export function isInsidePreventionContainer(element) {
+  const scrollContainer = element?.closest(
+    '[data-d-scroll~="scroll-container"]'
+  );
+  return scrollContainer?.matches('[data-d-scroll-focus-prevention="true"]');
+}
+
+/**
+ * Find the closest scroll container from an element.
+ *
+ * @param {Element} element
+ * @returns {Element|null}
+ */
+export function findClosestScrollContainer(element) {
+  return element?.closest('[data-d-scroll~="scroll-container"]');
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll/gesture-trap-handler.js b/frontend/discourse/float-kit/components/d-scroll/gesture-trap-handler.js
new file mode 100644
index 0000000000000..2de82eab07ec8
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/gesture-trap-handler.js
@@ -0,0 +1,293 @@
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { isKeyboardVisible } from "discourse/lib/utilities";
+
+/**
+ * GestureTrapHandler - Manages scroll gesture trap via IntersectionObserver for DScroll.View.
+ *
+ * Uses IntersectionObserver to detect when at scroll boundaries and controls
+ * overscroll-behavior based on position and configuration. Only needed when
+ * trap values differ between start and end.
+ *
+ * @class GestureTrapHandler
+ */
+export default class GestureTrapHandler {
+  /** @type {boolean} */
+  @tracked xTrap = false;
+
+  /** @type {boolean} */
+  @tracked yTrap = false;
+
+  /** @type {boolean} */
+  @tracked keyboardVisible = false;
+
+  /**
+   * Internal flag tracking if scroll is at start boundary.
+   * @type {boolean}
+   */
+  isAtStart = true;
+
+  /**
+   * Internal flag tracking if scroll is at end boundary.
+   * @type {boolean}
+   */
+  isAtEnd = true;
+
+  /** @type {HTMLElement|null} */
+  startSpyElement = null;
+
+  /** @type {HTMLElement|null} */
+  endSpyElement = null;
+
+  /** @type {IntersectionObserver|null} */
+  observer = null;
+
+  /**
+   * @param {DScrollView} view - The View component instance
+   */
+  constructor(view) {
+    this.view = view;
+  }
+
+  /**
+   * Get effective trap value (scrollGestureOvershoot false forces trap to true).
+   *
+   * @returns {boolean|Object}
+   */
+  get effectiveTrap() {
+    if (this.view.args.scrollGestureOvershoot === false) {
+      return true;
+    }
+    return this.view.args.scrollGestureTrap ?? false;
+  }
+
+  /**
+   * Whether we need the IntersectionObserver for dynamic trap state.
+   *
+   * @returns {boolean}
+   */
+  get needsObserver() {
+    const values = this.normalizedTrapValues;
+    return values.xStart !== values.xEnd || values.yStart !== values.yEnd;
+  }
+
+  /**
+   * Parse scrollGestureTrap config for specific edge.
+   *
+   * @param {string} edge - The edge to check (xStart, xEnd, yStart, yEnd)
+   * @param {string} axisKey - The axis key (x or y)
+   * @returns {boolean}
+   */
+  getTrapValue(edge, axisKey) {
+    const trap = this.effectiveTrap;
+
+    if (typeof trap === "boolean") {
+      return trap;
+    }
+
+    if (trap && typeof trap === "object") {
+      if (typeof trap[edge] === "boolean") {
+        return trap[edge];
+      }
+      if (typeof trap[axisKey] === "boolean") {
+        return trap[axisKey];
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Get normalized trap values with non-scroll axis normalization.
+   *
+   * @returns {{ xStart: boolean, xEnd: boolean, yStart: boolean, yEnd: boolean }}
+   */
+  get normalizedTrapValues() {
+    const xStart = this.getTrapValue("xStart", "x");
+    const xEnd = this.getTrapValue("xEnd", "x");
+    const yStart = this.getTrapValue("yStart", "y");
+    const yEnd = this.getTrapValue("yEnd", "y");
+
+    const axis = this.view.args.axis ?? "y";
+
+    if (axis === "y") {
+      const normalizedX = xStart !== xEnd ? true : xStart;
+      return { xStart: normalizedX, xEnd: normalizedX, yStart, yEnd };
+    } else {
+      const normalizedY = yStart !== yEnd ? true : yStart;
+      return { xStart, xEnd, yStart: normalizedY, yEnd: normalizedY };
+    }
+  }
+
+  /**
+   * Whether swipe trap is incapable (pageScroll enabled).
+   *
+   * @returns {boolean}
+   */
+  get swipeTrapIncapable() {
+    return this.view.args.pageScroll ?? false;
+  }
+
+  /**
+   * Get the current trap state for the scroll axis.
+   *
+   * @returns {boolean}
+   */
+  get currentTrap() {
+    const axis = this.view.args.axis ?? "y";
+    return axis === "y" ? this.yTrap : this.xTrap;
+  }
+
+  /**
+   * Handle IntersectionObserver entries.
+   *
+   * @param {string} axis - The scroll axis
+   * @param {Object} values - Normalized trap values
+   * @param {IntersectionObserverEntry[]} entries - Observer entries
+   */
+  handleIntersection(axis, values, entries) {
+    for (const entry of entries) {
+      if (entry.target === this.startSpyElement) {
+        if (entry.isIntersecting) {
+          this.isAtStart = true;
+          if (axis === "x") {
+            this.xTrap = values.xStart;
+          } else {
+            this.yTrap = values.yStart;
+          }
+        } else {
+          this.isAtStart = false;
+        }
+      } else if (entry.target === this.endSpyElement) {
+        if (entry.isIntersecting) {
+          this.isAtEnd = true;
+          if (axis === "x") {
+            this.xTrap = values.xEnd;
+          } else {
+            this.yTrap = values.yEnd;
+          }
+        } else {
+          this.isAtEnd = false;
+        }
+      }
+
+      if (this.isAtStart && this.isAtEnd) {
+        if (axis === "x") {
+          this.xTrap = false;
+        } else {
+          this.yTrap = false;
+        }
+      }
+    }
+  }
+
+  /**
+   * Handle visualViewport resize to track keyboard visibility.
+   */
+  @action
+  handleResize() {
+    this.keyboardVisible = isKeyboardVisible();
+  }
+
+  /**
+   * Set up IntersectionObserver and keyboard visibility tracking.
+   */
+  setup() {
+    const viewElement = this.view.viewElement;
+    const axis = this.view.args.axis ?? "y";
+    const values = this.normalizedTrapValues;
+
+    this.xTrap = values.xStart;
+    this.yTrap = values.yStart;
+
+    if (window.visualViewport) {
+      window.visualViewport.addEventListener("resize", this.handleResize);
+    }
+
+    if (!viewElement || !this.needsObserver) {
+      return;
+    }
+
+    this.observer = new IntersectionObserver(
+      this.handleIntersection.bind(this, axis, values),
+      {
+        root: viewElement,
+        rootMargin: "0px",
+        threshold: [1],
+      }
+    );
+
+    if (this.startSpyElement) {
+      this.observer.observe(this.startSpyElement);
+    }
+    if (this.endSpyElement) {
+      this.observer.observe(this.endSpyElement);
+    }
+  }
+
+  /**
+   * Register start spy element and observe it.
+   *
+   * @param {HTMLElement} element
+   */
+  registerStartSpy(element) {
+    this.startSpyElement = element;
+    if (this.observer && element) {
+      this.observer.observe(element);
+    }
+  }
+
+  /**
+   * Unregister start spy element.
+   *
+   * @param {HTMLElement} element
+   */
+  unregisterStartSpy(element) {
+    if (this.observer && element) {
+      this.observer.unobserve(element);
+    }
+    this.startSpyElement = null;
+  }
+
+  /**
+   * Register end spy element and observe it.
+   *
+   * @param {HTMLElement} element
+   */
+  registerEndSpy(element) {
+    this.endSpyElement = element;
+    if (this.observer && element) {
+      this.observer.observe(element);
+    }
+  }
+
+  /**
+   * Unregister end spy element.
+   *
+   * @param {HTMLElement} element
+   */
+  unregisterEndSpy(element) {
+    if (this.observer && element) {
+      this.observer.unobserve(element);
+    }
+    this.endSpyElement = null;
+  }
+
+  /**
+   * Clean up observer and event listeners.
+   */
+  cleanup() {
+    if (window.visualViewport) {
+      window.visualViewport.removeEventListener("resize", this.handleResize);
+    }
+
+    if (this.observer) {
+      this.observer.disconnect();
+      this.observer = null;
+    }
+
+    this.startSpyElement = null;
+    this.endSpyElement = null;
+    this.keyboardVisible = false;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll/is-text-input.js b/frontend/discourse/float-kit/components/d-scroll/is-text-input.js
new file mode 100644
index 0000000000000..445a21e0650ef
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/is-text-input.js
@@ -0,0 +1,48 @@
+/**
+ * Non-text input types that should not trigger scroll-into-view.
+ *
+ * @type {Set<string>}
+ */
+const NON_TEXT_INPUT_TYPES = new Set([
+  "checkbox",
+  "radio",
+  "range",
+  "color",
+  "file",
+  "image",
+  "button",
+  "submit",
+  "reset",
+  "hidden",
+]);
+
+/**
+ * Check if element is a text input that should trigger scroll-into-view.
+ * Includes HTMLInputElement (excluding non-text types), HTMLTextAreaElement,
+ * and any HTMLElement with contentEditable.
+ *
+ * @param {HTMLElement} element
+ * @returns {boolean}
+ */
+export default function isTextInput(element) {
+  if (!element) {
+    return false;
+  }
+
+  if (
+    element instanceof HTMLInputElement &&
+    !NON_TEXT_INPUT_TYPES.has(element.type)
+  ) {
+    return true;
+  }
+
+  if (element instanceof HTMLTextAreaElement) {
+    return true;
+  }
+
+  if (element instanceof HTMLElement && element.isContentEditable) {
+    return true;
+  }
+
+  return false;
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll/keyboard-focus-handler.js b/frontend/discourse/float-kit/components/d-scroll/keyboard-focus-handler.js
new file mode 100644
index 0000000000000..c563029b8fe02
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/keyboard-focus-handler.js
@@ -0,0 +1,263 @@
+import { isCloneElement } from "discourse/float-kit/lib/utils";
+import { getScrollBehavior, isKeyboardVisible } from "discourse/lib/utilities";
+import { capabilities } from "discourse/services/capabilities";
+import isTextInput from "./is-text-input";
+
+/**
+ * KeyboardFocusHandler - Manages keyboard focus scroll behavior for DScroll.View.
+ *
+ * Tracks keyboard open state, scrolls focused text inputs into view during
+ * keyboard animation, and uses visualViewport resize events to continuously
+ * adjust during keyboard animation.
+ *
+ * @class KeyboardFocusHandler
+ */
+export default class KeyboardFocusHandler {
+  /** @type {boolean} */
+  keyboardAlreadyOpen = false;
+
+  /** @type {boolean} */
+  scrollTriggeredByFocus = false;
+
+  /** @type {HTMLElement|null} */
+  focusedElement = null;
+
+  /** @type {number} */
+  elementTop = 0;
+
+  /** @type {number} */
+  elementBottom = 0;
+
+  /** @type {number} */
+  scrollPortTop = 0;
+
+  /** @type {number} */
+  scrollPortBottom = 0;
+
+  /** @type {number|null} */
+  keyboardOpenCleanupTimeout = null;
+
+  /** @type {number|null} */
+  keyboardOpeningFallbackTimeout = null;
+
+  /** @type {Function|null} */
+  resizeHandler = null;
+
+  /**
+   * @param {DScrollView} view - The View component instance
+   */
+  constructor(view) {
+    this.view = view;
+  }
+
+  /**
+   * Handle focus event on text input.
+   *
+   * @param {FocusEvent} event
+   * @param {boolean} shouldScrollIntoView - Whether to scroll element into view
+   */
+  handleFocus(event, shouldScrollIntoView) {
+    const target = event.target;
+    const scrollContainer = this.view.viewElement;
+
+    if (!target || !scrollContainer) {
+      return;
+    }
+
+    if (!isTextInput(target) || isCloneElement(target)) {
+      return;
+    }
+
+    // Set flag immediately to prevent keyboard dismiss during keyboard opening
+    // This must happen before any scroll events can fire from visualViewport resize
+    this.scrollTriggeredByFocus = true;
+
+    this.clearTimeouts();
+
+    const elementRect = target.getBoundingClientRect();
+    this.focusedElement = target;
+    this.elementTop = elementRect.top;
+    this.elementBottom = elementRect.bottom;
+
+    const viewBounds = this.view.getViewBoundsWithBorder();
+    this.scrollPortTop = viewBounds.top;
+    this.scrollPortBottom = viewBounds.bottom;
+
+    this.resizeHandler = () => {
+      this.clearTimeouts();
+
+      const keyboardOpen = isKeyboardVisible();
+      if (!keyboardOpen) {
+        return;
+      }
+
+      this.keyboardAlreadyOpen = true;
+
+      const viewport = this.view.getVisualViewportBounds();
+
+      const result = this.view.updateSafeArea({
+        scrollIntoPlace: false,
+        scrollBehavior: "smooth",
+        safeArea: this.view.args.safeArea ?? "visual-viewport",
+      });
+      if (result?.spacersHeightSetter) {
+        result.spacersHeightSetter();
+      }
+
+      if (shouldScrollIntoView) {
+        this.scrollIntoView(viewport);
+      }
+
+      this.removeResizeListener();
+    };
+
+    if (this.keyboardAlreadyOpen) {
+      this.resizeHandler();
+      this.addResizeListener();
+      this.keyboardOpenCleanupTimeout = setTimeout(() => {
+        this.removeResizeListener();
+      }, 900);
+    } else {
+      this.addResizeListener();
+      this.keyboardOpeningFallbackTimeout = setTimeout(() => {
+        this.removeResizeListener();
+        this.resizeHandler();
+      }, 900);
+    }
+  }
+
+  /**
+   * Handle blur event on text input.
+   *
+   * @param {FocusEvent} event
+   */
+  handleBlur(event) {
+    const target = event.target;
+    const relatedTarget = event.relatedTarget;
+
+    if (!isTextInput(target)) {
+      return;
+    }
+
+    if (isCloneElement(target)) {
+      return;
+    }
+
+    if (isTextInput(relatedTarget)) {
+      return;
+    }
+
+    this.keyboardAlreadyOpen = false;
+
+    const currentSafeArea = this.view.args.safeArea ?? "visual-viewport";
+    this.view.updateSafeArea({
+      scrollBehavior: getScrollBehavior(),
+      safeArea: currentSafeArea === "none" ? "none" : "layout-viewport",
+    });
+
+    this.scrollTriggeredByFocus = false;
+    this.clearTimeouts();
+    this.removeResizeListener();
+    this.focusedElement = null;
+  }
+
+  /**
+   * Scroll focused element into view.
+   *
+   * @param {Object} [cachedViewport] - Optional cached viewport bounds for consistency
+   * @param {number} cachedViewport.top - Top of visual viewport
+   * @param {number} cachedViewport.bottom - Bottom of visual viewport
+   */
+  scrollIntoView(cachedViewport) {
+    const scrollContainer = this.view.viewElement;
+    if (!scrollContainer || !this.focusedElement) {
+      return;
+    }
+
+    const viewport = cachedViewport ?? this.view.getVisualViewportBounds();
+
+    const elementTop = this.elementTop;
+    const elementBottom = this.elementBottom;
+    const scrollPortTop = this.scrollPortTop;
+    const scrollPortBottom = this.scrollPortBottom;
+
+    const scrollMarginTop = 64;
+    const scrollMarginBottom = capabilities.isAndroid ? 102 : 54;
+
+    const visibleTop = Math.max(scrollPortTop, viewport.top);
+    const visibleBottom = Math.min(scrollPortBottom, viewport.bottom);
+
+    const spaceAbove = elementTop - visibleTop;
+    const spaceBelow = visibleBottom - elementBottom;
+
+    if (spaceAbove < scrollMarginTop) {
+      const scrollDelta = Math.max(
+        -scrollContainer.scrollTop,
+        spaceAbove - scrollMarginTop
+      );
+      if (scrollDelta !== 0) {
+        this.scrollTriggeredByFocus = true;
+        scrollContainer.scrollBy({
+          top: scrollDelta,
+          behavior: getScrollBehavior(),
+        });
+      }
+    } else if (spaceBelow < scrollMarginBottom) {
+      const maxScroll =
+        scrollContainer.scrollHeight -
+        scrollContainer.clientHeight -
+        scrollContainer.scrollTop;
+      const scrollDelta = Math.min(maxScroll, scrollMarginBottom - spaceBelow);
+      if (scrollDelta !== 0) {
+        this.scrollTriggeredByFocus = true;
+        scrollContainer.scrollBy({
+          top: scrollDelta,
+          behavior: getScrollBehavior(),
+        });
+      }
+    }
+  }
+
+  /**
+   * Add visualViewport resize listener.
+   */
+  addResizeListener() {
+    if (this.resizeHandler && window.visualViewport) {
+      window.visualViewport.addEventListener("resize", this.resizeHandler);
+    }
+  }
+
+  /**
+   * Remove visualViewport resize listener.
+   */
+  removeResizeListener() {
+    if (this.resizeHandler && window.visualViewport) {
+      window.visualViewport.removeEventListener("resize", this.resizeHandler);
+    }
+  }
+
+  /**
+   * Clear all timeouts.
+   */
+  clearTimeouts() {
+    if (this.keyboardOpenCleanupTimeout) {
+      clearTimeout(this.keyboardOpenCleanupTimeout);
+      this.keyboardOpenCleanupTimeout = null;
+    }
+    if (this.keyboardOpeningFallbackTimeout) {
+      clearTimeout(this.keyboardOpeningFallbackTimeout);
+      this.keyboardOpeningFallbackTimeout = null;
+    }
+  }
+
+  /**
+   * Clean up all state and listeners.
+   */
+  cleanup() {
+    this.clearTimeouts();
+    this.removeResizeListener();
+    this.focusedElement = null;
+    this.keyboardAlreadyOpen = false;
+    this.scrollTriggeredByFocus = false;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll/native-focus-scroll-prevention.js b/frontend/discourse/float-kit/components/d-scroll/native-focus-scroll-prevention.js
new file mode 100644
index 0000000000000..1f8780d8982f3
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/native-focus-scroll-prevention.js
@@ -0,0 +1,225 @@
+import { modifier } from "ember-modifier";
+import { isCloneElement } from "discourse/float-kit/lib/utils";
+import { isKeyboardVisible } from "discourse/lib/utilities";
+import { capabilities } from "discourse/services/capabilities";
+import {
+  findClosestScrollContainer,
+  isColorOrSelect,
+  isInsidePreventionContainer,
+  isNearViewportBottom,
+  isPasswordRelatedInput,
+} from "./focus-scroll-utils";
+import isTextInput from "./is-text-input";
+
+/**
+ * Global state for native focus scroll prevention.
+ */
+const globalState = {
+  /** @type {Set<string>} - IDs of registered preventers */
+  preventers: new Set(),
+  /** @type {Function|null} - Cleanup function for global listeners */
+  cleanup: null,
+  /** @type {number} - Counter for generating unique IDs */
+  idCounter: 0,
+};
+
+/**
+ * Generate a unique ID for a preventer instance.
+ *
+ * @returns {string}
+ */
+function generatePreventerId() {
+  return `d-scroll-focus-prevention-${++globalState.idCounter}`;
+}
+
+/**
+ * Set up global document listeners for focus scroll prevention.
+ *
+ * @returns {Function} Cleanup function
+ */
+function setupGlobalListeners() {
+  const handleTouchStart = (event) => {
+    const target = event.target;
+    if (isInsidePreventionContainer(target)) {
+      const scrollContainer = findClosestScrollContainer(target);
+      scrollContainer?.focus({ preventScroll: true });
+      document.removeEventListener("touchstart", handleTouchStart, {
+        capture: true,
+      });
+    }
+  };
+
+  const handleBlur = (event) => {
+    const target = event.target;
+    const relatedTarget = event.relatedTarget;
+
+    if (!relatedTarget) {
+      document.addEventListener("touchstart", handleTouchStart, {
+        capture: true,
+        passive: false,
+      });
+      return;
+    }
+
+    if (!isInsidePreventionContainer(relatedTarget)) {
+      return;
+    }
+
+    if (isColorOrSelect(relatedTarget)) {
+      document.addEventListener("touchstart", handleTouchStart, {
+        capture: true,
+        passive: false,
+      });
+    }
+
+    if (
+      (!isTextInput(relatedTarget) && !isColorOrSelect(relatedTarget)) ||
+      isCloneElement(target)
+    ) {
+      return;
+    }
+
+    if (
+      !isPasswordRelatedInput(relatedTarget) &&
+      isTextInput(target) &&
+      isNearViewportBottom(target)
+    ) {
+      const clone = target.cloneNode(false);
+      clone.removeAttribute("id");
+      clone.setAttribute("data-d-scroll-clone", "true");
+      clone.style.setProperty("position", "fixed");
+      clone.style.setProperty("left", "0");
+      clone.style.setProperty("top", "0");
+      clone.style.setProperty("transform", "translateY(-3000px) scale(0)");
+      document.documentElement.appendChild(clone);
+      clone.focus({ preventScroll: true });
+
+      setTimeout(() => {
+        relatedTarget.focus({ preventScroll: true });
+        clone.remove();
+      }, 32);
+    } else {
+      relatedTarget.focus({ preventScroll: true });
+    }
+  };
+
+  const handleTouchEnd = (event) => {
+    const target = event.target;
+    const isActive = target === document.activeElement;
+    const isText = isTextInput(target);
+    const keyboardVisible = isKeyboardVisible();
+    const insideContainer = isInsidePreventionContainer(target);
+
+    if (isActive && isText && !keyboardVisible && insideContainer) {
+      const scrollContainer = findClosestScrollContainer(target);
+      scrollContainer?.focus({ preventScroll: true });
+    }
+  };
+
+  const handleFocusIn = (event) => {
+    const target = event.target;
+    if (
+      target &&
+      "setSelectionRange" in target &&
+      (["password", "search", "tel", "text", "url"].includes(target.type) ||
+        target instanceof HTMLTextAreaElement) &&
+      target.dScrollFocusedBefore !== true
+    ) {
+      const length = target.value?.length ?? 0;
+      target.setSelectionRange?.(length, length);
+      target.dScrollFocusedBefore = true;
+    }
+  };
+
+  document.addEventListener("blur", handleBlur, {
+    capture: true,
+    passive: false,
+  });
+  document.addEventListener("touchstart", handleTouchStart, {
+    capture: true,
+    passive: true,
+  });
+  document.addEventListener("touchend", handleTouchEnd, {
+    capture: true,
+    passive: true,
+  });
+  document.addEventListener("focusin", handleFocusIn);
+
+  return () => {
+    document.removeEventListener("blur", handleBlur, { capture: true });
+    document.removeEventListener("touchstart", handleTouchStart, {
+      capture: true,
+    });
+    document.removeEventListener("touchend", handleTouchEnd, { capture: true });
+    document.removeEventListener("focusin", handleFocusIn);
+  };
+}
+
+/**
+ * Register a scroll container for focus scroll prevention.
+ *
+ * @returns {string} The preventer ID for unregistering
+ */
+function registerPreventer() {
+  const id = generatePreventerId();
+  globalState.preventers.add(id);
+  processPreventersChanges();
+  return id;
+}
+
+/**
+ * Unregister a scroll container from focus scroll prevention.
+ *
+ * @param {string} id - The preventer ID to remove
+ */
+function unregisterPreventer(id) {
+  globalState.preventers.delete(id);
+  processPreventersChanges();
+}
+
+/**
+ * Process changes to the preventers list.
+ * Sets up or tears down global listeners based on whether any preventers are registered.
+ */
+function processPreventersChanges() {
+  if (!capabilities.isWebKit || !capabilities.isAppleMobile) {
+    return;
+  }
+
+  const hasPreventers = globalState.preventers.size > 0;
+
+  if (hasPreventers) {
+    if (!globalState.cleanup) {
+      globalState.cleanup = setupGlobalListeners();
+    }
+  } else {
+    if (globalState.cleanup) {
+      globalState.cleanup();
+      globalState.cleanup = null;
+    }
+  }
+}
+
+/**
+ * Modifier to prevent the browser's native scroll-into-view behavior
+ * when text inputs receive focus inside a scroll container.
+ *
+ * On WebKit iOS/iPadOS: Uses clone technique for certain inputs.
+ * Uses global document-level event listeners (singleton pattern).
+ *
+ * @param {HTMLElement} scrollContainer - The scroll container element
+ * @param {boolean} enabled - Whether prevention is enabled
+ */
+export default modifier((scrollContainer, [enabled]) => {
+  if (!enabled) {
+    return;
+  }
+
+  scrollContainer.setAttribute("data-d-scroll-focus-prevention", "true");
+  const preventerId = registerPreventer();
+
+  return () => {
+    scrollContainer.removeAttribute("data-d-scroll-focus-prevention");
+    unregisterPreventer(preventerId);
+  };
+});
diff --git a/frontend/discourse/float-kit/components/d-scroll/root.gjs b/frontend/discourse/float-kit/components/d-scroll/root.gjs
new file mode 100644
index 0000000000000..4ed414813a135
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/root.gjs
@@ -0,0 +1,26 @@
+import Component from "@glimmer/component";
+import { registerDestructor } from "@ember/destroyable";
+import ScrollController from "./controller";
+
+/**
+ * DScroll.Root - Root component that wraps all scroll sub-components.
+ *
+ * Creates a scroll controller instance and provides it to child components
+ * via the yielded hash. The controller exposes the imperative API.
+ *
+ * @component
+ * @yields {Object} controller - the scroll controller
+ */
+export default class DScrollRoot extends Component {
+  controller = new ScrollController();
+
+  constructor() {
+    super(...arguments);
+
+    registerDestructor(this, () => {
+      this.controller.cleanup();
+    });
+  }
+
+  <template>{{yield this.controller}}</template>
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll/safe-area-handler.js b/frontend/discourse/float-kit/components/d-scroll/safe-area-handler.js
new file mode 100644
index 0000000000000..f8d42edfb74b0
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/safe-area-handler.js
@@ -0,0 +1,339 @@
+import { action } from "@ember/object";
+import { getScrollBehavior } from "discourse/lib/utilities";
+
+/**
+ * Wait for scroll to settle before calling callback.
+ *
+ * @param {HTMLElement} element - The scroll container
+ * @param {Function} callback - Called when scroll settles
+ * @param {number} timeout - Timeout in ms (default 300)
+ */
+export function waitForScrollEnd(element, callback, timeout = 300) {
+  let timeoutId;
+  let lastScrollTop = element.scrollTop;
+
+  const finish = () => {
+    clearTimeout(timeoutId);
+    element.removeEventListener("scroll", onScroll);
+    callback();
+  };
+
+  const onScroll = () => {
+    const currentScrollTop = element.scrollTop;
+    if (currentScrollTop > lastScrollTop) {
+      finish();
+      return;
+    }
+    lastScrollTop = currentScrollTop;
+    clearTimeout(timeoutId);
+    timeoutId = setTimeout(finish, timeout);
+  };
+
+  timeoutId = setTimeout(finish, timeout);
+  element.addEventListener("scroll", onScroll);
+}
+
+/**
+ * SafeAreaHandler - Manages safe area spacers for DScroll.View.
+ *
+ * Adjusts spacer heights based on visual viewport changes, handles keyboard
+ * appearing/disappearing by growing spacers. Only active when axis is "y"
+ * and safeArea is not "none".
+ *
+ * @class SafeAreaHandler
+ */
+export default class SafeAreaHandler {
+  /** @type {number} */
+  previousStartHeight = 0;
+
+  /** @type {number} */
+  previousEndHeight = 0;
+
+  /** @type {number|null} */
+  updateTimeout = null;
+
+  /** @type {number|null} */
+  readdListenerTimeout = null;
+
+  /** @type {number|null} */
+  fallbackUpdateTimeout = null;
+
+  /**
+   * @param {DScrollView} view - The View component instance
+   */
+  constructor(view) {
+    this.view = view;
+  }
+
+  /**
+   * Whether safeArea handling is needed.
+   *
+   * @returns {boolean}
+   */
+  get isNeeded() {
+    const axis = this.view.args.axis ?? "y";
+    const safeArea = this.view.args.safeArea ?? "visual-viewport";
+    return axis === "y" && safeArea !== "none";
+  }
+
+  /**
+   * Set up safeArea handlers for visual viewport changes.
+   */
+  setup() {
+    if (!this.isNeeded || !window.visualViewport) {
+      return;
+    }
+
+    const viewElement = this.view.viewElement;
+
+    window.visualViewport.addEventListener("resize", this.handleResize);
+
+    if (viewElement) {
+      viewElement.addEventListener("scroll", this.handleScroll, {
+        once: true,
+      });
+    }
+
+    this.update();
+  }
+
+  /**
+   * Scroll handler for updates.
+   */
+  @action
+  handleScroll() {
+    this.update();
+  }
+
+  /**
+   * Resize handler with scroll listener coordination.
+   */
+  @action
+  handleResize() {
+    const viewElement = this.view.viewElement;
+
+    if (viewElement) {
+      viewElement.removeEventListener("scroll", this.handleScroll);
+    }
+
+    if (this.updateTimeout) {
+      clearTimeout(this.updateTimeout);
+    }
+    if (this.readdListenerTimeout) {
+      clearTimeout(this.readdListenerTimeout);
+    }
+    if (this.fallbackUpdateTimeout) {
+      clearTimeout(this.fallbackUpdateTimeout);
+    }
+
+    this.updateTimeout = setTimeout(() => {
+      this.update();
+
+      this.readdListenerTimeout = setTimeout(() => {
+        const currentViewElement = this.view.viewElement;
+        if (currentViewElement) {
+          currentViewElement.addEventListener("scroll", this.handleScroll, {
+            once: true,
+          });
+        }
+      }, 200);
+    }, 1);
+
+    this.fallbackUpdateTimeout = setTimeout(() => {
+      this.update();
+    }, 350);
+  }
+
+  /**
+   * Clean up safeArea handlers.
+   */
+  cleanup() {
+    const viewElement = this.view.viewElement;
+
+    if (window.visualViewport) {
+      window.visualViewport.removeEventListener("resize", this.handleResize);
+    }
+
+    if (viewElement) {
+      viewElement.removeEventListener("scroll", this.handleScroll);
+    }
+
+    if (this.updateTimeout) {
+      clearTimeout(this.updateTimeout);
+    }
+    if (this.readdListenerTimeout) {
+      clearTimeout(this.readdListenerTimeout);
+    }
+    if (this.fallbackUpdateTimeout) {
+      clearTimeout(this.fallbackUpdateTimeout);
+    }
+
+    this.updateTimeout = null;
+    this.readdListenerTimeout = null;
+    this.fallbackUpdateTimeout = null;
+  }
+
+  /**
+   * Get view bounds with border adjustment.
+   *
+   * @returns {{ top: number, bottom: number }}
+   */
+  getViewBoundsWithBorder() {
+    const viewElement = this.view.viewElement;
+    if (!viewElement) {
+      return { top: 0, bottom: 0 };
+    }
+
+    const rect = viewElement.getBoundingClientRect();
+    const style = window.getComputedStyle(viewElement);
+
+    return {
+      top: rect.top + parseFloat(style.borderTopWidth),
+      bottom: rect.bottom - parseFloat(style.borderBottomWidth),
+    };
+  }
+
+  /**
+   * Get visual viewport bounds.
+   *
+   * @returns {{ top: number, bottom: number }}
+   */
+  getVisualViewportBounds() {
+    const visualViewport = window.visualViewport;
+    if (!visualViewport) {
+      return { top: 0, bottom: window.innerHeight };
+    }
+
+    const top = visualViewport.offsetTop;
+    return {
+      top,
+      bottom: top + visualViewport.height,
+    };
+  }
+
+  /**
+   * Update safeArea spacer heights based on visual viewport.
+   *
+   * @param {Object} options
+   * @param {boolean} options.scrollIntoPlace - Whether to scroll to keep content in place (default: true)
+   * @param {string} options.scrollBehavior - Scroll behavior: "instant" or "smooth" (default: platform-aware)
+   * @param {string} options.safeArea - Override safeArea setting: "none", "layout-viewport", or "visual-viewport"
+   * @returns {{ spacersHeightSetter: Function, verticalScrollOffsetRequired: number } | undefined}
+   */
+  update({
+    scrollIntoPlace = true,
+    scrollBehavior = getScrollBehavior(),
+    safeArea,
+  } = {}) {
+    const viewElement = this.view.viewElement;
+    const controller = this.view.controller;
+    const contentElement = controller?.contentElement;
+    const startSpacerElement = controller?.startSpacerElement;
+    const endSpacerElement = controller?.endSpacerElement;
+
+    if (
+      !this.isNeeded ||
+      !viewElement ||
+      !controller ||
+      !contentElement ||
+      !startSpacerElement ||
+      !endSpacerElement
+    ) {
+      return;
+    }
+
+    const effectiveSafeArea =
+      safeArea ?? this.view.args.safeArea ?? "visual-viewport";
+
+    const viewBounds = this.getViewBoundsWithBorder();
+    const viewTop = viewBounds.top;
+    const viewBottom = viewBounds.bottom;
+
+    const viewport = this.getVisualViewportBounds();
+
+    const visibleBottom = Math.min(
+      viewBottom,
+      effectiveSafeArea === "visual-viewport"
+        ? viewport.bottom
+        : window.innerHeight
+    );
+
+    let startSpacerHeight;
+    let endSpacerHeight;
+
+    if (effectiveSafeArea === "visual-viewport") {
+      startSpacerHeight = Math.abs(Math.min(viewTop + viewport.top, 0));
+      endSpacerHeight = Math.max(viewBottom - viewport.bottom, 0);
+    } else {
+      startSpacerHeight = Math.abs(Math.min(viewTop, 0));
+      endSpacerHeight = Math.max(viewBottom - window.innerHeight, 0);
+    }
+
+    if (
+      Math.abs(this.previousStartHeight - startSpacerHeight) < 1 &&
+      Math.abs(this.previousEndHeight - endSpacerHeight) < 1
+    ) {
+      return;
+    }
+
+    let verticalScrollOffsetRequired = 0;
+    if (endSpacerElement) {
+      verticalScrollOffsetRequired =
+        -1 * (visibleBottom - endSpacerElement.getBoundingClientRect().top);
+    }
+
+    const contentFits =
+      contentElement &&
+      viewElement.offsetHeight - contentElement.offsetHeight >= 0;
+
+    const setSpacerHeights = () => {
+      this.previousStartHeight = startSpacerHeight;
+      this.previousEndHeight = endSpacerHeight;
+      controller.updateSpacerHeights(startSpacerHeight, endSpacerHeight);
+    };
+
+    if (
+      scrollBehavior === "smooth" &&
+      (verticalScrollOffsetRequired < 0 || contentFits)
+    ) {
+      if (scrollIntoPlace) {
+        if (this.view.keyboardHandler) {
+          this.view.keyboardHandler.scrollTriggeredByFocus = true;
+        }
+
+        if (contentFits) {
+          viewElement.scrollTo({
+            top: 0,
+            behavior: scrollBehavior,
+          });
+        } else {
+          viewElement.scrollBy({
+            top: verticalScrollOffsetRequired,
+            behavior: scrollBehavior,
+          });
+        }
+
+        this.previousEndHeight = endSpacerHeight;
+
+        waitForScrollEnd(viewElement, () => {
+          if (viewElement && contentFits) {
+            viewElement.scrollTo({
+              top: 0,
+              behavior: "instant",
+            });
+          }
+          setSpacerHeights();
+        });
+      }
+    } else {
+      setSpacerHeights();
+    }
+
+    if (!scrollIntoPlace) {
+      return {
+        spacersHeightSetter: setSpacerHeights,
+        verticalScrollOffsetRequired,
+      };
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-scroll/trigger.gjs b/frontend/discourse/float-kit/components/d-scroll/trigger.gjs
new file mode 100644
index 0000000000000..ef256da441eb2
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/trigger.gjs
@@ -0,0 +1,62 @@
+import Component from "@glimmer/component";
+import { hash } from "@ember/helper";
+import { action } from "@ember/object";
+import DSheetTrigger from "discourse/float-kit/components/d-sheet/trigger";
+
+/**
+ * DScroll.Trigger - A button that triggers scroll actions.
+ *
+ * @component
+ * @param {Object} @controller - The scroll controller instance
+ * @param {Object} @action - Action to execute: { type: "scroll-to" | "scroll-by", progress?, distance?, animationSettings? }
+ * @param {Function|Object} @onPress - Press event handler or options: { forceFocus?: boolean, runAction?: boolean }
+ * @param {Function} @onClick - Click handler invoked after the action logic
+ */
+export default class DScrollTrigger extends Component {
+  @action
+  handlePress(pressEvent) {
+    if (this.args.onPress) {
+      if (typeof this.args.onPress === "function") {
+        this.args.onPress(pressEvent);
+      } else {
+        pressEvent.changeDefault(this.args.onPress);
+      }
+    }
+
+    if (pressEvent.runAction && this.args.action && this.args.controller) {
+      this.executeAction();
+    }
+
+    if (this.args.onClick) {
+      this.args.onClick(pressEvent.nativeEvent);
+    }
+
+    pressEvent.changeDefault({ runAction: false });
+  }
+
+  executeAction() {
+    const { action, controller } = this.args;
+    if (!action || !controller) {
+      return;
+    }
+
+    const { type, progress, distance, animationSettings } = action;
+
+    if (type === "scroll-to") {
+      controller.scrollTo({ progress, distance, animationSettings });
+    } else if (type === "scroll-by") {
+      controller.scrollBy({ progress, distance, animationSettings });
+    }
+  }
+
+  <template>
+    {{#if @asChild}}
+      {{yield (hash handlePress=this.handlePress)}}
+    {{else}}
+      <DSheetTrigger @onPress={{this.handlePress}} ...attributes>
+        {{yield}}
+      </DSheetTrigger>
+    {{/if}}
+  </template>
+}
+
diff --git a/frontend/discourse/float-kit/components/d-scroll/view.gjs b/frontend/discourse/float-kit/components/d-scroll/view.gjs
new file mode 100644
index 0000000000000..de0b5970a4b14
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-scroll/view.gjs
@@ -0,0 +1,628 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { registerDestructor } from "@ember/destroyable";
+import { action } from "@ember/object";
+import { htmlSafe } from "@ember/template";
+import { modifier } from "ember-modifier";
+import { capabilities } from "discourse/services/capabilities";
+import GestureTrapHandler from "./gesture-trap-handler";
+import isTextInput from "./is-text-input";
+import KeyboardFocusHandler from "./keyboard-focus-handler";
+import nativeFocusScrollPrevention from "./native-focus-scroll-prevention";
+import SafeAreaHandler from "./safe-area-handler";
+
+/**
+ * DScroll.View - The scroll container component.
+ *
+ * @component
+ * @param {Object} controller - The scroll controller instance (provided by Root)
+ * @param {string} @axis - Scroll axis: "x" or "y" (default: "y")
+ * @param {boolean|Object} @scrollGestureTrap - Trap scroll gestures at boundaries
+ * @param {boolean} @scrollGestureOvershoot - Allow visual overscroll (default: true)
+ * @param {boolean|string} @scrollGesture - Enable scroll gestures (default: "auto")
+ * @param {Function} @onScroll - Callback on scroll
+ * @param {Function|Object} @onScrollStart - Callback on scroll start
+ * @param {Function} @onScrollEnd - Callback on scroll end
+ * @param {boolean} @nativeFocusScrollPrevention - Prevent native focus scroll (default: true)
+ * @param {Function|Object} @onFocusInside - Callback when descendant receives focus
+ * @param {Object} @scrollAnimationSettings - Animation settings for programmatic scroll
+ * @param {boolean} @pageScroll - Whether this is a page scroll container (default: false)
+ * @param {string} @safeArea - Safe area: "none", "layout-viewport", "visual-viewport" (default: "visual-viewport")
+ * @param {boolean} @scrollAnchoring - Enable scroll anchoring (default: true)
+ * @param {string} @scrollSnapType - CSS scroll-snap-type value (default: "none")
+ * @param {string} @scrollPadding - CSS scroll-padding value (default: "auto")
+ * @param {string} @scrollTimelineName - CSS scroll-timeline-name value (default: "none")
+ * @param {boolean} @nativeScrollbar - Show native scrollbar (default: true)
+ */
+export default class DScrollView extends Component {
+  @tracked viewElement = null;
+
+  scrollStartTimeout = null;
+  scrollEndTimeout = null;
+  isScrolling = false;
+
+  keyboardHandler = new KeyboardFocusHandler(this);
+  safeAreaHandler = new SafeAreaHandler(this);
+  gestureTrapHandler = new GestureTrapHandler(this);
+
+  registerElement = modifier(
+    (
+      element,
+      _,
+      {
+        onRegister,
+        onScroll,
+        onScrollEnd,
+        onFocusIn,
+        onFocusOut,
+        setupGestureTrap,
+        setupSafeArea,
+        cleanupGestureTrap,
+        cleanupSafeArea,
+      }
+    ) => {
+      onRegister(element);
+
+      element.addEventListener("scroll", onScroll, { passive: true });
+
+      if ("onscrollend" in window) {
+        element.addEventListener("scrollend", onScrollEnd);
+      }
+
+      element.addEventListener("focusin", onFocusIn, { capture: true });
+      element.addEventListener("focusout", onFocusOut, { capture: true });
+
+      setupGestureTrap();
+      setupSafeArea();
+
+      return () => {
+        element.removeEventListener("scroll", onScroll);
+        if ("onscrollend" in window) {
+          element.removeEventListener("scrollend", onScrollEnd);
+        }
+        element.removeEventListener("focusin", onFocusIn, { capture: true });
+        element.removeEventListener("focusout", onFocusOut, { capture: true });
+        cleanupGestureTrap();
+        cleanupSafeArea();
+      };
+    }
+  );
+
+  registerStartSpy = modifier((element, _, { register, unregister }) => {
+    register(element);
+    return () => unregister(element);
+  });
+
+  registerEndSpy = modifier((element, _, { register, unregister }) => {
+    register(element);
+    return () => unregister(element);
+  });
+
+  registerStartSpacer = modifier((element, _, { register }) => {
+    register(element);
+    return () => register(null);
+  });
+
+  registerEndSpacer = modifier((element, _, { register }) => {
+    register(element);
+    return () => register(null);
+  });
+
+  constructor() {
+    super(...arguments);
+
+    registerDestructor(this, () => {
+      if (this.scrollStartTimeout) {
+        clearTimeout(this.scrollStartTimeout);
+      }
+      if (this.scrollEndTimeout) {
+        clearTimeout(this.scrollEndTimeout);
+      }
+      this.keyboardHandler.cleanup();
+      this.safeAreaHandler.cleanup();
+      this.gestureTrapHandler.cleanup();
+    });
+  }
+
+  get controller() {
+    return this.args.controller;
+  }
+
+  @action
+  handleElementRegister(element) {
+    this.viewElement = element;
+    this.configureController();
+    this.controller.registerView(element);
+    this.controller.setupOverflowObserver();
+  }
+
+  @action
+  setupGestureTrap() {
+    this.gestureTrapHandler.setup();
+  }
+
+  @action
+  cleanupGestureTrap() {
+    this.gestureTrapHandler.cleanup();
+  }
+
+  @action
+  setupSafeArea() {
+    this.safeAreaHandler.setup();
+  }
+
+  @action
+  cleanupSafeArea() {
+    this.safeAreaHandler.cleanup();
+  }
+
+  @action
+  registerStartSpyElement(element) {
+    this.gestureTrapHandler.registerStartSpy(element);
+  }
+
+  @action
+  unregisterStartSpyElement(element) {
+    this.gestureTrapHandler.unregisterStartSpy(element);
+  }
+
+  @action
+  registerEndSpyElement(element) {
+    this.gestureTrapHandler.registerEndSpy(element);
+  }
+
+  @action
+  unregisterEndSpyElement(element) {
+    this.gestureTrapHandler.unregisterEndSpy(element);
+  }
+
+  @action
+  registerStartSpacerElement(element) {
+    this.controller.registerStartSpacer(element);
+  }
+
+  @action
+  registerEndSpacerElement(element) {
+    this.controller.registerEndSpacer(element);
+  }
+
+  configureController() {
+    this.controller.axis = this.args.axis ?? "y";
+    this.controller.safeArea = this.args.safeArea ?? "visual-viewport";
+    this.controller.scrollAnimationSettings = this.args
+      .scrollAnimationSettings ?? { skip: "auto" };
+    this.controller.onScroll = this.handleScroll;
+    this.controller.onScrollStart = this.handleScrollStart;
+    this.controller.onScrollEnd = this.handleScrollEnd;
+  }
+
+  /**
+   * Whether we need the IntersectionObserver for dynamic trap state.
+   *
+   * @returns {boolean}
+   */
+  get needsSwipeTrapObserver() {
+    return this.gestureTrapHandler.needsObserver;
+  }
+
+  /**
+   * Update safeArea spacer heights.
+   *
+   * @param {Object} options - Options to pass to SafeAreaHandler.update()
+   * @returns {Object|undefined}
+   */
+  @action
+  updateSafeArea(options) {
+    return this.safeAreaHandler.update(options);
+  }
+
+  /**
+   * Get view bounds with border adjustment.
+   *
+   * @returns {{ top: number, bottom: number }}
+   */
+  getViewBoundsWithBorder() {
+    return this.safeAreaHandler.getViewBoundsWithBorder();
+  }
+
+  /**
+   * Get visual viewport bounds.
+   *
+   * @returns {{ top: number, bottom: number }}
+   */
+  getVisualViewportBounds() {
+    return this.safeAreaHandler.getVisualViewportBounds();
+  }
+
+  @action
+  onScrollEvent(event) {
+    if (this.args.onScroll) {
+      const state = this.controller.getScrollState();
+      this.args.onScroll({
+        ...state,
+        nativeEvent: event,
+      });
+    }
+
+    if (!this.isScrolling) {
+      this.isScrolling = true;
+      this.handleScrollStart();
+    }
+
+    this.controller.scrollOngoing = true;
+
+    if (this.scrollEndTimeout) {
+      clearTimeout(this.scrollEndTimeout);
+    }
+    this.scrollEndTimeout = setTimeout(() => {
+      this.isScrolling = false;
+      this.controller.scrollOngoing = false;
+      if (!("onscrollend" in window)) {
+        this.handleScrollEnd(event);
+      }
+    }, 90);
+  }
+
+  @action
+  onScrollEndEvent(event) {
+    this.isScrolling = false;
+    this.controller.scrollOngoing = false;
+    this.handleScrollEnd(event);
+  }
+
+  @action
+  handleScroll() {
+    // Called from controller if needed
+  }
+
+  @action
+  handleScrollStart() {
+    if (this.args.onScrollStart) {
+      const defaultBehavior = { dismissKeyboard: false };
+
+      if (typeof this.args.onScrollStart === "function") {
+        const customEvent = {
+          changeDefault: (changedBehavior) => {
+            Object.assign(defaultBehavior, changedBehavior);
+          },
+          dismissKeyboard: defaultBehavior.dismissKeyboard,
+          nativeEvent: null,
+        };
+        this.args.onScrollStart(customEvent);
+      } else if (typeof this.args.onScrollStart === "object") {
+        Object.assign(defaultBehavior, this.args.onScrollStart);
+      }
+
+      // Don't dismiss keyboard if scroll was triggered by focus event
+      if (
+        defaultBehavior.dismissKeyboard &&
+        !this.keyboardHandler?.scrollTriggeredByFocus &&
+        document.activeElement
+      ) {
+        document.activeElement.blur();
+      }
+    }
+  }
+
+  @action
+  handleScrollEnd(event) {
+    if (this.args.onScrollEnd) {
+      this.args.onScrollEnd({ nativeEvent: event });
+    }
+  }
+
+  @action
+  onFocusInsideEvent(event) {
+    const target = event.target;
+
+    if (!isTextInput(target)) {
+      return;
+    }
+
+    if (target === this.viewElement) {
+      return;
+    }
+
+    const defaultBehavior = { scrollIntoView: true };
+
+    if (this.args.onFocusInside) {
+      if (typeof this.args.onFocusInside === "function") {
+        const customEvent = {
+          changeDefault: (changedBehavior) => {
+            Object.assign(defaultBehavior, changedBehavior);
+          },
+          scrollIntoView: defaultBehavior.scrollIntoView,
+          nativeEvent: event,
+        };
+        this.args.onFocusInside(customEvent);
+      } else if (typeof this.args.onFocusInside === "object") {
+        Object.assign(defaultBehavior, this.args.onFocusInside);
+      }
+    }
+
+    this.keyboardHandler.handleFocus(event, defaultBehavior.scrollIntoView);
+  }
+
+  /**
+   * Handle blur event inside scroll view.
+   *
+   * @param {FocusEvent} event
+   */
+  @action
+  onBlurInsideEvent(event) {
+    this.keyboardHandler.handleBlur(event);
+  }
+
+  @action
+  scrollElementIntoView(element) {
+    if (!element || !this.viewElement) {
+      return;
+    }
+
+    const elementRect = element.getBoundingClientRect();
+    const viewRect = this.viewElement.getBoundingClientRect();
+
+    const isFullyVisible =
+      elementRect.top >= viewRect.top &&
+      elementRect.bottom <= viewRect.bottom &&
+      elementRect.left >= viewRect.left &&
+      elementRect.right <= viewRect.right;
+
+    if (isFullyVisible) {
+      return;
+    }
+
+    const axis = this.args.axis ?? "y";
+    if (axis === "y") {
+      if (elementRect.top < viewRect.top) {
+        const scrollTop =
+          this.viewElement.scrollTop - (viewRect.top - elementRect.top);
+        this.viewElement.scrollTo({ top: scrollTop, behavior: "smooth" });
+      } else if (elementRect.bottom > viewRect.bottom) {
+        const scrollTop =
+          this.viewElement.scrollTop + (elementRect.bottom - viewRect.bottom);
+        this.viewElement.scrollTo({ top: scrollTop, behavior: "smooth" });
+      }
+    } else {
+      if (elementRect.left < viewRect.left) {
+        const scrollLeft =
+          this.viewElement.scrollLeft - (viewRect.left - elementRect.left);
+        this.viewElement.scrollTo({ left: scrollLeft, behavior: "smooth" });
+      } else if (elementRect.right > viewRect.right) {
+        const scrollLeft =
+          this.viewElement.scrollLeft + (elementRect.right - viewRect.right);
+        this.viewElement.scrollTo({ left: scrollLeft, behavior: "smooth" });
+      }
+    }
+  }
+
+  /**
+   * Build data-d-scroll attribute value for outer View wrapper.
+   *
+   * @returns {string}
+   */
+  get viewDataAttribute() {
+    const parts = ["root", "view"];
+    const axis = this.args.axis ?? "y";
+
+    parts.push(`axis-${axis}`);
+
+    if (this.controller?.scrollOngoing) {
+      parts.push("scroll-ongoing");
+    }
+
+    return parts.join(" ");
+  }
+
+  /**
+   * Build data-d-scroll attribute value for inner scrollContainer element.
+   *
+   * @returns {string}
+   */
+  get scrollContainerDataAttribute() {
+    const parts = ["scroll-container"];
+    const axis = this.args.axis ?? "y";
+
+    parts.push(`axis-${axis}`);
+
+    const showScrollbar = this.args.nativeScrollbar ?? true;
+    if (!showScrollbar) {
+      parts.push("no-scrollbar");
+    }
+
+    const anchoring = this.args.scrollAnchoring ?? true;
+    if (!anchoring) {
+      parts.push("no-anchoring");
+    }
+
+    const snapType = this.args.scrollSnapType ?? "none";
+    if (snapType === "proximity") {
+      parts.push("snap-proximity");
+    } else if (snapType === "mandatory") {
+      parts.push("snap-mandatory");
+    }
+
+    const overshoot = this.args.scrollGestureOvershoot ?? true;
+    if (!overshoot) {
+      parts.push("no-overshoot");
+    }
+
+    const skipAnimation = this.args.scrollAnimationSettings?.skip ?? "auto";
+    if (skipAnimation === true) {
+      parts.push("scroll-skip");
+    } else if (skipAnimation === false) {
+      parts.push("scroll-smooth");
+    } else {
+      parts.push("scroll-auto");
+    }
+
+    const trapX = this.gestureTrapHandler.xTrap;
+    const handler = this.gestureTrapHandler;
+    const trapY =
+      (!capabilities.isAndroidChromiumBrowser && handler.yTrap) ||
+      (handler.keyboardVisible && !handler.swipeTrapIncapable);
+
+    if (trapX) {
+      parts.push("trap-x");
+    }
+    if (trapY) {
+      parts.push("trap-y");
+    }
+
+    if (this.controller) {
+      this.controller.scrollTrapX = trapX;
+      this.controller.scrollTrapY = trapY;
+    }
+
+    const scrollGesture = this.args.scrollGesture ?? "auto";
+    if (scrollGesture === false) {
+      parts.push("no-scroll-gesture");
+    }
+
+    if (this.controller?.overflowX) {
+      parts.push("overflow-x");
+    }
+    if (this.controller?.overflowY) {
+      parts.push("overflow-y");
+    }
+
+    return parts.join(" ");
+  }
+
+  get scrollPaddingStyle() {
+    const padding = this.args.scrollPadding ?? "auto";
+    return `scroll-padding: ${padding};`;
+  }
+
+  get scrollTimelineStyle() {
+    const timelineName = this.args.scrollTimelineName ?? "none";
+    const axis = this.args.axis ?? "y";
+    return `scroll-timeline: ${timelineName} ${axis};`;
+  }
+
+  get combinedStyle() {
+    const styles = [this.scrollPaddingStyle, this.scrollTimelineStyle]
+      .filter(Boolean)
+      .join(" ");
+
+    return htmlSafe(styles);
+  }
+
+  get shouldPreventNativeFocus() {
+    return this.args.nativeFocusScrollPrevention ?? true;
+  }
+
+  /**
+   * @returns {string|undefined}
+   */
+  get computedTabIndex() {
+    if (this.shouldPreventNativeFocus) {
+      return "-1";
+    }
+    return "0";
+  }
+
+  /**
+   * @returns {string|undefined}
+   */
+  get computedRole() {
+    const pageScroll = this.args.pageScroll ?? false;
+
+    if (pageScroll) {
+      return undefined;
+    }
+    return "region";
+  }
+
+  get axis() {
+    return this.args.axis ?? "y";
+  }
+
+  get startSpyDataScroll() {
+    return `spy spy-start axis-${this.axis}`;
+  }
+
+  get endSpyDataScroll() {
+    return `spy spy-end axis-${this.axis}`;
+  }
+
+  /**
+   * Whether spacers should be rendered (only for vertical scrolling).
+   *
+   * @returns {boolean}
+   */
+  get shouldRenderSpacers() {
+    return this.axis === "y";
+  }
+
+  get startSpacerDataScroll() {
+    return `start-spacer axis-${this.axis}`;
+  }
+
+  get endSpacerDataScroll() {
+    return `end-spacer axis-${this.axis}`;
+  }
+
+  get spacerStyle() {
+    return htmlSafe("height: 0px;");
+  }
+
+  <template>
+    <div data-d-scroll={{this.viewDataAttribute}} ...attributes>
+      <div
+        data-d-scroll={{this.scrollContainerDataAttribute}}
+        style={{this.combinedStyle}}
+        tabindex={{this.computedTabIndex}}
+        role={{this.computedRole}}
+        {{this.registerElement
+          onRegister=this.handleElementRegister
+          onScroll=this.onScrollEvent
+          onScrollEnd=this.onScrollEndEvent
+          onFocusIn=this.onFocusInsideEvent
+          onFocusOut=this.onBlurInsideEvent
+          setupGestureTrap=this.setupGestureTrap
+          setupSafeArea=this.setupSafeArea
+          cleanupGestureTrap=this.cleanupGestureTrap
+          cleanupSafeArea=this.cleanupSafeArea
+        }}
+        {{nativeFocusScrollPrevention this.shouldPreventNativeFocus}}
+      >
+        {{#if this.needsSwipeTrapObserver}}
+          <div
+            data-d-scroll={{this.startSpyDataScroll}}
+            {{this.registerStartSpy
+              register=this.registerStartSpyElement
+              unregister=this.unregisterStartSpyElement
+            }}
+          ></div>
+        {{/if}}
+        {{#if this.shouldRenderSpacers}}
+          <div
+            data-d-scroll={{this.startSpacerDataScroll}}
+            style={{this.spacerStyle}}
+            {{this.registerStartSpacer
+              register=this.registerStartSpacerElement
+            }}
+          ></div>
+        {{/if}}
+        {{yield}}
+        {{#if this.shouldRenderSpacers}}
+          <div
+            data-d-scroll={{this.endSpacerDataScroll}}
+            style={{this.spacerStyle}}
+            {{this.registerEndSpacer register=this.registerEndSpacerElement}}
+          ></div>
+        {{/if}}
+        {{#if this.needsSwipeTrapObserver}}
+          <div
+            data-d-scroll={{this.endSpyDataScroll}}
+            {{this.registerEndSpy
+              register=this.registerEndSpyElement
+              unregister=this.unregisterEndSpyElement
+            }}
+          ></div>
+        {{/if}}
+      </div>
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet-stack.gjs b/frontend/discourse/float-kit/components/d-sheet-stack.gjs
new file mode 100644
index 0000000000000..412c61ea6ea15
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet-stack.gjs
@@ -0,0 +1,44 @@
+import Component from "@glimmer/component";
+import { registerDestructor } from "@ember/destroyable";
+import { hash } from "@ember/helper";
+import { guidFor } from "@ember/object/internals";
+import { service } from "@ember/service";
+
+/**
+ * Root component for sheet stacking.
+ * Groups together several Sheets and enables stacking-driven animations.
+ *
+ * @component DSheetStackRoot
+ * @param {string} [componentId] - Optional explicit ID for the stack
+ * @yields {{ stackId: string }} Block params with the resolved stack ID
+ */
+export default class Root extends Component {
+  /**
+   * @type {import("../services/sheet-stack-registry").default}
+   */
+  @service sheetStackRegistry;
+
+  /**
+   * Resolved stack ID, from args or auto-generated.
+   * @type {string}
+   */
+  id = this.args.componentId || guidFor(this);
+
+  /**
+   * Registers the stack in the registry and sets up a destructor to unregister it.
+   * @param {unknown} owner - Ember owner instance
+   * @param {Object} args - Component arguments
+   */
+  constructor(owner, args) {
+    super(owner, args);
+
+    // Register stack early so children can register
+    this.sheetStackRegistry.registerStack({ id: this.id }, null);
+
+    registerDestructor(this, () => {
+      this.sheetStackRegistry.unregisterStack(this.id);
+    });
+  }
+
+  <template>{{yield (hash stackId=this.id)}}</template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet.js b/frontend/discourse/float-kit/components/d-sheet.js
new file mode 100644
index 0000000000000..b3066bc9a0493
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet.js
@@ -0,0 +1,93 @@
+import ScrollContent from "./d-scroll/content";
+import ScrollRoot from "./d-scroll/root";
+import ScrollView from "./d-scroll/view";
+import Backdrop from "./d-sheet/backdrop";
+import BleedingBackground from "./d-sheet/bleeding-background";
+import Content from "./d-sheet/content";
+import Handle from "./d-sheet/handle";
+import Header from "./d-sheet/header";
+import Outlet from "./d-sheet/outlet";
+import Portal from "./d-sheet/portal";
+import Root from "./d-sheet/root";
+import SpecialWrapperContent from "./d-sheet/special-wrapper/content";
+import SpecialWrapperRoot from "./d-sheet/special-wrapper/root";
+import Trigger from "./d-sheet/trigger";
+import View from "./d-sheet/view";
+import StackRoot from "./d-sheet-stack";
+
+/**
+ * Namespace object exposing all DSheet sub-components for building sheet UIs.
+ *
+ * @type {{
+ *   Root: typeof Root,
+ *   Backdrop: typeof Backdrop,
+ *   BleedingBackground: typeof BleedingBackground,
+ *   Handle: typeof Handle,
+ *   Outlet: typeof Outlet,
+ *   Portal: typeof Portal,
+ *   View: typeof View,
+ *   Content: typeof Content,
+ *   Trigger: typeof Trigger,
+ *   Header: typeof Header,
+ *   SpecialWrapper: { Root: typeof SpecialWrapperRoot, Content: typeof SpecialWrapperContent },
+ *   Scroll: { Root: typeof ScrollRoot, View: typeof ScrollView, Content: typeof ScrollContent },
+ *   Stack: { Root: typeof StackRoot }
+ * }}
+ */
+const DSheet = {
+  /** @type {typeof Root} */
+  Root,
+  /** @type {typeof Backdrop} */
+  Backdrop,
+  /** @type {typeof BleedingBackground} */
+  BleedingBackground,
+  /** @type {typeof Handle} */
+  Handle,
+  /** @type {typeof Outlet} */
+  Outlet,
+  /** @type {typeof Portal} */
+  Portal,
+  /** @type {typeof View} */
+  View,
+  /** @type {typeof Content} */
+  Content,
+  /** @type {typeof Trigger} */
+  Trigger,
+  /** @type {typeof Header} */
+  Header,
+  /**
+   * Sub-components for special wrapper layouts (e.g. Toast).
+   *
+   * @type {{ Root: typeof SpecialWrapperRoot, Content: typeof SpecialWrapperContent }}
+   */
+  SpecialWrapper: {
+    /** @type {typeof SpecialWrapperRoot} */
+    Root: SpecialWrapperRoot,
+    /** @type {typeof SpecialWrapperContent} */
+    Content: SpecialWrapperContent,
+  },
+  /**
+   * Scroll sub-components for scrollable content within sheets.
+   *
+   * @type {{ Root: typeof ScrollRoot, View: typeof ScrollView, Content: typeof ScrollContent }}
+   */
+  Scroll: {
+    /** @type {typeof ScrollRoot} */
+    Root: ScrollRoot,
+    /** @type {typeof ScrollView} */
+    View: ScrollView,
+    /** @type {typeof ScrollContent} */
+    Content: ScrollContent,
+  },
+  /**
+   * Stack sub-components for managing stacked sheets.
+   *
+   * @type {{ Root: typeof StackRoot }}
+   */
+  Stack: {
+    /** @type {typeof StackRoot} */
+    Root: StackRoot,
+  },
+};
+
+export default DSheet;
diff --git a/frontend/discourse/float-kit/components/d-sheet/animation-travel.js b/frontend/discourse/float-kit/components/d-sheet/animation-travel.js
new file mode 100644
index 0000000000000..8ef038ed7dbd9
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/animation-travel.js
@@ -0,0 +1,384 @@
+/**
+ * Orchestrates animated transitions between d-sheet detent positions.
+ * Handles animation configuration resolution (presets, spring physics, fallbacks),
+ * travel type detection (entering/exiting/stepping), and coordinates with the
+ * sheet's state machines to ensure smooth opening, closing, and repositioning.
+ * Core bridge between user gestures and the underlying travel implementation.
+ */
+import { prefersReducedMotion } from "discourse/lib/utilities";
+import { SPRING_PRESETS } from "./animation";
+import { travelToDetent } from "./travel";
+
+/**
+ * Default animation configuration for exiting transitions.
+ * Uses a stiffer spring for snappy dismiss behavior.
+ * @type {{ easing: string, stiffness: number, damping: number, mass: number }}
+ */
+const EXITING_ANIMATION_DEFAULTS = {
+  easing: "spring",
+  stiffness: 520,
+  damping: 44,
+  mass: 1,
+};
+
+/**
+ * Set of recognized easing types that indicate valid animation config.
+ * When settings have one of these easings, fallback config is not applied.
+ * @type {Set<string>}
+ */
+const RECOGNIZED_EASINGS = new Set([
+  "ease",
+  "ease-in",
+  "ease-out",
+  "ease-in-out",
+  "linear",
+]);
+
+/**
+ * Manages animation travel for d-sheet component.
+ * Handles animation configuration resolution and travel execution.
+ */
+export default class AnimationTravel {
+  /**
+   * @type {Object} The sheet controller instance
+   */
+  controller;
+
+  /**
+   * @param {Object} controller - The sheet controller instance
+   */
+  constructor(controller) {
+    this.controller = controller;
+  }
+
+  /**
+   * Default animation config for exiting transitions.
+   *
+   * @returns {Object}
+   */
+  get exitingAnimationDefaults() {
+    return EXITING_ANIMATION_DEFAULTS;
+  }
+
+  /**
+   * Calculate snap-back accelerator travel axis size.
+   * @returns {number}
+   * @private
+   */
+  #getSnapBackAcceleratorSize() {
+    const c = this.controller;
+    if (!c.edgeAlignedNoOvershoot) {
+      return 0;
+    }
+    return c.snapToEndDetentsAcceleration === "auto" ? 10 : 1;
+  }
+
+  /**
+   * Check if settings have a recognized easing type.
+   *
+   * @param {string|Object|null} settings - Animation settings
+   * @param {Object|undefined} preset - Resolved preset if any
+   * @returns {boolean}
+   * @private
+   */
+  #hasRecognizedEasing(settings, preset) {
+    const easing = settings?.easing;
+    return (
+      preset ||
+      easing === "spring" ||
+      RECOGNIZED_EASINGS.has(easing) ||
+      (typeof easing === "string" && easing.startsWith("cubic-bezier"))
+    );
+  }
+
+  /**
+   * Resolve animation settings with fallback.
+   * Merge order (later overrides earlier):
+   * 1. Base { skip, easing: "spring" }
+   * 2. Settings object (if not string)
+   * 3. Preset values (if preset found)
+   * 4. Fallback (only if no recognized easing)
+   *
+   * @param {string|Object|null} settings - Animation settings (preset name or config object)
+   * @param {Object} fallback - Fallback config when no recognized easing
+   * @returns {Object}
+   * @private
+   */
+  #resolveAnimationSettings(settings, fallback) {
+    const isString = typeof settings === "string";
+    const presetName = isString ? settings : settings?.preset;
+    const preset = SPRING_PRESETS[presetName];
+
+    const hasEasing = this.#hasRecognizedEasing(settings, preset);
+
+    return {
+      skip: prefersReducedMotion(),
+      easing: "spring",
+      ...(isString ? {} : settings),
+      ...(preset ?? {}),
+      ...(hasEasing ? {} : fallback),
+    };
+  }
+
+  /**
+   * Determine travel type based on current and destination detent.
+   *
+   * @param {number} destinationDetent - Target detent index
+   * @returns {string} "entering", "exiting", or "stepping"
+   * @private
+   */
+  #determineTravelType(destinationDetent) {
+    if (destinationDetent === 0) {
+      return "exiting";
+    } else if (this.controller.activeDetent === 0) {
+      return "entering";
+    }
+    return "stepping";
+  }
+
+  /**
+   * Get raw animation settings for a travel type.
+   * For stepping, falls back to entering settings if not specified.
+   *
+   * @param {string} travelType - "entering", "exiting", or "stepping"
+   * @returns {string|Object|null}
+   * @private
+   */
+  #getRawAnimationSettings(travelType) {
+    const {
+      enteringAnimationSettings,
+      exitingAnimationSettings,
+      steppingAnimationSettings,
+    } = this.controller;
+
+    switch (travelType) {
+      case "entering":
+        return enteringAnimationSettings;
+      case "exiting":
+        return exitingAnimationSettings;
+      case "stepping":
+        return steppingAnimationSettings ?? enteringAnimationSettings;
+      default:
+        return null;
+    }
+  }
+
+  /**
+   * Get fallback config for a travel type.
+   *
+   * @param {string} travelType - "entering", "exiting", or "stepping"
+   * @returns {Object}
+   * @private
+   */
+  #getFallbackForTravelType(travelType) {
+    return travelType === "exiting"
+      ? this.exitingAnimationDefaults
+      : SPRING_PRESETS.smooth;
+  }
+
+  /**
+   * Get resolved animation config for traveling to a destination detent.
+   *
+   * @param {number} destinationDetent - Target detent index
+   * @param {string} [travelType] - Override travel type detection
+   * @returns {Object}
+   * @private
+   */
+  #getAnimationConfigForTravel(destinationDetent, travelType = null) {
+    const resolvedTravelType =
+      travelType ?? this.#determineTravelType(destinationDetent);
+    const settings = this.#getRawAnimationSettings(resolvedTravelType);
+    const fallback = this.#getFallbackForTravelType(resolvedTravelType);
+
+    return this.#resolveAnimationSettings(settings, fallback);
+  }
+
+  /**
+   * Animate sheet to a specific detent.
+   *
+   * @param {number} detentIndex - Target detent index
+   * @param {Object} [animationConfig] - Override animation config
+   * @returns {void}
+   */
+  animateToDetent(detentIndex, animationConfig = null) {
+    const c = this.controller;
+    const hasProgressValues = c.dimensions?.progressValueAtDetents?.length;
+
+    if (
+      !c.scrollContainer ||
+      !c.contentWrapper ||
+      !c.dimensions ||
+      !hasProgressValues
+    ) {
+      if (c.state.openness.isClosing && detentIndex === 0) {
+        c.state.openness.completeAnimation();
+        c.state.staging.advance();
+      }
+      if (c.state.openness.isOpening) {
+        c.state.openness.completeAnimation();
+        c.state.staging.advance();
+      }
+      return;
+    }
+
+    const travelType = this.#determineTravelType(detentIndex);
+    const resolvedConfig =
+      animationConfig ||
+      this.#getAnimationConfigForTravel(detentIndex, travelType);
+
+    const settings = this.#getRawAnimationSettings(travelType);
+    const trackToTravelOn =
+      (typeof settings === "object" && settings?.track) || c.tracks;
+
+    travelToDetent({
+      destinationDetent: detentIndex,
+      currentDetent: c.activeDetent,
+      dimensions: c.dimensions,
+      scrollContainer: c.scrollContainer,
+      contentWrapper: c.contentWrapper,
+      view: c.view,
+      tracks: c.tracks,
+      travelAnimations: c.travelAnimations,
+      belowSheetsInStack: c.belowSheetsInStack,
+      trackToTravelOn,
+      animationConfig: resolvedConfig,
+      setSegment: c.setSegment,
+      swipeOutDisabledWithDetent:
+        c.dimensions?.swipeOutDisabledWithDetent ?? false,
+      contentPlacement: c.contentPlacement,
+      hasOppositeTracks: c.tracks === "horizontal" || c.tracks === "vertical",
+      snapBackAcceleratorTravelAxisSize: this.#getSnapBackAcceleratorSize(),
+      onTravel: c.onTravel,
+      onTravelStart: c.onTravelStart,
+      runOnTravelStart: true,
+      onTravelEnd: () => this.#handleTravelEnd(),
+    });
+  }
+
+  /**
+   * Handle travel completion and state transitions.
+   * @returns {void}
+   * @private
+   */
+  #handleTravelEnd() {
+    const c = this.controller;
+    const exactProgress =
+      c.dimensions?.exactProgressValueAtDetents?.[c.currentSegment[0]];
+
+    if (exactProgress !== undefined) {
+      c.lastProcessedProgress = exactProgress;
+      c.stackingAdapter?.updateTravelProgress(exactProgress);
+    }
+
+    c.onTravelEnd?.();
+
+    const animationState = c.state.staging.current;
+    const wasOpening = c.state.openness.isOpening;
+    const wasClosing = c.state.openness.isClosing;
+    const wasOpen = c.state.openness.isOpen;
+    const shouldAdvancePosition =
+      c.state.position.isFrontOpening || c.state.position.isFrontClosing;
+    const shouldAdvanceAnimation = ["opening", "stepping", "closing"].includes(
+      animationState
+    );
+    const wasStepping = c.state.staging.matches("stepping");
+
+    if (wasOpening || wasClosing) {
+      c.state.openness.completeAnimation();
+    }
+
+    if (shouldAdvancePosition) {
+      c.state.position.advance();
+      c.stackingAdapter?.notifyParentPositionMachineNext();
+    }
+
+    if (shouldAdvanceAnimation) {
+      c.state.staging.advance();
+    }
+
+    if (wasOpen && wasStepping) {
+      c.updateTravelStatus("idleInside");
+    }
+  }
+
+  /**
+   * Travel to detent after resize without animation.
+   *
+   * @param {number} detentIndex - Target detent index
+   * @returns {void}
+   */
+  recalculateAndTravel(detentIndex) {
+    const c = this.controller;
+
+    if (!c.scrollContainer || !c.contentWrapper || !c.dimensions) {
+      return;
+    }
+
+    travelToDetent({
+      destinationDetent: detentIndex,
+      currentDetent: detentIndex,
+      dimensions: c.dimensions,
+      scrollContainer: c.scrollContainer,
+      contentWrapper: c.contentWrapper,
+      view: c.view,
+      tracks: c.tracks,
+      travelAnimations: c.travelAnimations,
+      belowSheetsInStack: c.belowSheetsInStack,
+      trackToTravelOn: c.tracks,
+      behavior: "instant",
+      runTravelCallbacksAndAnimations: false,
+      runOnTravelStart: false,
+      setSegment: c.setSegment,
+      swipeOutDisabledWithDetent:
+        c.dimensions?.swipeOutDisabledWithDetent ?? false,
+      contentPlacement: c.contentPlacement,
+      hasOppositeTracks: c.tracks === "horizontal" || c.tracks === "vertical",
+      snapBackAcceleratorTravelAxisSize:
+        c.dimensions?.snapOutAccelerator?.travelAxis?.unitless || 0,
+    });
+  }
+
+  /**
+   * Travel to stuck position (first or last detent) instantly.
+   *
+   * @param {string} direction - "front" for last detent, "back" for first
+   * @param {Function} onComplete - Callback when travel completes
+   * @returns {void}
+   */
+  stepToStuckPosition(direction, onComplete) {
+    const c = this.controller;
+
+    if (!c.scrollContainer || !c.dimensions?.detentMarkers) {
+      return;
+    }
+
+    const lastDetent = c.dimensions.detentMarkers.length;
+    const destinationDetent = direction === "front" ? lastDetent : 1;
+
+    const overflowTimeout = CSS.supports("overscroll-behavior", "none")
+      ? 1
+      : 10;
+    c.domAttributes?.temporarilyHideOverflow(overflowTimeout);
+
+    travelToDetent({
+      destinationDetent,
+      currentDetent: c.activeDetent,
+      dimensions: c.dimensions,
+      scrollContainer: c.scrollContainer,
+      contentWrapper: c.contentWrapper,
+      view: c.view,
+      tracks: c.tracks,
+      travelAnimations: c.travelAnimations,
+      belowSheetsInStack: c.belowSheetsInStack,
+      trackToTravelOn: c.tracks,
+      animationConfig: { skip: true },
+      setSegment: c.setSegment,
+      swipeOutDisabledWithDetent:
+        c.dimensions?.swipeOutDisabledWithDetent ?? false,
+      contentPlacement: c.contentPlacement,
+      hasOppositeTracks: c.tracks === "horizontal" || c.tracks === "vertical",
+      snapBackAcceleratorTravelAxisSize: this.#getSnapBackAcceleratorSize(),
+      onTravelEnd: onComplete,
+    });
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/animation.js b/frontend/discourse/float-kit/components/d-sheet/animation.js
new file mode 100644
index 0000000000000..87a0d69a41cac
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/animation.js
@@ -0,0 +1,418 @@
+/**
+ * Animation engine for d-sheet components, providing spring physics and bezier easing.
+ * Handles animation configuration, progress calculation, and interpolation for sheet transitions.
+ * Supports spring-based animations (with presets like "gentle", "snappy", "bouncy") and traditional
+ * cubic-bezier easing functions. Generates frame-by-frame progress values for smooth animations,
+ * with browser-native CSS calc() expressions for optimal performance.
+ */
+
+import { capabilities } from "discourse/services/capabilities";
+
+/**
+ * Constants for Bezier curve calculations.
+ */
+
+/** Max iterations for Newton-Raphson refinement. @type {number} */
+const NEWTON_RAPHSON_ITERATIONS = 4;
+
+/** Convergence threshold for binary subdivision. @type {number} */
+const BINARY_SUBDIVISION_THRESHOLD = 1e-7;
+
+/** Max iterations for binary subdivision. @type {number} */
+const BINARY_SUBDIVISION_ITERATIONS = 10;
+
+/** Number of precomputed samples along the bezier curve. @type {number} */
+const BEZIER_SAMPLE_SIZE = 11;
+
+/** Interval between precomputed bezier samples. @type {number} */
+const BEZIER_SAMPLE_INTERVAL = 0.1;
+
+/** Minimum derivative value before falling back to binary subdivision. @type {number} */
+const DERIVATIVE_THRESHOLD = 0.001;
+
+/**
+ * Default animation values.
+ */
+
+/** Default duration in frames for non-spring animations. @type {number} */
+const DEFAULT_ANIMATION_DURATION = 250;
+
+/** Default spring stiffness. @type {number} */
+const SPRING_STIFFNESS_DEFAULT = 300;
+
+/** Default spring damping coefficient. @type {number} */
+const SPRING_DAMPING_DEFAULT = 34;
+
+/** Default spring mass. @type {number} */
+const SPRING_MASS_DEFAULT = 1;
+
+/** Default precision threshold for spring settlement. @type {number} */
+const SPRING_PRECISION_DEFAULT = 0.1;
+
+/**
+ * Spring physics constants.
+ */
+
+/** Scaling factor for converting stiffness to spring constant. @type {number} */
+const SPRING_CONSTANT_SCALE = 0.000001;
+
+/** Scaling factor for converting damping to damping constant. @type {number} */
+const DAMPING_CONSTANT_SCALE = 0.001;
+
+/** Scaling factor for deriving velocity stability threshold. @type {number} */
+const VELOCITY_THRESHOLD_SCALE = 22;
+
+/** Scaling factor for deriving position stability threshold. @type {number} */
+const POSITION_THRESHOLD_SCALE = 10;
+
+/**
+ * Standard CSS easing cubic-bezier points.
+ *
+ * @type {Object<string, number[]>}
+ */
+const STANDARD_EASINGS = {
+  ease: [0.25, 0.1, 0.25, 1],
+  "ease-in": [0.42, 0, 1, 1],
+  "ease-out": [0, 0, 0.58, 1],
+  "ease-in-out": [0.42, 0, 0.58, 1],
+};
+
+/**
+ * Parse a cubic-bezier string into an array of points.
+ *
+ * @param {string} easing - Easing string (e.g., "cubic-bezier(0.1, 0.7, 1.0, 0.1)")
+ * @returns {number[]|null} Array of 4 points or null if invalid
+ */
+function parseCubicBezier(easing) {
+  const prefix = "cubic-bezier(";
+  if (!easing.startsWith(prefix)) {
+    return null;
+  }
+
+  const points = easing
+    .slice(prefix.length, -1)
+    .split(",")
+    .map((p) => parseFloat(p.trim()));
+
+  return points.length === 4 && !points.some(isNaN) ? points : null;
+}
+
+/**
+ * Calculate bezier curve value at parameter t.
+ *
+ * @param {number} t - Parameter value (0-1)
+ * @param {number} p1 - First control point
+ * @param {number} p2 - Second control point
+ * @returns {number} Bezier value at t
+ */
+function bezierValue(t, p1, p2) {
+  return (((1 - 3 * p2 + 3 * p1) * t + (3 * p2 - 6 * p1)) * t + 3 * p1) * t;
+}
+
+/**
+ * Calculate bezier curve derivative at parameter t.
+ *
+ * @param {number} t - Parameter value (0-1)
+ * @param {number} p1 - First control point
+ * @param {number} p2 - Second control point
+ * @returns {number} Derivative value at t
+ */
+function bezierDerivative(t, p1, p2) {
+  return 3 * (1 - 3 * p2 + 3 * p1) * t * t + 2 * (3 * p2 - 6 * p1) * t + 3 * p1;
+}
+
+/**
+ * Refine t estimate using Newton-Raphson iteration.
+ *
+ * @param {number} x - Target x value
+ * @param {number} guessT - Initial t estimate
+ * @param {number} x1 - First control point x
+ * @param {number} x2 - Second control point x
+ * @returns {number} Refined t value
+ */
+function newtonRaphsonIterate(x, guessT, x1, x2) {
+  for (let i = 0; i < NEWTON_RAPHSON_ITERATIONS; ++i) {
+    const derivative = bezierDerivative(guessT, x1, x2);
+    if (derivative === 0) {
+      break;
+    }
+    const currentX = bezierValue(guessT, x1, x2) - x;
+    guessT -= currentX / derivative;
+  }
+  return guessT;
+}
+
+/**
+ * Find t using binary subdivision when derivative is too small.
+ *
+ * @param {number} x - Target x value
+ * @param {number} start - Start of interval
+ * @param {number} end - End of interval
+ * @param {number} x1 - First control point x
+ * @param {number} x2 - Second control point x
+ * @returns {number} Refined t value
+ */
+function binarySubdivide(x, start, end, x1, x2) {
+  let mid;
+  let currentX;
+  let iterations = 0;
+
+  do {
+    mid = start + (end - start) / 2;
+    currentX = bezierValue(mid, x1, x2) - x;
+    if (currentX > 0) {
+      end = mid;
+    } else {
+      start = mid;
+    }
+  } while (
+    Math.abs(currentX) > BINARY_SUBDIVISION_THRESHOLD &&
+    ++iterations < BINARY_SUBDIVISION_ITERATIONS
+  );
+
+  return mid;
+}
+
+/**
+ * Find the parameter t for a given x value on the bezier curve.
+ *
+ * @param {number} x - Target x value
+ * @param {number} x1 - First control point x
+ * @param {number} x2 - Second control point x
+ * @param {Float32Array|number[]} sampleValues - Sampled x values
+ * @returns {number} Parameter t
+ */
+function getTForX(x, x1, x2, sampleValues) {
+  let intervalStart = 0;
+  let i = 1;
+  for (; i !== BEZIER_SAMPLE_SIZE - 1 && sampleValues[i] <= x; ++i) {
+    intervalStart += BEZIER_SAMPLE_INTERVAL;
+  }
+  const guessT =
+    intervalStart +
+    ((x - sampleValues[--i]) / (sampleValues[i + 1] - sampleValues[i])) *
+      BEZIER_SAMPLE_INTERVAL;
+  const derivative = bezierDerivative(guessT, x1, x2);
+
+  if (derivative >= DERIVATIVE_THRESHOLD) {
+    return newtonRaphsonIterate(x, guessT, x1, x2);
+  } else if (derivative === 0) {
+    return guessT;
+  } else {
+    return binarySubdivide(
+      x,
+      intervalStart,
+      intervalStart + BEZIER_SAMPLE_INTERVAL,
+      x1,
+      x2
+    );
+  }
+}
+
+/**
+ * Create a cubic bezier easing function.
+ *
+ * @param {number} x1 - First control point x
+ * @param {number} y1 - First control point y
+ * @param {number} x2 - Second control point x
+ * @param {number} y2 - Second control point y
+ * @returns {Function} Easing function that takes time (0-1) and returns progress (0-1)
+ */
+function createCubicBezierEasing(x1, y1, x2, y2) {
+  if (!(0 <= x1 && x1 <= 1 && 0 <= x2 && x2 <= 1)) {
+    throw new Error("bezier x values must be in [0, 1] range");
+  }
+
+  if (x1 === y1 && x2 === y2) {
+    return (t) => t;
+  }
+
+  const sampleValues =
+    typeof Float32Array === "function"
+      ? new Float32Array(BEZIER_SAMPLE_SIZE)
+      : new Array(BEZIER_SAMPLE_SIZE);
+
+  for (let i = 0; i < BEZIER_SAMPLE_SIZE; ++i) {
+    sampleValues[i] = bezierValue(i * BEZIER_SAMPLE_INTERVAL, x1, x2);
+  }
+
+  return (time) => {
+    if (time === 0 || time === 1) {
+      return time;
+    }
+
+    return bezierValue(getTForX(time, x1, x2, sampleValues), y1, y2);
+  };
+}
+
+/**
+ * Calculate spring animation values.
+ *
+ * @param {Object} config - Spring configuration
+ * @param {number} [config.mass=1] - Mass
+ * @param {number} [config.stiffness=300] - Stiffness
+ * @param {number} [config.damping=34] - Damping
+ * @param {number} [config.initialVelocity=0] - Initial velocity
+ * @param {number} [config.fromPosition=0] - Starting position
+ * @param {number} [config.toPosition=1] - Target position
+ * @param {number} [config.precision=0.1] - Precision threshold
+ * @returns {{ progressValuesArray: number[], duration: number }}
+ */
+function calculateSpringAnimation(config) {
+  const mass = config.mass ?? SPRING_MASS_DEFAULT;
+  const stiffness = config.stiffness ?? SPRING_STIFFNESS_DEFAULT;
+  const damping = config.damping ?? SPRING_DAMPING_DEFAULT;
+  const initialVelocity = config.initialVelocity ?? 0;
+  const fromPosition = config.fromPosition ?? 0;
+  const toPosition = config.toPosition ?? 1;
+  const precision = config.precision ?? SPRING_PRECISION_DEFAULT;
+
+  const progressValues = [];
+  let frameCount = 0;
+  const distance = Math.abs(toPosition - fromPosition);
+
+  if (distance === 0) {
+    return {
+      progressValuesArray: [],
+      duration: 0,
+    };
+  }
+
+  let position = 0;
+  let velocity = initialVelocity;
+
+  let isPositionStable = false;
+  let isVelocityStable = false;
+
+  const springConstant = -stiffness * SPRING_CONSTANT_SCALE;
+  const dampingConstant = -damping * DAMPING_CONSTANT_SCALE;
+  const velocityThreshold = precision / VELOCITY_THRESHOLD_SCALE;
+  const positionThreshold = precision * POSITION_THRESHOLD_SCALE;
+
+  while (!(isPositionStable && isVelocityStable)) {
+    const springForce = springConstant * (position - distance);
+    const dampingForce = dampingConstant * velocity;
+    const acceleration = (springForce + dampingForce) / mass;
+
+    velocity += acceleration;
+    position += velocity;
+
+    isVelocityStable = Math.abs(velocity) <= velocityThreshold;
+    isPositionStable = Math.abs(distance - position) <= positionThreshold;
+
+    const progress = position / distance;
+    progressValues.push(progress);
+    frameCount++;
+  }
+
+  return {
+    progressValuesArray: progressValues,
+    duration: frameCount,
+  };
+}
+
+/**
+ * Spring animation presets.
+ *
+ * @type {Object.<string, {stiffness: number, damping: number, mass: number}>}
+ */
+export const SPRING_PRESETS = {
+  gentle: { stiffness: 560, damping: 68, mass: 1.85 },
+  smooth: { stiffness: 580, damping: 60, mass: 1.35 },
+  snappy: { stiffness: 350, damping: 34, mass: 0.9 },
+  brisk: { stiffness: 350, damping: 28, mass: 0.65 },
+  bouncy: { stiffness: 240, damping: 19, mass: 0.7 },
+  elastic: { stiffness: 260, damping: 20, mass: 1 },
+};
+
+/**
+ * Generate animation configuration from origin/destination and settings.
+ *
+ * @param {Object} config
+ * @param {number} [config.origin=0] - Starting position
+ * @param {number} [config.destination=1] - Target position
+ * @param {Object} [config.animationConfig={}] - Animation settings
+ * @returns {{ progressValuesArray: number[], easing: string, duration: number, delay: number }}
+ */
+export function generateAnimationConfig(config) {
+  const origin = config.origin ?? 0;
+  const destination = config.destination ?? 1;
+  const animationConfig = config.animationConfig ?? {};
+
+  let progressValues = [];
+  let duration;
+
+  if (animationConfig.easing && animationConfig.easing !== "spring") {
+    duration = animationConfig.duration ?? DEFAULT_ANIMATION_DURATION;
+
+    if (animationConfig.easing === "linear") {
+      const step = 1 / (duration - 1);
+      for (let i = 0; i < duration; i++) {
+        const progress = i * step;
+        progressValues.push(isNaN(progress) ? 0 : progress);
+      }
+    } else {
+      let bezierPoints;
+      if (STANDARD_EASINGS[animationConfig.easing]) {
+        bezierPoints = STANDARD_EASINGS[animationConfig.easing];
+      } else if (
+        animationConfig.easing.startsWith("cubic-bezier") &&
+        parseCubicBezier(animationConfig.easing)
+      ) {
+        bezierPoints = parseCubicBezier(animationConfig.easing);
+      } else {
+        bezierPoints = STANDARD_EASINGS.ease;
+      }
+
+      const easing = createCubicBezierEasing(...bezierPoints);
+      for (let i = 0; i <= duration; i++) {
+        progressValues.push(easing(i / duration));
+      }
+    }
+  } else {
+    const springResult = calculateSpringAnimation({
+      stiffness: animationConfig.stiffness,
+      damping: animationConfig.damping,
+      mass: animationConfig.mass,
+      initialVelocity: animationConfig.initialVelocity,
+      precision: animationConfig.precision,
+      fromPosition: origin,
+      toPosition: destination,
+    });
+
+    progressValues = springResult.progressValuesArray;
+    duration = springResult.duration;
+  }
+
+  return {
+    progressValuesArray: progressValues,
+    easing: "linear",
+    duration,
+    delay: animationConfig.delay ?? 0,
+  };
+}
+
+/**
+ * Create a tween function for interpolating values based on progress.
+ * Always returns CSS calc() expressions to let the browser handle interpolation.
+ *
+ * @param {number} progress - Progress value (0-1)
+ * @returns {Function} Tween function (start, end) => CSS calc expression
+ */
+export function createTweenFunction(progress) {
+  return (start, end) => {
+    return `calc(${start} + (${end} - ${start}) * ${progress})`;
+  };
+}
+
+/**
+ * Check if browser supports linear() easing function.
+ *
+ * @returns {boolean}
+ */
+export function supportsLinearEasing() {
+  return (
+    CSS.supports("transition-timing-function", "linear(0, 1)") &&
+    !capabilities.isWebKit
+  );
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
new file mode 100644
index 0000000000000..f29823293ae03
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
@@ -0,0 +1,128 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import effect from "discourse/float-kit/helpers/effect";
+import concatClass from "discourse/helpers/concat-class";
+import Outlet from "./outlet";
+
+/**
+ * Default opacity travel animation for backdrop.
+ * @type {{ opacity: (params: { progress: number }) => number }}
+ */
+const DEFAULT_BACKDROP_TRAVEL_ANIMATION = {
+  opacity: ({ progress }) => Math.min(progress * 0.33, 0.33),
+};
+
+/**
+ * Backdrop component for d-sheet. Renders a semi-transparent overlay behind the sheet
+ * content that can optionally respond to click/swipe interactions.
+ *
+ * @component Backdrop
+ * @param {Object} sheet - The sheet controller instance
+ * @param {boolean} [swipeable=true] - Whether backdrop responds to click/swipe
+ * @param {Object|null} [travelAnimation] - Custom travel animation config. Properties can be:
+ *   - [start, end] array for keyframe tweening
+ *   - ({ progress, tween }) => value function
+ *   - string for static values
+ *   - null to disable
+ *   Default: { opacity: ({ progress }) => Math.min(progress * 0.33, 0.33) }
+ *   Set to { opacity: null } to disable default opacity animation.
+ * @param {Object} [stackingAnimation] - Stacking animation config (same format as travelAnimation)
+ */
+export default class Backdrop extends Component {
+  /**
+   * The rendered backdrop DOM element.
+   * @type {HTMLElement|null}
+   */
+  @tracked backdropElement = null;
+
+  /**
+   * Whether the backdrop responds to click/swipe interactions.
+   * Defaults to true when the arg is not provided.
+   *
+   * @type {boolean}
+   */
+  get swipeable() {
+    return this.args.swipeable ?? true;
+  }
+
+  /**
+   * Effective travel animation config, merging default with provided config.
+   * Converts array-style opacity values to interpolation functions.
+   *
+   * @type {Object|null}
+   */
+  get effectiveTravelAnimation() {
+    const userAnimation = this.args.travelAnimation;
+
+    if (userAnimation === null) {
+      return null;
+    }
+
+    const merged = { ...DEFAULT_BACKDROP_TRAVEL_ANIMATION, ...userAnimation };
+
+    if (Array.isArray(merged.opacity)) {
+      const [start, end] = merged.opacity;
+      merged.opacity = ({ progress }) => start + (end - start) * progress;
+    }
+
+    return merged;
+  }
+
+  /**
+   * Stores the rendered backdrop element.
+   *
+   * @param {HTMLElement} element
+   */
+  @action
+  setBackdropElement(element) {
+    this.backdropElement = element;
+  }
+
+  /**
+   * Registers the backdrop with the sheet controller and returns a cleanup function.
+   * Called via the effect helper when dependencies change.
+   *
+   * @param {Object} sheet - The sheet controller instance
+   * @param {HTMLElement} backdropElement - The backdrop DOM element
+   * @param {boolean} swipeable - Whether the backdrop responds to interactions
+   * @param {Object|null} travelAnimation - The effective travel animation config
+   * @returns {Function|undefined} Cleanup function to unregister the backdrop
+   */
+  @action
+  syncBackdrop(sheet, backdropElement, swipeable, travelAnimation) {
+    if (!sheet || !backdropElement) {
+      return;
+    }
+
+    sheet.registerBackdrop(backdropElement, travelAnimation, swipeable);
+
+    return () => {
+      sheet.unregisterBackdrop(backdropElement);
+    };
+  }
+
+  <template>
+    {{#if @sheet}}
+      {{effect
+        this.syncBackdrop
+        @sheet
+        this.backdropElement
+        this.swipeable
+        this.effectiveTravelAnimation
+      }}
+      <Outlet
+        @sheet={{@sheet}}
+        @travelAnimation={{this.effectiveTravelAnimation}}
+        @stackingAnimation={{@stackingAnimation}}
+        data-d-sheet={{concatClass
+          "backdrop"
+          (if @sheet.scrollContainerShouldBePassThrough "no-pointer-events")
+        }}
+        {{didInsert this.setBackdropElement}}
+        ...attributes
+      />
+    {{/if}}
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs b/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
new file mode 100644
index 0000000000000..8d4f21646e1e0
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
@@ -0,0 +1,21 @@
+import concatClass from "discourse/helpers/concat-class";
+
+/**
+ * Renders a bleeding background div for the d-sheet that extends behind the sheet content.
+ *
+ * @component BleedingBackground
+ * @param {import("./controller").default} sheet - The sheet controller instance providing placement, tracks, and staging state
+ */
+const BleedingBackground = <template>
+  <div
+    data-d-sheet={{concatClass
+      "bleeding-background"
+      @sheet.contentPlacementCssClass
+      @sheet.tracks
+      @sheet.stagingAttribute
+    }}
+    ...attributes
+  ></div>
+</template>;
+
+export default BleedingBackground;
diff --git a/frontend/discourse/float-kit/components/d-sheet/config-normalizer.js b/frontend/discourse/float-kit/components/d-sheet/config-normalizer.js
new file mode 100644
index 0000000000000..04be50e46b38a
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/config-normalizer.js
@@ -0,0 +1,158 @@
+/**
+ * @module config-normalizer
+ * Normalizes and resolves d-sheet track and placement configuration options.
+ */
+
+/**
+ * Convert track direction to content placement.
+ * When only tracks is provided, contentPlacement is derived from tracks.
+ * Array tracks and horizontal/vertical normalize to "center".
+ *
+ * @param {string | Array<string>} track - Track direction or array of tracks
+ * @returns {"center" | string} Content placement value
+ */
+function trackToPlacement(track) {
+  if (Array.isArray(track)) {
+    return "center";
+  }
+  switch (track) {
+    case "horizontal":
+    case "vertical":
+      return "center";
+    default:
+      return track;
+  }
+}
+
+/**
+ * Normalize array tracks to a single track string.
+ * Array tracks like ["left", "right"] or ["top", "bottom"] are normalized
+ * to "horizontal" or "vertical" respectively.
+ *
+ * @param {string | Array<string>} track - Track direction or array of tracks
+ * @returns {"horizontal" | "vertical" | string} Normalized track value
+ */
+function normalizeTrack(track) {
+  if (Array.isArray(track)) {
+    return track.includes("left") ? "horizontal" : "vertical";
+  }
+  return track;
+}
+
+/**
+ * Convert API placement value to CSS class.
+ * Uses "start"/"end" for vertical, "left"/"right" for horizontal, "center" for centered.
+ *
+ * @param {"top" | "bottom" | "left" | "right" | "center"} placement - Placement value
+ * @returns {"start" | "end" | "left" | "right" | "center"} CSS class value
+ */
+export function placementToCssClass(placement) {
+  switch (placement) {
+    case "top":
+      return "start";
+    case "bottom":
+      return "end";
+    case "left":
+      return "left";
+    case "right":
+      return "right";
+    case "center":
+      return "center";
+    default:
+      return "end";
+  }
+}
+
+/**
+ * Convert content placement to track direction.
+ * Inverse of trackToPlacement - when only contentPlacement is provided.
+ *
+ * @param {string} placement - Content placement value
+ * @returns {string} Track direction
+ */
+function placementToTrack(placement) {
+  return placement === "center" ? "bottom" : placement;
+}
+
+/**
+ * Resolve tracks and contentPlacement from partial options.
+ * Handles the logic of deriving missing options from provided ones.
+ *
+ * @param {Object} options - Configuration options
+ * @param {string | Array<string>} [options.tracks] - Track direction or array of tracks
+ * @param {string} [options.contentPlacement] - Content placement
+ * @param {Object} defaults - Default values
+ * @param {string} defaults.tracks - Default track direction
+ * @param {string} defaults.contentPlacement - Default content placement
+ * @returns {{ tracks: string, contentPlacement: string }} Resolved values
+ */
+export function resolveTracksAndPlacement(options, defaults) {
+  const hasPlacement = options.contentPlacement !== undefined;
+  const hasTracks = options.tracks !== undefined;
+
+  let tracks = defaults.tracks;
+  let contentPlacement = defaults.contentPlacement;
+
+  if (hasPlacement && !hasTracks) {
+    contentPlacement = options.contentPlacement;
+    tracks = placementToTrack(options.contentPlacement);
+  } else if (hasTracks && !hasPlacement) {
+    tracks = normalizeTrack(options.tracks);
+    contentPlacement = trackToPlacement(options.tracks);
+  } else if (hasPlacement && hasTracks) {
+    contentPlacement = options.contentPlacement;
+    tracks = normalizeTrack(options.tracks);
+  }
+
+  validateTracksPlacement(tracks, contentPlacement);
+  return { tracks, contentPlacement };
+}
+
+/**
+ * Validate that tracks and contentPlacement are compatible.
+ * When both are provided, contentPlacement must match tracks (or be "center").
+ * Logs a console warning when an invalid combination is detected.
+ *
+ * @param {string | Array<string>} tracks - Track direction or array of tracks
+ * @param {string} contentPlacement - Content placement
+ * @returns {boolean} Whether the combination is valid
+ */
+export function validateTracksPlacement(tracks, contentPlacement) {
+  if (!tracks || !contentPlacement) {
+    return true;
+  }
+
+  const isArrayTracks = Array.isArray(tracks);
+  const isCenterPlacement = contentPlacement === "center";
+
+  // Check for edge-aligned placement with non-matching tracks
+  const edgePlacements = ["top", "bottom", "left", "right"];
+  for (const edge of edgePlacements) {
+    if (contentPlacement === edge && tracks !== edge) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        `d-sheet: contentPlacement "${contentPlacement}" cannot be used ` +
+          `with tracks="${tracks}". Use "${edge}" or "center" for contentPlacement.`
+      );
+      return false;
+    }
+  }
+
+  // Check for bidirectional array tracks without center placement
+  if (isArrayTracks && !isCenterPlacement) {
+    const hasBothVertical = tracks.includes("top") && tracks.includes("bottom");
+    const hasBothHorizontal =
+      tracks.includes("left") && tracks.includes("right");
+
+    if (hasBothVertical || hasBothHorizontal) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        `d-sheet: contentPlacement "${contentPlacement}" cannot be used ` +
+          `with bidirectional tracks. Use "center" for contentPlacement.`
+      );
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/content.gjs b/frontend/discourse/float-kit/components/d-sheet/content.gjs
new file mode 100644
index 0000000000000..09cd13232a8b0
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/content.gjs
@@ -0,0 +1,140 @@
+import Component from "@glimmer/component";
+import { concat, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import { htmlSafe } from "@ember/template";
+import concatClass from "discourse/helpers/concat-class";
+import outletAnimationModifier from "./outlet-animation-modifier";
+import scrollListenerModifier from "./scroll-listener-modifier";
+
+/**
+ * Renders the scrollable content area of a sheet including scroll containers, content wrapper, and detent markers.
+ *
+ * @component Content
+ * @param {import("./controller").default} sheet - The sheet controller instance managing state, dimensions, and interactions
+ * @param {Record<string, [number, number] | ((params: { progress: number, tween: Function }) => string) | string | null>} [travelAnimation] - Travel animation config. Properties can be:
+ *   - [start, end] array for keyframe tweening
+ *   - ({ progress, tween }) => value function
+ *   - string for static values
+ *   - null to disable
+ *   Supports: opacity, visibility, transforms (translate, scale, rotate, skew variants),
+ *   and any CSS property
+ * @param {Record<string, [number, number] | ((params: { progress: number, tween: Function }) => string) | string | null>} [stackingAnimation] - Custom stacking animation config (same format as travelAnimation)
+ * @param {boolean} [asChild] - When true, skips rendering the content div and yields attributes for child to apply
+ */
+export default class Content extends Component {
+  /**
+   * Generates inline CSS custom properties for positioning a detent marker relative to its neighbors.
+   *
+   * @param {Array<string>} detents - Array of CSS length values representing detent positions
+   * @param {number} index - Zero-based index of the current detent in the array
+   * @returns {import("@ember/template").SafeString} Inline style string with --d-sheet-marker-prev, --d-sheet-marker-current, and --d-sheet-marker-index custom properties
+   */
+  stylesForDetentMarker(detents, index) {
+    const currentDetent = detents[index];
+    const prevDetent = index > 0 ? detents[index - 1] : "0px";
+
+    return htmlSafe(
+      `--d-sheet-marker-prev: ${prevDetent}; --d-sheet-marker-current: ${currentDetent}; --d-sheet-marker-index: ${index};`
+    );
+  }
+
+  <template>
+    <div
+      data-d-sheet={{concatClass
+        "scroll-container"
+        "overscroll-contain"
+        "scroll-trap-marker"
+        "scroll-behavior-smooth"
+        @sheet.tracks
+        @sheet.contentPlacementCssClass
+        (concat "staging-" @sheet.state.staging.current)
+        @sheet.effectiveSwipeTrapClass
+        "scroll-trap-optimised"
+        (if @sheet.swipeOutDisabledWithDetent "swipe-out-disabled")
+        (unless @sheet.swipeOvershoot "overshoot-inactive")
+        (if @sheet.scrollContainerShouldBePassThrough "no-pointer-events")
+      }}
+      {{didInsert @sheet.registerScrollContainer}}
+      {{scrollListenerModifier
+        @sheet.processScrollFrame
+        @sheet.state.openness.isScrollOngoing
+      }}
+      {{on "scroll" @sheet.handleScrollStateChange passive=true}}
+      {{on "touchstart" @sheet.handleTouchStart passive=true}}
+      {{on "touchend" @sheet.handleTouchEnd passive=true}}
+    >
+      <div data-d-sheet={{concatClass "front-spacer" @sheet.tracks}}></div>
+
+      <div
+        data-d-sheet={{concatClass
+          "content-wrapper"
+          @sheet.contentPlacementCssClass
+          (concat "staging-" @sheet.state.staging.current)
+          (if @sheet.swipeOvershoot "overshoot-active" "overshoot-inactive")
+          (if @sheet.swipeOutDisabledWithDetent "swipe-out-disabled")
+          (if
+            @sheet.isHorizontalTrack
+            "snap-type-x-mandatory"
+            "snap-type-y-mandatory"
+          )
+          @sheet.tracks
+        }}
+        {{didInsert @sheet.registerContentWrapper}}
+      >
+        {{#if @asChild}}
+          {{yield
+            (hash
+              dataDSheet=(concatClass
+                "content"
+                @sheet.contentPlacementCssClass
+                @sheet.tracks
+                (if
+                  @sheet.scrollContainerShouldBePassThrough "no-pointer-events"
+                )
+              )
+              registerContent=@sheet.registerContent
+              travelAnimation=@travelAnimation
+              stackingAnimation=@stackingAnimation
+            )
+          }}
+        {{else}}
+          <div
+            data-d-sheet={{concatClass
+              "content"
+              @sheet.contentPlacementCssClass
+              @sheet.tracks
+              (if @sheet.scrollContainerShouldBePassThrough "no-pointer-events")
+            }}
+            {{didInsert @sheet.registerContent}}
+            {{outletAnimationModifier
+              @sheet
+              @travelAnimation
+              @stackingAnimation
+            }}
+            ...attributes
+          >
+            {{yield}}
+          </div>
+        {{/if}}
+        <div
+          data-d-sheet={{concatClass "touch-target-expander" @sheet.tracks}}
+        ></div>
+      </div>
+
+      <div data-d-sheet={{concatClass "back-spacer" @sheet.tracks}}>
+        {{#each @sheet.detents as |detent index|}}
+          <div
+            data-d-sheet={{concatClass
+              "detent-marker"
+              @sheet.tracks
+              (if @sheet.swipeOutDisabledWithDetent "swipe-out-disabled")
+            }}
+            style={{this.stylesForDetentMarker @sheet.detents index}}
+            {{didInsert @sheet.registerDetentMarker}}
+          ></div>
+        {{/each}}
+      </div>
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
new file mode 100644
index 0000000000000..a7c37d985fbd8
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -0,0 +1,2253 @@
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import { guidFor } from "@ember/object/internals";
+import { next } from "@ember/runloop";
+import { TrackedArray } from "@ember-compat/tracked-built-ins";
+import { capabilities } from "discourse/services/capabilities";
+import AnimationTravel from "./animation-travel";
+import {
+  placementToCssClass,
+  resolveTracksAndPlacement,
+} from "./config-normalizer";
+import DetentManager from "./detent-manager";
+import DimensionCalculator from "./dimensions-calculator";
+import DOMAttributes from "./dom-attributes";
+import FocusManagement from "./focus-management";
+import ObserverManager from "./observer-manager";
+import ScrollProgressCalculator from "./scroll-progress-calculator";
+import StackingAdapter from "./stacking-adapter";
+import StateHelper from "./state-helper";
+import ThemeColorAdapter from "./theme-color-adapter";
+import TimeoutManager from "./timeout-manager";
+import { TouchHandler } from "./touch-handler";
+
+/**
+ * Browser feature detection for scroll-snap and IntersectionObserver.
+ * @type {boolean}
+ */
+const BROWSER_SUPPORTS_REQUIRED_FEATURES = (() => {
+  const supportsScrollSnap =
+    typeof CSS !== "undefined" && CSS.supports("scroll-snap-align: start");
+
+  const supportsIntersectionObserver =
+    typeof window !== "undefined" &&
+    "IntersectionObserver" in window &&
+    "IntersectionObserverEntry" in window &&
+    "intersectionRatio" in window.IntersectionObserverEntry.prototype;
+
+  return supportsScrollSnap && supportsIntersectionObserver;
+})();
+
+/**
+ * Controller for d-sheet component managing lifecycle, animations, and user interactions.
+ */
+export default class Controller {
+  /**
+   * Default configurations for event handler behaviors.
+   *
+   * @type {{ onClickOutside: { dismiss: boolean, stopOverlayPropagation: boolean }, onEscapeKeyDown: { nativePreventDefault: boolean, dismiss: boolean, stopOverlayPropagation: boolean }, onPresentAutoFocus: { focus: boolean }, onDismissAutoFocus: { focus: boolean } }}
+   */
+  static EVENT_HANDLER_DEFAULTS = {
+    onClickOutside: {
+      dismiss: true,
+      stopOverlayPropagation: true,
+    },
+    onEscapeKeyDown: {
+      nativePreventDefault: true,
+      dismiss: true,
+      stopOverlayPropagation: true,
+    },
+    onPresentAutoFocus: { focus: true },
+    onDismissAutoFocus: { focus: true },
+  };
+
+  /**
+   * Browser feature detection for scroll-snap and IntersectionObserver.
+   * Returns cached result from module-level constant.
+   *
+   * @returns {boolean} Whether required features are supported
+   * @static
+   */
+  static get browserSupportsRequiredFeatures() {
+    return BROWSER_SUPPORTS_REQUIRED_FEATURES;
+  }
+
+  /**
+   * The view element (outermost container).
+   * @type {HTMLElement|null}
+   */
+  @tracked view = null;
+
+  /**
+   * The content element (inner content container).
+   * @type {HTMLElement|null}
+   */
+  @tracked content = null;
+
+  /**
+   * The content wrapper element.
+   * @type {HTMLElement|null}
+   */
+  @tracked contentWrapper = null;
+
+  /**
+   * The scroll container element used for swipe interaction.
+   * @type {HTMLElement|null}
+   */
+  @tracked scrollContainer = null;
+
+  /**
+   * The backdrop element for dimming and click-outside handling.
+   * @type {HTMLElement|null}
+   */
+  @tracked backdrop = null;
+
+  /**
+   * Whether the sheet is currently presented.
+   * @type {boolean}
+   */
+  @tracked isPresented = false;
+
+  /**
+   * Whether it's safe to unmount the sheet (no animations running).
+   * @type {boolean}
+   */
+  @tracked safeToUnmount = true;
+
+  /**
+   * User-provided detent configuration.
+   * @type {Array|null}
+   */
+  @tracked detentsConfig = null;
+
+  /**
+   * Whether swipe overshoot is enabled.
+   * @type {boolean}
+   */
+  @tracked swipeOvershoot = true;
+
+  /**
+   * Whether backdrop responds to swipe gestures.
+   * @type {boolean}
+   */
+  @tracked backdropSwipeable = true;
+
+  /**
+   * Whether elements outside the sheet are inert.
+   * @type {boolean}
+   */
+  @tracked inertOutside = true;
+
+  /**
+   * Array of detent marker elements.
+   * @type {TrackedArray<HTMLElement>}
+   */
+  detentMarkers = new TrackedArray();
+
+  /**
+   * Unique ID for this controller instance.
+   * @type {string}
+   */
+  id = guidFor(this);
+
+  /**
+   * Content placement direction ("bottom", "top", "left", "right", "center").
+   * @type {string}
+   */
+  contentPlacement = "bottom";
+
+  /**
+   * Calculated dimensions for layout and scroll calculations.
+   * @type {Object|null}
+   */
+  dimensions = null;
+
+  /**
+   * Index of the currently active detent.
+   * @type {number}
+   */
+  activeDetent = 0;
+
+  /**
+   * Index of the target detent to animate to.
+   * @type {number}
+   */
+  targetDetent = 1;
+
+  /**
+   * Current travel segment [start, end] as detent indices.
+   * @type {Array<number>}
+   */
+  currentSegment = [0, 0];
+
+  /**
+   * Current travel status ("idleOutside", "idleInside", "travellingIn", "travellingOut", "stepping").
+   * @type {string}
+   */
+  travelStatus = "idleOutside";
+
+  /**
+   * Previous travel status before last change.
+   * @type {string}
+   */
+  previousTravelStatus = "idleOutside";
+
+  /**
+   * Current travel range (start and end detent indices).
+   * @type {{start: number, end: number}}
+   */
+  travelRange = { start: 0, end: 0 };
+
+  /**
+   * Last processed progress value to prevent duplicate callbacks.
+   * @type {number|null}
+   */
+  lastProcessedProgress = null;
+
+  /**
+   * Progress smoother function initialized when interaction begins.
+   * Prevents large jumps in progress values.
+   *
+   * @type {Function|null}
+   */
+  progressSmoother = null;
+
+  /**
+   * ARIA role for the sheet ("dialog", "alertdialog", etc.).
+   * @type {string}
+   */
+  role = "dialog";
+
+  /**
+   * Track direction ("bottom", "top", "left", "right", "horizontal", "vertical").
+   * @type {string}
+   */
+  tracks = "bottom";
+
+  /**
+   * Whether swipe gestures are enabled.
+   * @type {boolean}
+   */
+  swipe = true;
+
+  /**
+   * Whether swipe-to-dismiss is enabled.
+   * @type {boolean}
+   */
+  swipeDismissal = true;
+
+  /**
+   * Swipe trap configuration (true, false, {x, y}).
+   * @type {boolean|Object}
+   */
+  swipeTrap = true;
+
+  /**
+   * Whether native focus scroll prevention is enabled.
+   * @type {boolean}
+   */
+  nativeFocusScrollPrevention = true;
+
+  /**
+   * Whether page scrolling is enabled when sheet is open.
+   * @type {boolean}
+   */
+  pageScroll = false;
+
+  /**
+   * Animation settings for entering the sheet.
+   * @type {string|Object|null}
+   */
+  enteringAnimationSettings = null;
+
+  /**
+   * Animation settings for exiting the sheet.
+   * @type {string|Object|null}
+   */
+  exitingAnimationSettings = null;
+
+  /**
+   * Animation settings for stepping between detents.
+   * @type {string|Object|null}
+   */
+  steppingAnimationSettings = null;
+
+  /**
+   * Snap-out acceleration setting (auto or numeric value).
+   * @type {string|number}
+   */
+  snapOutAcceleration = "auto";
+
+  /**
+   * Snap-to-end detents acceleration setting (auto or numeric value).
+   * @type {string|number}
+   */
+  snapToEndDetentsAcceleration = "auto";
+
+  /**
+   * Click-outside handler configuration.
+   * @type {Object}
+   */
+  onClickOutside = {
+    dismiss: true,
+    stopOverlayPropagation: true,
+  };
+
+  /**
+   * Escape key handler configuration.
+   * @type {Object|Function}
+   */
+  onEscapeKeyDown = {
+    nativePreventDefault: true,
+    dismiss: true,
+    stopOverlayPropagation: true,
+  };
+
+  /**
+   * Auto-focus configuration when presenting.
+   * @type {Object|Function}
+   */
+  onPresentAutoFocus = { focus: true };
+
+  /**
+   * Auto-focus configuration when dismissing.
+   * @type {Object|Function}
+   */
+  onDismissAutoFocus = { focus: true };
+
+  /**
+   * Array of sheets below this one in the stack.
+   * @type {Array<Controller>}
+   */
+  belowSheetsInStack = [];
+
+  /**
+   * Index in the sheet stack.
+   * @type {number}
+   */
+  stackingIndex = -1;
+
+  /**
+   * ID of the stack this sheet belongs to.
+   * @type {string|null}
+   */
+  stackId = null;
+
+  /**
+   * Counter tracking how many times this sheet has been covered by sheets above.
+   * @type {number}
+   */
+  coveredCount = 0;
+
+  /**
+   * Reference to the sheet stack registry.
+   * @type {Object|null}
+   */
+  sheetStackRegistry = null;
+
+  /**
+   * Reference to the sheet registry.
+   * @type {Object|null}
+   */
+  sheetRegistry = null;
+
+  /**
+   * Reference to the theme color manager.
+   * @type {Object|null}
+   */
+  themeColorManager = null;
+
+  /**
+   * Array of registered travel animations.
+   * @type {Array<Object>}
+   */
+  travelAnimations = [];
+
+  /**
+   * Array of registered stacking animations.
+   * @type {Array<Object>}
+   */
+  stackingAnimations = [];
+
+  /**
+   * Theme color dimming overlay for backdrop.
+   * @type {{updateAlpha: Function, remove: Function}|null}
+   */
+  backdropThemeColorDimmingOverlay = null;
+
+  /**
+   * Cleanup function for backdrop theme color dimming travel animation.
+   * @type {Function|null}
+   */
+  backdropThemeColorDimmingTravelAnimationCleanup = null;
+
+  /**
+   * Current alpha value for backdrop theme color dimming.
+   * @type {number}
+   */
+  backdropThemeColorDimmingAlpha = 0;
+
+  /**
+   * Callback invoked when travel status changes.
+   * @type {Function|null}
+   */
+  onTravelStatusChange = null;
+
+  /**
+   * Callback invoked when travel range changes.
+   * @type {Function|null}
+   */
+  onTravelRangeChange = null;
+
+  /**
+   * Callback invoked during travel with progress updates.
+   * @type {Function|null}
+   */
+  onTravel = null;
+
+  /**
+   * Callback invoked when travel starts.
+   * @type {Function|null}
+   */
+  onTravelStart = null;
+
+  /**
+   * Callback invoked when travel ends.
+   * @type {Function|null}
+   */
+  onTravelEnd = null;
+
+  /**
+   * Callback invoked when active detent changes.
+   * @type {Function|null}
+   */
+  onActiveDetentChange = null;
+
+  /**
+   * Callback invoked when travel progress changes.
+   * @type {Function|null}
+   */
+  onTravelProgressChange = null;
+
+  /**
+   * Callback invoked when safe-to-unmount status changes.
+   * @type {Function|null}
+   */
+  onSafeToUnmountChange = null;
+
+  /**
+   * Callback invoked when focus enters the sheet.
+   * @type {Function|null}
+   */
+  onFocusInside = null;
+
+  /**
+   * Focus management helper instance.
+   * @type {FocusManagement|null}
+   */
+  focusManagement = null;
+
+  /**
+   * Touch handler instance.
+   * @type {TouchHandler}
+   */
+  touchHandler;
+
+  /**
+   * Timeout manager instance.
+   * @type {TimeoutManager}
+   */
+  timeoutManager;
+
+  /**
+   * Detent manager instance.
+   * @type {DetentManager}
+   */
+  detentManager;
+
+  /**
+   * DOM attributes helper instance.
+   * @type {DOMAttributes}
+   */
+  domAttributes;
+
+  /**
+   * Observer manager instance.
+   * @type {ObserverManager}
+   */
+  observerManager;
+
+  /**
+   * Scroll progress calculator instance.
+   * @type {ScrollProgressCalculator}
+   */
+  scrollProgressCalculator;
+
+  /**
+   * Stacking adapter instance.
+   * @type {StackingAdapter}
+   */
+  stackingAdapter;
+
+  /**
+   * State machine helper instance.
+   * @type {StateHelper}
+   */
+  state;
+
+  /**
+   * Animation travel helper instance.
+   * @type {AnimationTravel}
+   */
+  animationTravel;
+
+  /**
+   * Theme color adapter instance.
+   * @type {ThemeColorAdapter}
+   */
+  themeColorAdapter;
+
+  /**
+   * Root component reference (set externally).
+   * @type {Object|null}
+   */
+  rootComponent = null;
+
+  /**
+   * Whether the controller is being destroyed.
+   * @type {boolean}
+   */
+  isDestroying = false;
+
+  /**
+   * Whether the controller has been destroyed.
+   * @type {boolean}
+   */
+  isDestroyed = false;
+
+  /**
+   * Subscription definitions for state machines.
+   *
+   * @type {Array<{machine: string, state: string, timing?: string, callback?: Function, handler?: string, guard?: Function, type?: string}>}
+   */
+  #subscriptionDefinitions = [
+    {
+      machine: "staging",
+      state: "opening",
+      timing: "after-paint",
+      callback: () => {
+        requestAnimationFrame(() => {
+          this.state.openness.readyToOpen(false);
+        });
+      },
+    },
+    {
+      machine: "staging",
+      state: "closing",
+      timing: "after-paint",
+      callback: () => {
+        this.handleStateTransition({ type: "READY_TO_CLOSE" });
+      },
+    },
+    {
+      machine: "openness",
+      state: "opening",
+      timing: "before-paint",
+      handler: "handleOpening",
+    },
+    {
+      machine: "elementsReady",
+      state: "true",
+      timing: "immediate",
+      guard: () => this.state.openness.current === "opening",
+      callback: () => this.#startOpeningAnimation(),
+    },
+    {
+      machine: "openness",
+      state: "open",
+      guard: () => {
+        const msg = this.state.openness.lastProcessedMessage;
+        return ["NEXT", "PREPARED", "STEP", "READY_TO_OPEN"].includes(
+          msg?.type
+        );
+      },
+      callback: (message) => this.handleOpen(message),
+    },
+    { machine: "openness", state: "closing", handler: "handleClosing" },
+    {
+      machine: "openness",
+      state: "closed.status:pending",
+      handler: "handleClosedPending",
+    },
+    {
+      machine: "openness",
+      state: "closed.status:safe-to-unmount",
+      handler: "handleClosedSafeToUnmount",
+    },
+    {
+      machine: "openness",
+      state: "closed.status:flushing-to-preparing-opening",
+      timing: "before-paint",
+      callback: () => {
+        this.timeoutManager.clear("pendingFlush");
+        this.state.flushClosedStatus();
+      },
+    },
+    {
+      machine: "openness",
+      state: "closed.status:flushing-to-preparing-open",
+      timing: "before-paint",
+      callback: () => {
+        this.timeoutManager.clear("pendingFlush");
+        this.state.flushClosedStatus();
+      },
+    },
+    {
+      machine: "openness",
+      state: "closed.status:preparing-opening",
+      timing: "after-paint",
+      callback: () => {
+        this.state.beginEnterAnimation(false);
+      },
+    },
+    {
+      machine: "openness",
+      state: "closed.status:preparing-open",
+      timing: "after-paint",
+      callback: () => {
+        this.state.beginEnterAnimation(true);
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:going-down",
+      callback: () => {
+        this.coveredCount++;
+        this.stackingAdapter?.updateStackingIndexWithPositionValue();
+        this.state.staging.goDown();
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:idle",
+      callback: () => {
+        if (
+          this.state.staging.matches("going-down") ||
+          this.state.staging.matches("go-down")
+        ) {
+          this.state.staging.advance();
+        }
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:going-up",
+      callback: () => this.state.staging.goUp(),
+    },
+    {
+      machine: "position",
+      state: "covered.status:indeterminate",
+      callback: () => {
+        this.coveredCount--;
+        this.stackingAdapter?.updateStackingIndexWithPositionValue();
+
+        if (this.state.staging.matches("going-up")) {
+          this.state.staging.advance();
+        }
+
+        if (this.coveredCount === 0) {
+          this.state.position.goToFrontIdle();
+        } else {
+          this.state.position.goToCoveredIdle();
+        }
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:come-back",
+      timing: "immediate",
+      callback: () => {
+        this.state.advancePositionAuto();
+      },
+    },
+    {
+      machine: "openness",
+      state: "open.scroll:ongoing",
+      callback: () => {
+        const currentProgress =
+          this.dimensions?.progressValueAtDetents?.[this.activeDetent]?.exact ??
+          0;
+        this.progressSmoother = this.createProgressSmoother(currentProgress);
+      },
+    },
+    {
+      machine: "openness",
+      state: "open.swipe:ended",
+      guard: () => typeof this.onTravelStatusChange === "function",
+      callback: () => {
+        if (this.state.openness.isOpen) {
+          this.onTravelStatusChange("idleInside");
+        }
+      },
+    },
+    {
+      machine: "staging",
+      state: "none",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("none"),
+    },
+    {
+      machine: "staging",
+      state: "opening",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("opening"),
+    },
+    {
+      machine: "staging",
+      state: "open",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("open"),
+    },
+    {
+      machine: "staging",
+      state: "stepping",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("stepping"),
+    },
+    {
+      machine: "staging",
+      state: "closing",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("closing"),
+    },
+    {
+      machine: "staging",
+      state: "go-down",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("go-down"),
+    },
+    {
+      machine: "staging",
+      state: "going-down",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("going-down"),
+    },
+    {
+      machine: "staging",
+      state: "going-up",
+      timing: "immediate",
+      callback: () => this.stackingAdapter?.updateStagingInStack("going-up"),
+    },
+    {
+      machine: "touch",
+      state: "ongoing",
+      timing: "immediate",
+      callback: () => this.touchHandler.handleScrollStart(),
+    },
+    {
+      machine: "touch",
+      state: "ended",
+      timing: "immediate",
+      callback: () => this.touchHandler.handleScrollEnd(),
+    },
+  ];
+
+  /**
+   * Initialize the controller with helpers.
+   * Use configure() to set options after construction.
+   */
+  constructor() {
+    /** @type {TouchHandler} */
+    this.touchHandler = new TouchHandler(this);
+    /** @type {FocusManagement} */
+    this.focusManagement = new FocusManagement(this);
+    /** @type {TimeoutManager} */
+    this.timeoutManager = new TimeoutManager();
+    /** @type {DetentManager} */
+    this.detentManager = new DetentManager(this);
+    /** @type {DOMAttributes} */
+    this.domAttributes = new DOMAttributes(this);
+    /** @type {ObserverManager} */
+    this.observerManager = new ObserverManager(this);
+    /** @type {ScrollProgressCalculator} */
+    this.scrollProgressCalculator = new ScrollProgressCalculator(this);
+    /** @type {StackingAdapter} */
+    this.stackingAdapter = new StackingAdapter(this);
+    /** @type {StateHelper} */
+    this.state = new StateHelper();
+    /** @type {AnimationTravel} */
+    this.animationTravel = new AnimationTravel(this);
+    /** @type {ThemeColorAdapter} */
+    this.themeColorAdapter = new ThemeColorAdapter(this);
+    this.setupSubscriptions();
+  }
+
+  /**
+   * Configure options for the controller.
+   * Called by Root after construction and by View when it mounts.
+   *
+   * @param {Object} [options={}] - Configuration options
+   */
+  configure(options = {}) {
+    if (options.role !== undefined) {
+      this.role = options.role;
+    }
+
+    if (options.activeDetent !== undefined) {
+      this.targetDetent = options.activeDetent;
+    } else if (options.defaultActiveDetent !== undefined) {
+      this.targetDetent = options.defaultActiveDetent;
+    }
+
+    if ("detents" in options) {
+      this.detentsConfig = options.detents;
+    }
+
+    const result = resolveTracksAndPlacement(options, {
+      tracks: this.tracks,
+      contentPlacement: this.contentPlacement,
+    });
+    this.tracks = result.tracks;
+    this.contentPlacement = result.contentPlacement;
+
+    const propsToAssign = [
+      "swipe",
+      "swipeDismissal",
+      "swipeOvershoot",
+      "swipeTrap",
+      "onFocusInside",
+      "nativeFocusScrollPrevention",
+      "pageScroll",
+      "inertOutside",
+      "enteringAnimationSettings",
+      "exitingAnimationSettings",
+      "steppingAnimationSettings",
+      "snapOutAcceleration",
+      "snapToEndDetentsAcceleration",
+      "onTravelStatusChange",
+      "onTravelRangeChange",
+      "onTravel",
+      "onTravelStart",
+      "onTravelEnd",
+      "onActiveDetentChange",
+      "onSafeToUnmountChange",
+      "sheetStackRegistry",
+      "sheetRegistry",
+      "themeColorManager",
+    ];
+
+    for (const key of propsToAssign) {
+      if (options[key] !== undefined) {
+        this[key] = options[key];
+      }
+    }
+
+    const eventHandlers = [
+      "onClickOutside",
+      "onEscapeKeyDown",
+      "onPresentAutoFocus",
+      "onDismissAutoFocus",
+    ];
+
+    for (const key of eventHandlers) {
+      if (options[key] !== undefined) {
+        if (typeof options[key] === "function") {
+          this[key] = options[key];
+        } else {
+          this[key] = {
+            ...Controller.EVENT_HANDLER_DEFAULTS[key],
+            ...options[key],
+          };
+        }
+      }
+    }
+
+    this.themeColorAdapter.configure(options);
+  }
+
+  /**
+   * Set up state machine subscriptions for lifecycle management.
+   */
+  setupSubscriptions() {
+    for (const def of this.#subscriptionDefinitions) {
+      this.state.subscribe(def.machine, {
+        timing: def.timing || "immediate",
+        state: def.state,
+        guard: def.guard,
+        callback: def.callback || ((msg) => this[def.handler](msg)),
+        type: def.type,
+      });
+    }
+  }
+
+  /**
+   * Invoke all registered travel animation callbacks.
+   *
+   * @param {number} progress - Travel progress value (0-1)
+   * @param {Function} [tween] - Optional tween function for interpolation
+   */
+  aggregatedTravelCallback(progress, tween) {
+    const animations = this.travelAnimations;
+    for (let i = 0, len = animations.length; i < len; i++) {
+      animations[i].callback(progress, tween);
+    }
+  }
+
+  /**
+   * Invoke all registered stacking animation callbacks.
+   *
+   * @param {number} progress - Stacking progress value (0-1)
+   * @param {Function} tween - Tween function for interpolation
+   */
+  aggregatedStackingCallback(progress, tween) {
+    const animations = this.stackingAnimations;
+    for (let i = 0, len = animations.length; i < len; i++) {
+      animations[i].callback(progress, tween);
+    }
+  }
+
+  /**
+   * Whether scroll trap is active (inertOutside or swipeTrap enabled).
+   * @type {boolean}
+   */
+  get isScrollTrapActive() {
+    const trapValue = this.inertOutside ? true : this.swipeTrap;
+    return trapValue !== false && trapValue !== null && trapValue !== "none";
+  }
+
+  /**
+   * CSS class for the swipe trap based on configuration.
+   *
+   * @type {string|null}
+   */
+  get effectiveSwipeTrapClass() {
+    const trapValue = this.inertOutside ? true : this.swipeTrap;
+
+    if (!trapValue) {
+      return null;
+    }
+
+    if (trapValue === true) {
+      return "swipe-trap-both";
+    }
+
+    if (typeof trapValue === "object" && trapValue.x && trapValue.y) {
+      return "swipe-trap-both";
+    }
+
+    return null;
+  }
+
+  /**
+   * Whether the scroll container should allow pointer events to pass through.
+   *
+   * @type {boolean}
+   */
+  get scrollContainerShouldBePassThrough() {
+    return !this.inertOutside && !this.backdropSwipeable;
+  }
+
+  /**
+   * ID for the title element (accessibility).
+   *
+   * @type {string}
+   */
+  get titleId() {
+    return `${this.id}-title`;
+  }
+
+  /**
+   * ID for the description element (accessibility).
+   *
+   * @type {string}
+   */
+  get descriptionId() {
+    return `${this.id}-description`;
+  }
+
+  /**
+   * Get the effective detent configurations with implicit full-height appended.
+   * When no detents are configured, returns a single full-height marker.
+   *
+   * @type {Array<string>}
+   */
+  get detents() {
+    return this.detentManager.effectiveDetents;
+  }
+
+  /**
+   * Set the detent configurations and recalculate if needed.
+   *
+   * @param {Array|null} value - New detent configurations
+   */
+  set detents(value) {
+    const oldValue = this.detentsConfig;
+    this.detentsConfig = value;
+
+    if (oldValue !== value) {
+      this.detentMarkers = new TrackedArray();
+
+      if (this.view && this.content && this.scrollContainer) {
+        this.recalculateDimensionsFromResize();
+      }
+    }
+  }
+
+  /**
+   * Whether swipe-to-dismiss is disabled.
+   * True when sheet has detents, dismissal is disabled, and sheet is open.
+   *
+   * @type {boolean}
+   */
+  get swipeOutDisabledWithDetent() {
+    if (this.swipe === false || !Controller.browserSupportsRequiredFeatures) {
+      return false;
+    }
+
+    if (this.swipeDismissal && this.role !== "alertdialog") {
+      return false;
+    }
+
+    if (this.detentsConfig === null || this.detentsConfig === undefined) {
+      return false;
+    }
+
+    return this.state.openness.isOpen && !this.state.staging.isClosing;
+  }
+
+  /**
+   * Whether overshoot is disabled for edge-aligned sheets.
+   *
+   * @type {boolean}
+   */
+  get edgeAlignedNoOvershoot() {
+    if (this.swipeOvershoot) {
+      return false;
+    }
+
+    const isDismissalDisabled =
+      this.role === "alertdialog" || !this.swipeDismissal;
+    return !this.isCenteredTrack || isDismissalDisabled;
+  }
+
+  /**
+   * Whether webkit small spacer mode should be enabled.
+   * Used for webkit-specific scroll optimization when sheet is open and
+   * swipe overshoot is enabled.
+   *
+   * @type {boolean}
+   */
+  get webkitSmallSpacerMode() {
+    return (
+      capabilities.browserEngine === "webkit" &&
+      this.state.openness.isOpen &&
+      !this.state.staging.isClosing &&
+      !this.edgeAlignedNoOvershoot
+    );
+  }
+
+  /**
+   * Whether the sheet travels on a horizontal track.
+   *
+   * @type {boolean}
+   */
+  get isHorizontalTrack() {
+    return (
+      this.tracks === "left" ||
+      this.tracks === "right" ||
+      this.tracks === "horizontal"
+    );
+  }
+
+  /**
+   * Whether the sheet travels on a vertical track.
+   *
+   * @type {boolean}
+   */
+  get isVerticalTrack() {
+    return (
+      this.tracks === "top" ||
+      this.tracks === "bottom" ||
+      this.tracks === "vertical"
+    );
+  }
+
+  /**
+   * Whether the sheet uses a centered track (horizontal or vertical).
+   *
+   * @type {boolean}
+   */
+  get isCenteredTrack() {
+    return this.tracks === "horizontal" || this.tracks === "vertical";
+  }
+
+  /**
+   * Get the CSS class for content placement.
+   *
+   * @type {string}
+   */
+  get contentPlacementCssClass() {
+    return placementToCssClass(this.contentPlacement);
+  }
+
+  /**
+   * Get the staging attribute for CSS.
+   *
+   * @type {string|null}
+   */
+  get stagingAttribute() {
+    return this.state.staging.current === "none" ? "staging-none" : null;
+  }
+
+  /**
+   * Update travel status and notify callback.
+   *
+   * @param {string} status - "idleOutside", "idleInside", "travellingIn", "travellingOut", "stepping"
+   */
+  updateTravelStatus(status) {
+    if (this.travelStatus !== status) {
+      const previousStatus = this.travelStatus;
+      this.travelStatus = status;
+      this.previousTravelStatus = previousStatus;
+      const newSafeToUnmount = status === "idleOutside";
+      const safeToUnmountChanged = this.safeToUnmount !== newSafeToUnmount;
+      this.safeToUnmount = newSafeToUnmount;
+
+      if (safeToUnmountChanged) {
+        this.onSafeToUnmountChange?.(newSafeToUnmount);
+      }
+
+      this.handleStackingStateChange(status, previousStatus);
+
+      this.onTravelStatusChange?.(status);
+    }
+  }
+
+  /**
+   * Handle stacking state changes based on travel status.
+   * Delegates to stacking adapter for bookkeeping.
+   *
+   * @param {string} status - Current travel status
+   * @param {string} previousStatus - Previous travel status
+   */
+  handleStackingStateChange(status, previousStatus) {
+    this.stackingAdapter.handleTravelStatusChange(status, previousStatus);
+  }
+
+  /**
+   * Update travel range and notify callback.
+   *
+   * @param {number} start - Start detent index
+   * @param {number} end - End detent index
+   */
+  updateTravelRange(start, end) {
+    if (this.travelRange.start !== start || this.travelRange.end !== end) {
+      this.travelRange = { start, end };
+      this.onTravelRangeChange?.(this.travelRange);
+    }
+  }
+
+  /**
+   * Notify onTravel callback with current progress.
+   *
+   * @param {number} progress - Travel progress value (0-1)
+   */
+  notifyTravel(progress) {
+    this.onTravel?.({ progress });
+  }
+
+  /**
+   * Merged staging state for the stack.
+   * Returns "not-none" if ANY sheet in the stack has staging !== "none".
+   *
+   * @type {string}
+   */
+  get mergedStaging() {
+    return this.stackingAdapter?.getMergedStaging() ?? "none";
+  }
+
+  /**
+   * Whether any sheet in the stack is currently animating.
+   *
+   * @type {boolean}
+   */
+  get isStackAnimating() {
+    return this.mergedStaging !== "none";
+  }
+
+  /**
+   * Set the current travel segment and handle stuck position detection.
+   *
+   * @param {Array<number>} segment - Segment as [start, end] detent indices
+   */
+  @action
+  setSegment(segment) {
+    const prevSegment = this.currentSegment;
+    this.currentSegment = segment;
+
+    this.updateTravelRange(segment[0], segment[1]);
+
+    if (this.swipeOutDisabledWithDetent) {
+      const { backStuck, frontStuck, shouldStep } =
+        this.detentManager.determineStuckPosition(segment, prevSegment);
+
+      if (backStuck) {
+        this.state.stuck.startBack();
+        if (shouldStep === "back") {
+          this.stepToStuckPosition("back");
+        }
+      } else if (frontStuck) {
+        this.state.stuck.startFront();
+        if (shouldStep === "front") {
+          this.stepToStuckPosition("front");
+        }
+      } else {
+        if (this.state.stuck.isFront) {
+          this.state.stuck.endFront();
+        }
+        if (this.state.stuck.isBack) {
+          this.state.stuck.endBack();
+        }
+      }
+    }
+
+    if (segment[0] === segment[1]) {
+      this.activeDetent = segment[0];
+
+      if (this.onActiveDetentChange) {
+        this.onActiveDetentChange(this.activeDetent);
+      }
+    }
+  }
+
+  /**
+   * Handle a state transition message.
+   *
+   * @param {string|Object} message - State transition message
+   */
+  @action
+  handleStateTransition(message) {
+    this.state.openness.send(message);
+  }
+
+  /**
+   * Handle the opening state.
+   * Starts the enter animation and sends NEXT when complete.
+   * If elements aren't ready yet (tracked via elementsReady state machine),
+   * defers animation until ELEMENTS_REGISTERED is sent.
+   *
+   * @private
+   */
+  handleOpening() {
+    this.isPresented = true;
+    this.updateTravelStatus("travellingIn");
+    this.focusManagement.capturePreviouslyFocusedElement();
+
+    this.state.longRunning.start();
+    this.state.beginEnterAnimation(false);
+    this.stackingAdapter.notifyParentOfOpening(false);
+
+    if (this.state.elements.isReady) {
+      this.#startOpeningAnimation();
+    }
+  }
+
+  /**
+   * Start the opening animation.
+   * Called from handleOpening or from element registration when deferred.
+   *
+   * @private
+   */
+  #startOpeningAnimation() {
+    this.resetViewStyles();
+    this.calculateDimensionsIfReady();
+    this.domAttributes.setHidden();
+    this.animationTravel.animateToDetent(this.targetDetent);
+  }
+
+  /**
+   * Send ELEMENTS_REGISTERED if all required elements are now present.
+   * Used by register methods to signal readiness for deferred animations.
+   * Deferred to next frame to avoid Ember auto-tracking issues.
+   *
+   * @private
+   */
+  #notifyElementsRegisteredIfReady() {
+    if (
+      this.view &&
+      this.scrollContainer &&
+      this.contentWrapper &&
+      this.state.elements.isNotReady
+    ) {
+      // Defer to next run loop to avoid updating tracked state during render
+      next(() => {
+        if (this.state.elements.isNotReady) {
+          this.state.elements.markRegistered();
+        }
+      });
+    }
+  }
+
+  /**
+   * Handle the open state.
+   * Sets up scroll behavior, focus, and intersection observer.
+   *
+   * @param {Object} message - State transition message
+   */
+  handleOpen(message) {
+    if (this.state.longRunning.isActive) {
+      this.state.longRunning.end();
+    }
+
+    this.updateScrollSnapBehavior();
+    this.updateTravelRange(this.activeDetent, this.activeDetent);
+    this.updateTravelStatus("idleInside");
+    this.applyInertOutside();
+
+    if (message?.type !== "STEP") {
+      this.executeAutoFocusOnPresent();
+    }
+
+    if (this.state.staging.matches("opening")) {
+      this.state.staging.advance();
+    }
+
+    this.#setupIntersectionObserver();
+
+    if (message?.type === "STEP") {
+      this.handleStepMessage(message);
+    }
+  }
+
+  /**
+   * Set up intersection observer if swipe-out is enabled.
+   * Deferred to next frame to ensure DOM is ready.
+   * @private
+   */
+  #setupIntersectionObserver() {
+    if (this.swipeOutDisabledWithDetent) {
+      return;
+    }
+
+    requestAnimationFrame(() => {
+      if (this.state.openness.isOpen && !this.swipeOutDisabledWithDetent) {
+        this.setupIntersectionObserver();
+      }
+    });
+  }
+
+  /**
+   * Handle a STEP message to animate to a new detent.
+   *
+   * @param {Object} message - Message with optional detent property
+   * @private
+   */
+  handleStepMessage(message) {
+    this.state.stepAnimation();
+    this.updateTravelStatus("stepping");
+
+    if (message.detent !== undefined) {
+      this.animationTravel.animateToDetent(message.detent);
+    } else {
+      const nextDetent = this.activeDetent + 1;
+      this.animationTravel.animateToDetent(nextDetent);
+    }
+  }
+
+  /**
+   * Handle the closing state.
+   * Begins exit animation or handles immediate close.
+   *
+   * @private
+   */
+  handleClosing() {
+    this.state.position.readyToGoOut();
+    this.updateTravelStatus("travellingOut");
+    this.stackingAdapter.notifyParentOfClosing();
+
+    if (this.state.skip.isClosing) {
+      this.handleClosingWithoutAnimation();
+      return;
+    }
+
+    this.domAttributes.disableScrollSnap();
+    this.animationTravel.animateToDetent(
+      0,
+      this.animationTravel.exitingAnimationDefaults
+    );
+  }
+
+  /**
+   * Handle closing without animation (immediate close).
+   *
+   * @private
+   */
+  handleClosingWithoutAnimation() {
+    this.state.skip.disableClosing();
+
+    this.stackingAdapter.notifyBelowSheets(0);
+
+    requestAnimationFrame(() => {
+      this.handleStateTransition({ type: "NEXT" });
+    });
+  }
+
+  /**
+   * Handle the closed.pending state.
+   * Handles immediate close if needed, then schedules flush to safe-to-unmount.
+   * @private
+   */
+  handleClosedPending() {
+    this.state.longRunning.end();
+    this.#handleImmediateCloseIfNeeded();
+    this.#scheduleFlushToSafeToUnmount();
+  }
+
+  /**
+   * Handle immediate close (swipe-out) without animation.
+   * @private
+   */
+  #handleImmediateCloseIfNeeded() {
+    if (!this.state.skip.isClosing) {
+      return;
+    }
+
+    this.state.beginImmediateClose(true);
+    this.updateTravelStatus("travellingOut");
+    this.state.skip.disableClosing();
+    this.state.position.goOut();
+    this.stackingAdapter.notifyParentOfClosingImmediate();
+
+    this.stackingAdapter.notifyBelowSheets(0);
+  }
+
+  /**
+   * Schedule the flush to safe-to-unmount state.
+   * @private
+   */
+  #scheduleFlushToSafeToUnmount() {
+    this.timeoutManager.schedule(
+      "pendingFlush",
+      () => {
+        if (this.state.openness.isClosedPending) {
+          this.state.openness.flushComplete();
+        }
+      },
+      16
+    );
+  }
+
+  /**
+   * Handle the closed.safe-to-unmount state.
+   * Performs final cleanup and resets all state to initial values.
+   * @private
+   */
+  handleClosedSafeToUnmount() {
+    const wasLongRunning = this.state.longRunning.isActive;
+
+    // Reset presentation flags
+    this.isPresented = false;
+    if (this.state.stuck.isFront) {
+      this.state.stuck.endFront();
+    }
+    if (this.state.stuck.isBack) {
+      this.state.stuck.endBack();
+    }
+
+    if (wasLongRunning) {
+      this.state.longRunning.end();
+    }
+
+    // Reset elementsReady state machine for next open cycle
+    if (this.state.elements.isReady) {
+      this.state.elements.reset();
+    }
+
+    this.executeAutoFocusOnDismiss();
+    this.cleanup();
+
+    // Reset travel state
+    this.activeDetent = 0;
+    this.currentSegment = [0, 0];
+    this.dimensions = null;
+    this.lastProcessedProgress = null;
+
+    // Advance position machine if needed
+    if (!this.state.position.isOut && this.state.position.isFrontClosing) {
+      this.state.position.advance();
+    }
+
+    // Notify travel status change
+    this.updateTravelStatus("idleOutside");
+    this.updateTravelRange(0, 0);
+  }
+
+  /**
+   * Create dimension calculator options object.
+   * @returns {Object} Options for calculateDimensions
+   * @private
+   */
+  #getDimensionCalculatorOptions() {
+    return {
+      swipeOutDisabledWithDetent: this.swipeOutDisabledWithDetent,
+      snapOutAcceleration: this.snapOutAcceleration,
+      snapToEndDetentsAcceleration: this.snapToEndDetentsAcceleration,
+      edgeAlignedNoOvershoot: this.edgeAlignedNoOvershoot,
+      webkitSmallSpacerMode: this.webkitSmallSpacerMode,
+    };
+  }
+
+  /**
+   * Calculate and return dimensions using current elements.
+   * @returns {Object} Calculated dimensions
+   * @private
+   */
+  #calculateDimensions() {
+    const calculator = new DimensionCalculator({
+      view: this.view,
+      content: this.content,
+      scrollContainer: this.scrollContainer,
+      detentMarkers: this.detentMarkers,
+    });
+
+    return calculator.calculateDimensions(
+      this.tracks,
+      this.contentPlacement,
+      this.#getDimensionCalculatorOptions()
+    );
+  }
+
+  /**
+   * Calculate dimensions if all required elements are ready.
+   * Pure dimension calculation - no state transitions.
+   */
+  calculateDimensionsIfReady() {
+    const hasRequiredMarkers =
+      this.detentsConfig === undefined || this.detentMarkers.length > 0;
+
+    if (
+      this.view &&
+      this.content &&
+      this.scrollContainer &&
+      hasRequiredMarkers &&
+      !this.dimensions
+    ) {
+      this.dimensions = this.#calculateDimensions();
+      this.setInitialScrollPosition();
+    }
+  }
+
+  /**
+   * Set the initial scroll position based on track direction.
+   */
+  setInitialScrollPosition() {
+    if (!this.scrollContainer || !this.dimensions) {
+      return;
+    }
+
+    const isHorizontal = this.isHorizontalTrack;
+
+    if (this.tracks === "bottom" || this.tracks === "right") {
+      if (isHorizontal) {
+        this.scrollContainer.scrollLeft = 0;
+      } else {
+        this.scrollContainer.scrollTop = 0;
+      }
+    } else {
+      if (isHorizontal) {
+        this.scrollContainer.scrollLeft = this.scrollContainer.scrollWidth;
+      } else {
+        this.scrollContainer.scrollTop = this.scrollContainer.scrollHeight;
+      }
+    }
+  }
+
+  /**
+   * Set scroll position to a specific detent.
+   *
+   * @param {number} detentIndex - Target detent index
+   */
+  setScrollPositionToDetent(detentIndex) {
+    if (!this.scrollContainer || !this.dimensions) {
+      return;
+    }
+
+    const progressAtDetent =
+      this.dimensions.progressValueAtDetents?.[detentIndex]?.exact;
+    if (progressAtDetent === undefined) {
+      return;
+    }
+
+    const scrollDistance =
+      progressAtDetent * this.dimensions.content.travelAxis.unitless;
+    const isHorizontal = this.isHorizontalTrack;
+
+    if (isHorizontal) {
+      this.scrollContainer.scrollLeft = scrollDistance;
+    } else {
+      this.scrollContainer.scrollTop = scrollDistance;
+    }
+
+    this.activeDetent = detentIndex;
+    this.currentSegment = [detentIndex, detentIndex];
+  }
+
+  /**
+   * Set up the intersection observer for swipe-out detection.
+   */
+  setupIntersectionObserver() {
+    this.observerManager.setupIntersectionObserver();
+  }
+
+  /**
+   * Clean up the intersection observer.
+   */
+  cleanupIntersectionObserver() {
+    this.observerManager.cleanupIntersectionObserver();
+  }
+
+  /**
+   * Register the view element and initialize observers.
+   *
+   * @param {HTMLElement} view - The view element
+   */
+  @action
+  registerView(view) {
+    this.view = view;
+    this.resetViewStyles();
+    this.calculateDimensionsIfReady();
+    this.setupResizeObserver();
+    this.sheetRegistry?.recalculateInertOutside();
+    this.#notifyElementsRegisteredIfReady();
+  }
+
+  /**
+   * Set up ResizeObserver to watch view and content elements.
+   */
+  setupResizeObserver() {
+    this.observerManager.setupResizeObserver(() => {
+      if (
+        this.view &&
+        this.content &&
+        this.scrollContainer &&
+        this.dimensions
+      ) {
+        this.recalculateDimensionsFromResize();
+      }
+    });
+  }
+
+  /**
+   * Recalculate dimensions triggered by ResizeObserver.
+   */
+  recalculateDimensionsFromResize() {
+    this.dimensions = this.#calculateDimensions();
+
+    if (this.state.openness.isOpen) {
+      if (!this.swipeOutDisabledWithDetent) {
+        this.setupIntersectionObserver();
+      } else {
+        this.cleanupIntersectionObserver();
+      }
+    }
+
+    if (this.activeDetent > 0 && this.state.openness.isOpen) {
+      requestAnimationFrame(() => {
+        if (!this.isDestroying && !this.isDestroyed) {
+          this.animationTravel.recalculateAndTravel(this.activeDetent);
+        }
+      });
+    }
+  }
+
+  /**
+   * Full cleanup of all resources.
+   * Idempotent and safe to call multiple times.
+   * Called when sheet transitions to safe-to-unmount state.
+   */
+  cleanup() {
+    this.timeoutManager.cleanup();
+
+    this.touchHandler.detach();
+    this.observerManager.cleanup();
+    this.unregisterBackdrop(this.backdrop);
+    this.themeColorAdapter.cleanup();
+    this.domAttributes.cleanup();
+    this.focusManagement.cleanup();
+    this.state.cleanup();
+    this.stackingAdapter?.removeStagingFromStack();
+  }
+
+  /**
+   * Execute auto-focus when the sheet is presented.
+   */
+  executeAutoFocusOnPresent() {
+    this.focusManagement.executeAutoFocusOnPresent();
+  }
+
+  /**
+   * Execute auto-focus when the sheet is dismissed.
+   */
+  executeAutoFocusOnDismiss() {
+    this.focusManagement.executeAutoFocusOnDismiss();
+  }
+
+  /**
+   * Apply inert attribute to elements outside the sheet.
+   */
+  applyInertOutside() {
+    this.sheetRegistry?.updateInertOutside(this, this.inertOutside);
+  }
+
+  /**
+   * Register the content element.
+   *
+   * @param {HTMLElement} content - The content element
+   */
+  @action
+  registerContent(content) {
+    this.content = content;
+    this.themeColorAdapter.captureContentThemeColor();
+    this.calculateDimensionsIfReady();
+  }
+
+  /**
+   * Register the content wrapper element.
+   *
+   * @param {HTMLElement} contentWrapper - The content wrapper element
+   */
+  @action
+  registerContentWrapper(contentWrapper) {
+    this.contentWrapper = contentWrapper;
+    this.#notifyElementsRegisteredIfReady();
+  }
+
+  /**
+   * Register the scroll container element.
+   *
+   * @param {HTMLElement} scrollContainer - The scroll container element
+   */
+  @action
+  registerScrollContainer(scrollContainer) {
+    this.scrollContainer = scrollContainer;
+
+    this.calculateDimensionsIfReady();
+    this.#notifyElementsRegisteredIfReady();
+  }
+
+  /**
+   * Update scroll-snap behavior based on current state.
+   *
+   * @private
+   */
+  updateScrollSnapBehavior() {
+    if (!this.scrollContainer || !this.dimensions || !this.content) {
+      return;
+    }
+
+    this.domAttributes.enableScrollSnap();
+  }
+
+  /**
+   * Handle native scroll events - state transitions only.
+   */
+  @action
+  handleScrollStateChange() {
+    if (!this.state.openness.isOpen || this.state.staging.current !== "none") {
+      return;
+    }
+
+    if (!this.scrollContainer || !this.dimensions) {
+      return;
+    }
+
+    if (!this.state.openness.isScrollOngoing) {
+      this.state.openness.scrollStart();
+    }
+
+    if (!this.state.stuck.isFront && !this.state.stuck.isBack) {
+      if (!this.state.openness.isSwipeOngoing) {
+        this.state.openness.swipeStart();
+      }
+      if (!this.state.openness.isMoveOngoing) {
+        this.state.openness.moveStart();
+      }
+    }
+
+    this.timeoutManager.schedule(
+      "scrollEnd",
+      () => {
+        this.#handleScrollEnd();
+      },
+      200
+    );
+  }
+
+  /**
+   * Process a single scroll frame - called by RAF loop.
+   */
+  @action
+  processScrollFrame() {
+    if (!this.state.openness.isOpen) {
+      return;
+    }
+
+    if (!this.scrollContainer || !this.dimensions) {
+      return;
+    }
+
+    this.processScrollProgress();
+  }
+
+  /**
+   * Handle scroll end - send end messages for scroll/swipe/move.
+   * @private
+   */
+  #handleScrollEnd() {
+    this.state.openness.moveEnd();
+
+    const progress = this.scrollProgressCalculator.calculateProgress();
+    const detents = this.dimensions?.progressValueAtDetents;
+
+    if (progress && detents) {
+      for (const detent of detents) {
+        const matches =
+          progress.clampedProgress > detent.exact - 0.01 &&
+          progress.clampedProgress < detent.exact + 0.01;
+
+        if (matches) {
+          this.state.openness.scrollEnd();
+          this.state.openness.swipeEnd();
+          break;
+        }
+      }
+    }
+  }
+
+  /**
+   * Create a progress smoother function which prevents large jumps in progress values.
+   *
+   * @param {number} initialProgress - The initial/expected progress value
+   * @returns {Function} A smoother function that takes raw progress and returns smoothed progress
+   */
+  createProgressSmoother(initialProgress) {
+    let lastValue = initialProgress;
+    let lastDelta = 0;
+
+    return (newProgress) => {
+      let result = newProgress;
+      let currentDelta = lastValue - newProgress;
+
+      if (
+        (currentDelta === 0 ||
+          Math.abs(currentDelta) < Math.abs(lastDelta / 2)) &&
+        this.state.touch.isOngoing
+      ) {
+        result = lastValue - lastDelta / 2;
+        currentDelta = lastValue - result;
+      }
+
+      if (Math.abs(currentDelta) >= 0.1 && Math.abs(currentDelta) < 0.35) {
+        result = currentDelta >= 0 ? lastValue - 0.1 : lastValue + 0.1;
+        currentDelta = currentDelta >= 0 ? 0.1 : -0.1;
+      }
+
+      if (newProgress <= 0) {
+        result = 0;
+      }
+
+      lastValue = result;
+      lastDelta = currentDelta;
+      return result;
+    };
+  }
+
+  /**
+   * Process scroll progress and update callbacks.
+   */
+  processScrollProgress() {
+    const progress = this.scrollProgressCalculator.calculateProgress();
+    if (!progress) {
+      return;
+    }
+
+    const { clampedProgress } = progress;
+    const minProgress =
+      this.edgeAlignedNoOvershoot && this.swipeOutDisabledWithDetent
+        ? (this.dimensions?.progressValueAtDetents?.[1]?.exact ?? 0)
+        : 0;
+    const maxProgress = this.edgeAlignedNoOvershoot ? 1 : 10;
+
+    const smoothedProgressValue = this.progressSmoother
+      ? this.progressSmoother(clampedProgress)
+      : clampedProgress;
+    const smoothedProgress = Math.min(
+      maxProgress,
+      Math.max(minProgress, smoothedProgressValue)
+    );
+
+    if (this.lastProcessedProgress === smoothedProgress) {
+      return;
+    }
+
+    this.lastProcessedProgress = smoothedProgress;
+
+    this.aggregatedTravelCallback(smoothedProgress);
+    this.onTravelProgressChange?.(smoothedProgress);
+
+    this.stackingAdapter.notifyBelowSheets(smoothedProgress);
+
+    this.notifyTravel(smoothedProgress);
+
+    const segment =
+      this.scrollProgressCalculator.determineSegment(smoothedProgress);
+    if (segment) {
+      this.setSegment(segment);
+      if (segment[0] === 0 && segment[1] === 0 && smoothedProgress <= 0) {
+        return;
+      }
+    }
+  }
+
+  /**
+   * Handle touchstart events on scroll-container.
+   */
+  @action
+  handleTouchStart() {
+    this.state.touch.start();
+  }
+
+  /**
+   * Handle touchend events on scroll-container.
+   */
+  @action
+  handleTouchEnd() {
+    this.state.touch.end();
+  }
+
+  /**
+   * Handle focus events on scroll-container.
+   *
+   * @param {FocusEvent} event - The focus event
+   */
+  @action
+  handleFocus(event) {
+    if (!this.scrollContainer || !this.scrollContainer.contains(event.target)) {
+      return;
+    }
+
+    if (this.onFocusInside) {
+      this.onFocusInside({
+        nativeEvent: event,
+      });
+    }
+  }
+
+  /**
+   * Handle touch gesture start.
+   * Called by TouchHandler when a swipe gesture begins.
+   */
+  onTouchGestureStart() {
+    this.state.openness.swipeStart();
+  }
+
+  /**
+   * Handle touch gesture end.
+   * Called by TouchHandler when a swipe gesture ends.
+   * May trigger step to stuck position if needed.
+   */
+  onTouchGestureEnd() {
+    this.state.openness.swipeEnd();
+
+    if (
+      this.edgeAlignedNoOvershoot &&
+      this.snapToEndDetentsAcceleration === "auto" &&
+      this.state.openness.isOpen &&
+      this.state.openness.isScrollEnded
+    ) {
+      this.timeoutManager.schedule(
+        "stuckPosition",
+        () => {
+          requestAnimationFrame(() => {
+            if (this.state.openness.isOpen) {
+              if (this.state.stuck.isBack) {
+                this.stepToStuckPosition("back");
+              } else if (this.state.stuck.isFront) {
+                this.stepToStuckPosition("front");
+              }
+            }
+          });
+        },
+        80
+      );
+    }
+  }
+
+  /**
+   * Auto-step to a stuck position without animation.
+   *
+   * @param {string} direction - "front" (last detent) or "back" (first detent)
+   */
+  stepToStuckPosition(direction) {
+    if (this.state.stuck.isFront) {
+      this.state.stuck.endFront();
+    }
+    if (this.state.stuck.isBack) {
+      this.state.stuck.endBack();
+    }
+
+    this.state.openness.moveStart();
+    this.updateTravelStatus("travellingIn");
+
+    this.animationTravel.stepToStuckPosition(direction, () => {
+      this.state.openness.moveEnd();
+      this.updateTravelStatus("idleInside");
+    });
+  }
+
+  /**
+   * Register a detent marker element.
+   *
+   * @param {HTMLElement} detentMarker - The detent marker element
+   */
+  @action
+  registerDetentMarker(detentMarker) {
+    this.detentMarkers.push(detentMarker);
+    this.calculateDimensionsIfReady();
+  }
+
+  /**
+   * Register backdrop element with optional custom travel animation.
+   *
+   * @param {HTMLElement} backdrop - The backdrop element
+   * @param {Object|Function|null} travelAnimation - Travel animation config (used for theme color dimming)
+   * @param {boolean} swipeable - Whether backdrop responds to swipe/click
+   */
+  @action
+  registerBackdrop(backdrop, travelAnimation = null, swipeable = true) {
+    this.backdrop = backdrop;
+    this.backdropSwipeable = swipeable;
+    backdrop.style.opacity = 0;
+    backdrop.style.willChange = "opacity";
+    this.#cleanupBackdropThemeColorDimming();
+
+    const isDisabled =
+      travelAnimation &&
+      typeof travelAnimation === "object" &&
+      travelAnimation.opacity === null;
+
+    if (!isDisabled && this.themeColorAdapter.effectiveThemeColorDimming) {
+      const opacityFn =
+        typeof travelAnimation === "function"
+          ? travelAnimation
+          : typeof travelAnimation?.opacity === "function"
+            ? travelAnimation.opacity
+            : ({ progress }) => Math.min(progress * 0.33, 0.33);
+
+      const computedStyle = window.getComputedStyle(backdrop);
+      const backgroundColor = computedStyle.backgroundColor || "rgb(0, 0, 0)";
+
+      this.backdropThemeColorDimmingOverlay =
+        this.themeColorAdapter.registerThemeColorDimmingOverlay({
+          color: backgroundColor,
+          alpha: this.backdropThemeColorDimmingAlpha,
+        });
+
+      this.backdropThemeColorDimmingTravelAnimationCleanup =
+        this.registerTravelAnimation({
+          callback: (progress) => {
+            const opacity = opacityFn({ progress });
+            this.backdropThemeColorDimmingAlpha = opacity;
+            backdrop.style.setProperty("opacity", opacity);
+
+            if (this.backdropThemeColorDimmingOverlay) {
+              this.backdropThemeColorDimmingOverlay.updateAlpha(opacity);
+            }
+          },
+        });
+    }
+  }
+
+  /**
+   * Clean up backdrop theme color dimming overlay and travel animation.
+   * @private
+   */
+  #cleanupBackdropThemeColorDimming() {
+    this.backdropThemeColorDimmingTravelAnimationCleanup?.();
+    this.backdropThemeColorDimmingTravelAnimationCleanup = null;
+
+    this.backdropThemeColorDimmingOverlay?.remove?.();
+    this.backdropThemeColorDimmingOverlay = null;
+  }
+
+  /**
+   * Unregister backdrop element and remove backdrop-specific handlers.
+   *
+   * @param {HTMLElement|null} backdrop - The backdrop to unregister
+   */
+  @action
+  unregisterBackdrop(backdrop = this.backdrop) {
+    if (backdrop && this.backdrop && backdrop !== this.backdrop) {
+      return;
+    }
+
+    this.#cleanupBackdropThemeColorDimming();
+    this.backdrop = null;
+    this.backdropSwipeable = false;
+  }
+
+  /**
+   * Register a stacking animation callback.
+   *
+   * @param {Object} animation - Animation config with callback
+   * @param {Function} animation.callback - Called with (progress, tween) during travel
+   * @param {HTMLElement} animation.target - Target element for the animation
+   * @returns {Function} Unregister function
+   */
+  @action
+  registerStackingAnimation(animation) {
+    this.stackingAnimations.push(animation);
+
+    return () => {
+      const index = this.stackingAnimations.indexOf(animation);
+      if (index !== -1) {
+        this.stackingAnimations.splice(index, 1);
+      }
+    };
+  }
+
+  /**
+   * Register a travel animation callback.
+   *
+   * @param {Object} animation - Animation config with callback
+   * @param {Function} animation.callback - Called with (progress) during travel
+   * @param {HTMLElement} [animation.target] - Target element for the animation
+   * @param {Object} [animation.config] - Animation configuration object
+   * @returns {Function} Unregister function
+   */
+  @action
+  registerTravelAnimation(animation) {
+    this.travelAnimations.push(animation);
+
+    return () => {
+      const index = this.travelAnimations.indexOf(animation);
+      if (index !== -1) {
+        this.travelAnimations.splice(index, 1);
+      }
+    };
+  }
+
+  /**
+   * Open the sheet.
+   */
+  @action
+  open() {
+    this.state.broadcastOpen();
+  }
+
+  /**
+   * Close the sheet.
+   */
+  @action
+  close() {
+    this.handleStateTransition({ type: "CLOSE" });
+    this.#evaluateCloseMessage();
+  }
+
+  /**
+   * Evaluates whether a CLOSE request can proceed to actual closing.
+   *
+   * @private
+   */
+  #evaluateCloseMessage() {
+    if (!this.state.openness.isOpen) {
+      return;
+    }
+
+    const atInitialSegment =
+      this.currentSegment[0] === 0 && this.currentSegment[1] === 0;
+    const isSteppingWithSwipeOutDisabled =
+      this.swipeOutDisabledWithDetent &&
+      this.currentSegment[0] !== this.currentSegment[1];
+    const canActuallyClose =
+      this.state.position.isFront &&
+      !atInitialSegment &&
+      !isSteppingWithSwipeOutDisabled;
+
+    if (!canActuallyClose) {
+      if (this.rootComponent?.effectivePresented === false) {
+        this.rootComponent.present();
+      }
+      return;
+    }
+
+    this.state.staging.actuallyClose();
+    this.handleStateTransition({ type: "ACTUALLY_CLOSE" });
+  }
+
+  /**
+   * Send a message to the position machine.
+   *
+   * @param {string|Object} message - Message to send
+   * @param {Object} context - Context for guards
+   * @returns {boolean} Whether a transition occurred
+   */
+  sendToPositionMachine(message, context = {}) {
+    return this.state.sendToPosition(message, context);
+  }
+
+  /**
+   * Step to the next detent (upward direction).
+   * Cycles back to first detent when at the last.
+   */
+  @action
+  step() {
+    if (!this.state.openness.isOpen) {
+      return;
+    }
+
+    const nextDetent = this.detentManager.calculateStep("up");
+    if (nextDetent !== null) {
+      this.handleStateTransition({ type: "STEP", detent: nextDetent });
+    }
+  }
+
+  /**
+   * Step to the previous detent (downward direction).
+   * Cycles to last detent when at the first.
+   */
+  @action
+  stepDown() {
+    if (!this.state.openness.isOpen) {
+      return;
+    }
+
+    const prevDetent = this.detentManager.calculateStep("down");
+    if (prevDetent !== null) {
+      this.handleStateTransition({ type: "STEP", detent: prevDetent });
+    }
+  }
+
+  /**
+   * Step to a specific detent index.
+   *
+   * @param {number} detent - Target detent index (1-based)
+   */
+  @action
+  stepToDetent(detent) {
+    if (!this.state.openness.isOpen) {
+      return;
+    }
+
+    if (this.detentManager.isValidDetent(detent)) {
+      this.handleStateTransition({ type: "STEP", detent });
+    }
+  }
+
+  /**
+   * Reset view styles to default state.
+   */
+  resetViewStyles() {
+    this.domAttributes.resetViewStyles();
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/css-utils.js b/frontend/discourse/float-kit/components/d-sheet/css-utils.js
new file mode 100644
index 0000000000000..24373e19c118d
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/css-utils.js
@@ -0,0 +1,34 @@
+/**
+ * CSS transform properties that should be combined into a single transform string.
+ *
+ * @type {Set<string>}
+ */
+export const TRANSFORM_PROPS = new Set([
+  "translate",
+  "translateX",
+  "translateY",
+  "translateZ",
+  "scale",
+  "scaleX",
+  "scaleY",
+  "scaleZ",
+  "rotate",
+  "rotateX",
+  "rotateY",
+  "rotateZ",
+  "skew",
+  "skewX",
+  "skewY",
+]);
+
+/**
+ * Converts a camelCase CSS property to kebab-case with vendor prefix handling.
+ *
+ * @param {string} property - camelCase property name
+ * @returns {string} kebab-case property name
+ */
+export function toKebabCase(property) {
+  const prefix =
+    property.startsWith("webkit") || property.startsWith("moz") ? "-" : "";
+  return prefix + property.replace(/[A-Z]/g, "-$&").toLowerCase();
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/description.gjs b/frontend/discourse/float-kit/components/d-sheet/description.gjs
new file mode 100644
index 0000000000000..ceca5db3154b7
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/description.gjs
@@ -0,0 +1,18 @@
+/**
+ * Renders the description region of a sheet, linked via ID for accessibility.
+ *
+ * @component DSheetDescription
+ * @param {import("./controller").default} sheet - The sheet controller instance providing descriptionId
+ */
+const DSheetDescription = <template>
+  <div
+    id={{@sheet.descriptionId}}
+    class="Sheet-description"
+    data-d-sheet="description"
+    ...attributes
+  >
+    {{yield}}
+  </div>
+</template>;
+
+export default DSheetDescription;
diff --git a/frontend/discourse/float-kit/components/d-sheet/detent-manager.js b/frontend/discourse/float-kit/components/d-sheet/detent-manager.js
new file mode 100644
index 0000000000000..dc79091f8a9af
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/detent-manager.js
@@ -0,0 +1,145 @@
+/**
+ * Manages detent positions and stepping logic for the d-sheet component.
+ *
+ * Detents are discrete snap positions (e.g., half-height, full-height) that sheets can settle at.
+ * This manager handles: calculating which detent to step to based on user interaction,
+ * detecting when the sheet is "stuck" at content boundaries, and determining when to auto-step
+ * to the next detent. Works closely with the sheet controller to provide smooth, intuitive
+ * navigation through detent positions during drag, scroll, and programmatic operations.
+ */
+export default class DetentManager {
+  /**
+   * Reference to the parent sheet controller.
+   *
+   * @type {import("./controller").default}
+   */
+  controller;
+
+  /**
+   * @param {import("./controller").default} controller - The sheet controller instance
+   */
+  constructor(controller) {
+    this.controller = controller;
+  }
+
+  /**
+   * Get the effective detent configurations with implicit full-height appended.
+   * When no detents are configured, returns a single full-height marker.
+   *
+   * @type {Array<string>}
+   */
+  get effectiveDetents() {
+    const config = this.controller.detentsConfig;
+
+    if (config === null || config === undefined) {
+      return ["var(--d-sheet-content-travel-axis)"];
+    }
+
+    if (typeof config === "string") {
+      return [config, "var(--d-sheet-content-travel-axis)"];
+    }
+
+    return [...config, "var(--d-sheet-content-travel-axis)"];
+  }
+
+  /**
+   * Get the maximum detent index (1-based).
+   *
+   * @type {number}
+   */
+  get maxDetent() {
+    return this.effectiveDetents?.length ?? 1;
+  }
+
+  /**
+   * Calculate the next detent index for stepping.
+   *
+   * @param {string} [direction="up"] - Direction to step ("up" or "down")
+   * @param {number|null} [targetDetent=null] - Optional specific detent to step to
+   * @returns {number|null} Resolved detent index or null if no step needed
+   */
+  calculateStep(direction = "up", targetDetent = null) {
+    const { activeDetent } = this.controller;
+    const detentCount = this.maxDetent;
+
+    let resolvedDetent = targetDetent;
+
+    if (resolvedDetent === null) {
+      if (direction === "up") {
+        resolvedDetent = activeDetent < detentCount ? activeDetent + 1 : 1;
+      } else {
+        resolvedDetent = activeDetent > 1 ? activeDetent - 1 : detentCount;
+      }
+    }
+
+    if (resolvedDetent === 0 || resolvedDetent === activeDetent) {
+      return null;
+    }
+
+    return resolvedDetent;
+  }
+
+  /**
+   * Check if a target detent is valid for stepping.
+   *
+   * @param {number} detent - Target detent index (1-based)
+   * @returns {boolean} Whether the detent is valid
+   */
+  isValidDetent(detent) {
+    const detentCount = this.maxDetent;
+    return (
+      detent >= 1 &&
+      detent <= detentCount &&
+      detent !== this.controller.activeDetent
+    );
+  }
+
+  /**
+   * Check if stuck position auto-step should trigger.
+   *
+   * @returns {boolean} Whether auto-step conditions are met
+   */
+  shouldAutoStepToStuckPosition() {
+    const { controller } = this;
+    return (
+      controller.edgeAlignedNoOvershoot &&
+      controller.snapToEndDetentsAcceleration === "auto" &&
+      controller.state.openness.isScrollEnded &&
+      !controller.state.openness.isSwipeOngoing &&
+      controller.state.openness.isOpen
+    );
+  }
+
+  /**
+   * Determine stuck position from segment.
+   *
+   * @param {Array<number>} segment - Current segment [start, end]
+   * @param {Array<number>|null} prevSegment - Previous segment
+   * @returns {{ backStuck: boolean, frontStuck: boolean, shouldStep: string|null }}
+   */
+  determineStuckPosition(segment, prevSegment) {
+    const [start, end] = segment;
+    const [prevStart, prevEnd] = prevSegment || [];
+    const detentCount = this.maxDetent;
+
+    let backStuck = false;
+    let frontStuck = false;
+    let shouldStep = null;
+
+    if (start !== prevStart || end !== prevEnd) {
+      if (this.controller.edgeAlignedNoOvershoot && start === 1 && end === 1) {
+        backStuck = true;
+        if (this.shouldAutoStepToStuckPosition()) {
+          shouldStep = "back";
+        }
+      } else if (start === detentCount && end === detentCount) {
+        frontStuck = true;
+        if (this.shouldAutoStepToStuckPosition()) {
+          shouldStep = "front";
+        }
+      }
+    }
+
+    return { backStuck, frontStuck, shouldStep };
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js b/frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js
new file mode 100644
index 0000000000000..28597849400fe
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js
@@ -0,0 +1,633 @@
+/**
+ * Core dimension calculation engine for d-sheet components. Computes all sizing, spacing,
+ * and scroll physics for drawer/sheet UI patterns across different tracks (left/right/top/bottom/horizontal/vertical).
+ * Handles detent markers (snap points), spacers (front/back padding for scroll physics),
+ * snap-out accelerators (browser-specific momentum tuning), and progress tracking at detent boundaries.
+ * Supports centered tracks, edge-aligned sheets, swipe-out gestures, and WebKit-specific optimizations.
+ */
+
+import { capabilities } from "discourse/services/capabilities";
+
+/**
+ * Tolerance value for progress calculations near detent boundaries.
+ * @type {number}
+ */
+const PROGRESS_TOLERANCE = 2.1;
+
+/**
+ * Default edge padding applied when using "auto" snap acceleration.
+ * @type {number}
+ */
+const AUTO_EDGE_PADDING = 10;
+
+/**
+ * Chromium browser threshold for snap accelerator calculation.
+ * @type {number}
+ */
+const CHROMIUM_THRESHOLD = 1440;
+
+/**
+ * WebKit mobile (iOS/iPadOS) threshold for snap accelerator calculation.
+ * @type {number}
+ */
+const WEBKIT_MOBILE_THRESHOLD = 716;
+
+/**
+ * @typedef {Object} DimensionValue
+ * @property {string} px - The size as a CSS pixel string (e.g. "100px").
+ * @property {number} unitless - The raw numeric size.
+ * @property {number} unitlessRoundedDown - The size rounded down to an integer.
+ */
+
+/**
+ * @typedef {Object} AxisDimensions
+ * @property {DimensionValue} travelAxis - Dimension along the travel (scroll) axis.
+ * @property {DimensionValue} crossAxis - Dimension along the perpendicular axis.
+ */
+
+/**
+ * @typedef {Object} DetentMarkerDimension
+ * @property {DimensionValue} travelAxis - Travel axis dimension for this marker.
+ * @property {DimensionValue} crossAxis - Cross axis dimension for this marker.
+ * @property {{ travelAxis: DimensionValue }} accumulatedOffsets - Cumulative offsets from preceding markers.
+ */
+
+/**
+ * @typedef {Object} ProgressEntry
+ * @property {number} before - Progress value just before the detent boundary.
+ * @property {number} exact - Exact progress value at the detent boundary.
+ * @property {number} after - Progress value just after the detent boundary.
+ */
+
+/**
+ * @typedef {Object} SheetDimensions
+ * @property {AxisDimensions} view - Dimensions of the view element.
+ * @property {AxisDimensions} content - Dimensions of the content element.
+ * @property {DetentMarkerDimension[]} detentMarkers - Computed dimensions for each detent marker.
+ * @property {ProgressEntry[]} [progressValueAtDetents] - Progress entries at each detent.
+ * @property {number[]} [exactProgressValueAtDetents] - Exact progress values at each detent.
+ * @property {{ travelAxis: DimensionValue }} [frontSpacer] - Front spacer dimension.
+ * @property {{ travelAxis: DimensionValue }} [backSpacer] - Back spacer dimension.
+ * @property {{ travelAxis: DimensionValue }} [snapOutAccelerator] - Snap-out accelerator dimension.
+ */
+
+/**
+ * @typedef {Object} CalculatorElements
+ * @property {HTMLElement} view - The sheet view container element.
+ * @property {HTMLElement} content - The sheet content element.
+ * @property {HTMLElement} scrollContainer - The scrollable container element.
+ * @property {HTMLElement[]} detentMarkers - The detent marker elements.
+ */
+
+/**
+ * @typedef {Object} DimensionOptions
+ * @property {boolean} [swipeOutDisabledWithDetent] - Whether swipe-out is disabled when a detent is active.
+ * @property {boolean} [edgeAlignedNoOvershoot] - Whether edge-aligned sheets prevent overshoot.
+ * @property {string | number | ((contentSize: number) => number)} [snapOutAcceleration] - Snap-out acceleration strategy or value.
+ * @property {string} [snapToEndDetentsAcceleration] - Snap-to-end detent acceleration strategy.
+ * @property {boolean} [webkitSmallSpacerMode] - Whether to use minimal spacer sizes for WebKit.
+ */
+
+/**
+ * @typedef {Object} BuildContext
+ * @property {string} track - The track direction.
+ * @property {string} contentPlacement - Where the content is placed within the view.
+ * @property {boolean} isHorizontal - Whether the track is horizontal.
+ * @property {boolean} isCenteredTrack - Whether the track is a centered (symmetric) track.
+ * @property {string} travelProp - CSS property name for the travel axis ("width" or "height").
+ * @property {string} crossProp - CSS property name for the cross axis ("height" or "width").
+ * @property {boolean} swipeOutDisabledWithDetent - Whether swipe-out is disabled with a detent.
+ * @property {number} frontSpacerEdgePadding - Edge padding for the front spacer.
+ * @property {number} backSpacerEdgePadding - Edge padding for the back spacer.
+ * @property {string | number | ((contentSize: number) => number)} snapOutAcceleration - Snap-out acceleration value.
+ * @property {boolean} webkitSmallSpacerMode - Whether to use minimal spacer sizes for WebKit.
+ */
+
+/**
+ * Extracts travel and cross axis dimensions from a computed style.
+ *
+ * @param {CSSStyleDeclaration} computedStyle - The computed style of an element.
+ * @param {string} travelProp - CSS property name for the travel axis.
+ * @param {string} crossProp - CSS property name for the cross axis.
+ * @returns {AxisDimensions} The parsed axis dimensions.
+ */
+function parseDimensionsFromStyle(computedStyle, travelProp, crossProp) {
+  const travelValue = computedStyle.getPropertyValue(travelProp);
+  const crossValue = computedStyle.getPropertyValue(crossProp);
+
+  return {
+    travelAxis: {
+      px: travelValue,
+      unitless: parseFloat(travelValue),
+      unitlessRoundedDown: parseInt(travelValue, 10),
+    },
+    crossAxis: {
+      px: crossValue,
+      unitless: parseFloat(crossValue),
+      unitlessRoundedDown: parseInt(crossValue, 10),
+    },
+  };
+}
+
+/**
+ * Creates a dimension value object from a numeric size.
+ *
+ * @param {number} size - The numeric size in pixels.
+ * @returns {DimensionValue} The dimension value with px string, unitless, and rounded forms.
+ */
+function createDimensionValue(size) {
+  return {
+    px: `${size}px`,
+    unitless: size,
+    unitlessRoundedDown: Math.floor(size),
+  };
+}
+
+/**
+ * Handles view/content sizing, detent markers, and spacers.
+ */
+export default class DimensionCalculator {
+  /**
+   * References to the DOM elements used for dimension calculations.
+   * @type {CalculatorElements}
+   */
+  elements;
+
+  /**
+   * @param {CalculatorElements} elements - The DOM elements to measure.
+   */
+  constructor(elements) {
+    this.elements = elements;
+  }
+
+  /**
+   * Computes all sheet dimensions including spacers, detents, and progress values.
+   *
+   * @param {string} track - The track direction (e.g. "left", "right", "horizontal", "vertical").
+   * @param {string} contentPlacement - Where the content sits within the view (e.g. "end", "center").
+   * @param {DimensionOptions} [options] - Additional calculation options.
+   * @returns {SheetDimensions} The fully computed sheet dimensions.
+   */
+  calculateDimensions(track, contentPlacement, options = {}) {
+    const context = this.#buildContext(track, contentPlacement, options);
+    const dimensions = this.#parseInitialDimensions(context);
+
+    this.#applyVariables(dimensions, context);
+
+    const detents = this.#calculateDetents(dimensions, context);
+    Object.assign(dimensions, detents);
+
+    this.#applyVariables(dimensions, context);
+
+    return dimensions;
+  }
+
+  /**
+   * Builds the internal context object from track, placement, and options.
+   *
+   * @param {string} track - The track direction.
+   * @param {string} contentPlacement - Where the content is placed.
+   * @param {DimensionOptions} options - Calculation options.
+   * @returns {BuildContext} The resolved context for dimension calculations.
+   */
+  #buildContext(track, contentPlacement, options) {
+    const isHorizontal =
+      track === "right" || track === "left" || track === "horizontal";
+    const isCenteredTrack = track === "horizontal" || track === "vertical";
+
+    const {
+      swipeOutDisabledWithDetent = false,
+      edgeAlignedNoOvershoot = false,
+      snapOutAcceleration = "auto",
+      snapToEndDetentsAcceleration = "auto",
+      webkitSmallSpacerMode = false,
+    } = options;
+
+    const useAutoEdgePadding = snapToEndDetentsAcceleration === "auto";
+
+    return {
+      track,
+      contentPlacement,
+      isHorizontal,
+      isCenteredTrack,
+      travelProp: isHorizontal ? "width" : "height",
+      crossProp: isHorizontal ? "height" : "width",
+      swipeOutDisabledWithDetent:
+        !isCenteredTrack && swipeOutDisabledWithDetent,
+      frontSpacerEdgePadding:
+        !isCenteredTrack && swipeOutDisabledWithDetent && useAutoEdgePadding
+          ? AUTO_EDGE_PADDING
+          : 0,
+      backSpacerEdgePadding:
+        edgeAlignedNoOvershoot && useAutoEdgePadding ? AUTO_EDGE_PADDING : 0,
+      snapOutAcceleration,
+      webkitSmallSpacerMode,
+    };
+  }
+
+  /**
+   * Parses initial view and content dimensions from the DOM.
+   *
+   * @param {BuildContext} context - The calculation context.
+   * @returns {SheetDimensions} Initial dimensions with empty detent markers.
+   */
+  #parseInitialDimensions(context) {
+    const { view, content } = this.elements;
+    const { travelProp, crossProp } = context;
+
+    return {
+      view: parseDimensionsFromStyle(
+        window.getComputedStyle(view),
+        travelProp,
+        crossProp
+      ),
+      content: parseDimensionsFromStyle(
+        window.getComputedStyle(content),
+        travelProp,
+        crossProp
+      ),
+      detentMarkers: [],
+    };
+  }
+
+  /**
+   * Calculates detent marker dimensions and progress values at each detent.
+   *
+   * @param {SheetDimensions} dimensions - The current dimensions state.
+   * @param {BuildContext} context - The calculation context.
+   * @returns {{ detentMarkers: DetentMarkerDimension[], progressValueAtDetents: ProgressEntry[], exactProgressValueAtDetents: number[] }} Detent-related dimension data.
+   */
+  #calculateDetents(dimensions, context) {
+    const { detentMarkers } = this.elements;
+    const { travelProp, crossProp } = context;
+    const contentSize = dimensions.content.travelAxis.unitless;
+
+    const detentMarkerDimensions = this.#calculateDetentMarkerDimensions(
+      detentMarkers,
+      travelProp,
+      crossProp,
+      contentSize
+    );
+
+    const progressAtDetents = this.#calculateProgressAtDetents(
+      detentMarkerDimensions,
+      contentSize
+    );
+
+    return {
+      detentMarkers: detentMarkerDimensions,
+      progressValueAtDetents: progressAtDetents,
+      exactProgressValueAtDetents: progressAtDetents.map((p) => p.exact),
+    };
+  }
+
+  /**
+   * Computes dimensions and accumulated offsets for each detent marker element.
+   *
+   * @param {HTMLElement[]} markers - The detent marker DOM elements.
+   * @param {string} travelProp - CSS property for the travel axis.
+   * @param {string} crossProp - CSS property for the cross axis.
+   * @param {number} contentSize - The total content size along the travel axis.
+   * @returns {DetentMarkerDimension[]} Dimensions for each detent marker with accumulated offsets.
+   */
+  #calculateDetentMarkerDimensions(
+    markers,
+    travelProp,
+    crossProp,
+    contentSize
+  ) {
+    let accumulatedOffset = 0;
+    const markerCount = markers.length;
+
+    const dimensions = markers.map((marker, index) => {
+      const dims = parseDimensionsFromStyle(
+        window.getComputedStyle(marker),
+        travelProp,
+        crossProp
+      );
+
+      if (index !== markerCount - 1) {
+        accumulatedOffset += dims.travelAxis.unitless;
+      }
+
+      return {
+        ...dims,
+        accumulatedOffsets: {
+          travelAxis: createDimensionValue(accumulatedOffset),
+        },
+      };
+    });
+
+    if (dimensions.length > 0) {
+      const lastIndex = dimensions.length - 1;
+      const remainingContentSize = contentSize - accumulatedOffset;
+
+      dimensions[lastIndex] = {
+        travelAxis: createDimensionValue(remainingContentSize),
+        crossAxis: createDimensionValue(1),
+        accumulatedOffsets: {
+          travelAxis: createDimensionValue(
+            accumulatedOffset + remainingContentSize
+          ),
+        },
+      };
+    }
+
+    return dimensions;
+  }
+
+  /**
+   * Calculates progress values (before, exact, after) at each detent boundary.
+   *
+   * @param {DetentMarkerDimension[]} detentMarkerDimensions - The computed marker dimensions.
+   * @param {number} contentSize - The total content size along the travel axis.
+   * @returns {ProgressEntry[]} Progress entries for start, each intermediate detent, and end.
+   */
+  #calculateProgressAtDetents(detentMarkerDimensions, contentSize) {
+    const createProgressEntry = (baseOffset) => ({
+      before: (baseOffset - PROGRESS_TOLERANCE) / contentSize,
+      exact: baseOffset / contentSize,
+      after: (baseOffset + PROGRESS_TOLERANCE) / contentSize,
+    });
+
+    const progressAtDetents = [createProgressEntry(0)];
+
+    detentMarkerDimensions.slice(0, -1).forEach((marker) => {
+      const offset = marker.accumulatedOffsets.travelAxis.unitless;
+      progressAtDetents.push(createProgressEntry(offset));
+    });
+
+    progressAtDetents.push(createProgressEntry(contentSize));
+
+    return progressAtDetents;
+  }
+
+  /**
+   * Applies computed CSS custom properties and spacer dimensions to the view element.
+   *
+   * @param {SheetDimensions} dimensions - The current dimensions state (mutated in place).
+   * @param {BuildContext} context - The calculation context.
+   */
+  #applyVariables(dimensions, context) {
+    const { view: viewElement } = this.elements;
+    const {
+      contentPlacement,
+      isCenteredTrack,
+      swipeOutDisabledWithDetent,
+      frontSpacerEdgePadding,
+      backSpacerEdgePadding,
+      snapOutAcceleration,
+      webkitSmallSpacerMode,
+    } = context;
+
+    this.#applyViewContentStyles(dimensions, viewElement);
+
+    const viewSize = dimensions.view.travelAxis.unitless;
+    const contentSize = dimensions.content.travelAxis.unitless;
+
+    const snapOutAccelerator = this.#calculateSnapOutAccelerator(
+      snapOutAcceleration,
+      viewSize,
+      contentSize,
+      contentPlacement
+    );
+
+    const frontSpacerSize = this.#calculateFrontSpacerSize(
+      viewSize,
+      contentSize,
+      snapOutAccelerator,
+      dimensions.detentMarkers,
+      {
+        isCenteredTrack,
+        swipeOutDisabledWithDetent,
+        frontSpacerEdgePadding,
+        contentPlacement,
+        webkitSmallSpacerMode,
+      }
+    );
+
+    dimensions.frontSpacer = {
+      travelAxis: createDimensionValue(frontSpacerSize),
+    };
+
+    const backSpacerSize = this.#calculateBackSpacerSize(
+      viewSize,
+      contentSize,
+      snapOutAccelerator,
+      { isCenteredTrack, backSpacerEdgePadding, webkitSmallSpacerMode }
+    );
+
+    dimensions.backSpacer = {
+      travelAxis: createDimensionValue(backSpacerSize),
+    };
+
+    viewElement.style.setProperty(
+      "--d-sheet-front-spacer",
+      `${frontSpacerSize}px`
+    );
+
+    viewElement.style.setProperty(
+      "--d-sheet-back-spacer",
+      `${backSpacerSize}px`
+    );
+
+    this.#applyDetentAcceleratorStyles(
+      dimensions,
+      viewElement,
+      snapOutAccelerator
+    );
+  }
+
+  /**
+   * Sets CSS custom properties for view and content axis sizes on the view element.
+   *
+   * @param {SheetDimensions} dimensions - The current dimensions state.
+   * @param {HTMLElement} viewElement - The view DOM element to apply styles to.
+   */
+  #applyViewContentStyles(dimensions, viewElement) {
+    viewElement.style.setProperty(
+      "--d-sheet-view-travel-axis",
+      dimensions.view.travelAxis.px
+    );
+    viewElement.style.setProperty(
+      "--d-sheet-view-cross-axis",
+      dimensions.view.crossAxis.px
+    );
+    viewElement.style.setProperty(
+      "--d-sheet-content-travel-axis",
+      dimensions.content.travelAxis.px
+    );
+    viewElement.style.setProperty(
+      "--d-sheet-content-cross-axis",
+      dimensions.content.crossAxis.px
+    );
+  }
+
+  /**
+   * Applies the first detent size and snap accelerator as CSS custom properties.
+   *
+   * @param {SheetDimensions} dimensions - The current dimensions state (mutated to add snapOutAccelerator).
+   * @param {HTMLElement} viewElement - The view DOM element to apply styles to.
+   * @param {number} snapOutAccelerator - The computed snap-out accelerator value in pixels.
+   */
+  #applyDetentAcceleratorStyles(dimensions, viewElement, snapOutAccelerator) {
+    if (dimensions.detentMarkers?.length > 0) {
+      viewElement.style.setProperty(
+        "--d-sheet-first-detent-size",
+        dimensions.detentMarkers[0].travelAxis.px
+      );
+    }
+
+    dimensions.snapOutAccelerator = {
+      travelAxis: createDimensionValue(snapOutAccelerator),
+    };
+
+    viewElement.style.setProperty(
+      "--d-sheet-snap-accelerator",
+      `${snapOutAccelerator}px`
+    );
+  }
+
+  /**
+   * Calculates the front spacer size based on track type and layout configuration.
+   *
+   * @param {number} viewSize - The view size along the travel axis.
+   * @param {number} contentSize - The content size along the travel axis.
+   * @param {number} snapOutAccelerator - The snap-out accelerator value.
+   * @param {DetentMarkerDimension[]} detentMarkers - The detent marker dimensions.
+   * @param {{ isCenteredTrack: boolean, swipeOutDisabledWithDetent: boolean, frontSpacerEdgePadding: number, contentPlacement: string, webkitSmallSpacerMode: boolean }} options - Layout options.
+   * @returns {number} The front spacer size in pixels.
+   */
+  #calculateFrontSpacerSize(
+    viewSize,
+    contentSize,
+    snapOutAccelerator,
+    detentMarkers,
+    options
+  ) {
+    const {
+      isCenteredTrack,
+      swipeOutDisabledWithDetent,
+      frontSpacerEdgePadding,
+      contentPlacement,
+      webkitSmallSpacerMode,
+    } = options;
+
+    if (webkitSmallSpacerMode) {
+      return isCenteredTrack ? viewSize / 2 + 1 : 1;
+    }
+
+    if (isCenteredTrack) {
+      return (
+        viewSize / 2 +
+        viewSize -
+        (viewSize - contentSize) / 2 +
+        snapOutAccelerator
+      );
+    }
+
+    if (swipeOutDisabledWithDetent) {
+      const firstDetentSize = detentMarkers?.[0]?.travelAxis?.unitless ?? 0;
+      return contentSize - firstDetentSize + frontSpacerEdgePadding;
+    }
+
+    if (contentPlacement === "center") {
+      return viewSize - (viewSize - contentSize) / 2 + snapOutAccelerator;
+    }
+
+    return contentSize + snapOutAccelerator;
+  }
+
+  /**
+   * Calculates the back spacer size based on track type and layout configuration.
+   *
+   * @param {number} viewSize - The view size along the travel axis.
+   * @param {number} contentSize - The content size along the travel axis.
+   * @param {number} snapOutAccelerator - The snap-out accelerator value.
+   * @param {{ isCenteredTrack: boolean, backSpacerEdgePadding: number, webkitSmallSpacerMode: boolean }} options - Layout options.
+   * @returns {number} The back spacer size in pixels.
+   */
+  #calculateBackSpacerSize(viewSize, contentSize, snapOutAccelerator, options) {
+    const { isCenteredTrack, backSpacerEdgePadding, webkitSmallSpacerMode } =
+      options;
+
+    if (backSpacerEdgePadding > 0) {
+      return viewSize + backSpacerEdgePadding;
+    }
+
+    if (isCenteredTrack) {
+      if (webkitSmallSpacerMode) {
+        return viewSize / 2;
+      }
+      return (
+        viewSize / 2 +
+        viewSize -
+        (viewSize - contentSize) / 2 +
+        snapOutAccelerator
+      );
+    }
+
+    return viewSize;
+  }
+
+  /**
+   * Computes the snap-out accelerator value based on browser engine and content size.
+   *
+   * @param {string | number | ((contentSize: number) => number)} snapOutAcceleration - The acceleration strategy or value.
+   * @param {number} viewSize - The view size along the travel axis.
+   * @param {number} contentSize - The content size along the travel axis.
+   * @param {string} [contentPlacement="end"] - Where the content is placed within the view.
+   * @returns {number} The snap-out accelerator value in pixels.
+   */
+  #calculateSnapOutAccelerator(
+    snapOutAcceleration,
+    viewSize,
+    contentSize,
+    contentPlacement = "end"
+  ) {
+    if (snapOutAcceleration === "auto") {
+      const effectiveSize =
+        contentPlacement === "center"
+          ? contentSize + (viewSize - contentSize) / 2
+          : contentSize;
+
+      const { browserEngine, detectedPlatform } = capabilities;
+
+      if (browserEngine === "chromium") {
+        return effectiveSize <= CHROMIUM_THRESHOLD
+          ? 70 + 0.25 * effectiveSize
+          : 0.3 * effectiveSize;
+      }
+
+      if (browserEngine === "webkit") {
+        if (detectedPlatform === "ios" || detectedPlatform === "ipados") {
+          return effectiveSize <= WEBKIT_MOBILE_THRESHOLD
+            ? 15 + 0.1 * effectiveSize
+            : 0.12 * effectiveSize;
+        }
+        return 0.5 * effectiveSize;
+      }
+
+      return 10;
+    }
+
+    if (typeof snapOutAcceleration === "function") {
+      const result = parseInt(snapOutAcceleration(contentSize), 10);
+      return result < 1
+        ? 1
+        : result > contentSize / 2
+          ? contentSize / 2
+          : result;
+    }
+
+    if (snapOutAcceleration === "initial") {
+      return 1;
+    }
+
+    if (typeof snapOutAcceleration === "number") {
+      return Math.max(0, Math.min(snapOutAcceleration, contentSize / 2));
+    }
+
+    return 0;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/dom-attributes.js b/frontend/discourse/float-kit/components/d-sheet/dom-attributes.js
new file mode 100644
index 0000000000000..9760bdeb0fac8
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/dom-attributes.js
@@ -0,0 +1,178 @@
+/**
+ * DOM manipulation utilities for d-sheet component system.
+ *
+ * Manages view-level DOM attributes, inline styles, and element visibility for sheet animations.
+ * Handles swipe-out transitions, scroll snap behavior, overflow control during step navigation,
+ * and coordinate view positioning. Centralizes all direct DOM manipulation to maintain consistent
+ * state across sheet lifecycle events (open, close, navigate, swipe).
+ */
+
+import { cancel } from "@ember/runloop";
+import discourseLater from "discourse/lib/later";
+
+/**
+ * DOM attribute and style management for d-sheet.
+ * Centralizes data-d-sheet attribute manipulation and view style updates.
+ */
+export default class DOMAttributes {
+  /**
+   * Timer handle for deferred overflow restoration.
+   *
+   * @type {import("@ember/runloop").Timer | null}
+   */
+  overflowTimer = null;
+
+  /**
+   * Reference to the parent sheet controller.
+   *
+   * @type {import("./controller").default}
+   */
+  controller;
+
+  /**
+   * @param {import("./controller").default} controller - The sheet controller instance
+   */
+  constructor(controller) {
+    this.controller = controller;
+  }
+
+  /**
+   * Get the view element from controller.
+   *
+   * @returns {HTMLElement|null}
+   */
+  get view() {
+    return this.controller.view;
+  }
+
+  /**
+   * Get the content element from controller.
+   *
+   * @returns {HTMLElement|null}
+   */
+  get content() {
+    return this.controller.content;
+  }
+
+  /**
+   * Get the scroll container element from controller.
+   *
+   * @returns {HTMLElement|null}
+   */
+  get scrollContainer() {
+    return this.controller.scrollContainer;
+  }
+
+  /**
+   * Add the hidden attribute to the view for initial animation.
+   *
+   * @returns {void}
+   */
+  setHidden() {
+    if (this.view) {
+      const currentAttr = this.view.dataset.dSheet || "";
+      const attributes = new Set(currentAttr.split(" ").filter(Boolean));
+      attributes.add("hidden");
+      this.view.dataset.dSheet = Array.from(attributes).join(" ");
+    }
+  }
+
+  /**
+   * Reset view styles to default state.
+   *
+   * @returns {void}
+   */
+  resetViewStyles() {
+    if (!this.view) {
+      return;
+    }
+
+    this.view.style.removeProperty("pointer-events");
+    this.view.style.removeProperty("opacity");
+  }
+
+  /**
+   * Hide the view for swipe-out transition.
+   * Applied when intersection observer detects content is no longer visible.
+   *
+   * @returns {void}
+   */
+  hideForSwipeOut() {
+    if (this.view) {
+      this.view.style.setProperty("pointer-events", "none", "important");
+      this.view.style.setProperty("opacity", "0", "important");
+      this.view.style.setProperty("position", "fixed", "important");
+      this.view.style.setProperty("top", "-100px", "important");
+      this.view.style.setProperty("left", "-100px", "important");
+    }
+
+    if (this.content) {
+      this.content.style.setProperty("pointer-events", "none", "important");
+    }
+
+    if (this.scrollContainer) {
+      this.scrollContainer.style.setProperty("width", "1px", "important");
+      this.scrollContainer.style.setProperty("height", "1px", "important");
+      this.scrollContainer.style.setProperty(
+        "clip-path",
+        "inset(0)",
+        "important"
+      );
+    }
+  }
+
+  /**
+   * Disable scroll snap on the scroll container.
+   *
+   * @returns {void}
+   */
+  disableScrollSnap() {
+    if (this.scrollContainer) {
+      this.scrollContainer.style.setProperty(
+        "scroll-snap-type",
+        "none",
+        "important"
+      );
+    }
+  }
+
+  /**
+   * Enable scroll snap on the scroll container (remove override).
+   *
+   * @returns {void}
+   */
+  enableScrollSnap() {
+    if (this.scrollContainer) {
+      this.scrollContainer.style.removeProperty("scroll-snap-type");
+    }
+  }
+
+  /**
+   * Temporarily hide overflow during step animations.
+   *
+   * @param {number} duration - Duration in ms to hide overflow
+   * @returns {void}
+   */
+  temporarilyHideOverflow(duration) {
+    if (!this.scrollContainer) {
+      return;
+    }
+
+    cancel(this.overflowTimer);
+
+    this.scrollContainer.style.setProperty("overflow", "hidden");
+
+    this.overflowTimer = discourseLater(() => {
+      this.scrollContainer?.style.removeProperty("overflow");
+    }, duration);
+  }
+
+  /**
+   * Cleanup any pending timers.
+   *
+   * @returns {void}
+   */
+  cleanup() {
+    cancel(this.overflowTimer);
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/focus-management.js b/frontend/discourse/float-kit/components/d-sheet/focus-management.js
new file mode 100644
index 0000000000000..405c668f20acb
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/focus-management.js
@@ -0,0 +1,251 @@
+/**
+ * Focus management module for d-sheet components.
+ *
+ * Handles automatic focus control when sheets are presented and dismissed, including:
+ * - Capturing and restoring previously focused elements
+ * - Finding appropriate auto-focus targets within sheet content
+ * - Preventing unwanted scroll during focus changes
+ * - Respecting aria-hidden, inert, and other accessibility constraints
+ */
+import { processBehavior } from "discourse/float-kit/lib/behavior-handler";
+
+/**
+ * Selector for focusable elements.
+ *
+ * @type {string}
+ */
+const FOCUSABLE_SELECTOR = [
+  "input:not([disabled]):not([type=hidden])",
+  "select:not([disabled])",
+  "textarea:not([disabled])",
+  "button:not([disabled])",
+  "a[href]",
+  "area[href]",
+  "summary",
+  "iframe",
+  "object",
+  "embed",
+  "audio[controls]",
+  "video[controls]",
+  "[contenteditable]",
+  "[tabindex]:not([disabled])",
+].join(",");
+
+/**
+ * Selectors for elements that should be skipped during focus traversal.
+ *
+ * @type {string[]}
+ */
+const SKIPPABLE_SELECTORS = [
+  "[aria-hidden='true']",
+  "[aria-hidden='true'] *",
+  "[inert]",
+  "[inert] *",
+];
+
+/**
+ * Data attribute for elements to skip during auto-focus (scroll-container).
+ *
+ * @type {string}
+ */
+const AUTOFOCUS_SKIP_SELECTOR = "[data-d-sheet~='scroll-container']";
+
+/**
+ * Data attribute for Scroll.View elements (used to skip when finding first focusable).
+ *
+ * @type {string}
+ */
+const SCROLL_VIEW_SELECTOR = "[data-d-scroll~='view']";
+
+/**
+ * Get the first element from an array that doesn't match the Scroll.View selector.
+ * This skips Scroll.View containers when finding the first focusable child.
+ *
+ * @param {HTMLElement[]} elements - Array of elements to search
+ * @returns {HTMLElement|undefined} First safe element or first element if none match
+ */
+function getFirstSafeElement(elements) {
+  for (let i = 0; i < elements.length; ++i) {
+    if (!elements[i].matches(SCROLL_VIEW_SELECTOR)) {
+      return elements[i];
+    }
+  }
+  return elements[0];
+}
+
+/**
+ * Get focusable and tabbable elements within a container.
+ *
+ * @param {HTMLElement} container - The container element to search within
+ * @param {string[]} [additionalSkipSelectors] - Additional selectors for elements to skip
+ * @returns {{ safelyFocusableElements: HTMLElement[], safelyTabbableElements: HTMLElement[] }} Object containing arrays of focusable and tabbable elements
+ */
+function getFocusableElements(container, additionalSkipSelectors = []) {
+  if (!container) {
+    return { safelyFocusableElements: [], safelyTabbableElements: [] };
+  }
+
+  const skipSelector = [
+    ...additionalSkipSelectors,
+    ...SKIPPABLE_SELECTORS,
+  ].join(",");
+
+  const elements = [
+    ...(container.matches(FOCUSABLE_SELECTOR) ? [container] : []),
+    ...container.querySelectorAll(FOCUSABLE_SELECTOR),
+  ];
+
+  const elementsWithData = elements.map((element) => ({
+    element,
+    tabbable: element.matches(':not([hidden]):not([tabindex^="-"])'),
+    skippable:
+      element.matches(skipSelector) ||
+      !(
+        element.offsetWidth ||
+        element.offsetHeight ||
+        element.getClientRects().length
+      ),
+  }));
+
+  const safelyFocusableElements = elementsWithData
+    .filter((data) => !data.skippable)
+    .map((data) => data.element);
+
+  const safelyTabbableElements = elementsWithData
+    .filter((data) => data.tabbable && !data.skippable)
+    .map((data) => data.element);
+
+  return { safelyFocusableElements, safelyTabbableElements };
+}
+
+/**
+ * Manages focus behavior for sheets including auto-focus on present/dismiss
+ * and scroll prevention during focus changes.
+ */
+export default class FocusManagement {
+  /**
+   * The sheet controller instance.
+   *
+   * @type {Object}
+   */
+  controller;
+
+  /**
+   * The element that was focused before the sheet opened.
+   *
+   * @type {HTMLElement|null}
+   */
+  #previouslyFocusedElement = null;
+
+  /**
+   * Creates a new FocusManagement instance.
+   *
+   * @param {Object} controller - The sheet controller instance
+   */
+  constructor(controller) {
+    this.controller = controller;
+  }
+
+  /**
+   * Get the view element from controller.
+   *
+   * @returns {HTMLElement|null} The view element or null if not available
+   */
+  get #view() {
+    return this.controller.view;
+  }
+
+  /**
+   * Capture the currently focused element before the sheet opens.
+   */
+  capturePreviouslyFocusedElement() {
+    if (typeof document !== "undefined") {
+      this.#previouslyFocusedElement = document.activeElement;
+    }
+  }
+
+  /**
+   * Find the appropriate element to auto-focus when the sheet is presented.
+   *
+   * @returns {HTMLElement|null} The element to focus, or null if no suitable target found
+   */
+  findAutoFocusTarget() {
+    if (!this.#view) {
+      return null;
+    }
+
+    const { safelyTabbableElements } = getFocusableElements(this.#view, [
+      AUTOFOCUS_SKIP_SELECTOR,
+    ]);
+
+    const firstTabbable = getFirstSafeElement(safelyTabbableElements);
+
+    return firstTabbable ?? this.#view;
+  }
+
+  /**
+   * Execute auto-focus when the sheet is presented.
+   * Respects the onPresentAutoFocus behavior handler.
+   */
+  executeAutoFocusOnPresent() {
+    const behavior = processBehavior({
+      nativeEvent: null,
+      defaultBehavior: { focus: true },
+      handler: this.controller.onPresentAutoFocus,
+    });
+
+    if (behavior.focus === false) {
+      return;
+    }
+
+    const target = this.findAutoFocusTarget();
+    if (target) {
+      target.focus({ preventScroll: true });
+    }
+  }
+
+  /**
+   * Execute auto-focus when the sheet is dismissed.
+   * Restores focus to the previously focused element if appropriate.
+   * Respects the onDismissAutoFocus behavior handler.
+   */
+  executeAutoFocusOnDismiss() {
+    const activeElement = document.activeElement;
+
+    if (
+      this.#view &&
+      !this.#view.contains(activeElement) &&
+      document.contains(activeElement)
+    ) {
+      this.#previouslyFocusedElement = null;
+      return;
+    }
+
+    const behavior = processBehavior({
+      nativeEvent: null,
+      defaultBehavior: { focus: true },
+      handler: this.controller.onDismissAutoFocus,
+    });
+
+    if (behavior.focus === false) {
+      this.#previouslyFocusedElement = null;
+      return;
+    }
+
+    const target =
+      this.#previouslyFocusedElement &&
+      document.contains(this.#previouslyFocusedElement)
+        ? this.#previouslyFocusedElement
+        : document.body;
+
+    target.focus({ preventScroll: true });
+    this.#previouslyFocusedElement = null;
+  }
+
+  /**
+   * Clean up all resources and reset state.
+   */
+  cleanup() {
+    this.#previouslyFocusedElement = null;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/handle.gjs b/frontend/discourse/float-kit/components/d-sheet/handle.gjs
new file mode 100644
index 0000000000000..92766e38f3419
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/handle.gjs
@@ -0,0 +1,89 @@
+import { on } from "@ember/modifier";
+import SheetActionBase from "./sheet-action-base";
+
+/**
+ * Interactive handle for d-sheet; supports dismiss and step actions.
+ *
+ * @component DSheetHandle
+ * @param {string} forComponent - ID of the Root to associate with (uses Root's componentId)
+ * @param {Object} sheet - Sheet controller instance (alternative to forComponent)
+ * @param {string|Object} action - Action to perform:
+ *   - "dismiss": closes the sheet
+ *   - "step" (default): steps to next detent (upward, cycles)
+ *   - { type: "step", direction?: "up"|"down", detent?: number }: step with options
+ * @param {Object|Function} onPress - Press behavior configuration:
+ *   - { forceFocus?: boolean, runAction?: boolean }
+ *   - Or function receiving event with changeDefault method
+ *   Default: { forceFocus: true, runAction: true }
+ */
+export default class Handle extends SheetActionBase {
+  /**
+   * Default action type for the handle, overrides base "present" with "step".
+   *
+   * @type {string}
+   */
+  get defaultAction() {
+    return "step";
+  }
+
+  /**
+   * Whether the handle is disabled.
+   * Disabled when only one detent exists and action is not "dismiss".
+   *
+   * @type {boolean}
+   */
+  get isDisabled() {
+    const detents = this.sheet?.detents;
+    return detents?.length === 1 && this.actionType !== "dismiss";
+  }
+
+  /**
+   * Accessible fallback text when no block content is yielded.
+   *
+   * @type {string}
+   */
+  get defaultText() {
+    return this.actionType === "dismiss" ? "Dismiss" : "Cycle";
+  }
+
+  /**
+   * Whether the sheet is presented for aria-expanded.
+   *
+   * @type {boolean}
+   */
+  get isPresented() {
+    return this.sheet?.isPresented ?? false;
+  }
+
+  /**
+   * Execute the configured action on the sheet.
+   */
+  executeAction() {
+    switch (this.actionType) {
+      case "dismiss":
+        this.sheet?.close();
+        break;
+      case "step":
+        this.executeStepAction();
+        break;
+    }
+  }
+
+  <template>
+    <button
+      type="button"
+      data-d-sheet="touch-target-expander handle"
+      disabled={{this.isDisabled}}
+      aria-expanded={{this.isPresented}}
+      aria-controls={{this.sheetId}}
+      {{on "click" this.handleClick}}
+      ...attributes
+    >
+      {{#if (has-block)}}
+        {{yield}}
+      {{else}}
+        <span class="sr-only">{{this.defaultText}}</span>
+      {{/if}}
+    </button>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/header.gjs b/frontend/discourse/float-kit/components/d-sheet/header.gjs
new file mode 100644
index 0000000000000..b1cf3307a8f9b
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/header.gjs
@@ -0,0 +1,61 @@
+import { hash } from "@ember/helper";
+import DButton from "discourse/components/d-button";
+
+/**
+ * Header component for the sheet, providing left/right action slots and a title.
+ *
+ * @component DSheetHeader
+ * @param {import("./controller").default} sheet - The sheet controller instance providing close action and titleId
+ *
+ * @slot left - Yields a hash { Back, Cancel, Close } of pre-styled DButton components
+ * @slot title - Yields the title content rendered inside the header h2
+ * @slot right - Yields a pre-styled DButton component for right-side actions
+ */
+const Header = <template>
+  <div class="d-sheet-header">
+    <div class="d-sheet-header__left">
+      {{#if (has-block "left")}}
+        {{yield
+          (hash
+            Back=(component
+              DButton
+              class="btn-transparent btn-primary"
+              label="back"
+              icon="chevron-left"
+            )
+            Cancel=(component
+              DButton
+              class="btn-transparent btn-primary"
+              label="cancel"
+              action=@sheet.close
+            )
+            Close=(component
+              DButton
+              class="btn-transparent btn-primary"
+              label="close"
+              action=@sheet.close
+            )
+          )
+          to="left"
+        }}
+      {{/if}}
+    </div>
+
+    <h2 class="d-sheet-header__title" id={{@sheet.titleId}}>
+      {{#if (has-block "title")}}
+        {{yield to="title"}}
+      {{/if}}
+    </h2>
+
+    <div class="d-sheet-header__right">
+      {{#if (has-block "right")}}
+        {{yield
+          (component DButton class="btn-transparent btn-primary")
+          to="right"
+        }}
+      {{/if}}
+    </div>
+  </div>
+</template>;
+
+export default Header;
diff --git a/frontend/discourse/float-kit/components/d-sheet/observer-manager.js b/frontend/discourse/float-kit/components/d-sheet/observer-manager.js
new file mode 100644
index 0000000000000..1480c6214f4a8
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/observer-manager.js
@@ -0,0 +1,233 @@
+/**
+ * Observer management module for the d-sheet component system.
+ * Provides centralized lifecycle management for IntersectionObserver, ResizeObserver,
+ * and wheel event listeners. Handles swipe-out detection through intersection tracking
+ * when content scrolls beyond viewport bounds, responsive layout updates through resize
+ * observation, and differentiation between touch/wheel interactions for appropriate
+ * close behavior. Works in coordination with the sheet controller to manage observer
+ * setup, teardown, and state transitions based on detent configurations.
+ */
+import discourseLater from "discourse/lib/later";
+
+/**
+ * Centralized observer management for d-sheet.
+ * Handles IntersectionObserver, ResizeObserver, and wheel listener lifecycle.
+ */
+export default class ObserverManager {
+  /**
+   * @type {import("./controller").default}
+   */
+  #controller;
+
+  /**
+   * @type {IntersectionObserver|null}
+   */
+  #intersectionObserver = null;
+
+  /**
+   * @type {ResizeObserver|null}
+   */
+  #resizeObserver = null;
+
+  /**
+   * @type {(() => void)|null}
+   */
+  #wheelListener = null;
+
+  /**
+   * @type {boolean}
+   */
+  #wheelInteractionDetected = false;
+
+  /**
+   * @type {(() => void)|null}
+   */
+  #wheelCleanup = null;
+
+  /**
+   * @param {import("./controller").default} controller - The sheet controller instance
+   */
+  constructor(controller) {
+    this.#controller = controller;
+  }
+
+  /**
+   * Set up the intersection observer for swipe-out detection.
+   *
+   * @returns {void}
+   */
+  setupIntersectionObserver() {
+    const { view, content } = this.#controller;
+
+    if (!view || !content) {
+      return;
+    }
+
+    if (this.#controller.swipeOutDisabledWithDetent) {
+      this.cleanupIntersectionObserver();
+      return;
+    }
+
+    this.cleanupIntersectionObserver();
+
+    this.#wheelInteractionDetected = false;
+    this.#wheelListener = () => {
+      this.#wheelInteractionDetected = true;
+    };
+    window.addEventListener("wheel", this.#wheelListener, {
+      passive: true,
+      once: true,
+    });
+
+    this.#intersectionObserver = new IntersectionObserver(
+      (entries) => this.#handleIntersection(entries),
+      {
+        root: view,
+        threshold: [0],
+      }
+    );
+
+    this.#intersectionObserver.observe(content);
+  }
+
+  /**
+   * Handle intersection observer entries.
+   *
+   * @param {IntersectionObserverEntry[]} entries
+   * @returns {void}
+   */
+  #handleIntersection(entries) {
+    for (const entry of entries) {
+      if (!entry.isIntersecting && this.#controller.state.openness.isOpen) {
+        this.#controller.domAttributes?.hideForSwipeOut();
+
+        requestAnimationFrame(() => {
+          if (this.#wheelInteractionDetected) {
+            this.#handleWheelSwipeOut();
+          } else {
+            this.#triggerSwipeOut();
+          }
+        });
+      }
+    }
+  }
+
+  /**
+   * Handle swipe-out when wheel interaction was detected.
+   *
+   * @returns {void}
+   */
+  #handleWheelSwipeOut() {
+    let lastDeltaY = 100000;
+
+    const blockWheel = (e) => {
+      const currentDeltaY = Math.abs(e.deltaY);
+      if (lastDeltaY < currentDeltaY) {
+        window.removeEventListener("wheel", blockWheel, { passive: false });
+      } else {
+        e.preventDefault();
+      }
+      lastDeltaY = currentDeltaY;
+    };
+
+    window.addEventListener("wheel", blockWheel, { passive: false });
+    this.#wheelCleanup = () =>
+      window.removeEventListener("wheel", blockWheel, { passive: false });
+
+    discourseLater(() => {
+      this.#wheelCleanup?.();
+      this.#wheelCleanup = null;
+      this.#triggerSwipeOut();
+    }, 100);
+  }
+
+  /**
+   * Trigger the swipe-out transition.
+   *
+   * @returns {void}
+   */
+  #triggerSwipeOut() {
+    this.#controller.domAttributes?.disableScrollSnap();
+    this.#controller.state.skip.enableClosing();
+    this.#controller.handleStateTransition("SWIPED_OUT");
+  }
+
+  /**
+   * Clean up the intersection observer and wheel listener.
+   *
+   * @returns {void}
+   */
+  cleanupIntersectionObserver() {
+    if (this.#intersectionObserver) {
+      this.#intersectionObserver.disconnect();
+      this.#intersectionObserver = null;
+    }
+
+    if (this.#wheelListener) {
+      window.removeEventListener("wheel", this.#wheelListener);
+      this.#wheelListener = null;
+    }
+
+    if (this.#wheelCleanup) {
+      this.#wheelCleanup();
+      this.#wheelCleanup = null;
+    }
+  }
+
+  /**
+   * Set up the resize observer for view and content elements.
+   *
+   * @param {() => void} onResize - Callback to invoke on resize
+   * @returns {void}
+   */
+  setupResizeObserver(onResize) {
+    if (this.#resizeObserver) {
+      this.#resizeObserver.disconnect();
+    }
+
+    const { view, content } = this.#controller;
+
+    let viewFirstObservation = true;
+    let contentFirstObservation = true;
+
+    this.#resizeObserver = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        if (entry.target === view) {
+          if (viewFirstObservation) {
+            viewFirstObservation = false;
+            continue;
+          }
+          onResize();
+        } else if (entry.target === content) {
+          if (contentFirstObservation) {
+            this.#controller.calculateDimensionsIfReady();
+            contentFirstObservation = false;
+            continue;
+          }
+          onResize();
+        }
+      }
+    });
+
+    if (view) {
+      this.#resizeObserver.observe(view, { box: "border-box" });
+    }
+    if (content) {
+      this.#resizeObserver.observe(content, { box: "border-box" });
+    }
+  }
+
+  /**
+   * Clean up all observers.
+   *
+   * @returns {void}
+   */
+  cleanup() {
+    this.cleanupIntersectionObserver();
+
+    if (this.#resizeObserver) {
+      this.#resizeObserver.disconnect();
+      this.#resizeObserver = null;
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/outlet-animation-modifier.js b/frontend/discourse/float-kit/components/d-sheet/outlet-animation-modifier.js
new file mode 100644
index 0000000000000..cd75231472664
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/outlet-animation-modifier.js
@@ -0,0 +1,261 @@
+import Modifier from "ember-modifier";
+import { createTweenFunction } from "./animation";
+import { toKebabCase, TRANSFORM_PROPS } from "./css-utils";
+
+/**
+ * Ember modifier that applies travel and stacking animations to a sheet outlet element.
+ *
+ * @extends Modifier
+ */
+export default class OutletAnimationModifier extends Modifier {
+  /** @type {Function[]} */
+  #cleanupFns = [];
+
+  /** @type {Set<string>} */
+  #propertiesToClean = new Set();
+
+  /** Cleans up all registered animations on element destruction. */
+  willDestroy() {
+    this.#cleanup();
+  }
+
+  /**
+   * Applies travel and stacking animations to the element when arguments change.
+   *
+   * @param {HTMLElement} element
+   * @param {[Object|null, Object|undefined, Object|undefined]} positional - [sheet, travelAnimation, stackingAnimation]
+   */
+  modify(element, [sheet, travelAnimation, stackingAnimation]) {
+    this.#cleanup(element);
+
+    if (!sheet) {
+      return;
+    }
+
+    this.#registerAnimation(element, sheet, travelAnimation, "travel");
+    this.#registerAnimation(element, sheet, stackingAnimation, "stacking");
+  }
+
+  /**
+   * Registers a single animation (travel or stacking) on the element via the sheet.
+   *
+   * @param {HTMLElement} element
+   * @param {Object} sheet
+   * @param {Object|undefined} animationConfig
+   * @param {"travel"|"stacking"} type
+   */
+  #registerAnimation(element, sheet, animationConfig, type) {
+    if (!animationConfig) {
+      return;
+    }
+
+    const { animatedProperties, staticStyles, propertiesToClean } =
+      this.#prepareAnimation(animationConfig);
+
+    this.#applyStaticStyles(element, staticStyles);
+
+    for (const prop of propertiesToClean) {
+      this.#propertiesToClean.add(prop);
+    }
+
+    const registerMethod =
+      type === "travel"
+        ? "registerTravelAnimation"
+        : "registerStackingAnimation";
+
+    const unregister = sheet[registerMethod]({
+      target: element,
+      config: animationConfig,
+      callback: this.#createAnimationCallback(element, animatedProperties),
+    });
+
+    this.#cleanupFns.push(unregister);
+  }
+
+  /**
+   * Parses an animation config into animated properties, static styles, and properties to clean.
+   *
+   * @param {Object|undefined} config
+   * @returns {{ animatedProperties: Array<[string, Function]>, staticStyles: Map<string, string>, propertiesToClean: Set<string> }}
+   */
+  #prepareAnimation(config) {
+    const animatedProperties = [];
+    const staticStyles = new Map();
+    const propertiesToClean = new Set();
+
+    if (!config) {
+      return { animatedProperties, staticStyles, propertiesToClean };
+    }
+
+    const props = config.properties || config;
+
+    for (const [property, value] of Object.entries(props)) {
+      if (this.#shouldSkipProperty(property, value)) {
+        continue;
+      }
+
+      if (property === "transformOrigin") {
+        staticStyles.set("transform-origin", value);
+        propertiesToClean.add("transform-origin");
+        continue;
+      }
+
+      if (typeof value === "string") {
+        const kebabProp = toKebabCase(property);
+        staticStyles.set(kebabProp, value);
+        propertiesToClean.add(kebabProp);
+        continue;
+      }
+
+      const animationFn = this.#createPropertyAnimationFn(property, value);
+      if (!animationFn) {
+        continue;
+      }
+
+      if (TRANSFORM_PROPS.has(property) || property === "transform") {
+        this.#addTransformProperty(
+          animatedProperties,
+          propertiesToClean,
+          property,
+          animationFn
+        );
+      } else {
+        const kebabProp = toKebabCase(property);
+        animatedProperties.push([kebabProp, animationFn]);
+        propertiesToClean.add(kebabProp);
+      }
+    }
+
+    return { animatedProperties, staticStyles, propertiesToClean };
+  }
+
+  /**
+   * Determines whether a property should be skipped during animation preparation.
+   *
+   * @param {string} property
+   * @param {*} value
+   * @returns {boolean}
+   */
+  #shouldSkipProperty(property, value) {
+    return (
+      value === null ||
+      value === undefined ||
+      value === "ignore" ||
+      property === "properties"
+    );
+  }
+
+  /**
+   * Creates an animation function for a single property from a keyframe array or callback.
+   *
+   * @param {string} property
+   * @param {[string, string]|Function} value
+   * @returns {Function|null}
+   */
+  #createPropertyAnimationFn(property, value) {
+    if (Array.isArray(value)) {
+      if (
+        !property.startsWith("scale") &&
+        (!isNaN(value[0]) || !isNaN(value[1]))
+      ) {
+        throw new Error(
+          "Keyframe values used with a 'transform' property require a unit (e.g. 'px', 'em' or '%')."
+        );
+      }
+      return ({ tween }) => tween(value[0], value[1]);
+    }
+
+    if (typeof value === "function") {
+      return value;
+    }
+
+    return null;
+  }
+
+  /**
+   * Adds a transform property, merging with any existing transform animation function.
+   *
+   * @param {Array<[string, Function]>} animatedProperties
+   * @param {Set<string>} propertiesToClean
+   * @param {string} property
+   * @param {Function} animationFn
+   */
+  #addTransformProperty(
+    animatedProperties,
+    propertiesToClean,
+    property,
+    animationFn
+  ) {
+    const transformName = property === "transform" ? "" : property;
+
+    const wrappedFn = (params) => {
+      const val = animationFn(params);
+      return transformName ? `${transformName}(${val})` : val;
+    };
+
+    const existingIndex = animatedProperties.findIndex(
+      ([p]) => p === "transform"
+    );
+
+    if (existingIndex !== -1) {
+      const prevFn = animatedProperties[existingIndex][1];
+      animatedProperties[existingIndex][1] = (params) =>
+        `${prevFn(params)} ${wrappedFn(params)}`;
+    } else {
+      animatedProperties.push(["transform", wrappedFn]);
+      propertiesToClean.add("transform");
+    }
+  }
+
+  /**
+   * Applies non-animated CSS styles directly to the element.
+   *
+   * @param {HTMLElement} element
+   * @param {Map<string, string>} staticStyles
+   */
+  #applyStaticStyles(element, staticStyles) {
+    for (const [prop, value] of staticStyles) {
+      element.style.setProperty(prop, value);
+    }
+  }
+
+  /**
+   * Creates a callback that applies animated CSS property values on each animation frame.
+   *
+   * @param {HTMLElement} element
+   * @param {Array<[string, Function]>} animatedProperties
+   * @returns {(progress: number, tween?: Function) => void}
+   */
+  #createAnimationCallback(element, animatedProperties) {
+    const len = animatedProperties.length;
+
+    return (progress, tween) => {
+      const tweenFn = tween || createTweenFunction(progress);
+      const params = { progress, tween: tweenFn };
+
+      for (let i = 0; i < len; i++) {
+        const [prop, fn] = animatedProperties[i];
+        element.style.setProperty(prop, fn(params));
+      }
+    };
+  }
+
+  /**
+   * Unregisters all animations and removes applied CSS properties from the element.
+   *
+   * @param {HTMLElement} [element]
+   */
+  #cleanup(element) {
+    for (const fn of this.#cleanupFns) {
+      fn?.();
+    }
+    this.#cleanupFns = [];
+
+    if (element) {
+      for (const prop of this.#propertiesToClean) {
+        element.style.removeProperty(prop);
+      }
+    }
+    this.#propertiesToClean.clear();
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/outlet.gjs b/frontend/discourse/float-kit/components/d-sheet/outlet.gjs
new file mode 100644
index 0000000000000..bc2ef9400e8b0
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/outlet.gjs
@@ -0,0 +1,25 @@
+import outletAnimationModifier from "./outlet-animation-modifier";
+
+/**
+ * Wrapper element with travel and stacking animation support for d-sheet.
+ *
+ * Use this component when you want a simple wrapper element with animation support.
+ * For complex structures where you need to target a specific inner element,
+ * use the outlet-animation-modifier directly instead.
+ *
+ * @component Outlet
+ * @param {Object} sheet - The sheet controller instance managing this sheet's state
+ * @param {Record<string, [string, string] | ((params: { progress: number, tween: Function }) => string) | string | null>} [travelAnimation] - Travel animation config where each property maps to a keyframe pair, animation function, static string, or null to disable
+ * @param {Record<string, [string, string] | ((params: { progress: number, tween: Function }) => string) | string | null>} [stackingAnimation] - Stacking animation config (same format as travelAnimation)
+ * @yields The content to be wrapped within the animated div element
+ */
+const Outlet = <template>
+  <div
+    {{outletAnimationModifier @sheet @travelAnimation @stackingAnimation}}
+    ...attributes
+  >
+    {{yield}}
+  </div>
+</template>;
+
+export default Outlet;
diff --git a/frontend/discourse/float-kit/components/d-sheet/portal.gjs b/frontend/discourse/float-kit/components/d-sheet/portal.gjs
new file mode 100644
index 0000000000000..a79044eb6046a
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/portal.gjs
@@ -0,0 +1,47 @@
+import Component from "@glimmer/component";
+
+/**
+ * Portal component that renders content into document.body when sheet is presented.
+ *
+ * @component Portal
+ * @param {import("./controller").default} sheet - The sheet controller instance
+ * @param {HTMLElement} [container] - Optional custom container element to render into instead of document.body
+ * @param {boolean} [shouldRenderView] - Whether the view should be rendered (from Root, controlled mode)
+ */
+export default class Portal extends Component {
+  /**
+   * Resolves the target DOM element for the in-element portal.
+   * Prefers the provided container arg, falls back to the Ember testing container, then document.body.
+   *
+   * @type {HTMLElement}
+   */
+  get element() {
+    return (
+      this.args.container ??
+      document.getElementById("ember-testing") ??
+      document.body
+    );
+  }
+
+  /**
+   * Whether to render the portal content.
+   * Uses shouldRenderView from Root if provided (controlled mode),
+   * otherwise falls back to sheet.isPresented (uncontrolled mode).
+   *
+   * @type {boolean}
+   */
+  get shouldRender() {
+    if (this.args.shouldRenderView !== undefined) {
+      return this.args.shouldRenderView;
+    }
+    return this.args.sheet?.isPresented ?? false;
+  }
+
+  <template>
+    {{#in-element this.element insertBefore=null}}
+      {{#if this.shouldRender}}
+        {{yield}}
+      {{/if}}
+    {{/in-element}}
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/root.gjs b/frontend/discourse/float-kit/components/d-sheet/root.gjs
new file mode 100644
index 0000000000000..9f8c189ca9241
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/root.gjs
@@ -0,0 +1,384 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { registerDestructor } from "@ember/destroyable";
+import { action } from "@ember/object";
+import { schedule } from "@ember/runloop";
+import { service } from "@ember/service";
+import effect from "discourse/float-kit/helpers/effect";
+import Controller from "./controller";
+
+/**
+ * Root component for the sheet. Manages presentation and detent state.
+ * Behavioral/visual props should be passed to View, not Root.
+ *
+ * Controlled mode:
+ *   <DSheet.Root @presented={{this.isOpen}} @onPresentedChange={{this.setIsOpen}}>
+ *
+ * Uncontrolled mode:
+ *   <DSheet.Root> or <DSheet.Root @defaultPresented={{true}}>
+ *
+ * @component DSheetRoot
+ * @param {string} componentId - Optional ID to identify this sheet for forComponent lookups
+ * @param {boolean} defaultPresented - Whether the sheet is initially presented (default: false, uncontrolled mode only)
+ * @param {boolean} presented - Controls the presented state (controlled mode)
+ * @param {Function} onPresentedChange - Callback when presented state changes (controlled mode)
+ * @param {number} defaultActiveDetent - Initial detent index (defaults to 1)
+ * @param {number} activeDetent - Controlled detent index (for controlled mode)
+ * @param {Function} onActiveDetentChange - Callback when active detent changes
+ * @param {string} forComponent - Stack association: "closest" or explicit stackId
+ * @param {string} role - Accessibility role (default: "dialog")
+ * @param {boolean} inertOutside - Whether to make content outside sheet inert (default: true)
+ * @param {Function} onSafeToUnmountChange - Callback when safe to unmount changes
+ * @param {Function} onClosed - Callback when sheet has fully closed
+ */
+export default class Root extends Component {
+  /** @type {import("discourse/float-kit/services/sheet-registry").default} */
+  @service sheetRegistry;
+
+  /** @type {import("discourse/float-kit/services/sheet-stack-registry").default} */
+  @service sheetStackRegistry;
+
+  /** @type {import("discourse/float-kit/services/theme-color-manager").default} */
+  @service themeColorManager;
+
+  /**
+   * The sheet controller instance. Created immediately and replaced after each close cycle.
+   *
+   * @type {Controller}
+   */
+  @tracked sheet;
+
+  /**
+   * Internal presented state for uncontrolled mode.
+   *
+   * @type {boolean}
+   */
+  @tracked internalPresented = false;
+
+  /**
+   * Tracks the last known presented value to detect changes in syncPresented.
+   *
+   * @type {boolean|undefined}
+   * @private
+   */
+  #lastPresented;
+
+  /**
+   * Unsubscribe function for a deferred open waiting on a parent sheet animation.
+   *
+   * @type {Function|null}
+   * @private
+   */
+  #pendingOpenSubscription = null;
+
+  /**
+   * Whether an open request happened while closing and should be replayed
+   * once the controller reaches safe-to-unmount.
+   *
+   * @type {boolean}
+   * @private
+   */
+  #reopenAfterClose = false;
+
+  /**
+   * Initializes the controller, registers with the sheet registry, and sets up destructors.
+   *
+   * @param {unknown} owner - The Ember owner instance
+   * @param {Object} args - Component arguments
+   */
+  constructor(owner, args) {
+    super(owner, args);
+
+    this.createController();
+    this.sheet.rootComponent = this;
+
+    // Apply defaultPresented for uncontrolled mode
+    if (!this.isControlled && this.args.defaultPresented) {
+      this.internalPresented = true;
+    }
+
+    if (this.args.componentId) {
+      this.sheetRegistry.registerRoot(this.args.componentId, this);
+    }
+
+    registerDestructor(this, () => {
+      this.#cleanupPendingOpen();
+      if (this.args.componentId) {
+        this.sheetRegistry.unregisterRoot(this.args.componentId);
+      }
+      this.#cleanupCurrentSheet();
+    });
+  }
+
+  /**
+   * Syncs the effective presented state, opening or closing the sheet when it changes.
+   * Used as an effect callback to react to presented value transitions.
+   *
+   * @param {boolean} presented - The current effective presented state
+   */
+  @action
+  syncPresented(presented) {
+    if (presented === this.#lastPresented) {
+      return;
+    }
+
+    const previous = this.#lastPresented;
+    this.#lastPresented = presented;
+
+    schedule("afterRender", () => {
+      if (presented) {
+        this.openSheet();
+      } else if (previous !== undefined) {
+        this.#cleanupPendingOpen();
+        this.#reopenAfterClose = false;
+        this.sheet.close();
+      }
+    });
+  }
+
+  /**
+   * Whether the component is in controlled mode.
+   * Controlled mode is active when both @presented and @onPresentedChange are provided.
+   *
+   * @type {boolean}
+   */
+  get isControlled() {
+    return (
+      this.args.presented !== undefined &&
+      this.args.onPresentedChange !== undefined
+    );
+  }
+
+  /**
+   * The effective presented state, from either controlled or uncontrolled source.
+   *
+   * @type {boolean}
+   */
+  get effectivePresented() {
+    return this.isControlled ? this.args.presented : this.internalPresented;
+  }
+
+  /**
+   * Whether the View should be rendered.
+   * True when sheet should be visible OR during exit animation.
+   *
+   * @type {boolean}
+   */
+  get shouldRenderView() {
+    return this.effectivePresented || !this.sheet.safeToUnmount;
+  }
+
+  /**
+   * Present the sheet.
+   * In controlled mode, calls onPresentedChange(true).
+   * In uncontrolled mode, sets internal state.
+   */
+  @action
+  present() {
+    if (this.isControlled) {
+      this.args.onPresentedChange?.(true);
+    } else {
+      this.internalPresented = true;
+    }
+  }
+
+  /**
+   * Dismiss the sheet.
+   * In controlled mode, calls onPresentedChange(false).
+   * In uncontrolled mode, sets internal state.
+   */
+  @action
+  dismiss() {
+    if (this.isControlled) {
+      this.args.onPresentedChange?.(false);
+    } else {
+      this.internalPresented = false;
+    }
+  }
+
+  /**
+   * Cleanup the current sheet controller.
+   * Unregisters from stack and registry, then calls controller cleanup.
+   *
+   * @private
+   */
+  #cleanupCurrentSheet() {
+    if (this.sheet.stackId) {
+      this.sheetStackRegistry.unregisterSheetFromStack(this.sheet);
+    }
+    this.sheetRegistry.unregister(this.sheet);
+    this.sheet.cleanup();
+  }
+
+  /**
+   * Cleanup any pending open subscription.
+   *
+   * @private
+   */
+  #cleanupPendingOpen() {
+    if (this.#pendingOpenSubscription) {
+      this.#pendingOpenSubscription();
+      this.#pendingOpenSubscription = null;
+    }
+  }
+
+  /**
+   * Create a new Controller instance with subscriptions and initial configuration.
+   * Called in constructor and after each close cycle to prepare for the next open.
+   *
+   * @private
+   */
+  createController() {
+    this.sheet = new Controller();
+
+    this.sheet.state.subscribe("openness", {
+      timing: "immediate",
+      state: "closed.status:safe-to-unmount",
+      callback: () => this.handleSheetClosed(),
+    });
+
+    this.sheet.state.subscribe("openness", {
+      timing: "immediate",
+      state: "open",
+      callback: () => {
+        this.#reopenAfterClose = false;
+      },
+    });
+
+    this.sheet.onTravelProgressChange = (progress) => {
+      this.sheetStackRegistry.updateSheetTravelProgress(this.sheet, progress);
+    };
+
+    this.sheet.configure({
+      defaultActiveDetent: this.args.defaultActiveDetent,
+      activeDetent: this.args.activeDetent,
+      onActiveDetentChange: this.args.onActiveDetentChange,
+      onSafeToUnmountChange: this.args.onSafeToUnmountChange,
+      role: this.args.role,
+      inertOutside: this.args.inertOutside,
+      themeColorManager: this.themeColorManager,
+      sheetStackRegistry: this.sheetStackRegistry,
+      sheetRegistry: this.sheetRegistry,
+    });
+  }
+
+  /**
+   * The stack ID based on forComponent prop.
+   *
+   * @type {string|null}
+   */
+  get stackId() {
+    return this.args.forComponent ?? null;
+  }
+
+  /**
+   * Check if parent sheet in stack is ready (in position:idle state).
+   *
+   * @param {string|null} stackId - The stack ID to look up the topmost sheet
+   * @returns {Controller|null} Parent sheet if animating, null if ready
+   */
+  getAnimatingParentSheet(stackId) {
+    if (!stackId) {
+      return null;
+    }
+
+    const topmostSheet =
+      this.sheetStackRegistry.getTopmostSheetInStack(stackId);
+    if (!topmostSheet?.state?.position) {
+      return null;
+    }
+
+    return topmostSheet.state.position.isIdle ? null : topmostSheet;
+  }
+
+  /**
+   * Opens the sheet, deferring if a parent sheet in the stack is still animating.
+   * Subscribes to the parent's position state machine to wait for idle before opening.
+   */
+  @action
+  openSheet() {
+    this.#cleanupPendingOpen();
+
+    if (!this.sheet.safeToUnmount) {
+      this.#reopenAfterClose = true;
+      this.sheet.open();
+      return;
+    }
+
+    this.#reopenAfterClose = false;
+
+    const stackId = this.stackId;
+
+    if (!stackId) {
+      this.doOpenSheet(null);
+      return;
+    }
+
+    const animatingParent = this.getAnimatingParentSheet(stackId);
+
+    if (!animatingParent) {
+      this.doOpenSheet(stackId);
+      return;
+    }
+
+    this.#pendingOpenSubscription = animatingParent.state.subscribe(
+      "position",
+      {
+        timing: "immediate",
+        state: ["out", "front.status:idle", "covered.status:idle"],
+        callback: () => {
+          this.#cleanupPendingOpen();
+          if (!this.effectivePresented) {
+            return;
+          }
+          this.doOpenSheet(stackId);
+        },
+      }
+    );
+  }
+
+  /**
+   * Register the sheet and open it.
+   *
+   * @param {string|null} stackId - The stack ID to associate with the sheet
+   * @private
+   */
+  doOpenSheet(stackId) {
+    this.sheetRegistry.register(this.sheet);
+
+    if (stackId) {
+      this.sheetStackRegistry.registerSheetWithStack(stackId, this.sheet);
+    }
+
+    this.sheet.open();
+  }
+
+  /**
+   * Handle sheet closed state for cleanup.
+   * Creates a fresh controller for the next open cycle.
+   *
+   * @private
+   */
+  @action
+  handleSheetClosed() {
+    const shouldReopen = this.#reopenAfterClose;
+    this.#reopenAfterClose = false;
+
+    this.#cleanupCurrentSheet();
+    this.createController();
+    this.sheet.rootComponent = this;
+
+    if (shouldReopen) {
+      this.openSheet();
+    } else {
+      this.dismiss();
+    }
+
+    this.args.onClosed?.();
+  }
+
+  <template>
+    {{effect this.syncPresented this.effectivePresented}}
+    {{yield this.sheet}}
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/scroll-listener-modifier.js b/frontend/discourse/float-kit/components/d-sheet/scroll-listener-modifier.js
new file mode 100644
index 0000000000000..7fafe83cc8d92
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/scroll-listener-modifier.js
@@ -0,0 +1,51 @@
+/**
+ * D-Sheet Scroll Listener Modifier
+ *
+ * Provides a requestAnimationFrame-based polling mechanism for tracking scroll progress
+ * in d-sheet components. This approach synchronizes UI updates with the browser's paint
+ * cycle, ensuring smooth visual feedback during drag-to-dismiss gestures and scroll
+ * interactions. The RAF loop runs only when scroll is actively ongoing, minimizing
+ * performance impact during idle states.
+ */
+
+import { modifier } from "ember-modifier";
+
+/**
+ * Modifier that manages a requestAnimationFrame (RAF) polling loop.
+ *
+ * This loop is used to synchronize UI state with scroll progress during active
+ * scrolling or swiping. By using RAF instead of traditional scroll events,
+ * we ensure that position updates are aligned with the browser's paint cycle,
+ * providing the smoothest possible interaction.
+ *
+ * @param {HTMLElement} element - The scroll container element
+ * @param {[Function, boolean]} positional - [handler, isScrollOngoing]
+ * @returns {Function|undefined} Cleanup function that cancels the RAF loop, or undefined if inactive
+ */
+export default modifier((element, [handler, isScrollOngoing]) => {
+  if (!isScrollOngoing) {
+    return;
+  }
+
+  /** @type {number|undefined} */
+  let rafId;
+
+  /**
+   * Recursive RAF callback that invokes the handler and schedules the next frame.
+   */
+  function loop() {
+    handler();
+    rafId = requestAnimationFrame(loop);
+  }
+
+  loop();
+
+  /**
+   * Cleanup function that cancels the active requestAnimationFrame loop.
+   */
+  return () => {
+    if (rafId) {
+      cancelAnimationFrame(rafId);
+    }
+  };
+});
diff --git a/frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js b/frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js
new file mode 100644
index 0000000000000..2133aa3009fe9
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js
@@ -0,0 +1,209 @@
+/**
+ * @typedef {Object} ProgressResult
+ * @property {number} rawProgress - Unbounded progress from scroll position
+ * @property {number} clampedProgress - Progress clamped between first detent and max
+ */
+
+/**
+ * Handles scroll-based progress calculations for the sheet component.
+ */
+export default class ScrollProgressCalculator {
+  /**
+   * The sheet controller instance.
+   *
+   * @type {import("./controller").default}
+   */
+  controller;
+
+  /**
+   * @param {import("./controller").default} controller - The sheet controller instance
+   */
+  constructor(controller) {
+    this.controller = controller;
+  }
+
+  /**
+   * Calculate all progress values from current scroll position.
+   *
+   * @returns {ProgressResult|null} Progress values or null if elements are missing
+   */
+  calculateProgress() {
+    const { scrollContainer, dimensions, contentPlacement, tracks } =
+      this.controller;
+
+    if (!scrollContainer || !dimensions) {
+      return null;
+    }
+
+    const isHorizontal = tracks === "left" || tracks === "right";
+    const scrollPosition = isHorizontal
+      ? scrollContainer.scrollLeft
+      : scrollContainer.scrollTop;
+
+    const contentSize = dimensions.content?.travelAxis?.unitless ?? 1;
+    const scrollSize = dimensions.scroll?.travelAxis?.unitless ?? contentSize;
+
+    const effectiveContentSize =
+      contentPlacement !== "center"
+        ? contentSize
+        : contentSize + (scrollSize - contentSize) / 2;
+
+    const edgePadding = this.#getEdgePadding();
+    const snapAccelerator =
+      dimensions.snapOutAccelerator?.travelAxis?.unitless ?? 0;
+
+    const firstDetentProgress = this.#getFirstDetentProgress();
+    const maxClamp = this.#getMaxClamp();
+
+    const isTopOrLeft = tracks === "top" || tracks === "left";
+    const rawProgress = this.#calculateRawProgress({
+      scrollPosition,
+      contentSize,
+      effectiveContentSize,
+      edgePadding,
+      snapAccelerator,
+      isTopOrLeft,
+    });
+
+    const clampedProgress = Math.max(
+      firstDetentProgress,
+      Math.min(maxClamp, rawProgress)
+    );
+    return {
+      rawProgress,
+      clampedProgress,
+    };
+  }
+
+  /**
+   * Get the first detent progress value for clamping.
+   *
+   * @returns {number}
+   */
+  #getFirstDetentProgress() {
+    const { edgeAlignedNoOvershoot, swipeOutDisabledWithDetent, dimensions } =
+      this.controller;
+
+    if (edgeAlignedNoOvershoot && swipeOutDisabledWithDetent) {
+      return dimensions?.progressValueAtDetents?.[1]?.exact ?? 0;
+    }
+    return 0;
+  }
+
+  /**
+   * Get the max clamp value for progress.
+   *
+   * @returns {number}
+   */
+  #getMaxClamp() {
+    return this.controller.edgeAlignedNoOvershoot ? 1 : 10;
+  }
+
+  /**
+   * Get the edge padding value for progress calculations.
+   *
+   * @returns {number}
+   */
+  #getEdgePadding() {
+    const { edgeAlignedNoOvershoot, snapToEndDetentsAcceleration } =
+      this.controller;
+
+    if (!edgeAlignedNoOvershoot) {
+      return 0;
+    }
+
+    return snapToEndDetentsAcceleration === "auto" ? 10 : 1;
+  }
+
+  /**
+   * Calculate raw progress from scroll position based on content placement and track direction.
+   *
+   * @param {Object} params - Calculation parameters
+   * @param {number} params.scrollPosition - Current scroll position
+   * @param {number} params.contentSize - Size of the content on travel axis
+   * @param {number} params.effectiveContentSize - Effective size considering placement
+   * @param {number} params.edgePadding - Padding at the edges
+   * @param {number} params.snapAccelerator - Snap out accelerator value
+   * @param {boolean} params.isTopOrLeft - Whether track is top or left
+   * @returns {number} Raw progress value
+   */
+  #calculateRawProgress({
+    scrollPosition,
+    contentSize,
+    effectiveContentSize,
+    edgePadding,
+    snapAccelerator,
+    isTopOrLeft,
+  }) {
+    const { contentPlacement, dimensions, swipeOutDisabledWithDetent } =
+      this.controller;
+
+    if (dimensions?.webkitSmallSpacerMode) {
+      return isTopOrLeft
+        ? 1 - scrollPosition / contentSize
+        : 1 + scrollPosition / contentSize;
+    }
+
+    const divisor =
+      contentPlacement === "center" ? effectiveContentSize : contentSize;
+
+    if (isTopOrLeft) {
+      const numerator =
+        contentPlacement === "center"
+          ? effectiveContentSize + edgePadding - scrollPosition
+          : contentSize + edgePadding - scrollPosition;
+      return numerator / divisor;
+    }
+
+    if (contentPlacement !== "center" && swipeOutDisabledWithDetent) {
+      const firstDetentSize =
+        dimensions?.detentMarkers?.[0]?.travelAxis?.unitless;
+      const offset = (firstDetentSize ?? 0) - edgePadding;
+      return (scrollPosition + offset) / divisor;
+    }
+
+    return (scrollPosition - snapAccelerator) / divisor;
+  }
+
+  /**
+   * Determine the current segment from progress and detents.
+   *
+   * @param {number} progress - Segment progress value
+   * @returns {[number, number]|null} Segment as [start, end] indices or null if no change
+   */
+  determineSegment(progress) {
+    const { dimensions } = this.controller;
+    const detents = dimensions?.progressValueAtDetents;
+
+    if (!detents) {
+      return null;
+    }
+
+    if (progress <= 0) {
+      return [0, 0];
+    }
+
+    const n = detents.length;
+    for (let i = 0; i < n; i++) {
+      const { before, after } = detents[i];
+
+      // Moving between detents
+      if (progress > after && i + 1 < n && progress < detents[i + 1].before) {
+        return [i, i + 1];
+      }
+
+      // Snapped to detent
+      if (progress > before && progress < after) {
+        return [i, i];
+      }
+    }
+
+    // Fallback: if progress >= 1, set to last detent
+    if (progress >= 1) {
+      const lastDetent = n - 1;
+      return [lastDetent, lastDetent];
+    }
+
+    return null;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/scroll-trap-modifier.js b/frontend/discourse/float-kit/components/d-sheet/scroll-trap-modifier.js
new file mode 100644
index 0000000000000..a7b00bd8216c1
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/scroll-trap-modifier.js
@@ -0,0 +1,118 @@
+/**
+ * Scroll trap modifier for d-sheet overlays that prevents touch scroll gestures
+ * from propagating to the underlying page. Works by creating an invisible oversized
+ * scrollable area (via CSS ::before) and continuously resetting scroll position to
+ * center, effectively "trapping" scroll events. Includes iOS Safari workaround for
+ * rubber-band scrolling on devices without overscroll-behavior support.
+ */
+
+import { modifier as modifierFn } from "ember-modifier";
+import { capabilities } from "discourse/services/capabilities";
+
+/**
+ * The scroll trap works by creating an oversized scrollable area (600x600px larger
+ * via CSS ::before pseudo-element) and centering the scroll position at (300, 300).
+ * When the user attempts to scroll, we immediately reset to center, effectively
+ * "trapping" the scroll gesture and preventing it from propagating to the page.
+ *
+ * @constant {number}
+ */
+const SCROLL_CENTER_POSITION = 300;
+
+/**
+ * Delay in milliseconds before restoring scroll overflow on iOS.
+ * This brief hidden/auto cycle prevents iOS Safari's rubber-band effect
+ * from triggering unwanted page scrolls.
+ *
+ * @constant {number}
+ */
+const IOS_OVERFLOW_RESTORE_DELAY_MS = 10;
+
+/**
+ * Determines if the iOS rubber-band scroll workaround is needed.
+ * This is required on iOS/iPadOS Safari when `overscroll-behavior: contain`
+ * is not supported.
+ *
+ * @returns {boolean}
+ */
+function needsIOSRubberBandWorkaround() {
+  return (
+    capabilities.isAppleMobile && !CSS.supports("overscroll-behavior: contain")
+  );
+}
+
+/**
+ * Scrolls element to center position within the scroll trap area.
+ *
+ * @param {HTMLElement} element - The element to scroll
+ */
+function scrollToCenter(element) {
+  element.scrollTo(SCROLL_CENTER_POSITION, SCROLL_CENTER_POSITION);
+}
+
+/**
+ * Temporarily disables then re-enables overflow to prevent iOS Safari's
+ * rubber-band scrolling from propagating to the page.
+ *
+ * @param {HTMLElement} element - The element to apply the workaround to
+ */
+function applyIOSRubberBandWorkaround(element) {
+  element.style.setProperty("overflow", "hidden");
+  setTimeout(() => {
+    element.style.setProperty("overflow", "auto");
+  }, IOS_OVERFLOW_RESTORE_DELAY_MS);
+}
+
+/**
+ * Scroll trap modifier for d-sheet.
+ *
+ * Creates a scroll trap by centering at (300, 300) in a 600x600px scrollable area
+ * created by CSS ::before pseudo-element. This traps scroll gestures to prevent
+ * them from propagating to the page.
+ *
+ * @param {HTMLElement} element - The element to attach the scroll trap to
+ * @param {[boolean]} positional - Whether the scroll trap is active
+ * @returns {(() => void) | undefined} Cleanup function or undefined if not active
+ */
+export const scrollTrapModifier = modifierFn((element, [active]) => {
+  if (!active) {
+    return;
+  }
+
+  const requiresIOSWorkaround = needsIOSRubberBandWorkaround();
+
+  scrollToCenter(element);
+
+  /**
+   * Handles scroll events by resetting scroll position to center.
+   *
+   * @param {Event} e - The scroll event
+   */
+  const handleScroll = (e) => {
+    const target = e.currentTarget;
+    scrollToCenter(target);
+
+    if (requiresIOSWorkaround) {
+      applyIOSRubberBandWorkaround(target);
+    }
+  };
+
+  element.addEventListener("scroll", handleScroll);
+
+  /**
+   * Observes element size changes and recenters scroll position.
+   *
+   * @type {ResizeObserver}
+   */
+  const resizeObserver = new ResizeObserver((entries) => {
+    entries.forEach(() => {
+      scrollToCenter(element);
+    });
+  });
+  resizeObserver.observe(element, { box: "border-box" });
+
+  return () => {
+    element.removeEventListener("scroll", handleScroll);
+    resizeObserver.disconnect();
+  };
+});
diff --git a/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js b/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
new file mode 100644
index 0000000000000..6a11e98238f79
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
@@ -0,0 +1,143 @@
+import Component from "@glimmer/component";
+import { service } from "@ember/service";
+import {
+  getActionType,
+  getStepDetent,
+  getStepDirection,
+} from "discourse/float-kit/lib/action-utils";
+import { processBehavior } from "discourse/float-kit/lib/behavior-handler";
+
+/**
+ * Base class for sheet action components (triggers, handles).
+ * Provides shared logic for resolving sheet targets, parsing action
+ * configurations, and handling click events with customizable behavior.
+ *
+ * @extends Component
+ */
+export default class SheetActionBase extends Component {
+  /** @type {import("discourse/float-kit/services/sheet-registry").default} */
+  @service sheetRegistry;
+
+  /**
+   * Handles click events with configurable behavior via the onPress arg.
+   * Optionally forces focus and runs the configured action.
+   *
+   * @param {MouseEvent} event - The native click event
+   */
+  handleClick = (event) => {
+    const behavior = processBehavior({
+      nativeEvent: event,
+      defaultBehavior: { forceFocus: true, runAction: true },
+      handler: this.args.onPress,
+    });
+
+    if (behavior.forceFocus) {
+      event.currentTarget?.focus({ preventScroll: true });
+    }
+
+    if (!behavior.runAction) {
+      return;
+    }
+
+    this.executeAction();
+  };
+
+  /**
+   * The default action type when no action arg is provided.
+   * Subclasses override this to change the default (e.g. "step" for handles).
+   *
+   * @type {string}
+   */
+  get defaultAction() {
+    return "present";
+  }
+
+  /**
+   * Resolves the Root component via the forComponent arg using the sheet registry.
+   *
+   * @type {Object|undefined}
+   */
+  get targetRoot() {
+    if (this.args.forComponent) {
+      return this.sheetRegistry.getRootByComponentId(this.args.forComponent);
+    }
+    return undefined;
+  }
+
+  /**
+   * The sheet controller instance, resolved from the target Root or the sheet arg.
+   *
+   * @type {Object|undefined}
+   */
+  get sheet() {
+    return this.targetRoot?.sheet ?? this.args.sheet;
+  }
+
+  /**
+   * The resolved action configuration, falling back to the default action.
+   *
+   * @type {string|Object}
+   */
+  get triggerAction() {
+    return this.args.action ?? this.defaultAction;
+  }
+
+  /**
+   * The parsed action type string from the action configuration.
+   *
+   * @type {string}
+   */
+  get actionType() {
+    return getActionType(this.triggerAction);
+  }
+
+  /**
+   * The parsed step direction from the action configuration.
+   *
+   * @type {string}
+   */
+  get stepDirection() {
+    return getStepDirection(this.triggerAction);
+  }
+
+  /**
+   * The parsed target detent index from the action configuration.
+   *
+   * @type {number|undefined}
+   */
+  get stepDetent() {
+    return getStepDetent(this.triggerAction);
+  }
+
+  /**
+   * The ID of the resolved sheet, used for aria-controls.
+   *
+   * @type {string|undefined}
+   */
+  get sheetId() {
+    return this.sheet?.id;
+  }
+
+  /**
+   * Executes the configured action on the sheet. This method must be
+   * implemented by subclasses to handle specific action types.
+   * Called by handleClick when runAction behavior is enabled.
+   */
+  executeAction() {
+    // Implemented by subclasses
+  }
+
+  /**
+   * Executes a step action on the sheet. Steps to a specific detent if
+   * configured, otherwise steps down or up based on the step direction.
+   */
+  executeStepAction() {
+    if (this.stepDetent !== undefined) {
+      this.sheet?.stepToDetent(this.stepDetent);
+    } else if (this.stepDirection === "down") {
+      this.sheet?.stepDown();
+    } else {
+      this.sheet?.step();
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/special-wrapper/content.gjs b/frontend/discourse/float-kit/components/d-sheet/special-wrapper/content.gjs
new file mode 100644
index 0000000000000..71a742f15b433
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/special-wrapper/content.gjs
@@ -0,0 +1,12 @@
+/**
+ * Scroll-trap stabilizer wrapper for special sheet content layouts.
+ *
+ * @component DSheetSpecialWrapperContent
+ */
+const DSheetSpecialWrapperContent = <template>
+  <div data-d-sheet="scroll-trap-stabilizer" ...attributes>
+    {{yield}}
+  </div>
+</template>;
+
+export default DSheetSpecialWrapperContent;
diff --git a/frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs b/frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs
new file mode 100644
index 0000000000000..b47c5c107c664
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs
@@ -0,0 +1,67 @@
+import Component from "@glimmer/component";
+import { concat } from "@ember/helper";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import concatClass from "discourse/helpers/concat-class";
+import { capabilities } from "discourse/services/capabilities";
+import outletAnimationModifier from "../outlet-animation-modifier";
+import { scrollTrapModifier } from "../scroll-trap-modifier";
+
+/**
+ * Scroll-trap root for special layouts like Toast.
+ * When used with Content's asChild pattern, this component merges
+ * the content attributes with scroll-trap functionality.
+ *
+ * @component DSheetSpecialWrapperRoot
+ * @param {import("../controller").default} sheet - The sheet controller instance
+ * @param {Object} contentAttrs - Merged content attributes from Content's asChild pattern
+ * @param {string} [contentAttrs.dataDSheet] - Content data-d-sheet attributes to merge
+ * @param {Function} [contentAttrs.registerContent] - Content registration callback
+ * @param {Object} [contentAttrs.travelAnimation] - Travel animation configuration
+ * @param {Object} [contentAttrs.stackingAnimation] - Stacking animation configuration
+ */
+export default class DSheetSpecialWrapperRoot extends Component {
+  /**
+   * Whether the scroll trap is active, based on WebKit browser detection.
+   * Only WebKit browsers require the scroll trap optimization.
+   *
+   * @type {boolean}
+   */
+  active = capabilities.isWebKit;
+
+  /**
+   * Calculates the perpendicular axis based on the sheet's travel axis.
+   * Top/bottom tracks have vertical travel, so perpendicular is horizontal.
+   * Left/right/horizontal tracks have horizontal travel, so perpendicular is vertical.
+   *
+   * @returns {"vertical"|"horizontal"} The perpendicular axis direction
+   */
+  get perpendicularAxis() {
+    const tracks = this.args.sheet?.tracks;
+    return tracks === "left" || tracks === "right" || tracks === "horizontal"
+      ? "vertical"
+      : "horizontal";
+  }
+
+  <template>
+    <div
+      data-d-sheet={{concatClass
+        @contentAttrs.dataDSheet
+        "scroll-trap-root"
+        "special-wrapper-root"
+        (if this.perpendicularAxis (concat "scroll-" this.perpendicularAxis))
+        (if this.active "scroll-trap-active" "scroll-trap-inactive")
+        "scroll-trap-optimised"
+      }}
+      {{scrollTrapModifier this.active}}
+      {{didInsert @contentAttrs.registerContent}}
+      {{outletAnimationModifier
+        @sheet
+        @contentAttrs.travelAnimation
+        @contentAttrs.stackingAnimation
+      }}
+      ...attributes
+    >
+      {{yield}}
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js b/frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js
new file mode 100644
index 0000000000000..ec247fddc0c42
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js
@@ -0,0 +1,257 @@
+/**
+ * Adapter for coordinating sheet stacking behavior in the d-sheet system.
+ * Acts as a bridge between individual sheet controllers and the SheetStackRegistry service,
+ * managing stack position tracking, parent-child sheet notifications, and stacking animations.
+ * Each sheet controller owns one StackingAdapter instance to participate in stacked sheet navigation.
+ * Key responsibilities: stack bookkeeping, parent notifications during open/close, and propagating
+ * travel progress to sheets below in the stack for coordinated animation effects.
+ */
+
+import { createTweenFunction } from "./animation";
+
+/**
+ * Adapter for managing sheet stacking within a registry.
+ * Encapsulates stack bookkeeping and parent-child sheet notifications.
+ *
+ * This adapter delegates to the SheetStackRegistry service for:
+ * - Stack position tracking (stackPosition)
+ * - Stacking count management (increment/decrement on idle state changes)
+ * - Parent sheet notifications (opening, closing, closing immediate)
+ * - Travel progress updates
+ */
+export default class StackingAdapter {
+  /** @type {number} */
+  stackPosition = 0;
+
+  /**
+   * @param {Object} controller - The sheet controller instance that owns this adapter
+   */
+  constructor(controller) {
+    /** @type {Object} */
+    this.controller = controller;
+  }
+
+  /**
+   * Get the stack registry from controller.
+   *
+   * @returns {Object|null} The SheetStackRegistry service or null if not configured
+   */
+  get registry() {
+    return this.controller.sheetStackRegistry;
+  }
+
+  /**
+   * Get the stack ID from controller.
+   *
+   * @returns {string|null} The stack ID this sheet belongs to, or null if not in a stack
+   */
+  get stackId() {
+    return this.controller.stackId;
+  }
+
+  /**
+   * Whether stacking is enabled (has both stackId and registry).
+   *
+   * @returns {boolean} True if this sheet is part of a managed stack
+   */
+  get isStackEnabled() {
+    return Boolean(this.stackId && this.registry);
+  }
+
+  /**
+   * Handle travel status change for stacking bookkeeping.
+   * Updates stack position and stacking count based on status transitions.
+   *
+   * @param {string} status - New travel status ("idleInside"|"idleOutside"|"stepping"|"travellingIn"|"travellingOut")
+   * @param {string} previousStatus - Previous travel status for transition detection
+   */
+  handleTravelStatusChange(status, previousStatus) {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    const stackingCount = this.registry.getStackingCount(this.stackId);
+
+    if (previousStatus !== "stepping" && status === "idleInside") {
+      if (this.stackPosition === 0) {
+        this.stackPosition = stackingCount + 1;
+      }
+      this.registry.incrementStackingCount(this.stackId);
+      this.updateStackingIndexWithPositionValue();
+    } else if (status === "idleOutside") {
+      this.stackPosition = 0;
+      this.registry.decrementStackingCount(this.stackId);
+      this.updateStackingIndexWithPositionValue();
+    }
+  }
+
+  /**
+   * Notify parent sheet that this sheet is opening.
+   * Triggers parent's position machine to transition to covered state.
+   *
+   * @param {boolean} [skipOpening=false] - Whether to skip the opening animation
+   */
+  notifyParentOfOpening(skipOpening = false) {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    this.registry.notifyParentSheetOfChildOpening(
+      this.stackId,
+      this.controller,
+      {
+        skipOpening,
+      }
+    );
+  }
+
+  /**
+   * Notify parent sheet that this sheet is closing with animation.
+   * Triggers parent's position machine to prepare for uncovering.
+   */
+  notifyParentOfClosing() {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    this.registry.notifyParentSheetOfChildClosing(
+      this.stackId,
+      this.controller
+    );
+  }
+
+  /**
+   * Notify parent sheet that this sheet is closing immediately without animation.
+   * Triggers parent's position machine to immediately return to front state.
+   */
+  notifyParentOfClosingImmediate() {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    this.registry.notifyParentSheetOfChildClosingImmediate(
+      this.stackId,
+      this.controller
+    );
+  }
+
+  /**
+   * Update travel progress in the registry.
+   * Used to track sheet position for stacking calculations.
+   *
+   * @param {number} progress - Travel progress value between 0 (outside) and 1 (fully inside)
+   */
+  updateTravelProgress(progress) {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    this.registry.updateSheetTravelProgress(this.controller, progress);
+  }
+
+  /**
+   * Notify sheets below this one in the stack with stacking progress.
+   * Calls each below sheet's aggregatedStackingCallback to animate their covered state.
+   *
+   * @param {number} progress - Stacking progress value between 0 and 1
+   */
+  notifyBelowSheets(progress) {
+    const belowSheets = this.controller.belowSheetsInStack;
+    if (!belowSheets || belowSheets.length === 0) {
+      return;
+    }
+
+    const belowSheetsLength = belowSheets.length;
+    const sumIndex = belowSheetsLength - 1;
+
+    for (const belowSheet of belowSheets) {
+      const progressSum =
+        belowSheet.selfAndAboveTravelProgressSum?.[sumIndex] ?? 0;
+      const accumulatedProgress = progressSum + progress;
+      const accumulatedTween = createTweenFunction(accumulatedProgress);
+
+      belowSheet.aggregatedStackingCallback(
+        accumulatedProgress,
+        accumulatedTween
+      );
+    }
+  }
+
+  /**
+   * Get the parent (previous) sheet in the stack.
+   * The parent is the sheet that was opened before this one.
+   *
+   * @returns {Object|null} The parent sheet controller, or null if none exists
+   */
+  getParentSheet() {
+    if (!this.isStackEnabled) {
+      return null;
+    }
+
+    return this.registry.getPreviousSheetInStack(this.stackId, this.controller);
+  }
+
+  /**
+   * Notify parent sheet's position machine to advance.
+   * Sends "NEXT" message to continue the parent's state machine transitions.
+   */
+  notifyParentPositionMachineNext() {
+    const parentSheet = this.getParentSheet();
+    if (parentSheet) {
+      parentSheet.sendToPositionMachine("NEXT");
+    }
+  }
+
+  /**
+   * Update this sheet's staging state in the stack registry.
+   *
+   * @param {string} staging - The staging state ("none", "opening", "closing", etc.)
+   */
+  updateStagingInStack(staging) {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    this.registry.updateSheetStagingInStack(
+      this.stackId,
+      this.controller.id,
+      staging
+    );
+  }
+
+  /**
+   * Remove this sheet's staging data from the stack registry.
+   */
+  removeStagingFromStack() {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    this.registry.removeSheetStagingFromStack(this.stackId, this.controller.id);
+  }
+
+  /**
+   * Get the merged staging state for the stack.
+   *
+   * @returns {string} "none" or "not-none"
+   */
+  getMergedStaging() {
+    if (!this.isStackEnabled) {
+      return "none";
+    }
+
+    return this.registry.getMergedStagingForStack(this.stackId);
+  }
+
+  /**
+   * Update stacking index with position machine's value.
+   */
+  updateStackingIndexWithPositionValue() {
+    if (!this.isStackEnabled) {
+      return;
+    }
+
+    const positionValue = this.controller.state?.position?.current ?? "out";
+    this.registry.updateSheetStackingIndex(this.controller, positionValue);
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state-helper.js b/frontend/discourse/float-kit/components/d-sheet/state-helper.js
new file mode 100644
index 0000000000000..c7ce46ff4c75a
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state-helper.js
@@ -0,0 +1,231 @@
+import ElementsState from "./state/elements";
+import LongRunningState from "./state/long-running";
+import OpennessState from "./state/openness";
+import PositionState from "./state/position";
+import SkipState from "./state/skip";
+import StagingState from "./state/staging";
+import StuckState from "./state/stuck";
+import TouchState from "./state/touch";
+import StateMachineGroup from "./state-machine-group";
+import { GUARDS, POSITION_MACHINES, SHEET_MACHINES } from "./states";
+
+/**
+ * State machine facade for d-sheet.
+ * Owns all state machines and provides namespaced access.
+ */
+export default class StateHelper {
+  /**
+   * Group managing all sheet-level state machines.
+   * @type {StateMachineGroup}
+   */
+  #sheetMachines = new StateMachineGroup(SHEET_MACHINES, { guards: GUARDS });
+
+  /**
+   * Group managing position-related state machines.
+   * @type {StateMachineGroup}
+   */
+  #positionMachines = new StateMachineGroup(POSITION_MACHINES, {
+    guards: GUARDS,
+  });
+
+  /**
+   * Initializes all state namespaces from their backing machines.
+   */
+  constructor() {
+    /**
+     * Openness lifecycle namespace (open, closed, opening, closing).
+     * @type {OpennessState}
+     */
+    this.openness = new OpennessState(
+      this.#sheetMachines.getMachine("openness")
+    );
+
+    /**
+     * Animation staging namespace (none, opening, open, stepping, closing).
+     * @type {StagingState}
+     */
+    this.staging = new StagingState(
+      this.#sheetMachines.getMachine("staging"),
+      this.openness
+    );
+
+    /**
+     * Stack position namespace (out, front, covered).
+     * @type {PositionState}
+     */
+    this.position = new PositionState(
+      this.#positionMachines.getMachine("position")
+    );
+
+    /**
+     * Scroll container touch tracking namespace.
+     * @type {TouchState}
+     */
+    this.touch = new TouchState(
+      this.#sheetMachines.getMachine("scrollContainerTouch")
+    );
+
+    /**
+     * Detent boundary stuck state namespace (front and back).
+     * @type {StuckState}
+     */
+    this.stuck = new StuckState(
+      this.#sheetMachines.getMachine("frontStuck"),
+      this.#sheetMachines.getMachine("backStuck")
+    );
+
+    /**
+     * DOM elements readiness namespace.
+     * @type {ElementsState}
+     */
+    this.elements = new ElementsState(
+      this.#sheetMachines.getMachine("elementsReady")
+    );
+
+    /**
+     * Skip animation flags namespace (opening and closing).
+     * @type {SkipState}
+     */
+    this.skip = new SkipState(
+      this.#sheetMachines.getMachine("skipOpening"),
+      this.#sheetMachines.getMachine("skipClosing")
+    );
+
+    /**
+     * Long-running operation tracking namespace.
+     * @type {LongRunningState}
+     */
+    this.longRunning = new LongRunningState(
+      this.#sheetMachines.getMachine("longRunning")
+    );
+  }
+
+  /**
+   * Begin enter animation - coordinates staging and position machines.
+   * @param {boolean} [skipOpening=false] - Whether to skip the opening animation
+   * @returns {void}
+   */
+  beginEnterAnimation(skipOpening = false) {
+    this.staging.openPrepared();
+    this.position.readyToGoFront(skipOpening);
+  }
+
+  /**
+   * Begin exit animation - coordinates staging and position machines.
+   * @param {boolean} [skipClosing=false] - Whether to skip the closing animation
+   * @returns {void}
+   */
+  beginExitAnimation(skipClosing = false) {
+    this.staging.actuallyClose(skipClosing);
+    this.position.readyToGoOut();
+  }
+
+  /**
+   * Begin immediate close - only staging, no position change.
+   * @param {boolean} [skipClosing=true] - Whether to skip the closing animation
+   * @returns {void}
+   */
+  beginImmediateClose(skipClosing = true) {
+    this.staging.actuallyClose(skipClosing);
+  }
+
+  /**
+   * Step the staging animation to the next phase.
+   * @returns {void}
+   */
+  stepAnimation() {
+    this.staging.actuallyStep();
+  }
+
+  /**
+   * Subscribe to state machine changes.
+   * @param {string} machineName - Machine name (openness, staging, position, etc.)
+   * @param {Object} options - Subscription options
+   * @param {string} options.timing - When to invoke ("immediate", "before-paint", "after-paint")
+   * @param {string | string[]} options.state - State pattern(s) to match
+   * @param {Function} options.callback - Function to call when state matches
+   * @param {Function | boolean} [options.guard] - Optional guard condition
+   * @param {string} [options.type] - "enter" (default) or "exit"
+   * @returns {Function} Unsubscribe function
+   */
+  subscribe(machineName, options) {
+    const machine = this.#getMachine(machineName);
+    return machine.subscribe(options);
+  }
+
+  /**
+   * Resolves a logical machine name to its underlying StateMachine instance.
+   * @param {string} name - Logical machine name
+   * @returns {import("./state-machine").default | undefined}
+   */
+  #getMachine(name) {
+    const mapping = {
+      openness: () => this.#sheetMachines.getMachine("openness"),
+      staging: () => this.#sheetMachines.getMachine("staging"),
+      position: () => this.#positionMachines.getMachine("position"),
+      touch: () => this.#sheetMachines.getMachine("scrollContainerTouch"),
+      longRunning: () => this.#sheetMachines.getMachine("longRunning"),
+      skipOpening: () => this.#sheetMachines.getMachine("skipOpening"),
+      skipClosing: () => this.#sheetMachines.getMachine("skipClosing"),
+      backStuck: () => this.#sheetMachines.getMachine("backStuck"),
+      frontStuck: () => this.#sheetMachines.getMachine("frontStuck"),
+      elementsReady: () => this.#sheetMachines.getMachine("elementsReady"),
+    };
+    return mapping[name]?.();
+  }
+
+  /**
+   * Cleanup all state machines by removing their subscriptions.
+   * @returns {void}
+   */
+  cleanup() {
+    this.#sheetMachines.getMachine("openness").cleanup();
+    this.#sheetMachines.getMachine("staging").cleanup();
+    this.#positionMachines.getMachine("position").cleanup();
+    this.#sheetMachines.getMachine("scrollContainerTouch").cleanup();
+    this.#sheetMachines.getMachine("longRunning").cleanup();
+    this.#sheetMachines.getMachine("skipOpening").cleanup();
+    this.#sheetMachines.getMachine("skipClosing").cleanup();
+    this.#sheetMachines.getMachine("backStuck").cleanup();
+    this.#sheetMachines.getMachine("frontStuck").cleanup();
+    this.#sheetMachines.getMachine("elementsReady").cleanup();
+  }
+
+  /**
+   * Send a message to the position machine.
+   * Used by stacking adapter for inter-sheet communication.
+   * @param {string | {type: string}} message - Message type or object to send
+   * @param {Object} [context={}] - Context data for guards
+   * @returns {boolean} Whether any transition occurred
+   */
+  sendToPosition(message, context = {}) {
+    return this.#positionMachines.getMachine("position").send(message, context);
+  }
+
+  /**
+   * Advance position to next state (auto-transition).
+   * @returns {void}
+   */
+  advancePositionAuto() {
+    this.#positionMachines.getMachine("position").send("");
+  }
+
+  /**
+   * Flush closed status to preparing-opening (auto-transition).
+   * @returns {void}
+   */
+  flushClosedStatus() {
+    this.#sheetMachines.getMachine("openness").send({
+      machine: "openness:closed.status",
+      type: "",
+    });
+  }
+
+  /**
+   * Open all sheet machines (broadcasts OPEN to all).
+   * @returns {void}
+   */
+  broadcastOpen() {
+    this.#sheetMachines.send({ type: "OPEN" });
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state-machine-group.js b/frontend/discourse/float-kit/components/d-sheet/state-machine-group.js
new file mode 100644
index 0000000000000..f8ff086f8eae2
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state-machine-group.js
@@ -0,0 +1,143 @@
+import { tracked } from "@glimmer/tracking";
+import StateMachine from "./state-machine";
+
+/**
+ * @typedef {Object} MachineDefinition
+ * @property {string} name - Unique name identifying the machine within the group
+ * @property {string} initial - Initial state path for the machine
+ * @property {Object<string, Object>} states - Map of state names to configurations
+ * @property {boolean} [silentOnly] - If true, state changes don't trigger reactive updates
+ */
+
+/**
+ * @typedef {Object} StateMachineGroupOptions
+ * @property {Object<string, function(string[], Object): boolean>} [guards] - Guard functions for transitions
+ */
+
+/**
+ * Manages an array of named state machines, enabling cross-machine
+ * transitions via prefix syntax (e.g., "machineName:state.nested:value").
+ */
+export default class StateMachineGroup {
+  /**
+   * Tracked version counter for reactivity.
+   * @type {number}
+   */
+  @tracked version = 0;
+
+  /**
+   * Map of machine names to StateMachine instances.
+   * @type {Map<string, StateMachine>}
+   */
+  #machines = new Map();
+
+  /**
+   * Guard functions shared across all machines.
+   * @type {Object<string, function(string[], Object): boolean>}
+   */
+  #guards;
+
+  /**
+   * Create a new StateMachineGroup.
+   *
+   * @param {MachineDefinition[]} machineDefinitions - Array of machine definitions to instantiate
+   * @param {StateMachineGroupOptions} [options] - Configuration options for the group
+   */
+  constructor(machineDefinitions, options = {}) {
+    this.#guards = options.guards || {};
+
+    for (const def of machineDefinitions) {
+      const machine = new StateMachine(
+        {
+          initial: def.initial,
+          states: def.states,
+          silentOnly: def.silentOnly,
+        },
+        def.initial,
+        { guards: this.#guards, parentGroup: this, machineName: def.name }
+      );
+      this.#machines.set(def.name, machine);
+    }
+  }
+
+  /**
+   * Check if a machine exists in this group.
+   *
+   * @param {string} name - Machine name
+   * @returns {boolean}
+   */
+  hasMachine(name) {
+    return this.#machines.has(name);
+  }
+
+  /**
+   * Get a machine by name.
+   *
+   * @param {string} name - Machine name
+   * @returns {StateMachine|undefined}
+   */
+  getMachine(name) {
+    return this.#machines.get(name);
+  }
+
+  /**
+   * Send a message to all machines in the group.
+   * Each machine independently processes the message.
+   *
+   * @param {string|{type: string}} message - Message to send
+   * @param {Object} [context] - Context for guards
+   * @returns {void}
+   */
+  send(message, context = {}) {
+    let anyTransitioned = false;
+    for (const machine of this.#machines.values()) {
+      if (machine.send(message, context)) {
+        anyTransitioned = true;
+      }
+    }
+    if (anyTransitioned) {
+      this.version++;
+    }
+  }
+
+  /**
+   * Get all current states as an array of prefixed strings.
+   *
+   * @returns {string[]}
+   */
+  toStrings() {
+    // Trigger reactivity
+    void this.version;
+
+    const result = [];
+    for (const [name, machine] of this.#machines) {
+      for (const state of machine.toStrings()) {
+        result.push(`${name}:${state}`);
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Transition to a specific state, handling cross-machine transitions.
+   * Called by child machines when they encounter a prefixed target.
+   *
+   * @param {string} target - Full target path (e.g., "position:front.status:idle")
+   * @returns {void}
+   */
+  transitionTo(target) {
+    const colonIndex = target.indexOf(":");
+    if (colonIndex === -1) {
+      return;
+    }
+
+    const machineName = target.substring(0, colonIndex);
+    const statePath = target.substring(colonIndex + 1);
+
+    const machine = this.#machines.get(machineName);
+    if (machine) {
+      machine.transitionToState(statePath);
+      this.version++;
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state-machine.js b/frontend/discourse/float-kit/components/d-sheet/state-machine.js
new file mode 100644
index 0000000000000..fa595438f7e92
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state-machine.js
@@ -0,0 +1,1339 @@
+import { tracked } from "@glimmer/tracking";
+import { schedule } from "@ember/runloop";
+import { TrackedObject } from "@ember-compat/tracked-built-ins";
+
+/**
+ * @typedef {Object} Subscription
+ * @property {Symbol} id - Unique identifier for the subscription
+ * @property {string} timing - When to invoke callback ("immediate", "before-paint", "after-paint")
+ * @property {string|string[]} state - State pattern(s) to match
+ * @property {function(Object): void} callback - Function to call when state matches
+ * @property {function(): boolean|boolean} guard - Guard condition
+ */
+
+/**
+ * @typedef {Object} QueuedMessage
+ * @property {{type: string}} message - The message to process
+ * @property {Object} context - Context data for guards
+ */
+
+/**
+ * @typedef {Object} StateDefinition
+ * @property {string} initial - Initial state
+ * @property {Object<string, Object>} states - Map of state names to configurations
+ * @property {boolean} [silentOnly] - If true, state changes don't trigger reactive updates
+ */
+
+/**
+ * @typedef {Object} StateMachineOptions
+ * @property {Object<string, function(string[], Object): boolean>} [guards] - Guard functions for transitions
+ */
+
+/**
+ * @typedef {Object} TransitionResult
+ * @property {boolean} transitioned - Whether a transition occurred
+ * @property {string[]} enteredStates - States that were entered
+ * @property {string[]} exitedStates - States that were exited
+ * @property {boolean} silent - Whether the transition was silent
+ */
+
+/**
+ * Debug logging utility for state machine diagnostics.
+ *
+ * @type {{enabled: boolean, log: (...args: any[]) => void}}
+ */
+const DEBUG = {
+  enabled: false,
+  log(...args) {
+    if (this.enabled) {
+      // eslint-disable-next-line no-console
+      console.log("[StateMachine]", ...args);
+    }
+  },
+};
+
+if (typeof window !== "undefined") {
+  window.debugSheetsStateMachine = () => {
+    DEBUG.enabled = true;
+    DEBUG.log("Debug logging enabled");
+  };
+}
+
+/**
+ * Sentinel value representing an automatic (unnamed) transition.
+ *
+ * @type {string}
+ */
+const AUTOMATIC_TRANSITION = "";
+
+/**
+ * Subscription timing constants controlling when callbacks fire relative to rendering.
+ *
+ * @type {{IMMEDIATE: string, BEFORE_PAINT: string, AFTER_PAINT: string}}
+ */
+const TIMING = {
+  IMMEDIATE: "immediate",
+  BEFORE_PAINT: "before-paint",
+  AFTER_PAINT: "after-paint",
+};
+
+/**
+ * Subscription type constants for entry and exit actions.
+ *
+ * @type {{ENTER: string, EXIT: string}}
+ */
+const TYPE = {
+  ENTER: "enter",
+  EXIT: "exit",
+};
+
+/**
+ * Hierarchical state machine with support for nested machines and subscriptions.
+ * Uses Glimmer tracking for automatic reactivity when state changes.
+ *
+ * @example
+ * const machine = new StateMachine(
+ *   {
+ *     initial: "idle",
+ *     states: {
+ *       idle: { messages: { START: "running" } },
+ *       running: { messages: { STOP: "idle" } }
+ *     }
+ *   },
+ *   "idle"
+ * );
+ *
+ * machine.send("START");
+ * machine.matches("running"); // true
+ */
+class StateMachine {
+  /**
+   * Current state of the machine.
+   *
+   * @type {string}
+   */
+  @tracked current;
+
+  /**
+   * The state machine definition.
+   *
+   * @type {StateDefinition}
+   */
+  definition;
+
+  /**
+   * Context data used by guards.
+   *
+   * @type {Object<string, *>}
+   */
+  context = {};
+
+  /**
+   * Tracked object containing states of nested machines.
+   *
+   * @type {TrackedObject<string, string>}
+   */
+  nestedMachines = new TrackedObject();
+
+  /**
+   * The last message that was processed.
+   *
+   * @type {{type: string}|null}
+   */
+  lastProcessedMessage = null;
+
+  /**
+   * Queue of pending messages awaiting processing.
+   *
+   * @type {QueuedMessage[]}
+   */
+  #messageQueue = [];
+
+  /**
+   * Whether the message queue is currently being drained.
+   *
+   * @type {boolean}
+   */
+  #isProcessingQueue = false;
+
+  /**
+   * Timed subscriptions (before-paint and after-paint).
+   *
+   * @type {Subscription[]}
+   */
+  #subscriptions = [];
+
+  /**
+   * Immediate-timing entry subscriptions.
+   *
+   * @type {Subscription[]}
+   */
+  #entryActions = [];
+
+  /**
+   * Exit subscriptions fired when leaving a state.
+   *
+   * @type {Subscription[]}
+   */
+  #exitActions = [];
+
+  /**
+   * Cache mapping state paths to their resolved configurations.
+   *
+   * @type {Map<string, Object|null>}
+   */
+  #stateConfigCache = new Map();
+
+  /**
+   * Named guard functions for conditional transitions.
+   *
+   * @type {Object<string, (previousStates: string[], message: Object) => boolean>}
+   */
+  #guards = {};
+
+  /**
+   * Machine definitions for the current state's nested machines.
+   *
+   * @type {Array<Object>|null}
+   */
+  #currentStateMachines = null;
+
+  /**
+   * Names of nested machines marked as silent (no subscriber notifications).
+   *
+   * @type {Set<string>}
+   */
+  #silentMachines = new Set();
+
+  /**
+   * Parent group if this machine is part of a StateMachineGroup.
+   * @type {Object|null}
+   */
+  #parentGroup = null;
+
+  /**
+   * Name of this machine within its parent group.
+   * @type {string|null}
+   */
+  #machineName = null;
+
+  /**
+   * @param {Object} definition - State machine definition with states and transitions
+   * @param {string} initialState - Initial state path (e.g., "closed.safe-to-unmount")
+   * @param {StateMachineOptions} [options] - Optional configuration including guards
+   */
+  constructor(definition, initialState, options = {}) {
+    this.definition = definition;
+    this.current = initialState;
+    this.#guards = options.guards || {};
+    this.#parentGroup = options.parentGroup || null;
+    this.#machineName = options.machineName || null;
+    this.#initializeNestedMachines(this.current);
+    this.#processAutomaticTransitions();
+  }
+
+  /**
+   * Send a message to the state machine.
+   *
+   * @param {string|Object} message - Message type string or object with type property
+   * @param {Object} [context={}] - Context data for guards
+   * @returns {boolean} Whether any transition occurred
+   *
+   * @example
+   * machine.send("OPEN");
+   * machine.send({ type: "STEP", detent: 2 });
+   */
+  send(message, context = {}) {
+    const normalizedMessage =
+      typeof message === "string" ? { type: message } : message;
+
+    DEBUG.log(
+      `send: ${normalizedMessage.type}, current: ${this.current}, context:`,
+      context
+    );
+
+    this.#messageQueue.push({ message: normalizedMessage, context });
+
+    if (!this.#isProcessingQueue) {
+      return this.#processQueue();
+    }
+
+    return true;
+  }
+
+  /**
+   * Check if the machine is in a specific state.
+   *
+   * @param {string} state - State pattern to match
+   * @returns {boolean} Whether the machine matches the state
+   *
+   * @example
+   * machine.matches("open");                    // exact match
+   * machine.matches("closed");                  // matches "closed.pending"
+   * machine.matches("front.status:idle");       // nested machine state
+   */
+  matches(state) {
+    if (this.current === state) {
+      return true;
+    }
+
+    if (state.includes(":")) {
+      return this.#matchesNestedMachineState(state);
+    }
+
+    return (
+      this.current.startsWith(state) &&
+      this.current.charAt(state.length) === "."
+    );
+  }
+
+  /**
+   * Returns an array of all current state strings including nested machine states.
+   *
+   * @returns {string[]} Array of state strings
+   *
+   * @example
+   * // Returns ["open", "open.scroll:ended", "open.move:ended"]
+   * machine.toStrings();
+   */
+  toStrings() {
+    const strings = [this.current];
+    const parentState = this.current.split(".")[0];
+
+    for (const [machineName, machineState] of Object.entries(
+      this.nestedMachines
+    )) {
+      if (machineState) {
+        strings.push(`${parentState}.${machineName}:${machineState}`);
+      }
+    }
+
+    return strings;
+  }
+
+  /**
+   * Subscribe to state changes with timing control.
+   *
+   * @param {Object} options - Subscription options
+   * @param {string} options.timing - "immediate", "before-paint", or "after-paint"
+   * @param {string|string[]} options.state - State pattern(s) to match
+   * @param {Function} options.callback - Function to call when state matches
+   * @param {Function|boolean} [options.guard] - Optional guard condition
+   * @param {string} [options.type] - "enter" (default) or "exit"
+   * @returns {Function} Unsubscribe function
+   *
+   * @example
+   * const unsubscribe = machine.subscribe({
+   *   timing: "immediate",
+   *   state: "open",
+   *   callback: (message) => console.log("Opened!", message),
+   *   guard: () => someCondition
+   * });
+   *
+   * // Later: unsubscribe();
+   */
+  subscribe({ timing, state, callback, guard = true, type = TYPE.ENTER }) {
+    const id = Symbol();
+    const subscription = { id, timing, state, callback, guard };
+
+    if (type === TYPE.EXIT) {
+      this.#exitActions.push(subscription);
+    } else if (timing === TIMING.IMMEDIATE) {
+      this.#entryActions.push(subscription);
+    } else {
+      this.#subscriptions.push(subscription);
+    }
+
+    return () => this.#unsubscribe(id);
+  }
+
+  /**
+   * Remove all subscriptions from this machine.
+   */
+  cleanup() {
+    this.#subscriptions = [];
+    this.#entryActions = [];
+    this.#exitActions = [];
+  }
+
+  /**
+   * Get the configuration for a given state path.
+   *
+   * @param {string} statePath - Dot-notation state path
+   * @returns {Object|null} State configuration or null if not found
+   */
+  getStateConfig(statePath) {
+    if (this.#stateConfigCache.has(statePath)) {
+      return this.#stateConfigCache.get(statePath);
+    }
+
+    const config = this.#resolveStateConfig(statePath);
+    this.#stateConfigCache.set(statePath, config);
+    return config;
+  }
+
+  /**
+   * Get the current state of a nested machine.
+   *
+   * @param {string} machineName - Nested machine name
+   * @returns {string|null} Current state or null
+   */
+  getNestedMachineState(machineName) {
+    return this.nestedMachines[machineName] || null;
+  }
+
+  /**
+   * Walk the definition tree to resolve a dot-notation state path to its config.
+   *
+   * @param {string} statePath - Dot-notation state path
+   * @returns {Object|null} Resolved configuration or null
+   */
+  #resolveStateConfig(statePath) {
+    const parts = statePath.split(".");
+    let config = this.definition.states[parts[0]];
+
+    if (!config) {
+      return null;
+    }
+
+    for (let i = 1; i < parts.length; i++) {
+      if (config.states?.[parts[i]]) {
+        config = config.states[parts[i]];
+      } else if (config.machines) {
+        const machineDef = config.machines.find((m) => m.name === parts[i]);
+        if (machineDef && i + 1 < parts.length) {
+          const machineState = parts[i + 1];
+          if (machineDef.states?.[machineState]) {
+            config = machineDef.states[machineState];
+            i++;
+          } else {
+            return null;
+          }
+        } else {
+          return null;
+        }
+      } else {
+        return null;
+      }
+    }
+
+    return config;
+  }
+
+  /**
+   * Remove a subscription by its unique id from all subscription lists.
+   *
+   * @param {Symbol} id - Subscription identifier
+   */
+  #unsubscribe(id) {
+    this.#subscriptions = this.#subscriptions.filter((s) => s.id !== id);
+    this.#entryActions = this.#entryActions.filter((s) => s.id !== id);
+    this.#exitActions = this.#exitActions.filter((s) => s.id !== id);
+  }
+
+  /**
+   * Initialize nested machines for a given state path.
+   *
+   * @param {string} statePath - State path to initialize nested machines for
+   */
+  #initializeNestedMachines(statePath) {
+    const stateConfig = this.getStateConfig(statePath);
+    this.#silentMachines.clear();
+
+    if (stateConfig?.machines) {
+      // Normalize to array if single object
+      const machinesArray = Array.isArray(stateConfig.machines)
+        ? stateConfig.machines
+        : [stateConfig.machines];
+
+      this.#currentStateMachines = machinesArray;
+      for (const machineDef of machinesArray) {
+        this.nestedMachines[machineDef.name] = machineDef.initial;
+        if (machineDef.silentOnly) {
+          this.#silentMachines.add(machineDef.name);
+        }
+      }
+    } else {
+      this.#currentStateMachines = null;
+    }
+  }
+
+  /**
+   * Check if a nested machine is marked as silent.
+   *
+   * @param {string} machineName - Name of the nested machine
+   * @returns {boolean} Whether the machine is silent
+   */
+  #isSilentMachine(machineName) {
+    return this.#silentMachines.has(machineName);
+  }
+
+  /**
+   * Set the state of a nested machine.
+   *
+   * @param {string} machineName - Name of the nested machine
+   * @param {string} stateName - Target state name
+   */
+  #setNestedMachineState(machineName, stateName) {
+    this.nestedMachines[machineName] = stateName;
+  }
+
+  /**
+   * Get the parent state from a state path.
+   *
+   * @param {string} statePath - State path
+   * @returns {string|null} Parent state or null if no parent
+   */
+  #getParentState(statePath) {
+    const parts = statePath.split(".");
+    return parts.length > 1 ? parts[0] : null;
+  }
+
+  /**
+   * Process all queued messages sequentially.
+   *
+   * @returns {boolean} Whether any transitions occurred
+   */
+  #processQueue() {
+    if (this.#messageQueue.length === 0) {
+      this.#isProcessingQueue = false;
+      return false;
+    }
+
+    this.#isProcessingQueue = true;
+    let anyTransitioned = false;
+
+    while (this.#messageQueue.length > 0) {
+      const { message, context } = this.#messageQueue.shift();
+      const result = this.#processMessage(message, context);
+
+      this.lastProcessedMessage = message;
+
+      if (result.transitioned) {
+        anyTransitioned = true;
+        if (!result.silent) {
+          this.#notifySubscribers(
+            message,
+            result.enteredStates,
+            result.exitedStates
+          );
+        }
+      }
+    }
+
+    this.#isProcessingQueue = false;
+    return anyTransitioned;
+  }
+
+  /**
+   * Process a single message and attempt transitions.
+   *
+   * @param {Object} message - Message object with type property
+   * @param {Object} context - Context data for guards
+   * @returns {TransitionResult} Result indicating whether transition occurred
+   */
+  #processMessage(message, context = {}) {
+    // Merge context into message for guards
+    const enrichedMessage = { ...message, ...context };
+    const previousState = this.current;
+    const previousNestedStates = { ...this.nestedMachines };
+
+    DEBUG.log(
+      `processMessage: type=${message.type}, previousState=${previousState}, nestedStates:`,
+      previousNestedStates
+    );
+
+    const mainStateResult = this.#tryMainStateTransition(
+      enrichedMessage,
+      context
+    );
+    if (mainStateResult) {
+      this.#processAutomaticTransitions();
+      this.#processNestedMachinesSilently(enrichedMessage, context);
+
+      const { entered, exited } = this.#calculateStateChanges(
+        previousState,
+        previousNestedStates
+      );
+      return {
+        transitioned: true,
+        enteredStates: entered,
+        exitedStates: exited,
+        silent: false,
+      };
+    }
+
+    const nestedResult = this.#tryNestedMachineTransition(
+      enrichedMessage,
+      context
+    );
+    if (nestedResult) {
+      const { entered, exited } = this.#calculateStateChanges(
+        previousState,
+        previousNestedStates
+      );
+      return {
+        transitioned: true,
+        enteredStates: entered,
+        exitedStates: exited,
+        silent: nestedResult.silent,
+      };
+    }
+
+    return {
+      transitioned: false,
+      enteredStates: [],
+      exitedStates: [],
+      silent: false,
+    };
+  }
+
+  /**
+   * Attempt a transition for the main state machine.
+   *
+   * @param {Object} message - Message with type property
+   * @param {Object} context - Context data for guards
+   * @returns {boolean} Whether a transition occurred
+   */
+  #tryMainStateTransition(message, context) {
+    const messageType = message.type;
+    const currentStateConfig = this.getStateConfig(this.current);
+
+    let transitions = currentStateConfig?.messages?.[messageType];
+    DEBUG.log(
+      `processMessage: checking main state transitions, found:`,
+      transitions ? "yes" : "no"
+    );
+
+    if (!transitions) {
+      const parentState = this.#getParentState(this.current);
+      if (parentState) {
+        const parentConfig = this.getStateConfig(parentState);
+        transitions = parentConfig?.messages?.[messageType];
+      }
+    }
+
+    if (!transitions) {
+      return false;
+    }
+
+    return this.#tryTransitions(transitions, message, context, (target) =>
+      this.#transitionToState(target)
+    );
+  }
+
+  /**
+   * Attempt a transition for a nested state machine.
+   *
+   * @param {Object} message - Message with type property
+   * @param {Object} context - Context data for guards
+   * @returns {Object|null} Object with silent flag if transition occurred, null otherwise
+   */
+  #tryNestedMachineTransition(message, context) {
+    const messageType = message.type;
+    const currentStateConfig = this.getStateConfig(this.current);
+
+    if (!currentStateConfig?.machines) {
+      return null;
+    }
+
+    // Normalize to array if single object
+    const machinesArray = Array.isArray(currentStateConfig.machines)
+      ? currentStateConfig.machines
+      : [currentStateConfig.machines];
+
+    for (const machineDef of machinesArray) {
+      const machineName = machineDef.name;
+      const currentMachineState =
+        this.getNestedMachineState(machineName) || machineDef.initial;
+      const machineStateConfig = machineDef.states?.[currentMachineState];
+
+      if (!machineStateConfig?.messages?.[messageType]) {
+        continue;
+      }
+
+      const transitioned = this.#tryTransitions(
+        machineStateConfig.messages[messageType],
+        message,
+        context,
+        (target) => {
+          if (this.#isCrossLevelTransition(target, machineDef)) {
+            this.#transitionToState(target);
+          } else {
+            this.#setNestedMachineState(machineName, target);
+          }
+        }
+      );
+
+      if (transitioned) {
+        this.#processNestedMachineAutomaticTransitions(machineName);
+        return { silent: this.#isSilentMachine(machineName) };
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Try each transition in a list until one succeeds.
+   *
+   * @param {string|Object|Array} transitions - Transition or array of transitions
+   * @param {Object} message - Message being processed
+   * @param {Object} context - Context data for guards
+   * @param {Function} onSuccess - Callback to invoke with target state if transition succeeds
+   * @returns {boolean} Whether a transition succeeded
+   */
+  #tryTransitions(transitions, message, context, onSuccess) {
+    const transitionList = Array.isArray(transitions)
+      ? transitions
+      : [transitions];
+
+    for (const transition of transitionList) {
+      if (typeof transition === "string") {
+        DEBUG.log(`tryTransitions: direct target "${transition}"`);
+        onSuccess(transition);
+        return true;
+      }
+
+      if (transition.guard) {
+        const previousStates = this.#parentGroup
+          ? this.#parentGroup.toStrings()
+          : this.toStrings();
+        const guardPassed = this.#checkGuard(
+          transition.guard,
+          previousStates,
+          message
+        );
+        DEBUG.log(
+          `tryTransitions: guard "${transition.guard}" -> ${guardPassed}`
+        );
+        if (!guardPassed) {
+          continue;
+        }
+      }
+
+      if (transition.target) {
+        DEBUG.log(`tryTransitions: target "${transition.target}"`);
+        onSuccess(transition.target);
+        return true;
+      }
+    }
+
+    DEBUG.log(`tryTransitions: no valid transition found`);
+    return false;
+  }
+
+  /**
+   * Check if a guard condition passes.
+   *
+   * @param {string} guardName - Name of the guard function
+   * @param {string[]} previousStates - Previous state strings
+   * @param {Object} message - Message being processed
+   * @returns {boolean} Whether the guard passes
+   */
+  #checkGuard(guardName, previousStates, message) {
+    const guardFn = this.#guards[guardName];
+    return guardFn ? guardFn(previousStates, message) : true;
+  }
+
+  /**
+   * Transition to a specific state. Public method for StateMachineGroup.
+   *
+   * @param {string} targetState - Target state path
+   */
+  transitionToState(targetState) {
+    this.#transitionToState(targetState);
+  }
+
+  /**
+   * Internal method to transition to a specific state.
+   *
+   * @param {string} targetState - Target state path
+   */
+  #transitionToState(targetState) {
+    const previousState = this.current;
+    DEBUG.log(`transitionToState: ${previousState} -> ${targetState}`);
+
+    // Check for machine prefix when part of a group (e.g., "position:front.status:idle")
+    if (this.#parentGroup) {
+      const colonIndex = targetState.indexOf(":");
+      if (colonIndex !== -1) {
+        const potentialMachineName = targetState.substring(0, colonIndex);
+        // If prefix matches a different machine in the group, delegate
+        if (
+          this.#parentGroup.hasMachine(potentialMachineName) &&
+          potentialMachineName !== this.#machineName
+        ) {
+          DEBUG.log(`transitionToState: delegating to ${potentialMachineName}`);
+          this.#parentGroup.transitionTo(targetState);
+          return;
+        }
+        // If prefix matches our own name, strip it and continue
+        if (potentialMachineName === this.#machineName) {
+          targetState = targetState.substring(colonIndex + 1);
+        }
+      }
+    }
+
+    const colonIndex = targetState.indexOf(":");
+
+    if (colonIndex !== -1) {
+      this.#transitionToNestedMachinePath(targetState);
+    } else {
+      this.#transitionToStatePath(targetState);
+    }
+  }
+
+  /**
+   * Transition to a nested machine path (format: "state.machine:state").
+   *
+   * @param {string} targetState - Target state with nested machine notation
+   */
+  #transitionToNestedMachinePath(targetState) {
+    const dotIndex = targetState.indexOf(".");
+    const mainState = targetState.substring(0, dotIndex);
+    const rest = targetState.substring(dotIndex + 1);
+
+    DEBUG.log(`transitionToState: nested MACHINE path, mainState=${mainState}`);
+
+    this.current = mainState;
+
+    const stateConfig = this.getStateConfig(mainState);
+    const newMachines = stateConfig?.machines || null;
+
+    if (this.#machinesAreDifferent(this.#currentStateMachines, newMachines)) {
+      DEBUG.log(`transitionToState: reinitializing nested machines`);
+      this.nestedMachines = new TrackedObject();
+      this.#initializeNestedMachines(mainState);
+    }
+
+    const machineColonIndex = rest.indexOf(":");
+    const machineName = rest.substring(0, machineColonIndex);
+    const machineState = rest.substring(machineColonIndex + 1);
+    DEBUG.log(
+      `transitionToState: setting nested machine ${machineName}=${machineState}`
+    );
+    this.#setNestedMachineState(machineName, machineState);
+  }
+
+  /**
+   * Transition to a simple state path.
+   *
+   * @param {string} targetState - Target state path
+   */
+  #transitionToStatePath(targetState) {
+    this.current = targetState;
+
+    const stateConfig = this.getStateConfig(targetState);
+    const newMachines = stateConfig?.machines || null;
+
+    if (this.#machinesAreDifferent(this.#currentStateMachines, newMachines)) {
+      this.nestedMachines = new TrackedObject();
+      this.#initializeNestedMachines(targetState);
+    }
+  }
+
+  /**
+   * Check if two machine definitions are different.
+   *
+   * @param {Array<Object>|null} oldMachines - Previous machine definitions
+   * @param {Array<Object>|null} newMachines - New machine definitions
+   * @returns {boolean} Whether the machines are different
+   */
+  #machinesAreDifferent(oldMachines, newMachines) {
+    if (oldMachines === newMachines) {
+      return false;
+    }
+    if (!oldMachines || !newMachines) {
+      return true;
+    }
+    if (oldMachines.length !== newMachines.length) {
+      return true;
+    }
+    for (let i = 0; i < oldMachines.length; i++) {
+      if (oldMachines[i].name !== newMachines[i].name) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Check if a transition target crosses hierarchical levels.
+   *
+   * @param {string} target - Target state
+   * @param {Object} machineDef - Machine definition
+   * @returns {boolean} Whether this is a cross-level transition
+   */
+  #isCrossLevelTransition(target, machineDef) {
+    if (machineDef.states?.[target]) {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Process automatic (unnamed) transitions after a state change.
+   */
+  #processAutomaticTransitions() {
+    const currentStateConfig = this.getStateConfig(this.current);
+
+    if (this.#processMainStateAutomaticTransition(currentStateConfig)) {
+      return;
+    }
+
+    this.#processNestedMachinesAutomaticTransitions(currentStateConfig);
+  }
+
+  /**
+   * Process automatic transition for the main state.
+   *
+   * @param {Object} currentStateConfig - Configuration for current state
+   * @returns {boolean} Whether an automatic transition occurred
+   */
+  #processMainStateAutomaticTransition(currentStateConfig) {
+    if (!currentStateConfig?.messages?.[AUTOMATIC_TRANSITION]) {
+      return false;
+    }
+
+    const previousState = this.current;
+    const previousNestedStates = { ...this.nestedMachines };
+
+    const transitioned = this.#tryTransitions(
+      currentStateConfig.messages[AUTOMATIC_TRANSITION],
+      { type: AUTOMATIC_TRANSITION },
+      {},
+      (target) => this.#transitionToState(target)
+    );
+
+    if (transitioned) {
+      const { entered, exited } = this.#calculateStateChanges(
+        previousState,
+        previousNestedStates
+      );
+      this.#notifySubscribers({ type: AUTOMATIC_TRANSITION }, entered, exited);
+      this.#processAutomaticTransitions();
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Process automatic transitions for all nested machines.
+   *
+   * @param {Object} currentStateConfig - Configuration for current state
+   */
+  #processNestedMachinesAutomaticTransitions(currentStateConfig) {
+    if (!currentStateConfig?.machines) {
+      return;
+    }
+
+    // Normalize to array if single object
+    const machinesArray = Array.isArray(currentStateConfig.machines)
+      ? currentStateConfig.machines
+      : [currentStateConfig.machines];
+
+    for (const machineDef of machinesArray) {
+      const machineName = machineDef.name;
+      const currentMachineState =
+        this.getNestedMachineState(machineName) || machineDef.initial;
+      const machineStateConfig = machineDef.states?.[currentMachineState];
+
+      if (!machineStateConfig?.messages?.[AUTOMATIC_TRANSITION]) {
+        continue;
+      }
+
+      const previousState = this.current;
+      const previousNestedStates = { ...this.nestedMachines };
+
+      const transitioned = this.#tryTransitions(
+        machineStateConfig.messages[AUTOMATIC_TRANSITION],
+        { type: AUTOMATIC_TRANSITION },
+        {},
+        (target) => this.#setNestedMachineState(machineName, target)
+      );
+
+      if (transitioned) {
+        const { entered, exited } = this.#calculateStateChanges(
+          previousState,
+          previousNestedStates
+        );
+        if (!this.#isSilentMachine(machineName)) {
+          this.#notifySubscribers(
+            { type: AUTOMATIC_TRANSITION },
+            entered,
+            exited
+          );
+        }
+        this.#processAutomaticTransitions();
+        return;
+      }
+    }
+  }
+
+  /**
+   * Process automatic transitions for a specific nested machine.
+   *
+   * @param {string} machineName - Name of the nested machine
+   */
+  #processNestedMachineAutomaticTransitions(machineName) {
+    const currentStateConfig = this.getStateConfig(this.current);
+    if (!currentStateConfig?.machines) {
+      return;
+    }
+
+    // Normalize to array if single object
+    const machinesArray = Array.isArray(currentStateConfig.machines)
+      ? currentStateConfig.machines
+      : [currentStateConfig.machines];
+
+    const machineDef = machinesArray.find((m) => m.name === machineName);
+    if (!machineDef) {
+      return;
+    }
+
+    const currentMachineState =
+      this.getNestedMachineState(machineName) || machineDef.initial;
+    const machineStateConfig = machineDef.states?.[currentMachineState];
+
+    if (machineStateConfig?.messages?.[AUTOMATIC_TRANSITION]) {
+      const transitioned = this.#tryTransitions(
+        machineStateConfig.messages[AUTOMATIC_TRANSITION],
+        { type: AUTOMATIC_TRANSITION },
+        {},
+        (target) => this.#setNestedMachineState(machineName, target)
+      );
+
+      if (transitioned) {
+        this.#processNestedMachineAutomaticTransitions(machineName);
+      }
+    }
+  }
+
+  /**
+   * Process silent-only nested machines with a message.
+   *
+   * @param {Object} message - Message being processed
+   * @param {Object} context - Context data for guards
+   */
+  #processNestedMachinesSilently(message, context) {
+    const messageType = message.type;
+    const currentStateConfig = this.getStateConfig(this.current);
+
+    DEBUG.log(`processNestedMachinesSilently: message=${messageType}`);
+
+    if (!currentStateConfig?.machines) {
+      DEBUG.log(`processNestedMachinesSilently: no machines to process`);
+      return;
+    }
+
+    // Normalize to array if single object
+    const machinesArray = Array.isArray(currentStateConfig.machines)
+      ? currentStateConfig.machines
+      : [currentStateConfig.machines];
+
+    for (const machineDef of machinesArray) {
+      if (!machineDef.silentOnly) {
+        continue;
+      }
+
+      const machineName = machineDef.name;
+      const currentMachineState =
+        this.getNestedMachineState(machineName) || machineDef.initial;
+      const machineStateConfig = machineDef.states?.[currentMachineState];
+
+      DEBUG.log(
+        `processNestedMachinesSilently: checking silentOnly machine "${machineName}", currentState="${currentMachineState}"`
+      );
+
+      if (machineStateConfig?.messages?.[messageType]) {
+        DEBUG.log(
+          `processNestedMachinesSilently: "${machineName}" handles "${messageType}"`
+        );
+        this.#tryTransitions(
+          machineStateConfig.messages[messageType],
+          message,
+          context,
+          (target) => {
+            DEBUG.log(
+              `processNestedMachinesSilently: "${machineName}" transitioning to "${target}"`
+            );
+            if (!this.#isCrossLevelTransition(target, machineDef)) {
+              this.#setNestedMachineState(machineName, target);
+            }
+          }
+        );
+      }
+    }
+  }
+
+  /**
+   * Check if current state matches a nested machine state pattern.
+   *
+   * @param {string} state - State pattern (e.g., "open.scroll:ended")
+   * @returns {boolean} Whether the pattern matches
+   */
+  #matchesNestedMachineState(state) {
+    const dotIndex = state.indexOf(".");
+    const colonIndex = state.indexOf(":");
+
+    if (dotIndex === -1 || colonIndex === -1) {
+      return false;
+    }
+
+    const parentState = state.substring(0, dotIndex);
+    const machineName = state.substring(dotIndex + 1, colonIndex);
+    const machineState = state.substring(colonIndex + 1);
+
+    const isInParentState =
+      this.current === parentState ||
+      this.current.startsWith(`${parentState}.`);
+
+    if (!isInParentState) {
+      return false;
+    }
+
+    const currentMachineState = this.getNestedMachineState(machineName);
+
+    if (currentMachineState === machineState) {
+      return true;
+    }
+
+    return (
+      currentMachineState?.startsWith(machineState) &&
+      currentMachineState?.charAt(machineState.length) === "."
+    );
+  }
+
+  /**
+   * Calculate which states were entered and exited during a transition.
+   *
+   * @param {string} previousState - Previous main state
+   * @param {Object<string, string>} previousNestedStates - Previous nested machine states
+   * @returns {{entered: string[], exited: string[]}} Arrays of entered and exited states
+   */
+  #calculateStateChanges(previousState, previousNestedStates) {
+    const entered = [];
+    const exited = [];
+
+    const parentState = this.current.split(".")[0];
+    const prevParentState = previousState.split(".")[0];
+
+    DEBUG.log(
+      `calculateStateChanges: previousState=${previousState}, currentState=${this.current}`
+    );
+
+    entered.push(this.current);
+
+    if (this.current !== previousState) {
+      exited.push(previousState);
+    }
+
+    for (const [machineName, machineState] of Object.entries(
+      this.nestedMachines
+    )) {
+      const prevMachineState = previousNestedStates[machineName];
+      if (prevMachineState !== machineState) {
+        entered.push(`${parentState}.${machineName}:${machineState}`);
+        if (prevMachineState) {
+          exited.push(`${prevParentState}.${machineName}:${prevMachineState}`);
+        }
+      }
+    }
+
+    if (parentState !== prevParentState) {
+      for (const [machineName, machineState] of Object.entries(
+        previousNestedStates
+      )) {
+        if (machineState) {
+          exited.push(`${prevParentState}.${machineName}:${machineState}`);
+        }
+      }
+    }
+
+    DEBUG.log(`calculateStateChanges: entered=`, entered, `exited=`, exited);
+    return { entered, exited };
+  }
+
+  /**
+   * Notify subscribers of state changes.
+   *
+   * @param {Object} message - Message that triggered the change
+   * @param {string[]} enteredStates - States that were entered
+   * @param {string[]} exitedStates - States that were exited
+   */
+  #notifySubscribers(message, enteredStates, exitedStates) {
+    DEBUG.log(
+      `notifySubscribers: message=${message.type}, enteredStates=`,
+      enteredStates,
+      `exitedStates=`,
+      exitedStates
+    );
+    DEBUG.log(
+      `notifySubscribers: ${this.#exitActions.length} exit actions, ${this.#entryActions.length} entry actions, ${this.#subscriptions.length} subscriptions`
+    );
+
+    this.#dispatchExitActions(message, exitedStates);
+    this.#dispatchEntryActions(message, enteredStates);
+    this.#dispatchTimedSubscriptions(message);
+  }
+
+  /**
+   * Dispatch exit action callbacks for states that were exited.
+   *
+   * @param {Object} message - Message that triggered the change
+   * @param {string[]} exitedStates - States that were exited
+   */
+  #dispatchExitActions(message, exitedStates) {
+    for (const sub of this.#exitActions) {
+      const wasExited = this.#didExitState(sub, exitedStates);
+      const guardPasses =
+        typeof sub.guard === "function" ? sub.guard() : sub.guard;
+
+      DEBUG.log(
+        `notifySubscribers: exit action for state="${sub.state}", wasExited=${wasExited}, guardPasses=${guardPasses}`
+      );
+      if (wasExited && guardPasses) {
+        DEBUG.log(`notifySubscribers: FIRING exit callback for "${sub.state}"`);
+        sub.callback(message);
+      }
+    }
+  }
+
+  /**
+   * Dispatch entry action callbacks for states that were entered.
+   *
+   * @param {Object} message - Message that triggered the change
+   * @param {string[]} enteredStates - States that were entered
+   */
+  #dispatchEntryActions(message, enteredStates) {
+    for (const sub of this.#entryActions) {
+      const wasEntered = this.#didEnterState(sub, enteredStates);
+      const guardPasses =
+        typeof sub.guard === "function" ? sub.guard() : sub.guard;
+
+      DEBUG.log(
+        `notifySubscribers: entry action for state="${sub.state}", wasEntered=${wasEntered}, guardPasses=${guardPasses}`
+      );
+      if (wasEntered && guardPasses) {
+        DEBUG.log(
+          `notifySubscribers: FIRING entry callback for "${sub.state}"`
+        );
+        sub.callback(message);
+      }
+    }
+  }
+
+  /**
+   * Dispatch timed subscriptions (before-paint and after-paint).
+   *
+   * @param {Object} message - Message that triggered the change
+   */
+  #dispatchTimedSubscriptions(message) {
+    let beforePaintSubs = null;
+    let afterPaintSubs = null;
+
+    for (const sub of this.#subscriptions) {
+      if (!this.#evaluateSubscriptionConditions(sub)) {
+        continue;
+      }
+
+      if (sub.timing === TIMING.BEFORE_PAINT) {
+        if (!beforePaintSubs) {
+          beforePaintSubs = [];
+        }
+        beforePaintSubs.push(sub);
+      } else if (sub.timing === TIMING.AFTER_PAINT) {
+        if (!afterPaintSubs) {
+          afterPaintSubs = [];
+        }
+        afterPaintSubs.push(sub);
+      }
+    }
+
+    if (beforePaintSubs) {
+      schedule("afterRender", () => {
+        for (const sub of beforePaintSubs) {
+          if (this.#evaluateSubscriptionConditions(sub)) {
+            sub.callback(message);
+          }
+        }
+      });
+    }
+
+    if (afterPaintSubs) {
+      schedule("afterRender", () => {
+        requestAnimationFrame(() => {
+          for (const sub of afterPaintSubs) {
+            if (this.#evaluateSubscriptionConditions(sub)) {
+              sub.callback(message);
+            }
+          }
+        });
+      });
+    }
+  }
+
+  /**
+   * Evaluate whether a subscription's state and guard conditions are met.
+   *
+   * @param {Subscription} sub - Subscription to evaluate
+   * @returns {boolean} Whether conditions are met
+   */
+  #evaluateSubscriptionConditions(sub) {
+    let stateMatches;
+    if (Array.isArray(sub.state)) {
+      stateMatches = sub.state.some((s) => this.matches(s));
+    } else {
+      stateMatches = this.matches(sub.state);
+    }
+    const guardPasses =
+      typeof sub.guard === "function" ? sub.guard() : sub.guard;
+    return stateMatches && guardPasses;
+  }
+
+  /**
+   * Check if a subscription's state was entered.
+   *
+   * @param {Subscription} sub - Subscription to check
+   * @param {string[]} enteredStates - States that were entered
+   * @returns {boolean} Whether the subscription's state was entered
+   */
+  #didEnterState(sub, enteredStates) {
+    const subStates = Array.isArray(sub.state) ? sub.state : [sub.state];
+
+    for (const subState of subStates) {
+      const found = enteredStates.includes(subState);
+      DEBUG.log(
+        `didEnterState: checking "${subState}" in`,
+        enteredStates,
+        `-> ${found}`
+      );
+      if (found) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Check if a subscription's state was exited.
+   *
+   * @param {Subscription} sub - Subscription to check
+   * @param {string[]} exitedStates - States that were exited
+   * @returns {boolean} Whether the subscription's state was exited
+   */
+  #didExitState(sub, exitedStates) {
+    const subStates = Array.isArray(sub.state) ? sub.state : [sub.state];
+
+    for (const subState of subStates) {
+      if (exitedStates.includes(subState)) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
+
+export default StateMachine;
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/elements.js b/frontend/discourse/float-kit/components/d-sheet/state/elements.js
new file mode 100644
index 0000000000000..8e07c8e64dd55
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/elements.js
@@ -0,0 +1,51 @@
+/**
+ * Namespace for elements ready state machine.
+ * Tracks whether DOM elements have been registered.
+ */
+export default class ElementsState {
+  /**
+   * State machine tracking element registration status.
+   * @type {import("../state-machine").default}
+   */
+  #machine;
+
+  /**
+   * Creates an ElementsState wrapping the given state machine.
+   * @param {import("../state-machine").default} machine - The elementsReady state machine instance
+   */
+  constructor(machine) {
+    this.#machine = machine;
+  }
+
+  /**
+   * Whether all required DOM elements have been registered.
+   * @type {boolean}
+   */
+  get isReady() {
+    return this.#machine.matches("true");
+  }
+
+  /**
+   * Whether required DOM elements have not yet been registered.
+   * @type {boolean}
+   */
+  get isNotReady() {
+    return this.#machine.matches("false");
+  }
+
+  /**
+   * Marks DOM elements as registered by sending the ELEMENTS_REGISTERED event.
+   * @returns {void}
+   */
+  markRegistered() {
+    this.#machine.send("ELEMENTS_REGISTERED");
+  }
+
+  /**
+   * Resets the element registration state back to its initial value.
+   * @returns {void}
+   */
+  reset() {
+    this.#machine.send("RESET");
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/long-running.js b/frontend/discourse/float-kit/components/d-sheet/state/long-running.js
new file mode 100644
index 0000000000000..7faa17ef44baf
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/long-running.js
@@ -0,0 +1,50 @@
+/**
+ * Namespace for long-running operation state machine.
+ * Tracks whether a long-running operation is in progress.
+ */
+export default class LongRunningState {
+  /**
+   * The backing boolean state machine.
+   * @type {import("../state-machine").default}
+   */
+  #machine;
+
+  /**
+   * @param {import("../state-machine").default} machine - Boolean state machine for long-running tracking
+   */
+  constructor(machine) {
+    this.#machine = machine;
+  }
+
+  /**
+   * Whether a long-running operation is currently active.
+   * @returns {boolean}
+   */
+  get isActive() {
+    return this.#machine.matches("true");
+  }
+
+  /**
+   * Whether no long-running operation is in progress.
+   * @returns {boolean}
+   */
+  get isInactive() {
+    return this.#machine.matches("false");
+  }
+
+  /**
+   * Signals the start of a long-running operation.
+   * @returns {void}
+   */
+  start() {
+    this.#machine.send("TO_TRUE");
+  }
+
+  /**
+   * Signals the end of a long-running operation.
+   * @returns {void}
+   */
+  end() {
+    this.#machine.send("TO_FALSE");
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/openness.js b/frontend/discourse/float-kit/components/d-sheet/state/openness.js
new file mode 100644
index 0000000000000..cd0d750d58816
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/openness.js
@@ -0,0 +1,229 @@
+/**
+ * Namespace for openness state machine (main open/close lifecycle).
+ * Includes nested scroll, move, and swipe states.
+ */
+export default class OpennessState {
+  /**
+   * The underlying state machine driving openness transitions.
+   *
+   * @type {import("../state-machine").default}
+   */
+  #machine;
+
+  /**
+   * @param {import("../state-machine").default} machine - The openness state machine instance
+   */
+  constructor(machine) {
+    this.#machine = machine;
+  }
+
+  /**
+   * Whether the sheet is fully open.
+   *
+   * @type {boolean}
+   */
+  get isOpen() {
+    return this.#machine.current === "open";
+  }
+
+  /**
+   * Whether the sheet is in the closing transition.
+   *
+   * @type {boolean}
+   */
+  get isClosing() {
+    return this.#machine.current === "closing";
+  }
+
+  /**
+   * Whether the sheet is in the opening transition or preparing to open.
+   *
+   * @type {boolean}
+   */
+  get isOpening() {
+    return (
+      this.#machine.current === "opening" ||
+      this.#machine.matches("closed.status:preparing-opening") ||
+      this.#machine.matches("closed.status:preparing-open")
+    );
+  }
+
+  /**
+   * Whether the sheet is fully closed.
+   *
+   * @type {boolean}
+   */
+  get isClosed() {
+    return this.#machine.current === "closed";
+  }
+
+  /**
+   * Whether the sheet is closed and pending further action.
+   *
+   * @type {boolean}
+   */
+  get isClosedPending() {
+    return this.#machine.matches("closed.status:pending");
+  }
+
+  /**
+   * Whether the sheet is closed and safe to unmount from the DOM.
+   *
+   * @type {boolean}
+   */
+  get isClosedSafeToUnmount() {
+    return this.#machine.matches("closed.status:safe-to-unmount");
+  }
+
+  /**
+   * Whether content scrolling is actively ongoing.
+   *
+   * @type {boolean}
+   */
+  get isScrollOngoing() {
+    return this.#machine.matches("open.scroll:ongoing");
+  }
+
+  /**
+   * Whether content scrolling has ended.
+   *
+   * @type {boolean}
+   */
+  get isScrollEnded() {
+    return this.#machine.matches("open.scroll:ended");
+  }
+
+  /**
+   * Whether a swipe gesture is actively ongoing.
+   *
+   * @type {boolean}
+   */
+  get isSwipeOngoing() {
+    return this.#machine.matches("open.swipe:ongoing");
+  }
+
+  /**
+   * Whether a move gesture is actively ongoing.
+   *
+   * @type {boolean}
+   */
+  get isMoveOngoing() {
+    return this.#machine.matches("open.move:ongoing");
+  }
+
+  /**
+   * Signals the start of a scroll interaction, guarded to avoid duplicate sends.
+   *
+   * @returns {void}
+   */
+  scrollStart() {
+    if (!this.isScrollOngoing) {
+      this.#machine.send("SCROLL_START");
+    }
+  }
+
+  /**
+   * Signals the end of a scroll interaction, guarded to only send when scrolling.
+   *
+   * @returns {void}
+   */
+  scrollEnd() {
+    if (this.isScrollOngoing) {
+      this.#machine.send("SCROLL_END");
+    }
+  }
+
+  /**
+   * Signals the start of a swipe gesture.
+   *
+   * @returns {void}
+   */
+  swipeStart() {
+    this.#machine.send("SWIPE_START");
+  }
+
+  /**
+   * Signals the end of a swipe gesture.
+   *
+   * @returns {void}
+   */
+  swipeEnd() {
+    this.#machine.send("SWIPE_END");
+  }
+
+  /**
+   * Signals that an animation has completed, advancing to the next state.
+   *
+   * @returns {void}
+   */
+  completeAnimation() {
+    this.#machine.send("NEXT");
+  }
+
+  /**
+   * Signals the start of a move gesture.
+   *
+   * @returns {void}
+   */
+  moveStart() {
+    this.#machine.send("MOVE_START");
+  }
+
+  /**
+   * Signals the end of a move gesture.
+   *
+   * @returns {void}
+   */
+  moveEnd() {
+    this.#machine.send("MOVE_END");
+  }
+
+  /**
+   * Begins a step transition to a specific detent position.
+   *
+   * @param {number} detent - The target detent index to step to
+   * @returns {void}
+   */
+  beginStep(detent) {
+    this.#machine.send({ type: "STEP", detent });
+  }
+
+  /**
+   * Signals that the sheet is ready to open.
+   *
+   * @param {boolean} skipOpening - Whether to skip the opening animation
+   * @returns {void}
+   */
+  readyToOpen(skipOpening) {
+    this.#machine.send({ type: "READY_TO_OPEN", skipOpening });
+  }
+
+  /**
+   * Forwards an arbitrary message to the underlying state machine.
+   *
+   * @param {string | {type: string}} messageOrType - Message type string or message object
+   * @param {Object} [context] - Optional context data for guards
+   * @returns {void}
+   */
+  send(messageOrType, context) {
+    this.#machine.send(messageOrType, context);
+  }
+
+  /**
+   * The current state of the openness machine.
+   *
+   * @type {string}
+   */
+  get current() {
+    return this.#machine.current;
+  }
+
+  /**
+   * The last message processed by the openness machine.
+   *
+   * @type {{type: string} | null}
+   */
+  get lastProcessedMessage() {
+    return this.#machine.lastProcessedMessage;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/position.js b/frontend/discourse/float-kit/components/d-sheet/state/position.js
new file mode 100644
index 0000000000000..89db8cbc17f8a
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/position.js
@@ -0,0 +1,169 @@
+/**
+ * Namespace for position state machine.
+ * Tracks sheet position in stack: out, front, covered.
+ */
+export default class PositionState {
+  /**
+   * The underlying state machine driving position transitions.
+   *
+   * @type {import("../state-machine").default}
+   */
+  #machine;
+
+  /**
+   * @param {import("../state-machine").default} machine - The state machine instance to wrap
+   */
+  constructor(machine) {
+    this.#machine = machine;
+  }
+
+  /**
+   * Whether the sheet is in the "out" position (not visible in the stack).
+   *
+   * @returns {boolean}
+   */
+  get isOut() {
+    return this.#machine.matches("out");
+  }
+
+  /**
+   * Whether the sheet is in the "front" position (topmost in the stack).
+   *
+   * @returns {boolean}
+   */
+  get isFront() {
+    return this.#machine.matches("front");
+  }
+
+  /**
+   * Whether the sheet is in the "covered" position (behind another sheet).
+   *
+   * @returns {boolean}
+   */
+  get isCovered() {
+    return this.#machine.matches("covered");
+  }
+
+  /**
+   * Whether the sheet is front and in the opening transition.
+   *
+   * @returns {boolean}
+   */
+  get isFrontOpening() {
+    return this.#machine.matches("front.status:opening");
+  }
+
+  /**
+   * Whether the sheet is front and in the closing transition.
+   *
+   * @returns {boolean}
+   */
+  get isFrontClosing() {
+    return this.#machine.matches("front.status:closing");
+  }
+
+  /**
+   * Whether the sheet is front and idle (fully open, no transition in progress).
+   *
+   * @returns {boolean}
+   */
+  get isFrontIdle() {
+    return this.#machine.matches("front.status:idle");
+  }
+
+  /**
+   * Whether the sheet is covered and idle.
+   *
+   * @returns {boolean}
+   */
+  get isCoveredIdle() {
+    return this.#machine.matches("covered.status:idle");
+  }
+
+  /**
+   * Whether the sheet is in any idle state (out, front idle, or covered idle).
+   *
+   * @returns {boolean}
+   */
+  get isIdle() {
+    return (
+      this.isOut ||
+      this.#machine.matches("front.status:idle") ||
+      this.#machine.matches("covered.status:idle")
+    );
+  }
+
+  /**
+   * Transitions the sheet to the "out" position.
+   *
+   * @returns {void}
+   */
+  goOut() {
+    this.#machine.send("GO_OUT");
+  }
+
+  /**
+   * Advances the position state machine to the next state.
+   *
+   * @returns {void}
+   */
+  advance() {
+    this.#machine.send("NEXT");
+  }
+
+  /**
+   * Transitions directly to the front idle state.
+   *
+   * @returns {void}
+   */
+  goToFrontIdle() {
+    this.#machine.send("GOTO_front");
+  }
+
+  /**
+   * Transitions directly to the covered idle state.
+   *
+   * @returns {void}
+   */
+  goToCoveredIdle() {
+    this.#machine.send("GOTO_idle");
+  }
+
+  /**
+   * Signals readiness to transition to the front position.
+   *
+   * @param {boolean} skipOpening - Whether to skip the opening animation
+   * @returns {void}
+   */
+  readyToGoFront(skipOpening) {
+    this.#machine.send("READY_TO_GO_FRONT", { skipOpening });
+  }
+
+  /**
+   * Signals readiness to transition to the out position.
+   *
+   * @returns {void}
+   */
+  readyToGoOut() {
+    this.#machine.send("READY_TO_GO_OUT");
+  }
+
+  /**
+   * The current state path of the underlying machine.
+   *
+   * @returns {string}
+   */
+  get current() {
+    return this.#machine.current;
+  }
+
+  /**
+   * Checks if the position machine matches the given state pattern.
+   *
+   * @param {string} state - State pattern to match (e.g., "front", "front.status:idle")
+   * @returns {boolean}
+   */
+  matches(state) {
+    return this.#machine.matches(state);
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/skip.js b/frontend/discourse/float-kit/components/d-sheet/state/skip.js
new file mode 100644
index 0000000000000..59dd458f2b56e
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/skip.js
@@ -0,0 +1,74 @@
+/**
+ * Namespace for skip animation state machines.
+ * Tracks whether opening/closing animations should be skipped.
+ */
+export default class SkipState {
+  /**
+   * State machine tracking whether opening animation should be skipped.
+   * @type {import("../state-machine").default}
+   */
+  #openingMachine;
+
+  /**
+   * State machine tracking whether closing animation should be skipped.
+   * @type {import("../state-machine").default}
+   */
+  #closingMachine;
+
+  /**
+   * @param {import("../state-machine").default} openingMachine - State machine for skip-opening state
+   * @param {import("../state-machine").default} closingMachine - State machine for skip-closing state
+   */
+  constructor(openingMachine, closingMachine) {
+    this.#openingMachine = openingMachine;
+    this.#closingMachine = closingMachine;
+  }
+
+  /**
+   * Whether the opening animation should be skipped.
+   * @returns {boolean}
+   */
+  get isOpening() {
+    return this.#openingMachine.matches("true");
+  }
+
+  /**
+   * Whether the closing animation should be skipped.
+   * @returns {boolean}
+   */
+  get isClosing() {
+    return this.#closingMachine.matches("true");
+  }
+
+  /**
+   * Enables skipping of the opening animation.
+   * @returns {void}
+   */
+  enableOpening() {
+    this.#openingMachine.send("TO_TRUE");
+  }
+
+  /**
+   * Disables skipping of the opening animation.
+   * @returns {void}
+   */
+  disableOpening() {
+    this.#openingMachine.send("TO_FALSE");
+  }
+
+  /**
+   * Enables skipping of the closing animation.
+   * @returns {void}
+   */
+  enableClosing() {
+    this.#closingMachine.send("TO_TRUE");
+  }
+
+  /**
+   * Disables skipping of the closing animation.
+   * @returns {void}
+   */
+  disableClosing() {
+    this.#closingMachine.send("TO_FALSE");
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/staging.js b/frontend/discourse/float-kit/components/d-sheet/state/staging.js
new file mode 100644
index 0000000000000..1383057e3ac0a
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/staging.js
@@ -0,0 +1,166 @@
+/**
+ * Namespace for staging/animation state machine.
+ * Tracks animation phases: none, opening, open, stepping, closing, going-down, going-up.
+ */
+export default class StagingState {
+  /** @type {import("../state-machine").default} */
+  #machine;
+
+  /** @type {import("./openness").default} */
+  #openness;
+
+  /**
+   * @param {import("../state-machine").default} machine - The staging state machine instance
+   * @param {import("./openness").default} opennessNamespace - The openness state namespace for context
+   */
+  constructor(machine, opennessNamespace) {
+    this.#machine = machine;
+    this.#openness = opennessNamespace;
+  }
+
+  /**
+   * Whether the staging machine is in the "none" (idle) state.
+   *
+   * @type {boolean}
+   */
+  get isNone() {
+    return this.#machine.current === "none";
+  }
+
+  /**
+   * Whether the staging machine is in the "opening" animation phase.
+   *
+   * @type {boolean}
+   */
+  get isOpening() {
+    return this.#machine.current === "opening";
+  }
+
+  /**
+   * Whether the staging machine is in the "open" state.
+   *
+   * @type {boolean}
+   */
+  get isOpen() {
+    return this.#machine.current === "open";
+  }
+
+  /**
+   * Whether the staging machine is in the "stepping" animation phase.
+   *
+   * @type {boolean}
+   */
+  get isStepping() {
+    return this.#machine.current === "stepping";
+  }
+
+  /**
+   * Whether the staging machine is in the "closing" animation phase.
+   *
+   * @type {boolean}
+   */
+  get isClosing() {
+    return this.#machine.current === "closing";
+  }
+
+  /**
+   * Whether the staging machine is in the "going-down" animation phase.
+   *
+   * @type {boolean}
+   */
+  get isGoingDown() {
+    return this.#machine.current === "going-down";
+  }
+
+  /**
+   * Whether the staging machine is in the "going-up" animation phase.
+   *
+   * @type {boolean}
+   */
+  get isGoingUp() {
+    return this.#machine.current === "going-up";
+  }
+
+  /**
+   * Whether any animation is in progress (not in "none" state).
+   *
+   * @type {boolean}
+   */
+  get isAnimating() {
+    return this.#machine.current !== "none";
+  }
+
+  /**
+   * Check if the staging machine matches a given state pattern.
+   *
+   * @param {string} state - State pattern to match against
+   * @returns {boolean} Whether the machine matches the state
+   */
+  matches(state) {
+    return this.#machine.matches(state);
+  }
+
+  /**
+   * Signal that opening preparation is complete, transitioning to the opening phase.
+   */
+  openPrepared() {
+    this.#machine.send("OPEN_PREPARED", {
+      opennessState: this.#openness.current,
+    });
+  }
+
+  /**
+   * Trigger the close animation, optionally skipping the closing phase.
+   *
+   * @param {boolean} [skipClosing=false] - Whether to skip the closing animation
+   */
+  actuallyClose(skipClosing = false) {
+    this.#machine.send("ACTUALLY_CLOSE", {
+      opennessState: this.#openness.current,
+      skipClosing,
+    });
+  }
+
+  /**
+   * Trigger the step animation between detents.
+   */
+  actuallyStep() {
+    this.#machine.send("ACTUALLY_STEP", {
+      opennessState: this.#openness.current,
+    });
+  }
+
+  /**
+   * Advance the staging machine to its next state via the NEXT message.
+   */
+  advance() {
+    this.#machine.send("NEXT");
+  }
+
+  /**
+   * Trigger the going-down animation phase.
+   */
+  goDown() {
+    this.#machine.send("GO_DOWN", {
+      opennessState: this.#openness.current,
+    });
+  }
+
+  /**
+   * Trigger the going-up animation phase.
+   */
+  goUp() {
+    this.#machine.send("GO_UP", {
+      opennessState: this.#openness.current,
+    });
+  }
+
+  /**
+   * The current state of the staging machine.
+   *
+   * @type {string}
+   */
+  get current() {
+    return this.#machine.current;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/stuck.js b/frontend/discourse/float-kit/components/d-sheet/state/stuck.js
new file mode 100644
index 0000000000000..f6284f74d5d89
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/stuck.js
@@ -0,0 +1,95 @@
+/**
+ * Namespace for stuck state machines (front and back).
+ * Tracks whether sheet is stuck at detent boundaries.
+ */
+export default class StuckState {
+  /**
+   * State machine tracking front detent stuck status.
+   * @type {import("../state-machine").default}
+   */
+  #frontMachine;
+
+  /**
+   * State machine tracking back detent stuck status.
+   * @type {import("../state-machine").default}
+   */
+  #backMachine;
+
+  /**
+   * @param {import("../state-machine").default} frontMachine - State machine for front stuck state
+   * @param {import("../state-machine").default} backMachine - State machine for back stuck state
+   */
+  constructor(frontMachine, backMachine) {
+    this.#frontMachine = frontMachine;
+    this.#backMachine = backMachine;
+  }
+
+  /**
+   * Whether the sheet is stuck at the front detent.
+   * @returns {boolean}
+   */
+  get isFront() {
+    return this.#frontMachine.matches("true");
+  }
+
+  /**
+   * Whether the sheet is stuck at the back detent.
+   * @returns {boolean}
+   */
+  get isBack() {
+    return this.#backMachine.matches("true");
+  }
+
+  /**
+   * Whether the sheet is stuck at either detent.
+   * @returns {boolean}
+   */
+  get isEither() {
+    return this.isFront || this.isBack;
+  }
+
+  /**
+   * Transition the front machine to the stuck state.
+   * @returns {void}
+   */
+  startFront() {
+    this.#frontMachine.send("STUCK_START");
+  }
+
+  /**
+   * Transition the front machine out of the stuck state.
+   * @returns {void}
+   */
+  endFront() {
+    this.#frontMachine.send("STUCK_END");
+  }
+
+  /**
+   * Transition the back machine to the stuck state.
+   * @returns {void}
+   */
+  startBack() {
+    this.#backMachine.send("STUCK_START");
+  }
+
+  /**
+   * Transition the back machine out of the stuck state.
+   * @returns {void}
+   */
+  endBack() {
+    this.#backMachine.send("STUCK_END");
+  }
+
+  /**
+   * End stuck state on all machines that are currently stuck.
+   * @returns {void}
+   */
+  endAll() {
+    if (this.isFront) {
+      this.endFront();
+    }
+    if (this.isBack) {
+      this.endBack();
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/touch.js b/frontend/discourse/float-kit/components/d-sheet/state/touch.js
new file mode 100644
index 0000000000000..e7df29d4c94f7
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state/touch.js
@@ -0,0 +1,50 @@
+/**
+ * Namespace for scroll container touch state machine.
+ * Tracks whether touch is ongoing or ended.
+ */
+export default class TouchState {
+  /**
+   * The underlying state machine for scroll container touch.
+   * @type {import("../state-machine").default}
+   */
+  #machine;
+
+  /**
+   * @param {import("../state-machine").default} machine - The scroll container touch state machine
+   */
+  constructor(machine) {
+    this.#machine = machine;
+  }
+
+  /**
+   * Whether a touch interaction is currently ongoing.
+   * @returns {boolean}
+   */
+  get isOngoing() {
+    return this.#machine.matches("ongoing");
+  }
+
+  /**
+   * Whether the touch interaction has ended.
+   * @returns {boolean}
+   */
+  get isEnded() {
+    return this.#machine.matches("ended");
+  }
+
+  /**
+   * Signal that a touch interaction has started.
+   * @returns {void}
+   */
+  start() {
+    this.#machine.send("TOUCH_START");
+  }
+
+  /**
+   * Signal that a touch interaction has ended.
+   * @returns {void}
+   */
+  end() {
+    this.#machine.send("TOUCH_END");
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/states.js b/frontend/discourse/float-kit/components/d-sheet/states.js
new file mode 100644
index 0000000000000..1a0936587481a
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/states.js
@@ -0,0 +1,443 @@
+/**
+ * @typedef {Object} TransitionTarget
+ * @property {string} [guard] - Guard name that must pass for this transition
+ * @property {string} target - Target state to transition to
+ */
+
+/**
+ * @typedef {string | TransitionTarget | TransitionTarget[]} TransitionDef
+ */
+
+/**
+ * @typedef {Object} StateConfig
+ * @property {Object<string, TransitionDef>} [messages] - Map of message types to transitions
+ * @property {MachineDefinition[]} [machines] - Nested child machines within this state
+ */
+
+/**
+ * @typedef {Object} MachineDefinition
+ * @property {string} name - Unique name identifying the machine within the group
+ * @property {string} initial - Initial state for the machine
+ * @property {Object<string, StateConfig>} states - Map of state names to configurations
+ * @property {boolean} [silentOnly] - If true, state changes do not trigger reactive updates
+ */
+
+/**
+ * @typedef {Object} GuardMessage
+ * @property {string} type - The message type that triggered the transition
+ * @property {boolean} [skipClosing] - Whether to skip closing animation
+ * @property {boolean} [skipOpening] - Whether to skip opening animation
+ */
+
+/**
+ * Guard name constants for state machine transitions.
+ * Use these instead of string literals to prevent typos.
+ *
+ * @type {Readonly<{
+ *   NOT_SKIP_CLOSING: "notSkipClosing",
+ *   NOT_SKIP_OPENING: "notSkipOpening",
+ *   NOT_SKIP_CLOSING_MSG: "notSkipClosingMsg",
+ *   NOT_SKIP_OPENING_MSG: "notSkipOpeningMsg",
+ *   SKIP_OPENING: "skipOpening",
+ *   SKIP_CLOSING: "skipClosing",
+ *   SAFE_TO_UNMOUNT: "safeToUnmount",
+ *   SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING: "safeToUnmountAndNotSkipOpening"
+ * }>}
+ */
+const GUARD_NAMES = {
+  NOT_SKIP_CLOSING: "notSkipClosing",
+  NOT_SKIP_OPENING: "notSkipOpening",
+  NOT_SKIP_CLOSING_MSG: "notSkipClosingMsg",
+  NOT_SKIP_OPENING_MSG: "notSkipOpeningMsg",
+  SKIP_OPENING: "skipOpening",
+  SKIP_CLOSING: "skipClosing",
+  SAFE_TO_UNMOUNT: "safeToUnmount",
+  SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING: "safeToUnmountAndNotSkipOpening",
+};
+
+/**
+ * Guard functions for state machine transitions.
+ * Each guard receives (previousStates, message) and returns a boolean.
+ * - previousStates: Array of state strings before transition
+ * - message: The message object with optional context properties
+ *
+ * @type {Object<string, (previousStates: string[], message: GuardMessage) => boolean>}
+ */
+export const GUARDS = {
+  [GUARD_NAMES.NOT_SKIP_CLOSING]: (previousStates, message) =>
+    !previousStates.includes("skipClosing:true") && !message.skipClosing,
+  [GUARD_NAMES.NOT_SKIP_OPENING]: (previousStates, message) =>
+    !previousStates.includes("skipOpening:true") && !message.skipOpening,
+  [GUARD_NAMES.NOT_SKIP_CLOSING_MSG]: (previousStates, message) =>
+    !message.skipClosing,
+  [GUARD_NAMES.NOT_SKIP_OPENING_MSG]: (previousStates, message) =>
+    !message.skipOpening,
+  [GUARD_NAMES.SKIP_OPENING]: (previousStates, message) =>
+    previousStates.includes("skipOpening:true") || message.skipOpening,
+  [GUARD_NAMES.SKIP_CLOSING]: (previousStates, message) =>
+    previousStates.includes("skipClosing:true") || message.skipClosing,
+  [GUARD_NAMES.SAFE_TO_UNMOUNT]: (previousStates) =>
+    previousStates.includes("openness:closed.status:safe-to-unmount"),
+  [GUARD_NAMES.SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING]: (
+    previousStates,
+    message
+  ) =>
+    previousStates.includes("openness:closed.status:safe-to-unmount") &&
+    !previousStates.includes("skipOpening:true") &&
+    !message.skipOpening,
+};
+
+/**
+ * Machine definitions for the sheet's primary state machine group.
+ * Includes staging, longRunning, skipOpening, skipClosing, openness,
+ * scrollContainerTouch, backStuck, frontStuck, and elementsReady machines.
+ *
+ * @type {MachineDefinition[]}
+ */
+export const SHEET_MACHINES = [
+  {
+    name: "staging",
+    initial: "none",
+    states: {
+      none: {
+        messages: {
+          OPEN: [
+            {
+              guard: GUARD_NAMES.SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING,
+              target: "opening",
+            },
+            {
+              guard: GUARD_NAMES.SAFE_TO_UNMOUNT,
+              target: "open",
+            },
+          ],
+          OPEN_PREPARED: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_OPENING,
+              target: "opening",
+            },
+            {
+              target: "open",
+            },
+          ],
+          ACTUALLY_CLOSE: {
+            guard: GUARD_NAMES.NOT_SKIP_CLOSING,
+            target: "closing",
+          },
+          ACTUALLY_STEP: "stepping",
+          GO_DOWN: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_OPENING_MSG,
+              target: "going-down",
+            },
+            {
+              target: "go-down",
+            },
+          ],
+          GO_UP: "going-up",
+        },
+      },
+      open: { messages: { NEXT: "none" } },
+      opening: { messages: { NEXT: "none" } },
+      stepping: { messages: { NEXT: "none" } },
+      closing: { messages: { NEXT: "none" } },
+      "go-down": { messages: { NEXT: "none" } },
+      "going-down": { messages: { NEXT: "none" } },
+      "going-up": { messages: { NEXT: "none" } },
+    },
+  },
+  {
+    name: "longRunning",
+    initial: "false",
+    states: {
+      false: { messages: { TO_TRUE: "true" } },
+      true: { messages: { TO_FALSE: "false" } },
+    },
+  },
+  {
+    name: "skipOpening",
+    initial: "false",
+    states: {
+      true: { messages: { TO_FALSE: "false" } },
+      false: { messages: { TO_TRUE: "true" } },
+    },
+  },
+  {
+    name: "skipClosing",
+    initial: "false",
+    states: {
+      true: { messages: { TO_FALSE: "false" } },
+      false: { messages: { TO_TRUE: "true" } },
+    },
+  },
+  {
+    name: "openness",
+    initial: "closed",
+    states: {
+      closed: {
+        messages: {
+          READY_TO_OPEN: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_OPENING_MSG,
+              target: "opening",
+            },
+            {
+              target: "open",
+            },
+          ],
+        },
+        machines: [
+          {
+            name: "status",
+            initial: "safe-to-unmount",
+            states: {
+              "safe-to-unmount": {},
+              pending: {
+                messages: {
+                  OPEN: [
+                    {
+                      guard: GUARD_NAMES.SKIP_OPENING,
+                      target: "flushing-to-preparing-open",
+                    },
+                    { target: "flushing-to-preparing-opening" },
+                  ],
+                  "": "safe-to-unmount",
+                },
+              },
+              "flushing-to-preparing-open": {
+                messages: { "": "preparing-open" },
+              },
+              "flushing-to-preparing-opening": {
+                messages: { "": "preparing-opening" },
+              },
+              "preparing-open": {},
+              "preparing-opening": {},
+            },
+          },
+        ],
+      },
+      opening: {
+        messages: { NEXT: "open" },
+      },
+      open: {
+        messages: {
+          ACTUALLY_CLOSE: [
+            {
+              guard: GUARD_NAMES.SKIP_CLOSING,
+              target: "openness:closed.status:pending",
+            },
+          ],
+          SWIPED_OUT: "openness:closed.status:pending",
+          READY_TO_CLOSE: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_CLOSING_MSG,
+              target: "closing",
+            },
+          ],
+          STEP: "open",
+        },
+        machines: [
+          {
+            name: "scroll",
+            initial: "ended",
+            states: {
+              ended: { messages: { SCROLL_START: "ongoing" } },
+              ongoing: { messages: { SCROLL_END: "ended" } },
+            },
+          },
+          {
+            name: "move",
+            initial: "ended",
+            states: {
+              ended: { messages: { MOVE_START: "ongoing" } },
+              ongoing: { messages: { MOVE_END: "ended" } },
+            },
+          },
+          {
+            name: "swipe",
+            silentOnly: true,
+            initial: "unstarted",
+            states: {
+              unstarted: { messages: { SWIPE_START: "ongoing" } },
+              ongoing: { messages: { SWIPE_END: "ended" } },
+              ended: {
+                messages: { SWIPE_START: "ongoing" },
+              },
+            },
+          },
+          {
+            name: "evaluateCloseMessage",
+            silentOnly: true,
+            initial: "false",
+            states: {
+              false: { messages: { CLOSE: "true" } },
+              true: { messages: { CLOSE: "false" } },
+            },
+          },
+          {
+            name: "evaluateStepMessage",
+            silentOnly: true,
+            initial: "false",
+            states: {
+              false: { messages: { STEP: "true" } },
+              true: { messages: { STEP: "false" } },
+            },
+          },
+        ],
+      },
+      closing: { messages: { NEXT: "openness:closed.status:pending" } },
+    },
+  },
+  {
+    name: "scrollContainerTouch",
+    initial: "ended",
+    states: {
+      ended: { messages: { TOUCH_START: "ongoing" } },
+      ongoing: { messages: { TOUCH_END: "ended" } },
+    },
+  },
+  {
+    name: "backStuck",
+    silentOnly: true,
+    initial: "false",
+    states: {
+      false: { messages: { STUCK_START: "true" } },
+      true: { messages: { STUCK_END: "false" } },
+    },
+  },
+  {
+    name: "frontStuck",
+    silentOnly: true,
+    initial: "false",
+    states: {
+      false: { messages: { STUCK_START: "true" } },
+      true: { messages: { STUCK_END: "false" } },
+    },
+  },
+  {
+    name: "elementsReady",
+    initial: "false",
+    states: {
+      false: { messages: { ELEMENTS_REGISTERED: "true" } },
+      true: { messages: { RESET: "false" } },
+    },
+  },
+];
+
+/**
+ * Machine definitions for the sheet's position state machine group.
+ * Includes active and position machines that manage sheet stacking and transitions.
+ *
+ * @type {MachineDefinition[]}
+ */
+export const POSITION_MACHINES = [
+  {
+    name: "active",
+    initial: "false",
+    states: {
+      false: { messages: { TO_TRUE: "true" } },
+      true: { messages: { TO_FALSE: "false" } },
+    },
+  },
+  {
+    name: "position",
+    initial: "out",
+    states: {
+      out: {
+        messages: {
+          READY_TO_GO_FRONT: [
+            {
+              guard: GUARD_NAMES.SKIP_OPENING,
+              target: "position:front.status:idle",
+            },
+            {
+              target: "position:front.status:opening",
+            },
+          ],
+        },
+      },
+      front: {
+        machines: [
+          {
+            name: "status",
+            initial: "opening",
+            states: {
+              opening: {
+                messages: {
+                  NEXT: "idle",
+                },
+              },
+              closing: {
+                messages: {
+                  NEXT: "position:out",
+                },
+              },
+              idle: {
+                messages: {
+                  READY_TO_GO_DOWN: [
+                    {
+                      guard: GUARD_NAMES.SKIP_OPENING,
+                      target: "position:covered.status:idle",
+                    },
+                    {
+                      target: "position:covered.status:going-down",
+                    },
+                  ],
+                  READY_TO_GO_OUT: "closing",
+                  GO_OUT: "position:out",
+                },
+              },
+            },
+          },
+        ],
+      },
+      covered: {
+        machines: [
+          {
+            name: "status",
+            initial: "going-down",
+            states: {
+              "going-down": {
+                messages: {
+                  NEXT: "idle",
+                },
+              },
+              "going-up": {
+                messages: {
+                  NEXT: "indeterminate",
+                },
+              },
+              indeterminate: {
+                messages: {
+                  GOTO_idle: "idle",
+                  GOTO_front: "position:front.status:idle",
+                },
+              },
+              idle: {
+                messages: {
+                  READY_TO_GO_DOWN: [
+                    {
+                      guard: GUARD_NAMES.SKIP_OPENING,
+                      target: "come-back",
+                    },
+                    {
+                      target: "going-down",
+                    },
+                  ],
+                  READY_TO_GO_UP: "going-up",
+                  GO_UP: "indeterminate",
+                  GOTO_front: "position:front.status:idle",
+                },
+              },
+              "come-back": {
+                messages: {
+                  "": "idle",
+                },
+              },
+            },
+          },
+        ],
+      },
+    },
+  },
+];
diff --git a/frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js b/frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js
new file mode 100644
index 0000000000000..78df5a5658324
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js
@@ -0,0 +1,129 @@
+/**
+ * Adapter for managing mobile browser theme-color meta tag behavior in d-sheet modals.
+ * Coordinates with ThemeColorManager to handle dimming overlays during sheet presentation,
+ * captures theme colors from sheet content backgrounds, and maintains a stack-based ownership
+ * model for nested sheets. Supports auto-detection of WebKit capabilities and configurable
+ * dimming alpha values for visual sheet hierarchy.
+ */
+
+import { capabilities } from "discourse/services/capabilities";
+
+/**
+ * Manages theme color behavior for sheets including dimming overlays,
+ * meta tag ownership, and color capture from content elements.
+ */
+export default class ThemeColorAdapter {
+  /** @type {import("./controller").default} */
+  controller;
+
+  /** @type {boolean | string} */
+  themeColorDimming = false;
+
+  /** @type {number | null} */
+  themeColorDimmingAlpha = null;
+
+  /** @type {HTMLMetaElement | null} */
+  themeColorMetaTag = null;
+
+  /** @type {{controller: ThemeColorAdapter, previousContent: string} | null} */
+  themeColorStackEntry = null;
+
+  /** @type {string | null} */
+  underlyingThemeColor = null;
+
+  /**
+   * @param {import("./controller").default} controller
+   */
+  constructor(controller) {
+    this.controller = controller;
+  }
+
+  /**
+   * Proxies the theme color manager service from the controller.
+   *
+   * @type {import("../../services/theme-color-manager").default | null}
+   */
+  get themeColorManager() {
+    return this.controller.themeColorManager;
+  }
+
+  /**
+   * Proxies the sheet's content element from the controller.
+   *
+   * @type {HTMLElement | null}
+   */
+  get content() {
+    return this.controller.content;
+  }
+
+  /**
+   * Whether theme color dimming is effectively enabled.
+   * When set to "auto", checks WebKit capabilities.
+   *
+   * @type {boolean}
+   */
+  get effectiveThemeColorDimming() {
+    if (this.themeColorDimming === "auto") {
+      return (
+        capabilities.isWebKit && !capabilities.isStandaloneWithBlackTranslucent
+      );
+    }
+    return Boolean(this.themeColorDimming);
+  }
+
+  /**
+   * Applies theme color settings from the provided options.
+   *
+   * @param {Object} options
+   * @param {boolean | string} [options.themeColorDimming]
+   * @param {number} [options.themeColorDimmingAlpha]
+   */
+  configure(options) {
+    if (options.themeColorDimming !== undefined) {
+      this.themeColorDimming = options.themeColorDimming;
+    }
+    if (options.themeColorDimmingAlpha !== undefined) {
+      this.themeColorDimmingAlpha = options.themeColorDimmingAlpha;
+    }
+  }
+
+  /**
+   * Registers a theme color dimming overlay via the manager.
+   *
+   * @param {{color: string, alpha: number}} overlay
+   * @returns {{updateAlpha: (alpha: number) => void, remove: () => void} | undefined}
+   */
+  registerThemeColorDimmingOverlay(overlay) {
+    return this.themeColorManager?.registerThemeColorDimmingOverlay(
+      this,
+      overlay
+    );
+  }
+
+  /**
+   * Releases ownership of the theme color via the manager.
+   *
+   * @returns {void}
+   */
+  releaseThemeColorOwnership() {
+    this.themeColorManager?.releaseThemeColorOwnership(this);
+  }
+
+  /**
+   * Captures the theme color from the content element's background.
+   *
+   * @returns {void}
+   */
+  captureContentThemeColor() {
+    this.themeColorManager?.captureContentThemeColor(this);
+  }
+
+  /**
+   * Cleans up theme color resources by releasing ownership.
+   *
+   * @returns {void}
+   */
+  cleanup() {
+    this.releaseThemeColorOwnership();
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/timeout-manager.js b/frontend/discourse/float-kit/components/d-sheet/timeout-manager.js
new file mode 100644
index 0000000000000..521d876204ae8
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/timeout-manager.js
@@ -0,0 +1,51 @@
+import { cancel } from "@ember/runloop";
+import discourseLater from "discourse/lib/later";
+
+/**
+ * Centralized timeout management for d-sheet controller.
+ * Provides named timeout scheduling with automatic cleanup.
+ */
+export default class TimeoutManager {
+  /** @type {Map<string, EmberRunTimer>} */
+  timeouts = new Map();
+
+  /**
+   * Schedules a named timeout, replacing any existing one with the same key.
+   *
+   * @param {string} key - Unique identifier for the timeout
+   * @param {Function} callback - Function to execute after delay
+   * @param {number} delay - Delay in milliseconds
+   * @returns {void}
+   */
+  schedule(key, callback, delay) {
+    this.clear(key);
+    const timer = discourseLater(() => {
+      this.timeouts.delete(key);
+      callback();
+    }, delay);
+    this.timeouts.set(key, timer);
+  }
+
+  /**
+   * Cancels and removes a specific timeout by key.
+   *
+   * @param {string} key - Unique identifier for the timeout
+   * @returns {void}
+   */
+  clear(key) {
+    cancel(this.timeouts.get(key));
+    this.timeouts.delete(key);
+  }
+
+  /**
+   * Cancels and removes all scheduled timeouts.
+   *
+   * @returns {void}
+   */
+  cleanup() {
+    for (const timer of this.timeouts.values()) {
+      cancel(timer);
+    }
+    this.timeouts.clear();
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/title.gjs b/frontend/discourse/float-kit/components/d-sheet/title.gjs
new file mode 100644
index 0000000000000..d8e7e26459663
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/title.gjs
@@ -0,0 +1,21 @@
+import concatClass from "discourse/helpers/concat-class";
+
+/**
+ * Renders the title heading of a sheet, linked via ID for accessibility.
+ *
+ * @component DSheetTitle
+ * @param {import("./controller").default} sheet - The sheet controller instance providing titleId
+ * @param {string} [class] - Optional CSS class appended to the title element
+ */
+const DSheetTitle = <template>
+  <h2
+    id={{@sheet.titleId}}
+    class={{concatClass "Sheet-title" @class}}
+    data-d-sheet="title"
+    ...attributes
+  >
+    {{yield}}
+  </h2>
+</template>;
+
+export default DSheetTitle;
diff --git a/frontend/discourse/float-kit/components/d-sheet/touch-handler.js b/frontend/discourse/float-kit/components/d-sheet/touch-handler.js
new file mode 100644
index 0000000000000..067de5b66e3ad
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/touch-handler.js
@@ -0,0 +1,168 @@
+/**
+ * Touch gesture and scroll tracking handler for d-sheet bottom sheet component.
+ *
+ * Manages touch-based scroll interactions and scroll-snap behavior detection for the d-sheet
+ * component. Tracks scroll gesture lifecycle (start/end) and monitors for scroll-snap
+ * completion using native scrollend events with fallback timeout. Coordinates with the
+ * d-sheet controller to enable gesture-aware animations and state transitions.
+ */
+
+import { cancel } from "@ember/runloop";
+import discourseLater from "discourse/lib/later";
+
+/**
+ * Timeout in ms for detecting scroll end via debounce.
+ * Used alongside native scrollend event when supported.
+ *
+ * @type {number}
+ */
+const SCROLL_END_TIMEOUT = 90;
+
+/**
+ * Handles touch/scroll gesture tracking for d-sheet.
+ *
+ * Primary responsibilities:
+ * 1. Track scroll gesture start/end and notify the controller
+ * 2. Monitor scroll-snap completion using native scrollend event with timeout fallback
+ *
+ * @class TouchHandler
+ */
+export class TouchHandler {
+  /**
+   * Reference to the sheet controller that owns this handler.
+   *
+   * @type {Object}
+   */
+  sheet = null;
+
+  /**
+   * Whether a scroll gesture is currently being tracked.
+   *
+   * @type {boolean}
+   */
+  isTrackingScroll = false;
+
+  /**
+   * Timeout ID for the scroll end debounce.
+   *
+   * @type {number|null}
+   */
+  scrollendTimeout = null;
+
+  /**
+   * Bound handler function for the scrollend event.
+   *
+   * @type {Function|null}
+   */
+  scrollendHandler = null;
+
+  /**
+   * Creates a new TouchHandler instance.
+   *
+   * @param {Object} sheet - The sheet controller instance
+   */
+  constructor(sheet) {
+    this.sheet = sheet;
+  }
+
+  /**
+   * Called when a touch/scroll gesture starts.
+   * Notifies the controller and begins tracking.
+   *
+   * @returns {void}
+   */
+  handleScrollStart() {
+    if (!this.sheet.scrollContainer) {
+      return;
+    }
+    this.sheet.onTouchGestureStart?.();
+    this.isTrackingScroll = true;
+  }
+
+  /**
+   * Called when a touch/scroll gesture ends.
+   * Notifies the controller and starts monitoring for scroll-snap completion.
+   *
+   * @returns {void}
+   */
+  handleScrollEnd() {
+    if (!this.isTrackingScroll) {
+      return;
+    }
+    this.sheet.onTouchGestureEnd?.();
+    this.startScrollendMonitor();
+    this.isTrackingScroll = false;
+  }
+
+  /**
+   * Starts monitoring for scroll-snap completion.
+   * Always uses timeout for debounce; also uses native scrollend when supported.
+   *
+   * @returns {void}
+   */
+  startScrollendMonitor() {
+    this.stopScrollendMonitor();
+
+    if (!this.sheet.scrollContainer) {
+      return;
+    }
+
+    this.scrollendHandler = () => {
+      this.handleScrollendComplete();
+    };
+
+    if ("onscrollend" in window) {
+      this.sheet.scrollContainer.addEventListener(
+        "scrollend",
+        this.scrollendHandler
+      );
+    }
+
+    this.scrollendTimeout = discourseLater(() => {
+      this.isTrackingScroll = false;
+      if (!("onscrollend" in window)) {
+        this.scrollendHandler?.();
+      }
+    }, SCROLL_END_TIMEOUT);
+  }
+
+  /**
+   * Called when scroll-snap completes (via scrollend event or timeout).
+   *
+   * @returns {void}
+   */
+  handleScrollendComplete() {
+    this.stopScrollendMonitor();
+  }
+
+  /**
+   * Stops monitoring for scroll-snap completion.
+   * Removes the scrollend event listener and cancels any pending timeout.
+   *
+   * @returns {void}
+   */
+  stopScrollendMonitor() {
+    if (this.scrollendHandler && this.sheet.scrollContainer) {
+      this.sheet.scrollContainer.removeEventListener(
+        "scrollend",
+        this.scrollendHandler
+      );
+    }
+    this.scrollendHandler = null;
+
+    if (this.scrollendTimeout) {
+      cancel(this.scrollendTimeout);
+      this.scrollendTimeout = null;
+    }
+  }
+
+  /**
+   * Detaches the handler and cleans up all resources.
+   *
+   * @returns {void}
+   */
+  detach() {
+    this.stopScrollendMonitor();
+    this.isTrackingScroll = false;
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/travel.js b/frontend/discourse/float-kit/components/d-sheet/travel.js
new file mode 100644
index 0000000000000..12565e90922a2
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/travel.js
@@ -0,0 +1,762 @@
+import {
+  createTweenFunction,
+  generateAnimationConfig,
+  supportsLinearEasing,
+} from "./animation";
+import { toKebabCase, TRANSFORM_PROPS } from "./css-utils";
+
+/**
+ * Builds a single keyframe object from config at a given progress.
+ *
+ * @param {Record<string, [string, string] | ((ctx: {progress: number, tween: (start: string, end: string) => string}) => string) | string | null | undefined>} config - Animation config with property template functions
+ * @param {number} progress - Progress value
+ * @returns {Record<string, string>} Keyframe object for Web Animations API
+ */
+function buildKeyframe(config, progress) {
+  const keyframe = {};
+  const transforms = [];
+  const tween = createTweenFunction(progress);
+
+  for (const [property, value] of Object.entries(config)) {
+    if (
+      value === null ||
+      value === undefined ||
+      property === "transformOrigin"
+    ) {
+      continue;
+    }
+
+    let computedValue;
+    if (Array.isArray(value)) {
+      computedValue = tween(value[0], value[1]);
+    } else if (typeof value === "function") {
+      computedValue = value({ progress, tween });
+    } else if (typeof value === "string") {
+      computedValue = value;
+    } else {
+      continue;
+    }
+
+    if (TRANSFORM_PROPS.has(property)) {
+      transforms.push(`${property}(${computedValue})`);
+    } else {
+      keyframe[property] = computedValue;
+    }
+  }
+
+  if (transforms.length > 0) {
+    keyframe.transform = transforms.join(" ");
+  }
+
+  return keyframe;
+}
+
+/**
+ * Sets the scroll position on a scroll container for a given axis.
+ *
+ * @param {HTMLElement} scrollContainer - The scroll container element
+ * @param {string} scrollAxis - The scroll axis ("x" or "y")
+ * @param {number} position - The position to scroll to
+ */
+function setScrollPosition(scrollContainer, scrollAxis, position) {
+  if (scrollAxis === "x") {
+    scrollContainer.scrollTo(position, 0);
+    scrollContainer.scrollLeft = position;
+  } else {
+    scrollContainer.scrollTo(0, position);
+    scrollContainer.scrollTop = position;
+  }
+}
+
+/**
+ * Builds keyframes array from config and progress values.
+ *
+ * @param {Object} config - Animation config
+ * @param {number[]} progressValues - Array of progress values
+ * @param {boolean} supportsLinear - Whether linear() easing is supported
+ * @param {Object|null} [stackingInfo] - Stacking info with reversedStackingIndex and selfAndAboveTravelProgressSum
+ * @returns {Object[]} Array of keyframe objects
+ */
+function buildKeyframesFromConfig(
+  config,
+  progressValues,
+  supportsLinear,
+  stackingInfo = null
+) {
+  if (!progressValues || progressValues.length === 0) {
+    return [];
+  }
+
+  /**
+   * Adjusts progress value based on stacking info.
+   *
+   * @param {number} progress - The progress value to adjust
+   * @returns {number} The adjusted progress value
+   */
+  const adjustProgress = (progress) => {
+    if (!stackingInfo) {
+      return progress;
+    }
+    const { reversedStackingIndex, selfAndAboveTravelProgressSum } =
+      stackingInfo;
+    if (selfAndAboveTravelProgressSum && reversedStackingIndex !== undefined) {
+      return (
+        (selfAndAboveTravelProgressSum[reversedStackingIndex] ?? 0) + progress
+      );
+    }
+    return progress;
+  };
+
+  if (supportsLinear) {
+    return [
+      buildKeyframe(config, adjustProgress(progressValues[0])),
+      buildKeyframe(
+        config,
+        adjustProgress(progressValues[progressValues.length - 1])
+      ),
+    ];
+  }
+  return progressValues.map((p) => buildKeyframe(config, adjustProgress(p)));
+}
+
+/**
+ * Animates a single target element and returns a promise that resolves when complete.
+ * Persists final keyframe styles to the element after animation finishes.
+ *
+ * @param {Object} params - Animation parameters
+ * @param {HTMLElement} params.target - Element to animate
+ * @param {Object[]} params.keyframes - Keyframes array
+ * @param {Object} params.animationOptions - WAAPI animation options
+ * @param {string} [params.transformOrigin] - Optional transform origin
+ * @returns {Promise<void>}
+ */
+function animateTarget({
+  target,
+  keyframes,
+  animationOptions,
+  transformOrigin,
+}) {
+  if (transformOrigin) {
+    target.style.transformOrigin = transformOrigin;
+  }
+
+  const animation = target.animate(keyframes, animationOptions);
+
+  return new Promise((resolve) => {
+    /**
+     * Cleanup animation event listeners.
+     */
+    const cleanup = () => {
+      animation.removeEventListener("finish", onEnd);
+      animation.removeEventListener("cancel", onEnd);
+    };
+
+    /**
+     * Handles animation end, applies final keyframe styles.
+     */
+    const onEnd = () => {
+      const finalKeyframe = keyframes[keyframes.length - 1];
+      if (finalKeyframe && animation.playState === "finished") {
+        Object.entries(finalKeyframe).forEach(([property, value]) => {
+          target.style.setProperty(toKebabCase(property), value);
+        });
+      }
+      cleanup();
+      resolve();
+    };
+
+    animation.addEventListener("finish", onEnd);
+    animation.addEventListener("cancel", onEnd);
+  });
+}
+
+/**
+ * Resolves the destination detent, using active detent as fallback.
+ * @param {number|undefined} desiredDetent - Desired detent index
+ * @param {number} activeDetent - Current active detent index
+ * @returns {number} Resolved detent index
+ */
+export function resolveDestinationDetent(desiredDetent, activeDetent) {
+  return typeof desiredDetent === "number" ? desiredDetent : activeDetent;
+}
+
+/**
+ * Calculates the scroll position needed to reach a specific detent.
+ *
+ * @param {Object} config - Configuration object
+ * @param {string} config.trackToTravelOn - Track direction (top, bottom, left, right, horizontal, vertical)
+ * @param {number} config.destinationDetent - Target detent index
+ * @param {number} config.detentCount - Total number of detents
+ * @param {boolean} config.swipeOutDisabledWithDetent - Whether swipe-out is disabled with detent
+ * @param {boolean} config.hasOppositeTracks - Whether sheet has opposite tracks
+ * @param {string} config.contentPlacement - Content placement (center or edge)
+ * @param {Object} config.elementsDimensions - Dimensions of sheet elements
+ * @param {number} [config.snapBackAcceleratorSize] - Size of snap-back accelerator
+ * @returns {{positionToScrollTo: number|null, scrollAxis: string|null}} Scroll position and axis
+ */
+export function calculateScrollPositionForDetent(config) {
+  const {
+    trackToTravelOn,
+    destinationDetent,
+    detentCount,
+    swipeOutDisabledWithDetent,
+    hasOppositeTracks,
+    contentPlacement,
+    elementsDimensions,
+    snapBackAcceleratorSize,
+  } = config;
+
+  if (elementsDimensions.detentMarkers?.length <= destinationDetent - 1) {
+    return {
+      positionToScrollTo: null,
+      scrollAxis: null,
+    };
+  }
+
+  const isClosedDetent = destinationDetent === 0;
+  const isFirstDetent = destinationDetent === 1;
+  const isLastDetent = destinationDetent === detentCount;
+  const isBackTrack =
+    trackToTravelOn === "right" || trackToTravelOn === "bottom";
+
+  const viewSize = elementsDimensions.view.travelAxis.unitless;
+  const contentSize = elementsDimensions.content.travelAxis.unitless;
+  const acceleratorSize =
+    elementsDimensions.snapOutAccelerator.travelAxis.unitless;
+  const detentMarkers = elementsDimensions.detentMarkers;
+  const detentOffset = isClosedDetent
+    ? 0
+    : detentMarkers[destinationDetent - 1].accumulatedOffsets.travelAxis
+        .unitless;
+
+  let scrollPosition = 0;
+
+  if (hasOppositeTracks) {
+    if (isLastDetent) {
+      scrollPosition =
+        viewSize -
+        (viewSize - contentSize) / 2 +
+        elementsDimensions.snapOutAccelerator.travelAxis.unitless;
+    } else if (isClosedDetent) {
+      scrollPosition = isBackTrack ? 0 : 10000;
+    }
+  } else if (isBackTrack) {
+    if (isLastDetent) {
+      scrollPosition = 10000;
+    } else if (
+      (swipeOutDisabledWithDetent && isFirstDetent) ||
+      isClosedDetent
+    ) {
+      scrollPosition = 0;
+    } else if (
+      !isLastDetent &&
+      !(swipeOutDisabledWithDetent && isFirstDetent) &&
+      !isClosedDetent
+    ) {
+      if (swipeOutDisabledWithDetent) {
+        scrollPosition =
+          detentMarkers[destinationDetent - 1].accumulatedOffsets.travelAxis
+            .unitless - detentMarkers[0].travelAxis.unitless;
+      } else {
+        scrollPosition = detentOffset + acceleratorSize;
+      }
+    }
+  } else if (trackToTravelOn === "left" || trackToTravelOn === "top") {
+    const effectiveAcceleratorSize = snapBackAcceleratorSize ?? acceleratorSize;
+    const acceleratorAdjustment =
+      swipeOutDisabledWithDetent && isFirstDetent
+        ? 2 * effectiveAcceleratorSize
+        : isLastDetent
+          ? 0
+          : effectiveAcceleratorSize;
+
+    if (contentPlacement === "center") {
+      scrollPosition = isClosedDetent
+        ? contentSize +
+          (viewSize - contentSize) / 2 -
+          detentOffset +
+          acceleratorAdjustment
+        : 0;
+    } else {
+      scrollPosition = contentSize - detentOffset + acceleratorAdjustment;
+    }
+  }
+
+  return {
+    positionToScrollTo: scrollPosition,
+    scrollAxis:
+      trackToTravelOn === "left" ||
+      trackToTravelOn === "right" ||
+      trackToTravelOn === "horizontal"
+        ? "x"
+        : "y",
+  };
+}
+
+/**
+ * Executes animated sheet travel to a destination detent using Web Animations API.
+ * @param {Object} config - Configuration object
+ * @param {number} config.destinationDetent - Target detent index
+ * @param {Function} config.setSegment - Function to update current segment
+ * @param {HTMLElement} config.view - View element
+ * @param {HTMLElement} config.scrollContainer - Scroll container element
+ * @param {HTMLElement} config.contentWrapper - Content wrapper element
+ * @param {Array} config.travelAnimations - Array of travel animation callbacks
+ * @param {Array} config.belowSheetsInStack - Sheets below in the stack
+ * @param {string} config.contentPlacement - Content placement
+ * @param {number} config.positionToScrollTo - Target scroll position
+ * @param {string} config.scrollAxis - Scroll axis (x or y)
+ * @param {Object} config.animationConfig - Animation configuration
+ * @param {Function} [config.onTravel] - Callback during travel
+ * @param {Function} [config.onTravelStart] - Callback at travel start
+ * @param {Function} [config.onTravelEnd] - Callback at travel end
+ * @param {boolean} [config.runOnTravelStart] - Whether to run onTravelStart
+ * @param {Object} config.dimensions - Sheet dimensions
+ * @param {string} config.trackToTravelOn - Track direction
+ */
+export function executeSheetTravel(config) {
+  const {
+    destinationDetent,
+    setSegment,
+    view,
+    scrollContainer,
+    contentWrapper,
+    travelAnimations,
+    belowSheetsInStack,
+    contentPlacement,
+    positionToScrollTo,
+    scrollAxis,
+    animationConfig,
+    onTravel,
+    onTravelStart,
+    onTravelEnd,
+    runOnTravelStart,
+    dimensions,
+    trackToTravelOn,
+  } = config;
+
+  const stackingAnimations = [];
+
+  belowSheetsInStack.forEach((belowSheet) => {
+    stackingAnimations.push(
+      ...belowSheet.stackingAnimations.map((anim) => ({
+        ...anim,
+        reversedStackingIndex: belowSheetsInStack.length - 1,
+        selfAndAboveTravelProgressSum: belowSheet.selfAndAboveTravelProgressSum,
+      }))
+    );
+  });
+
+  if (runOnTravelStart && onTravelStart) {
+    onTravelStart();
+  }
+
+  const shouldAnimateContent =
+    !Object.hasOwn(animationConfig, "contentMove") ||
+    animationConfig.contentMove;
+
+  const viewTravelSize = dimensions.view.travelAxis.unitless;
+  const contentTravelSize = dimensions.content.travelAxis.unitless;
+  const effectiveContentSize =
+    contentPlacement !== "center"
+      ? contentTravelSize
+      : contentTravelSize + (viewTravelSize - contentTravelSize) / 2;
+
+  const viewRect = view.getBoundingClientRect();
+  const contentWrapperRect = contentWrapper.getBoundingClientRect();
+  const verticalOffset = contentWrapperRect.top - viewRect.top;
+  const horizontalOffset = contentWrapperRect.left - viewRect.left;
+
+  let currentOffset = 0;
+  switch (trackToTravelOn) {
+    case "top":
+      currentOffset = verticalOffset + effectiveContentSize;
+      break;
+    case "bottom":
+      currentOffset = verticalOffset - effectiveContentSize;
+      break;
+    case "left":
+      currentOffset = horizontalOffset + effectiveContentSize;
+      break;
+    case "right":
+      currentOffset = horizontalOffset - effectiveContentSize;
+      break;
+  }
+
+  const currentProgress = Math.max(
+    Math.abs(currentOffset) / effectiveContentSize,
+    0
+  );
+
+  const targetProgress =
+    dimensions.progressValueAtDetents[destinationDetent].exact;
+  const progressDelta = targetProgress - currentProgress;
+
+  const targetPosition = targetProgress * effectiveContentSize;
+  const targetOffset =
+    trackToTravelOn === "left" || trackToTravelOn === "top"
+      ? targetPosition
+      : -targetPosition;
+
+  const animation = generateAnimationConfig({
+    origin: currentOffset,
+    destination: targetOffset,
+    animationConfig,
+  });
+
+  const { progressValuesArray, duration, delay } = animation;
+
+  if (progressValuesArray.length === 0) {
+    setScrollPosition(scrollContainer, scrollAxis, positionToScrollTo);
+    setSegment([destinationDetent, destinationDetent]);
+    if (onTravelEnd) {
+      onTravelEnd();
+    }
+    return;
+  }
+
+  const filteredProgressValues = [];
+  for (let i = 0; i < progressValuesArray.length - 1; i += 8) {
+    filteredProgressValues.push(progressValuesArray[i]);
+  }
+  if (progressValuesArray.length % 8 !== 0) {
+    filteredProgressValues.push(
+      progressValuesArray[progressValuesArray.length - 1]
+    );
+  }
+
+  const mappedProgressValues = filteredProgressValues.map(
+    (e) => currentProgress + progressDelta * e
+  );
+
+  const finalScrollPosition = positionToScrollTo;
+
+  const transformAxis = scrollAxis === "x" ? "X" : "Y";
+
+  const transformDistance = currentOffset - targetOffset;
+
+  const needsTransform = shouldAnimateContent && transformDistance !== 0;
+
+  const useLinearEasing = supportsLinearEasing();
+  const easingValue = useLinearEasing
+    ? `linear(${filteredProgressValues.join(",")})`
+    : "linear";
+
+  const transformKeyframes = needsTransform
+    ? useLinearEasing
+      ? [
+          {
+            transform: `translate${transformAxis}(${transformDistance * (1 - filteredProgressValues[0])}px)`,
+          },
+          {
+            transform: `translate${transformAxis}(${transformDistance * (1 - filteredProgressValues[filteredProgressValues.length - 1])}px)`,
+          },
+        ]
+      : filteredProgressValues.map((progressValue) => ({
+          transform: `translate${transformAxis}(${transformDistance * (1 - progressValue)}px)`,
+        }))
+    : [{ transform: "translateY(0px)" }, { transform: "translateY(0px)" }];
+
+  /**
+   * Sets the scroll position on the scroll container.
+   */
+  const setScroll = () => {
+    setScrollPosition(scrollContainer, scrollAxis, finalScrollPosition);
+  };
+
+  /**
+   * Animates the content wrapper element.
+   *
+   * @returns {Promise<void>} Resolves when animation completes
+   */
+  const animateContent = () => {
+    if (!needsTransform || !contentWrapper) {
+      return Promise.resolve();
+    }
+
+    return new Promise((resolve) => {
+      const contentAnimation = contentWrapper.animate(transformKeyframes, {
+        duration,
+        easing: easingValue,
+        delay,
+      });
+
+      /**
+       * Cleanup content animation event listeners.
+       */
+      const cleanup = () => {
+        contentAnimation.removeEventListener("finish", onEnd);
+        contentAnimation.removeEventListener("cancel", onEnd);
+      };
+
+      /**
+       * Handles content animation end.
+       */
+      const onEnd = () => {
+        cleanup();
+        resolve();
+      };
+
+      contentAnimation.addEventListener("finish", onEnd);
+      contentAnimation.addEventListener("cancel", onEnd);
+    });
+  };
+
+  /**
+   * Animates all travel callbacks and stacking animations.
+   *
+   * @returns {Promise<void>} Resolves when all animations complete
+   */
+  const animateTravelCallbacks = () => {
+    const animationOptions = { duration, easing: easingValue, delay };
+    const progressValues = useLinearEasing
+      ? [
+          mappedProgressValues[0],
+          mappedProgressValues[mappedProgressValues.length - 1],
+        ]
+      : mappedProgressValues;
+
+    const allAnimationPromises = [];
+
+    const allAnimations = [
+      ...travelAnimations.map((anim) => ({ ...anim, isStacking: false })),
+      ...stackingAnimations.map((anim) => ({ ...anim, isStacking: true })),
+    ];
+
+    allAnimations
+      .filter((anim) => anim.config && anim.target)
+      .forEach((anim) => {
+        const stackingInfo = anim.isStacking
+          ? {
+              reversedStackingIndex: anim.reversedStackingIndex,
+              selfAndAboveTravelProgressSum: anim.selfAndAboveTravelProgressSum,
+            }
+          : null;
+
+        const keyframes = buildKeyframesFromConfig(
+          anim.config,
+          progressValues,
+          useLinearEasing,
+          stackingInfo
+        );
+
+        allAnimationPromises.push(
+          animateTarget({
+            target: anim.target,
+            keyframes,
+            animationOptions,
+            transformOrigin: anim.config.transformOrigin,
+          })
+        );
+      });
+
+    return new Promise((resolve) => {
+      let startTime = null;
+
+      /**
+       * Animation loop that reports progress updates.
+       *
+       * @param {number} timestamp - Current timestamp from requestAnimationFrame
+       */
+      const progressReportLoop = (timestamp) => {
+        if (startTime === null) {
+          startTime = timestamp;
+        }
+
+        const elapsed = timestamp - startTime;
+        const frameIndex = Math.floor(elapsed);
+
+        if (frameIndex < progressValuesArray.length) {
+          const progress =
+            currentProgress + progressDelta * progressValuesArray[frameIndex];
+
+          let currentSegment = [0, 0];
+          if (progress < 0) {
+            currentSegment = [0, 0];
+            setSegment(currentSegment);
+          } else if (progress > 1) {
+            currentSegment = [1, 1];
+            setSegment(currentSegment);
+          } else if (dimensions?.progressValueAtDetents) {
+            const detents = dimensions.progressValueAtDetents;
+            for (let i = 0; i < detents.length; i++) {
+              const detent = detents[i];
+              if (
+                progress > detent.after &&
+                i + 1 < detents.length &&
+                progress < detents[i + 1].before
+              ) {
+                currentSegment = [i, i + 1];
+                setSegment(currentSegment);
+              } else if (progress > detent.before && progress < detent.after) {
+                currentSegment = [i, i];
+                setSegment(currentSegment);
+              }
+            }
+          }
+
+          if (onTravel) {
+            onTravel({
+              progress,
+              range: { start: currentSegment[0], end: currentSegment[1] },
+              progressAtDetents: dimensions.exactProgressValueAtDetents,
+            });
+          }
+
+          requestAnimationFrame(progressReportLoop);
+        } else {
+          const lastDetent = Math.min(
+            (dimensions?.progressValueAtDetents?.length ?? 1) - 1,
+            destinationDetent
+          );
+          setSegment([lastDetent, lastDetent]);
+
+          Promise.all(allAnimationPromises).then(resolve);
+        }
+      };
+
+      requestAnimationFrame(progressReportLoop);
+    });
+  };
+
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      if (view?.dataset?.dSheet?.includes("hidden")) {
+        view.dataset.dSheet = view.dataset.dSheet
+          .replace(/\s*hidden\s*/g, " ")
+          .trim();
+      }
+
+      setScroll();
+
+      Promise.all([animateContent(), animateTravelCallbacks()]).then(() => {
+        if (onTravelEnd) {
+          onTravelEnd();
+        }
+      });
+    });
+  });
+}
+
+/**
+ * Main entry point for traveling to a detent. Handles both smooth and instant behavior.
+ * @param {Object} config - Configuration object
+ * @param {number} [config.destinationDetent] - Target detent index
+ * @param {number} config.currentDetent - Current detent index
+ * @param {Object} config.dimensions - Sheet dimensions
+ * @param {HTMLElement} config.scrollContainer - Scroll container element
+ * @param {HTMLElement} config.contentWrapper - Content wrapper element
+ * @param {HTMLElement} config.view - View element
+ * @param {string} config.tracks - Track direction
+ * @param {Array} config.travelAnimations - Array of travel animation callbacks
+ * @param {Array} config.belowSheetsInStack - Sheets below in the stack
+ * @param {string} [config.trackToTravelOn] - Track to travel on (overrides tracks)
+ * @param {boolean} [config.runTravelCallbacksAndAnimations=true] - Whether to run callbacks
+ * @param {boolean} [config.runOnTravelStart=true] - Whether to run onTravelStart
+ * @param {Object} config.animationConfig - Animation configuration
+ * @param {Function} [config.onTravel] - Callback during travel
+ * @param {Function} [config.onTravelStart] - Callback at travel start
+ * @param {Function} [config.onTravelEnd] - Callback at travel end
+ * @param {number} [config.snapBackAcceleratorTravelAxisSize] - Snap-back accelerator size
+ * @param {boolean} config.swipeOutDisabledWithDetent - Whether swipe-out is disabled
+ * @param {Function} config.setSegment - Function to update segment
+ * @param {string} config.contentPlacement - Content placement
+ * @param {boolean} config.hasOppositeTracks - Whether sheet has opposite tracks
+ * @param {string} [config.behavior] - Travel behavior (smooth or instant)
+ */
+export function travelToDetent(config) {
+  const {
+    destinationDetent,
+    currentDetent,
+    dimensions,
+    scrollContainer,
+    contentWrapper,
+    view,
+    tracks,
+    travelAnimations,
+    belowSheetsInStack,
+    trackToTravelOn,
+    runTravelCallbacksAndAnimations = true,
+    runOnTravelStart = true,
+    animationConfig,
+    onTravel,
+    onTravelStart,
+    onTravelEnd,
+    snapBackAcceleratorTravelAxisSize,
+    swipeOutDisabledWithDetent,
+    setSegment,
+    contentPlacement,
+    hasOppositeTracks,
+  } = config;
+
+  if (destinationDetent === undefined && currentDetent === null) {
+    return;
+  }
+
+  if (!scrollContainer || !dimensions?.content) {
+    return;
+  }
+
+  const resolvedDestination = resolveDestinationDetent(
+    destinationDetent,
+    currentDetent
+  );
+
+  const trackToTravelOnResolved = trackToTravelOn || tracks;
+
+  const scrollInfo = calculateScrollPositionForDetent({
+    destinationDetent: resolvedDestination,
+    detentCount: dimensions.detentMarkers.length,
+    trackToTravelOn: trackToTravelOnResolved,
+    swipeOutDisabledWithDetent,
+    hasOppositeTracks,
+    contentPlacement,
+    snapBackAcceleratorSize: snapBackAcceleratorTravelAxisSize,
+    elementsDimensions: dimensions,
+  });
+
+  const { positionToScrollTo, scrollAxis } = scrollInfo;
+
+  if (positionToScrollTo === null || scrollAxis === null) {
+    return;
+  }
+
+  const behavior =
+    config.behavior || (animationConfig?.skip ? "instant" : "smooth");
+
+  if (behavior === "smooth") {
+    executeSheetTravel({
+      destinationDetent: resolvedDestination,
+      setSegment,
+      view,
+      scrollContainer,
+      contentWrapper,
+      travelAnimations,
+      belowSheetsInStack,
+      positionToScrollTo,
+      contentPlacement,
+      scrollAxis,
+      animationConfig,
+      onTravel,
+      onTravelStart,
+      onTravelEnd,
+      runOnTravelStart,
+      dimensions,
+      trackToTravelOn: trackToTravelOnResolved,
+    });
+  } else {
+    if (runTravelCallbacksAndAnimations && runOnTravelStart && onTravelStart) {
+      onTravelStart();
+    }
+
+    setScrollPosition(scrollContainer, scrollAxis, positionToScrollTo);
+
+    setSegment([resolvedDestination, resolvedDestination]);
+
+    if (runTravelCallbacksAndAnimations) {
+      if (onTravelEnd) {
+        onTravelEnd();
+      }
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/trigger.gjs b/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
new file mode 100644
index 0000000000000..84645555e76b2
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
@@ -0,0 +1,98 @@
+import { on } from "@ember/modifier";
+import DButton from "discourse/components/d-button";
+import SheetActionBase from "./sheet-action-base";
+
+/**
+ * Trigger button for controlling a sheet.
+ *
+ * @component Trigger
+ * @param {string} forComponent - ID of the Root to associate with (uses Root's componentId)
+ * @param {Object} sheet - The sheet controller instance (alternative to forComponent)
+ * @param {string|Object} action - Action to perform:
+ *   - "present" (default): opens the sheet
+ *   - "dismiss": closes the sheet
+ *   - "step": steps to next detent (upward, cycles)
+ *   - { type: "step", direction?: "up"|"down", detent?: number }: step with options
+ * @param {Object|Function} onPress - Press behavior configuration:
+ *   - { forceFocus?: boolean, runAction?: boolean }
+ *   - Or function receiving event with changeDefault method
+ *   Default: { forceFocus: true, runAction: true }
+ */
+export default class Trigger extends SheetActionBase {
+  /**
+   * Computes the aria-haspopup attribute value based on the sheet's role.
+   * Returns "dialog" for dialog/alertdialog roles when the action is "present".
+   *
+   * @type {string|undefined}
+   */
+  get ariaHasPopup() {
+    const role = this.sheet?.role;
+    const isDialogRole = role === "dialog" || role === "alertdialog";
+    return isDialogRole && this.actionType === "present" ? "dialog" : undefined;
+  }
+
+  /**
+   * aria-expanded attribute value.
+   * Only relevant for present/dismiss actions.
+   *
+   * @type {boolean|undefined}
+   */
+  get ariaExpanded() {
+    const actionType = this.actionType;
+    if (actionType === "present" || actionType === "dismiss") {
+      return this.sheet?.isPresented ?? false;
+    }
+    return undefined;
+  }
+
+  /**
+   * The Root component - either from forComponent lookup or from sheet's reference.
+   *
+   * @type {Object|undefined}
+   */
+  get root() {
+    return this.targetRoot ?? this.sheet?.rootComponent;
+  }
+
+  /**
+   * Execute the configured action on the sheet.
+   * Uses Root's present()/dismiss() methods for controlled/uncontrolled handling.
+   */
+  executeAction() {
+    const root = this.root;
+
+    switch (this.actionType) {
+      case "dismiss":
+        if (root) {
+          root.dismiss();
+        } else {
+          this.sheet?.close();
+        }
+        break;
+      case "step":
+        this.executeStepAction();
+        break;
+      case "present":
+      default:
+        if (root) {
+          root.present();
+        } else {
+          this.sheet?.open();
+        }
+        break;
+    }
+  }
+
+  <template>
+    <DButton
+      aria-haspopup={{this.ariaHasPopup}}
+      aria-controls={{this.sheetId}}
+      aria-expanded={{this.ariaExpanded}}
+      {{on "click" this.handleClick}}
+      class="btn-default"
+      ...attributes
+    >
+      {{yield}}
+    </DButton>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/view.gjs b/frontend/discourse/float-kit/components/d-sheet/view.gjs
new file mode 100644
index 0000000000000..cdeeb3b6cd097
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/view.gjs
@@ -0,0 +1,170 @@
+import Component from "@glimmer/component";
+import { concat, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import { modifier as modifierFn } from "ember-modifier";
+import effect from "discourse/float-kit/helpers/effect";
+import concatClass from "discourse/helpers/concat-class";
+import { or } from "discourse/truth-helpers";
+import Backdrop from "./backdrop";
+import Content from "./content";
+import { scrollTrapModifier } from "./scroll-trap-modifier";
+
+/**
+ * View component for d-sheet.
+ *
+ * Renders the sheet view and configures the Controller with behavioral/visual props.
+ *
+ * @component DSheetView
+ * @param {Object} sheet - The sheet controller instance
+ * @param {string} [contentPlacement] - Placement: "top" | "bottom" | "left" | "right" | "center"
+ * @param {string|Array<string>} [tracks] - Track content travels on: "top" | "bottom" | "left" | "right" | ["top", "bottom"] | ["left", "right"]
+ * @param {Array<string>} [detents] - Detent values for the sheet
+ * @param {boolean} [swipe=true] - Enable swipe gestures
+ * @param {boolean} [swipeDismissal=true] - Allow swipe to dismiss
+ * @param {boolean} [swipeOvershoot=true] - Allow overshoot
+ * @param {boolean|Object} [swipeTrap] - Trap swipes within the view
+ * @param {boolean} [nativeFocusScrollPrevention=true] - Prevent scroll on focus
+ * @param {boolean} [pageScroll] - Enable page-level scroll behavior
+ * @param {boolean} [inertOutside=true] - Prevent interactions outside
+ * @param {Object} [onClickOutside] - Click outside behavior config
+ * @param {Object|Function} [onEscapeKeyDown] - Escape key behavior config
+ * @param {Object|Function} [onPresentAutoFocus] - Auto-focus on present config
+ * @param {Object|Function} [onDismissAutoFocus] - Auto-focus on dismiss config
+ * @param {string|Object} [enteringAnimationSettings] - Animation settings for opening
+ * @param {string|Object} [exitingAnimationSettings] - Animation settings for closing
+ * @param {string|Object} [steppingAnimationSettings] - Animation settings for stepping
+ * @param {number|string} [snapOutAcceleration] - Snap out acceleration
+ * @param {number|string} [snapToEndDetentsAcceleration] - Snap to end detents acceleration
+ * @param {boolean|string} [themeColorDimming] - Whether to dim theme color
+ * @param {number} [themeColorDimmingAlpha] - Alpha value for theme color dimming
+ * @param {Function} [onTravelStatusChange] - Callback when travel status changes
+ * @param {Function} [onTravelRangeChange] - Callback when travel range changes
+ * @param {Function} [onTravel] - Callback during travel with progress
+ * @param {Function} [onTravelStart] - Callback when travel starts
+ * @param {Function} [onTravelEnd] - Callback when travel ends
+ */
+export default class View extends Component {
+  /**
+   * Modifier that registers the view element with the Controller.
+   *
+   * @type {import("ember-modifier").FunctionBasedModifier<{ Element: HTMLElement; Args: { Positional: [Object] } }>}
+   */
+  registerView = modifierFn((element, [sheet]) => {
+    sheet.registerView(element);
+  });
+
+  /**
+   * Configure the Controller with behavioral options.
+   * Called via effect helper when sheet or any configuration args change.
+   *
+   * @param {Object} sheet - The sheet controller instance
+   * @action
+   */
+  @action
+  configureSheet(sheet) {
+    if (!sheet) {
+      return;
+    }
+
+    sheet.configure({
+      contentPlacement: this.args.contentPlacement,
+      tracks: this.args.tracks,
+      detents: this.args.detents,
+      swipe: this.args.swipe,
+      swipeDismissal: this.args.swipeDismissal,
+      swipeOvershoot: this.args.swipeOvershoot,
+      swipeTrap: this.args.swipeTrap,
+      nativeFocusScrollPrevention: this.args.nativeFocusScrollPrevention,
+      pageScroll: this.args.pageScroll,
+      inertOutside: this.args.inertOutside,
+      onClickOutside: this.args.onClickOutside,
+      onEscapeKeyDown: this.args.onEscapeKeyDown,
+      onPresentAutoFocus: this.args.onPresentAutoFocus,
+      onDismissAutoFocus: this.args.onDismissAutoFocus,
+      enteringAnimationSettings: this.args.enteringAnimationSettings,
+      exitingAnimationSettings: this.args.exitingAnimationSettings,
+      steppingAnimationSettings: this.args.steppingAnimationSettings,
+      snapOutAcceleration: this.args.snapOutAcceleration,
+      snapToEndDetentsAcceleration: this.args.snapToEndDetentsAcceleration,
+      themeColorDimming: this.args.themeColorDimming,
+      themeColorDimmingAlpha: this.args.themeColorDimmingAlpha,
+      onTravelStatusChange: this.args.onTravelStatusChange,
+      onTravelRangeChange: this.args.onTravelRangeChange,
+      onTravel: this.args.onTravel,
+      onTravelStart: this.args.onTravelStart,
+      onTravelEnd: this.args.onTravelEnd,
+    });
+  }
+
+  <template>
+    {{effect this.configureSheet @sheet}}
+
+    <div
+      data-d-sheet={{concatClass
+        "view"
+        @sheet.tracks
+        (if @sheet.state.openness.isClosed "closed")
+        (unless @sheet.inertOutside "no-pointer-events")
+        @sheet.effectiveSwipeTrapClass
+        (concat "staging-" @sheet.state.staging.current)
+        (if @sheet.isStackAnimating "animating")
+        "sheet-root"
+        (if
+          (or @sheet.state.stuck.isFront @sheet.state.stuck.isBack)
+          "overshoot-active"
+        )
+      }}
+      tabindex="-1"
+      role={{@sheet.role}}
+      aria-labelledby={{@sheet.titleId}}
+      aria-describedby={{@sheet.descriptionId}}
+      {{this.registerView @sheet}}
+      {{on "focus" @sheet.handleFocus capture=true}}
+      ...attributes
+    >
+      <div
+        data-d-sheet={{concatClass
+          "primary-scroll-trap"
+          "scroll-trap-root"
+          (if @sheet.isHorizontalTrack "scroll-horizontal" "scroll-vertical")
+          @sheet.tracks
+          (unless @sheet.inertOutside "no-pointer-events")
+          (if @sheet.scrollContainerShouldBePassThrough "pass-through")
+          (if
+            @sheet.isScrollTrapActive
+            "scroll-trap-active"
+            "scroll-trap-inactive"
+          )
+          "scroll-trap-optimised"
+          "scroll-trap-marker"
+          "scroll-trap-end"
+        }}
+        {{scrollTrapModifier @sheet.isScrollTrapActive}}
+      >
+        <div data-d-sheet="scroll-trap-stabilizer">
+          {{yield
+            (hash
+              Backdrop=(component Backdrop sheet=@sheet)
+              Content=(component
+                Content sheet=@sheet inertOutside=@sheet.inertOutside
+              )
+            )
+          }}
+        </div>
+      </div>
+      <div
+        data-d-sheet={{concatClass
+          "scroll-trap-root"
+          "secondary-scroll-trap"
+          "no-pointer-events"
+          "scroll-trap-active"
+          "scroll-both"
+          "scroll-trap-marker"
+          "scroll-trap-end"
+        }}
+        {{scrollTrapModifier true}}
+      ></div>
+    </div>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-stack.gjs b/frontend/discourse/float-kit/components/d-stack.gjs
new file mode 100644
index 0000000000000..baeebe3b3a199
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-stack.gjs
@@ -0,0 +1,216 @@
+import Component from "@glimmer/component";
+import { array, hash } from "@ember/helper";
+import { guidFor } from "@ember/object/internals";
+import TrackedMediaQuery from "discourse/lib/tracked-media-query";
+import DSheet from "./d-sheet";
+
+/**
+ * Returns a stacking animation configuration based on track direction.
+ * @param {"right" | "bottom"} tracks - The direction the stack tracks
+ * @returns {{ translateX?: Function, translateY?: Function, scale: [number, number], transformOrigin: string }}
+ */
+function stackingAnimationFor(tracks) {
+  return tracks === "right"
+    ? {
+        translateX: ({ progress }) =>
+          progress <= 1
+            ? progress * -10 + "px"
+            : `calc(-12.5px + 2.5px * ${progress})`,
+        scale: [1, 0.933],
+        transformOrigin: "0 50%",
+      }
+    : {
+        translateY: ({ progress }) =>
+          progress <= 1
+            ? progress * -10 + "px"
+            : `calc(-12.5px + 2.5px * ${progress})`,
+        scale: [1, 0.933],
+        transformOrigin: "50% 0",
+      };
+}
+
+/**
+ * Shared template for rendering stack content with portal, view, backdrop, and content layers.
+ * @component DStackSharedContent
+ * @param {Object} sheet - The sheet controller instance
+ * @param {"right" | "bottom"} tracks - The direction the stack tracks
+ * @param {string} stackRoot - The stack root ID for nested stack association
+ * @param {Object} stackingAnimation - Animation configuration for stacking behavior
+ */
+const DStackSharedContent = <template>
+  <DSheet.Portal @sheet={{@sheet}}>
+    <DSheet.View
+      class="d-stack__view"
+      @sheet={{@sheet}}
+      @tracks={{@tracks}}
+      @contentPlacement={{@tracks}}
+    >
+      <DSheet.Backdrop
+        class="d-stack__backdrop"
+        @sheet={{@sheet}}
+        @travelAnimation={{hash opacity=(array 0 0.2)}}
+      />
+      <DSheet.Content
+        class="d-stack__content"
+        @sheet={{@sheet}}
+        @stackingAnimation={{@stackingAnimation}}
+      >
+        <div class="d-stack__inner-content">
+          {{yield
+            (hash
+              sheet=@sheet
+              Trigger=(component DSheet.Trigger sheet=@sheet)
+              Stack=(component DStackNested stackRoot=@stackRoot tracks=@tracks)
+              dismiss=@sheet.close
+            )
+          }}
+        </div>
+      </DSheet.Content>
+    </DSheet.View>
+  </DSheet.Portal>
+</template>;
+
+/**
+ * Content wrapper that computes stacking animation from the track direction.
+ * @component DStackContent
+ * @param {Object} sheet - The sheet controller instance
+ * @param {string} stackRoot - The stack root ID for nested stack association
+ * @param {"right" | "bottom"} tracks - The direction the stack tracks
+ */
+class DStackContent extends Component {
+  /**
+   * Computes the stacking animation config based on the track direction.
+   * @returns {{ translateX?: Function, translateY?: Function, scale: [number, number], transformOrigin: string }}
+   */
+  get stackingAnimation() {
+    return stackingAnimationFor(this.args.tracks);
+  }
+
+  <template>
+    <DStackSharedContent
+      @sheet={{@sheet}}
+      @stackRoot={{@stackRoot}}
+      @tracks={{@tracks}}
+      @stackingAnimation={{this.stackingAnimation}}
+      as |api|
+    >
+      {{yield api}}
+    </DStackSharedContent>
+  </template>
+}
+
+/**
+ * Nested stack component that creates a new sheet root within an existing stack.
+ * @component DStackNested
+ * @param {string} stackRoot - The parent stack root ID
+ * @param {"right" | "bottom"} tracks - The direction the stack tracks
+ */
+class DStackNested extends Component {
+  /**
+   * Auto-generated unique ID for this nested stack component.
+   * @returns {string}
+   */
+  get componentId() {
+    return guidFor(this);
+  }
+
+  /**
+   * Computes the stacking animation config based on the track direction.
+   * @returns {{ translateX?: Function, translateY?: Function, scale: [number, number], transformOrigin: string }}
+   */
+  get stackingAnimation() {
+    return stackingAnimationFor(this.args.tracks);
+  }
+
+  <template>
+    <DSheet.Root @forComponent={{@stackRoot}} as |sheet|>
+      {{yield
+        (hash
+          Trigger=(component
+            DSheet.Trigger forComponent=this.componentId sheet=sheet
+          )
+          Content=(component
+            DStackSharedContent
+            sheet=sheet
+            stackRoot=@stackRoot
+            tracks=@tracks
+            stackingAnimation=this.stackingAnimation
+          )
+          present=sheet.open
+          dismiss=sheet.close
+        )
+      }}
+    </DSheet.Root>
+  </template>
+}
+
+/**
+ * Responsive stacking sheet component. Tracks right on large viewports, bottom on small.
+ * @component DStack
+ * @param {string} [componentId] - Optional explicit ID for the stack component
+ * @param {boolean} [defaultPresented] - Whether the stack is initially presented (uncontrolled mode)
+ * @param {boolean} [presented] - Controls the presented state (controlled mode)
+ * @param {Function} [onPresentedChange] - Callback when presented state changes (controlled mode)
+ * @param {Function} [onClosed] - Callback when the stack has fully closed
+ */
+export default class DStack extends Component {
+  /**
+   * Media query tracker for responsive direction switching.
+   * @type {TrackedMediaQuery}
+   */
+  largeViewport = new TrackedMediaQuery("(min-width: 700px)");
+
+  /**
+   * Tears down the media query listener.
+   */
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.largeViewport.teardown();
+  }
+
+  /**
+   * Determines the track direction based on viewport width.
+   * @returns {"right" | "bottom"}
+   */
+  get tracks() {
+    return this.largeViewport.matches ? "right" : "bottom";
+  }
+
+  /**
+   * Resolved component ID, from args or auto-generated.
+   * @returns {string}
+   */
+  get componentId() {
+    return this.args.componentId ?? guidFor(this);
+  }
+
+  <template>
+    <DSheet.Stack.Root as |stack|>
+      <DSheet.Root
+        @componentId={{this.componentId}}
+        @forComponent={{stack.stackId}}
+        @defaultPresented={{@defaultPresented}}
+        @presented={{@presented}}
+        @onPresentedChange={{@onPresentedChange}}
+        @onClosed={{@onClosed}}
+        as |sheet|
+      >
+        {{yield
+          (hash
+            Trigger=(component
+              DSheet.Trigger forComponent=this.componentId sheet=sheet
+            )
+            Content=(component
+              DStackContent
+              sheet=sheet
+              stackRoot=stack.stackId
+              tracks=this.tracks
+            )
+            present=sheet.open
+            dismiss=sheet.close
+          )
+        }}
+      </DSheet.Root>
+    </DSheet.Stack.Root>
+  </template>
+}
diff --git a/frontend/discourse/float-kit/components/d-toast.gjs b/frontend/discourse/float-kit/components/d-toast.gjs
index 7f4509b392f0f..3ea34c2501117 100644
--- a/frontend/discourse/float-kit/components/d-toast.gjs
+++ b/frontend/discourse/float-kit/components/d-toast.gjs
@@ -1,104 +1,338 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
+import { concat, hash } from "@ember/helper";
+import { on } from "@ember/modifier";
 import { action } from "@ember/object";
-import autoCloseToast from "discourse/float-kit/modifiers/auto-close-toast";
+import { service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import { modifier } from "ember-modifier";
 import concatClass from "discourse/helpers/concat-class";
-import deprecated from "discourse/lib/deprecated";
-import { getMaxAnimationTimeMs } from "discourse/lib/swipe-events";
-import swipe from "discourse/modifiers/swipe";
-import { and } from "discourse/truth-helpers";
-
-const VELOCITY_THRESHOLD = -1.2;
+import { or } from "discourse/truth-helpers";
+import DSheet from "./d-sheet";
 
+/**
+ * A wrapper component for an individual toast.
+ * Handles auto-close logic, progress bar animation, and stacking styles.
+ *
+ * @component d-toast
+ * @param {DToastInstance} toast - The toast instance to render
+ * @param {TrackedArray<DToastInstance>} toasts - The list of all active toasts
+ * @param {Function} [onTravelStatusChange] - Callback when travel status changes
+ */
 export default class DToast extends Component {
-  @tracked progressBar;
+  @service capabilities;
+  @service toasts;
+
+  @tracked pointerOver = false;
+  @tracked travelStatus = "idleOutside";
+  @tracked presented = true;
+
+  /**
+   * Modifier that measures the height of each toast and reports it to the service.
+   * This allows the service to know the height of the front toast at all times.
+   */
+  measureHeight = modifier((element) => {
+    if (!this.isFront) {
+      return;
+    }
+
+    const observer = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        this.toasts.heights.set(this.args.toast.id, entry.target.offsetHeight);
+      }
+    });
+
+    observer.observe(element);
+
+    this.toasts.heights.set(this.args.toast.id, element.offsetHeight);
+
+    return () => {
+      observer.disconnect();
+      this.toasts.heights.delete(this.args.toast.id);
+    };
+  });
+
+  /**
+   * The placement of the toast content.
+   *
+   * @returns {string}
+   */
+  get contentPlacement() {
+    return "top";
+  }
+
+  /**
+   * The track placement for DSheet.
+   *
+   * @returns {string}
+   */
+  get tracks() {
+    return this.capabilities.isAndroid ? "right" : "top";
+  }
+
+  /**
+   * Active (non-dismissed) toasts from the list.
+   *
+   * @returns {Array}
+   */
+  get activeToasts() {
+    const toasts = this.args.toasts ?? [];
+    return toasts.filter((t) => !t.dismissed);
+  }
+
+  /**
+   * Whether this toast is the front-most toast in the stack.
+   *
+   * @returns {boolean}
+   */
+  get isFront() {
+    if (this.args.toast.dismissed) {
+      return false;
+    }
+
+    const active = this.activeToasts;
+    return active.length === 0 || this.args.toast === active[active.length - 1];
+  }
+
+  /**
+   * CSS variables for the toast container.
+   *
+   * @returns {SafeString}
+   */
+  get toastStyles() {
+    const order = this.args.toast.stackOrder;
+    const styles = [
+      `--index: ${order}`,
+      `--toasts-before: ${order}`,
+      `--z-index: ${order}`,
+    ];
+
+    return htmlSafe(styles.join("; "));
+  }
+
+  /**
+   * CSS variables for the inner content, specifically for stacking offset.
+   *
+   * @returns {SafeString}
+   */
+  get innerStyles() {
+    const active = this.activeToasts;
+    const indexInActive = active.indexOf(this.args.toast);
+
+    const distanceFromFront =
+      indexInActive === -1 ? 0 : active.length - 1 - indexInActive;
+
+    return htmlSafe(`--distance-from-front: ${distanceFromFront}`);
+  }
+
+  /**
+   * CSS variables for clamping background toasts to the height of the front toast.
+   *
+   * @returns {SafeString}
+   */
+  get clampingStyles() {
+    if (!this.isFront && this.toasts.frontToastHeight > 0) {
+      return htmlSafe(
+        `max-height: ${this.toasts.frontToastHeight}px; overflow: hidden;`
+      );
+    }
+    return htmlSafe("");
+  }
 
+  /**
+   * Custom animation settings for the entering transition.
+   *
+   * @returns {Object|null}
+   */
+  get enteringAnimationSettings() {
+    if (!this.isFront) {
+      return {
+        contentMove: false,
+        duration: 400,
+      };
+    }
+    return null;
+  }
+
+  /**
+   * Escape key behavior handler - only dismiss if this is the front toast.
+   * If not front, propagate to the next layer so the actual front toast handles it.
+   * Using a function so it dynamically checks isFront at the time of keypress.
+   *
+   * @param {Object} event - The escape key event with changeDefault method
+   */
   @action
-  registerProgressBar(element) {
-    this.progressBar = element;
+  handleEscapeKey(event) {
+    event.changeDefault({
+      dismiss: this.isFront,
+      stopOverlayPropagation: this.isFront,
+    });
+  }
+
+  /**
+   * The container for all toasts.
+   *
+   * @returns {HTMLElement|null}
+   */
+  get toastsContainers() {
+    return document.querySelector(".fk-d-toasts");
+  }
+
+  /**
+   * Whether the auto-close timer should be paused.
+   *
+   * @returns {boolean}
+   */
+  get isPaused() {
+    return (
+      !this.isFront ||
+      this.pointerOver ||
+      this.travelStatus !== "idleInside" ||
+      !this.presented
+    );
+  }
+
+  /**
+   * The style for the progress bar, managing the animation state reactively.
+   *
+   * @returns {SafeString}
+   */
+  get progressBarStyle() {
+    const styles = [
+      `animation-duration: ${this.args.toast.duration}ms`,
+      `animation-play-state: ${this.isPaused ? "paused" : "running"}`,
+    ];
+
+    return htmlSafe(styles.join("; "));
   }
 
   @action
-  async didSwipe(state) {
-    if (state.deltaY >= 0) {
-      this.#animateWrapperPosition(state.element, 0);
-      return;
+  handleProgressComplete(event) {
+    if (
+      event.animationName === "d-toast-progress" &&
+      this.args.toast.options.autoClose
+    ) {
+      this.presented = false;
     }
+  }
 
-    if (state.velocityY < VELOCITY_THRESHOLD) {
-      await this.#close(state.element);
-    } else {
-      await this.#animateWrapperPosition(state.element, state.deltaY);
+  @action
+  handleTravelStatusChange(status) {
+    this.travelStatus = status;
+
+    if (status === "idleOutside") {
+      this.pointerOver = false;
     }
+
+    this.args.onTravelStatusChange?.(status);
   }
 
   @action
-  async didEndSwipe(state) {
-    if (state.velocityY < VELOCITY_THRESHOLD) {
-      await this.#close(state.element);
-    } else {
-      await this.#animateWrapperPosition(state.element, 0);
+  handlePointerDown(event) {
+    if (event.pointerType === "touch") {
+      this.pointerOver = true;
     }
   }
 
-  async #close(element) {
-    await this.#closeWrapperAnimation(element);
-    this.args.toast.close();
+  @action
+  handlePointerUp(event) {
+    if (event.pointerType === "touch") {
+      this.pointerOver = false;
+    }
   }
 
-  async #closeWrapperAnimation(element) {
-    await element.animate([{ transform: "translateY(-150px)" }], {
-      fill: "forwards",
-      duration: getMaxAnimationTimeMs(),
-    }).finished;
+  @action
+  handlePointerEnter(event) {
+    if (event.pointerType === "mouse") {
+      this.pointerOver = true;
+    }
   }
 
-  async #animateWrapperPosition(element, position) {
-    await element.animate([{ transform: `translateY(${position}px)` }], {
-      fill: "forwards",
-    }).finished;
+  @action
+  handlePointerLeave(event) {
+    if (event.pointerType === "mouse") {
+      this.pointerOver = false;
+    }
   }
 
-  get duration() {
-    const duration = this.args.toast.options.duration;
-
-    if (duration === "long") {
-      return 5000;
-    } else if (duration === "short") {
-      return 3000;
-    } else {
-      deprecated(
-        "Using an integer for the duration property of the d-toast component is deprecated. Use `short` or `long` instead.",
-        { id: "float-kit.d-toast.duration" }
-      );
+  @action
+  handlePresentedChange(presented) {
+    this.presented = presented;
 
-      return duration;
+    if (!presented) {
+      this.args.toast.dismissed = true;
     }
   }
 
+  @action
+  handleClosed() {
+    this.args.toast.close();
+  }
+
   <template>
-    <output
-      role={{if @toast.options.autoClose "status" "log"}}
-      key={{@toast.id}}
-      class={{concatClass "fk-d-toast" @toast.options.class}}
-      {{autoCloseToast
-        close=@toast.close
-        duration=this.duration
-        progressBar=this.progressBar
-        enabled=@toast.options.autoClose
-      }}
-      {{swipe onDidSwipe=this.didSwipe onDidEndSwipe=this.didEndSwipe}}
-      data-test-duration={{this.duration}}
+    <DSheet.Root
+      @presented={{this.presented}}
+      @onPresentedChange={{this.handlePresentedChange}}
+      @onClosed={{this.handleClosed}}
+      @inertOutside={{false}}
+      @role=""
+      as |sheet|
     >
-      <@toast.options.component
-        @data={{@toast.options.data}}
-        @close={{@toast.close}}
-        @showProgressBar={{and
-          @toast.options.showProgressBar
-          @toast.options.autoClose
-        }}
-        @onRegisterProgressBar={{this.registerProgressBar}}
-      />
-    </output>
+      <DSheet.Portal @sheet={{sheet}} @container={{this.toastsContainers}}>
+        <DSheet.View
+          @sheet={{sheet}}
+          @contentPlacement={{this.contentPlacement}}
+          @tracks={{this.tracks}}
+          @inertOutside={{false}}
+          @onClickOutside={{hash dismiss=false stopOverlayPropagation=false}}
+          @onEscapeKeyDown={{this.handleEscapeKey}}
+          @onTravelStatusChange={{this.handleTravelStatusChange}}
+          @enteringAnimationSettings={{this.enteringAnimationSettings}}
+          class={{concatClass
+            "d-toast"
+            (concat "d-toast--" this.contentPlacement)
+            (if
+              @toast.options.data?.theme
+              (concat "d-toast--" @toast.options.data.theme)
+            )
+            @toast.options.class
+          }}
+          style={{this.toastStyles}}
+        >
+          <DSheet.Content @sheet={{sheet}} @asChild={{true}} as |contentAttrs|>
+            <DSheet.SpecialWrapper.Root
+              @sheet={{sheet}}
+              @contentAttrs={{contentAttrs}}
+              class="d-toast__content"
+            >
+              <DSheet.SpecialWrapper.Content
+                class="d-toast__inner-content"
+                data-index={{@toast.stackOrder}}
+                data-front={{if this.isFront "true" "false"}}
+                data-presented={{if this.presented "true" "false"}}
+                data-pointer-over={{if this.pointerOver "true" "false"}}
+                data-theme={{or @toast.options.data?.theme "default"}}
+                style={{this.innerStyles}}
+                {{on "pointerenter" this.handlePointerEnter}}
+                {{on "pointerleave" this.handlePointerLeave}}
+                {{on "pointerdown" this.handlePointerDown}}
+                {{on "pointerup" this.handlePointerUp}}
+                {{on "pointercancel" this.handlePointerUp}}
+              >
+                <@toast.options.component
+                  @toast={{@toast}}
+                  @close={{sheet.close}}
+                  @isFront={{this.isFront}}
+                  @progressBarStyle={{this.progressBarStyle}}
+                  @onProgressComplete={{this.handleProgressComplete}}
+                  {{this.measureHeight}}
+                  style={{this.clampingStyles}}
+                />
+              </DSheet.SpecialWrapper.Content>
+            </DSheet.SpecialWrapper.Root>
+          </DSheet.Content>
+        </DSheet.View>
+      </DSheet.Portal>
+    </DSheet.Root>
   </template>
 }
diff --git a/frontend/discourse/float-kit/components/d-toasts.gjs b/frontend/discourse/float-kit/components/d-toasts.gjs
index 29149199a4fba..1f5f731f7f817 100644
--- a/frontend/discourse/float-kit/components/d-toasts.gjs
+++ b/frontend/discourse/float-kit/components/d-toasts.gjs
@@ -2,13 +2,30 @@ import Component from "@glimmer/component";
 import { service } from "@ember/service";
 import DToast from "discourse/float-kit/components/d-toast";
 
+const MAX_VISIBLE_TOASTS = 3;
+
+/**
+ * The container component for all toasts.
+ * Renders the last N active toasts.
+ *
+ * @component d-toasts
+ */
 export default class DToasts extends Component {
   @service toasts;
 
+  /**
+   * Returns the subset of toasts that should be visible in the UI.
+   *
+   * @returns {Array<DToastInstance>}
+   */
+  get visibleToasts() {
+    return this.toasts.activeToasts.slice(-MAX_VISIBLE_TOASTS);
+  }
+
   <template>
-    <section class="fk-d-toasts">
-      {{#each this.toasts.activeToasts as |toast|}}
-        <DToast @toast={{toast}} />
+    <section class="fk-d-toasts" role="status" aria-live="polite" aria-label="Notifications">
+      {{#each this.visibleToasts key="id" as |toast|}}
+        <DToast @toasts={{this.toasts.activeToasts}} @toast={{toast}} />
       {{/each}}
     </section>
   </template>
diff --git a/frontend/discourse/float-kit/helpers/effect.js b/frontend/discourse/float-kit/helpers/effect.js
new file mode 100644
index 0000000000000..8b3b67621266a
--- /dev/null
+++ b/frontend/discourse/float-kit/helpers/effect.js
@@ -0,0 +1,49 @@
+import Helper from "@ember/component/helper";
+import { registerDestructor } from "@ember/destroyable";
+
+/**
+ * A helper for reactive side effects. Unlike regular helpers which compute values,
+ * this helper is explicitly for side effects that should run when dependencies change.
+ *
+ * The callback receives all positional arguments after the callback itself.
+ * To register a cleanup function, return it from the callback.
+ *
+ * @example
+ * // In component:
+ * @action
+ * handlePresentedChange(presented, defaultPresented) {
+ *   // side effect logic here
+ *
+ *   return () => { ... }; // optional cleanup
+ * }
+ *
+ * // In template:
+ * {{effect this.handlePresentedChange @presented @defaultPresented}}
+ */
+export default class EffectHelper extends Helper {
+  cleanupFn = null;
+
+  constructor() {
+    super(...arguments);
+    registerDestructor(this, () => this.cleanup());
+  }
+
+  compute([callback, ...dependencies]) {
+    this.cleanup();
+
+    if (typeof callback !== "function") {
+      return;
+    }
+
+    const result = callback(...dependencies);
+
+    if (typeof result === "function") {
+      this.cleanupFn = result;
+    }
+  }
+
+  cleanup() {
+    this.cleanupFn?.();
+    this.cleanupFn = null;
+  }
+}
diff --git a/frontend/discourse/float-kit/lib/action-utils.js b/frontend/discourse/float-kit/lib/action-utils.js
new file mode 100644
index 0000000000000..6e8773af3513a
--- /dev/null
+++ b/frontend/discourse/float-kit/lib/action-utils.js
@@ -0,0 +1,30 @@
+/**
+ * Parse an action prop value to extract the action type.
+ * Action can be a string ("present", "dismiss", "step") or an object { type, direction?, detent? }.
+ *
+ * @param {string|Object} action - The action prop value
+ * @returns {string} The action type
+ */
+export function getActionType(action) {
+  return typeof action === "object" ? action.type : action;
+}
+
+/**
+ * Parse an action prop value to extract the step direction.
+ *
+ * @param {string|Object} action - The action prop value
+ * @returns {string} The step direction ("up" or "down")
+ */
+export function getStepDirection(action) {
+  return typeof action === "object" ? (action.direction ?? "up") : "up";
+}
+
+/**
+ * Parse an action prop value to extract the target detent index.
+ *
+ * @param {string|Object} action - The action prop value
+ * @returns {number|undefined} The detent index if specified
+ */
+export function getStepDetent(action) {
+  return typeof action === "object" ? action.detent : undefined;
+}
diff --git a/frontend/discourse/float-kit/lib/behavior-handler.js b/frontend/discourse/float-kit/lib/behavior-handler.js
new file mode 100644
index 0000000000000..ee4d76b0e4793
--- /dev/null
+++ b/frontend/discourse/float-kit/lib/behavior-handler.js
@@ -0,0 +1,52 @@
+/**
+ * Process an event handler behavior configuration.
+ *
+ * This pattern is used by trigger components to handle onPress events
+ * with customizable default behaviors. Supports both function handlers
+ * that can call changeDefault() and object configurations that merge
+ * with defaults.
+ *
+ * @param {Object} options
+ * @param {Event|null} options.nativeEvent - The native event that triggered the handler
+ * @param {Object} options.defaultBehavior - Default behavior configuration
+ * @param {Function|Object} [options.handler] - Handler function or configuration object
+ * @returns {Object} The resolved behavior configuration
+ *
+ * @example
+ * // With function handler
+ * const behavior = processBehavior({
+ *   nativeEvent: event,
+ *   defaultBehavior: { forceFocus: true, runAction: true },
+ *   handler: (e) => e.changeDefault({ forceFocus: false })
+ * });
+ *
+ * @example
+ * // With object configuration
+ * const behavior = processBehavior({
+ *   nativeEvent: event,
+ *   defaultBehavior: { forceFocus: true, runAction: true },
+ *   handler: { forceFocus: false }
+ * });
+ */
+export function processBehavior({ nativeEvent, defaultBehavior, handler }) {
+  let result = { ...defaultBehavior };
+
+  if (handler) {
+    if (typeof handler === "function") {
+      const customEvent = {
+        ...result,
+        nativeEvent,
+        changeDefault(changes) {
+          result = { ...result, ...changes };
+          Object.assign(this, changes);
+        },
+      };
+      handler(customEvent);
+    } else {
+      result = { ...defaultBehavior, ...handler };
+    }
+  }
+
+  return result;
+}
+
diff --git a/frontend/discourse/float-kit/lib/d-toast-instance.js b/frontend/discourse/float-kit/lib/d-toast-instance.js
index 138c5b093e868..490549b7ba7ba 100644
--- a/frontend/discourse/float-kit/lib/d-toast-instance.js
+++ b/frontend/discourse/float-kit/lib/d-toast-instance.js
@@ -1,13 +1,21 @@
 import { action } from "@ember/object";
 import { setOwner } from "@ember/owner";
+import { tracked } from "@glimmer/tracking";
 import { service } from "@ember/service";
 import { TOAST } from "discourse/float-kit/lib/constants";
+import deprecated from "discourse/lib/deprecated";
 import uniqueId from "discourse/helpers/unique-id";
 
+/**
+ * Represents an individual toast instance with its state and configuration.
+ */
 export default class DToastInstance {
   @service site;
   @service toasts;
 
+  @tracked dismissed = false;
+  @tracked stackOrder = 0;
+
   options = null;
   id = uniqueId();
 
@@ -16,11 +24,43 @@ export default class DToastInstance {
     this.options = { ...TOAST.options, ...options };
   }
 
+  /**
+   * The normalized duration in milliseconds.
+   * Supports 'short', 'long', or a custom integer value (deprecated).
+   *
+   * @returns {number}
+   */
+  get duration() {
+    const { duration } = this.options;
+
+    if (duration === "long") {
+      return 5000;
+    } else if (duration === "short") {
+      return 3000;
+    } else if (Number.isInteger(duration)) {
+      deprecated(
+        "Using an integer for the duration property of the d-toast component is deprecated. Use `short` or `long` instead.",
+        { id: "float-kit.d-toast.duration" }
+      );
+      return duration;
+    }
+
+    return 3000;
+  }
+
+  /**
+   * Closes the toast by removing it from the active toasts list.
+   */
   @action
   close() {
     this.toasts.close(this);
   }
 
+  /**
+   * Whether the toast should be displayed on the current view (desktop/mobile).
+   *
+   * @returns {boolean}
+   */
   get isValidForView() {
     return this.options.views.includes(
       this.site.desktopView ? "desktop" : "mobile"
diff --git a/frontend/discourse/float-kit/lib/utils.js b/frontend/discourse/float-kit/lib/utils.js
new file mode 100644
index 0000000000000..bf23ade6ffc5f
--- /dev/null
+++ b/frontend/discourse/float-kit/lib/utils.js
@@ -0,0 +1,10 @@
+/**
+ * Check if element is a clone (used during focus scroll prevention).
+ *
+ * @param {Element} element
+ * @returns {boolean}
+ */
+export function isCloneElement(element) {
+  return element?.getAttribute("data-d-scroll-clone") === "true";
+}
+
diff --git a/frontend/discourse/float-kit/modifiers/auto-close-toast.js b/frontend/discourse/float-kit/modifiers/auto-close-toast.js
deleted file mode 100644
index cf02699f2fea6..0000000000000
--- a/frontend/discourse/float-kit/modifiers/auto-close-toast.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import { registerDestructor } from "@ember/destroyable";
-import { cancel } from "@ember/runloop";
-import Modifier from "ember-modifier";
-import { bind } from "discourse/lib/decorators";
-import discourseLater from "discourse/lib/later";
-
-const CSS_TRANSITION_DELAY_MS = 300;
-const TRANSITION_CLASS = "-fade-out";
-
-export default class AutoCloseToast extends Modifier {
-  element;
-  close;
-  duration;
-  transitionLaterHandler;
-  closeLaterHandler;
-  progressBar;
-  progressAnimation;
-  enabled;
-
-  constructor(owner, args) {
-    super(owner, args);
-    registerDestructor(this, (instance) => instance.cleanup());
-  }
-
-  modify(element, _, { close, duration, progressBar, enabled }) {
-    if (enabled === false) {
-      this.enabled = false;
-      return;
-    }
-
-    this.element = element;
-    this.close = close;
-    this.duration = duration;
-    this.timeRemaining = duration;
-    this.progressBar = progressBar;
-    this.element.addEventListener("touchstart", this.stopTimer, {
-      passive: true,
-      once: true,
-    });
-    this.element.addEventListener("mouseenter", this.stopTimer, {
-      passive: true,
-    });
-    this.element.addEventListener("mouseleave", this.startTimer, {
-      passive: true,
-    });
-    this.startTimer();
-  }
-
-  @bind
-  startTimer() {
-    this.startProgressAnimation();
-
-    this.transitionLaterHandler = discourseLater(() => {
-      this.element.classList.add(TRANSITION_CLASS);
-
-      this.closeLaterHandler = discourseLater(() => {
-        this.close();
-      }, CSS_TRANSITION_DELAY_MS);
-    }, this.timeRemaining);
-  }
-
-  @bind
-  stopTimer() {
-    this.pauseProgressAnimation();
-    cancel(this.transitionLaterHandler);
-    cancel(this.closeLaterHandler);
-  }
-
-  @bind
-  startProgressAnimation() {
-    if (!this.progressBar) {
-      return;
-    }
-
-    if (this.progressAnimation) {
-      this.progressAnimation.play();
-      this.progressBar.style.opacity = 1;
-      return;
-    }
-
-    this.progressAnimation = this.progressBar.animate(
-      { transform: `scaleX(0)` },
-      { duration: this.duration, fill: "forwards" }
-    );
-  }
-
-  @bind
-  pauseProgressAnimation() {
-    if (
-      !this.progressAnimation ||
-      this.progressAnimation.currentTime === this.duration
-    ) {
-      return;
-    }
-
-    this.progressAnimation.pause();
-    this.progressBar.style.opacity = 0.5;
-    this.timeRemaining = this.duration - this.progressAnimation.currentTime;
-  }
-
-  cleanup() {
-    if (!this.enabled) {
-      return;
-    }
-
-    this.stopTimer();
-    this.element.removeEventListener("mouseenter", this.stopTimer);
-    this.element.removeEventListener("mouseleave", this.startTimer);
-    this.progressBar = null;
-  }
-}
diff --git a/frontend/discourse/float-kit/services/sheet-registry.js b/frontend/discourse/float-kit/services/sheet-registry.js
new file mode 100644
index 0000000000000..b1f6a5db77203
--- /dev/null
+++ b/frontend/discourse/float-kit/services/sheet-registry.js
@@ -0,0 +1,680 @@
+import { cancel, schedule } from "@ember/runloop";
+import Service from "@ember/service";
+
+const inertRefCounts = new WeakMap();
+
+/**
+ * Service for managing sheet instances, click-outside handling,
+ * scroll lock, and centralized inert management.
+ */
+export default class SheetRegistry extends Service {
+  /** @type {Map<string, Object>} */
+  sheets = new Map();
+
+  /** @type {Object[]} */
+  sheetsInOrder = [];
+
+  /** @type {Function|null} */
+  clickOutsideCleanup = null;
+
+  /** @type {Function|null} */
+  escapeKeyCleanup = null;
+
+  /** @type {EventTarget|null} */
+  pointerDownTarget = null;
+
+  /** @type {number} */
+  scrollLockCount = 0;
+
+  /** @type {[number, number]} */
+  savedScrollPosition = [0, 0];
+
+  /** @type {Function|null} */
+  scrollLockCleanup = null;
+
+  /** @type {boolean} */
+  isResizing = false;
+
+  /** @type {number|null} */
+  resizeTimeout = null;
+
+  /** @type {Set<string>} */
+  controllersWithScrollLock = new Set();
+
+  /** @type {Function|null} */
+  inertCleanup = null;
+
+  /** @type {Set<Element>} */
+  inertElements = new Set();
+
+  /** @type {Set<Element>} */
+  rootElements = new Set();
+
+  /** @type {MutationObserver|null} */
+  mutationObserver = null;
+
+  /** @type {Object|null} */
+  recalculateInertTimeout = null;
+
+  /** @type {Map<string, Object>} Root components registered by componentId */
+  #rootsByComponentId = new Map();
+
+  /**
+   * Cleans up all listeners and state when the service is destroyed.
+   */
+  willDestroy() {
+    super.willDestroy();
+
+    cancel(this.recalculateInertTimeout);
+    this.cleanupClickOutsideListener();
+    this.cleanupEscapeKeyListener();
+    this.cleanupInert();
+    if (this.scrollLockCleanup) {
+      this.scrollLockCleanup();
+      this.scrollLockCleanup = null;
+    }
+    this.scrollLockCount = 0;
+  }
+
+  /**
+   * Registers a sheet controller with the registry.
+   *
+   * @param {Object} controller
+   */
+  register(controller) {
+    this.sheets.set(controller.id, controller);
+    this.sheetsInOrder.push(controller);
+
+    if (this.sheetsInOrder.length === 1) {
+      this.setupClickOutsideListener();
+      this.setupEscapeKeyListener();
+    }
+
+    if (controller.inertOutside) {
+      this.applyScrollLock();
+      this.controllersWithScrollLock.add(controller.id);
+    }
+
+    this.recalculateInertOutside();
+  }
+
+  /**
+   * Unregisters a sheet controller from the registry.
+   *
+   * @param {Object} controller
+   */
+  unregister(controller) {
+    if (this.controllersWithScrollLock.has(controller.id)) {
+      this.removeScrollLock();
+      this.controllersWithScrollLock.delete(controller.id);
+    }
+
+    this.sheets.delete(controller.id);
+    const index = this.sheetsInOrder.indexOf(controller);
+    if (index !== -1) {
+      this.sheetsInOrder.splice(index, 1);
+    }
+
+    if (this.sheetsInOrder.length === 0) {
+      this.cleanupClickOutsideListener();
+      this.cleanupEscapeKeyListener();
+    }
+
+    this.recalculateInertOutside();
+  }
+
+  /**
+   * Updates scroll lock for a controller.
+   *
+   * @param {Object} controller
+   * @param {boolean} shouldLock
+   */
+  updateScrollLock(controller, shouldLock) {
+    const hasLock = this.controllersWithScrollLock.has(controller.id);
+
+    if (shouldLock && !hasLock) {
+      this.applyScrollLock();
+      this.controllersWithScrollLock.add(controller.id);
+    } else if (!shouldLock && hasLock) {
+      this.removeScrollLock();
+      this.controllersWithScrollLock.delete(controller.id);
+    }
+  }
+
+  /**
+   * Notifies registry that a sheet's inertOutside state changed.
+   *
+   * @param {Object} controller
+   * @param {boolean} inertOutside
+   */
+  updateInertOutside(controller, inertOutside) {
+    this.updateScrollLock(controller, inertOutside);
+
+    if (controller.view) {
+      if (inertOutside) {
+        controller.view.setAttribute("aria-modal", "true");
+      } else {
+        controller.view.removeAttribute("aria-modal");
+      }
+    }
+
+    this.recalculateInertOutside();
+  }
+
+  /**
+   * Recalculates which elements should be inert.
+   * Collects all sheet views from topmost down to first inertOutside sheet.
+   */
+  recalculateInertOutside() {
+    cancel(this.recalculateInertTimeout);
+
+    this.recalculateInertTimeout = schedule("afterRender", () => {
+      this.cleanupInert();
+
+      const hasInertOutside = this.sheetsInOrder.some(
+        (sheet) => sheet.inertOutside
+      );
+
+      if (!hasInertOutside || this.sheetsInOrder.length === 0) {
+        return;
+      }
+
+      const rootElements = new Set();
+
+      for (let i = this.sheetsInOrder.length - 1; i >= 0; i--) {
+        const sheet = this.sheetsInOrder[i];
+
+        if (sheet.view) {
+          rootElements.add(sheet.view);
+        }
+
+        if (sheet.inertOutside) {
+          break;
+        }
+      }
+
+      document.querySelectorAll("[aria-live]").forEach((el) => {
+        rootElements.add(el);
+      });
+
+      this.rootElements = rootElements;
+      this.moveFocusIfNecessary(rootElements);
+      this.applyInert(rootElements);
+    });
+  }
+
+  /**
+   * Moves focus to topmost sheet if currently outside protected elements.
+   *
+   * @param {Set<Element>} rootElements
+   */
+  moveFocusIfNecessary(rootElements) {
+    const activeElement = document.activeElement;
+    if (!activeElement || activeElement === document.body) {
+      return;
+    }
+
+    const focusInRoot = [...rootElements].some((root) =>
+      root.contains(activeElement)
+    );
+
+    if (!focusInRoot) {
+      const topmostSheet = this.sheetsInOrder[this.sheetsInOrder.length - 1];
+      if (topmostSheet?.view) {
+        topmostSheet.view.focus({ preventScroll: true });
+      }
+    }
+  }
+
+  /**
+   * Applies inert attribute to elements outside the root elements.
+   *
+   * @param {Set<Element>} rootElements
+   */
+  applyInert(rootElements) {
+    const inertElements = new Set();
+
+    const treeWalker = document.createTreeWalker(
+      document,
+      NodeFilter.SHOW_ELEMENT,
+      {
+        acceptNode: (node) => {
+          if (
+            node instanceof HTMLElement &&
+            node.dataset.liveAnnouncer === "true"
+          ) {
+            rootElements.add(node);
+          }
+
+          if (
+            node.tagName === "HEAD" ||
+            node.tagName === "SCRIPT" ||
+            rootElements.has(node) ||
+            (node.parentElement && inertElements.has(node.parentElement))
+          ) {
+            return NodeFilter.FILTER_REJECT;
+          }
+
+          if (
+            (node instanceof HTMLElement &&
+              node.getAttribute("role") === "row") ||
+            [...rootElements].some((root) => node.contains(root))
+          ) {
+            return NodeFilter.FILTER_SKIP;
+          }
+
+          return NodeFilter.FILTER_ACCEPT;
+        },
+      }
+    );
+
+    let node = treeWalker.nextNode();
+    while (node) {
+      this.makeElementInert(node, inertElements);
+      node = treeWalker.nextNode();
+    }
+
+    this.inertElements = inertElements;
+    this.setupMutationObserver(rootElements);
+  }
+
+  /**
+   * Makes an element inert using reference counting.
+   *
+   * @param {Element} element
+   * @param {Set<Element>} inertElements
+   */
+  makeElementInert(element, inertElements) {
+    const count = inertRefCounts.get(element) ?? 0;
+
+    if (!element.hasAttribute("inert") || count > 0) {
+      if (count === 0) {
+        element.inert = true;
+      }
+      inertElements.add(element);
+      inertRefCounts.set(element, count + 1);
+    }
+  }
+
+  /**
+   * Sets up MutationObserver to apply inert to dynamically added content.
+   *
+   * @param {Set<Element>} rootElements
+   */
+  setupMutationObserver(rootElements) {
+    this.mutationObserver = new MutationObserver((mutations) => {
+      for (const mutation of mutations) {
+        if (mutation.type !== "childList" || mutation.addedNodes.length === 0) {
+          continue;
+        }
+
+        const allProtected = [...rootElements, ...this.inertElements];
+        if (allProtected.some((el) => el.contains(mutation.target))) {
+          continue;
+        }
+
+        for (const addedNode of mutation.addedNodes) {
+          if (!(addedNode instanceof HTMLElement)) {
+            continue;
+          }
+
+          if (addedNode.dataset.liveAnnouncer === "true") {
+            rootElements.add(addedNode);
+          } else {
+            this.makeElementInert(addedNode, this.inertElements);
+          }
+        }
+      }
+    });
+
+    this.mutationObserver.observe(document, {
+      childList: true,
+      subtree: true,
+    });
+  }
+
+  /**
+   * Cleans up inert state - removes inert from elements.
+   */
+  cleanupInert() {
+    if (this.mutationObserver) {
+      this.mutationObserver.disconnect();
+      this.mutationObserver = null;
+    }
+
+    for (const element of this.inertElements) {
+      const count = inertRefCounts.get(element);
+      if (count === 1) {
+        element.inert = false;
+        inertRefCounts.delete(element);
+      } else if (count !== undefined) {
+        inertRefCounts.set(element, count - 1);
+      }
+    }
+
+    this.inertElements = new Set();
+    this.rootElements = new Set();
+  }
+
+  /**
+   * @param {string} id
+   * @returns {Object|undefined}
+   */
+  find(id) {
+    return this.sheets.get(id);
+  }
+
+  /**
+   * Registers a Root component by its componentId.
+   *
+   * @param {string} componentId
+   * @param {Object} rootComponent
+   */
+  registerRoot(componentId, rootComponent) {
+    this.#rootsByComponentId.set(componentId, rootComponent);
+  }
+
+  /**
+   * Unregisters a Root component by its componentId.
+   *
+   * @param {string} componentId
+   */
+  unregisterRoot(componentId) {
+    this.#rootsByComponentId.delete(componentId);
+  }
+
+  /**
+   * Gets a Root component by its componentId.
+   *
+   * @param {string} componentId
+   * @returns {Object|undefined}
+   */
+  getRootByComponentId(componentId) {
+    return this.#rootsByComponentId.get(componentId);
+  }
+
+  /**
+   * Gets the topmost sheet (last in order).
+   *
+   * @returns {Object|null}
+   */
+  getTopmostSheet() {
+    if (this.sheetsInOrder.length === 0) {
+      return null;
+    }
+    return this.sheetsInOrder[this.sheetsInOrder.length - 1];
+  }
+
+  /**
+   * Applies scroll lock with reference counting.
+   */
+  applyScrollLock() {
+    if (this.scrollLockCount === 0) {
+      this.savedScrollPosition = [window.scrollX, window.scrollY];
+      document.documentElement.style.setProperty("overflow", "hidden");
+
+      const handleResize = () => {
+        clearTimeout(this.resizeTimeout);
+        this.isResizing = true;
+        this.resizeTimeout = setTimeout(() => {
+          this.isResizing = false;
+        }, 50);
+      };
+
+      const handleScroll = () => {
+        if (!this.isResizing) {
+          window.scrollTo(...this.savedScrollPosition);
+        }
+      };
+
+      window.addEventListener("resize", handleResize);
+      window.addEventListener("scroll", handleScroll, { passive: false });
+
+      this.scrollLockCleanup = () => {
+        window.removeEventListener("resize", handleResize);
+        window.removeEventListener("scroll", handleScroll);
+        if (this.resizeTimeout) {
+          clearTimeout(this.resizeTimeout);
+          this.resizeTimeout = null;
+        }
+      };
+    }
+    this.scrollLockCount++;
+  }
+
+  /**
+   * Removes scroll lock with reference counting.
+   */
+  removeScrollLock() {
+    if (this.scrollLockCount > 0) {
+      this.scrollLockCount--;
+      if (this.scrollLockCount === 0) {
+        document.documentElement.style.removeProperty("overflow");
+        if (this.scrollLockCleanup) {
+          this.scrollLockCleanup();
+          this.scrollLockCleanup = null;
+        }
+      }
+    }
+  }
+
+  /**
+   * Sets up global click listener for click-outside handling.
+   */
+  setupClickOutsideListener() {
+    const handlePointerDown = (event) => {
+      this.pointerDownTarget = event.target;
+    };
+
+    const handleClick = (event) => {
+      this.handleClickOutside(event);
+    };
+
+    document.addEventListener("pointerdown", handlePointerDown, {
+      capture: true,
+    });
+    document.addEventListener("click", handleClick, {
+      capture: true,
+    });
+
+    this.clickOutsideCleanup = () => {
+      document.removeEventListener("pointerdown", handlePointerDown, {
+        capture: true,
+      });
+      document.removeEventListener("click", handleClick, {
+        capture: true,
+      });
+    };
+  }
+
+  /**
+   * Cleans up global click listener.
+   */
+  cleanupClickOutsideListener() {
+    if (this.clickOutsideCleanup) {
+      this.clickOutsideCleanup();
+      this.clickOutsideCleanup = null;
+    }
+    this.pointerDownTarget = null;
+  }
+
+  /**
+   * Sets up a single global keydown listener for Escape key handling.
+   * Only the topmost sheet handles Escape.
+   */
+  setupEscapeKeyListener() {
+    const handleKeyDown = (event) => {
+      if (event.key === "Escape") {
+        this.handleEscapeKey(event);
+      }
+    };
+
+    document.addEventListener("keydown", handleKeyDown);
+
+    this.escapeKeyCleanup = () => {
+      document.removeEventListener("keydown", handleKeyDown);
+    };
+  }
+
+  /**
+   * Cleans up global escape key listener.
+   */
+  cleanupEscapeKeyListener() {
+    if (this.escapeKeyCleanup) {
+      this.escapeKeyCleanup();
+      this.escapeKeyCleanup = null;
+    }
+  }
+
+  /**
+   * Processes a behavior handler that can be either an object or a function.
+   *
+   * @param {Object|Function} handler - The handler (object or function with changeDefault)
+   * @param {Object} defaultBehavior - The default behavior object
+   * @param {Event} nativeEvent - The native DOM event
+   * @returns {Object} The resolved behavior object
+   */
+  processBehaviorHandler(handler, defaultBehavior, nativeEvent) {
+    let result = { ...defaultBehavior };
+    if (handler) {
+      if (typeof handler === "function") {
+        const customEvent = {
+          ...defaultBehavior,
+          nativeEvent,
+          changeDefault(changedBehavior) {
+            result = { ...defaultBehavior, ...changedBehavior };
+            Object.assign(this, changedBehavior);
+          },
+        };
+        customEvent.changeDefault = customEvent.changeDefault.bind(customEvent);
+        handler(customEvent);
+      } else {
+        result = { ...defaultBehavior, ...handler };
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Handles Escape key for stacked sheets.
+   * Processes from topmost sheet down, respecting stopOverlayPropagation.
+   *
+   * @param {KeyboardEvent} event
+   */
+  handleEscapeKey(event) {
+    const layerCount = this.sheetsInOrder.length;
+    if (layerCount > 0) {
+      this.processEscapeOnLayer(layerCount - 1, event);
+    }
+  }
+
+  /**
+   * Processes Escape key on a specific layer.
+   * Recursively processes lower layers if stopOverlayPropagation is false.
+   *
+   * @param {number} layerIndex - Index of the layer to process
+   * @param {KeyboardEvent} event - The keyboard event
+   */
+  processEscapeOnLayer(layerIndex, event) {
+    const sheet = this.sheetsInOrder[layerIndex];
+    if (!sheet) {
+      return;
+    }
+
+    if (!sheet.state.openness.isOpen) {
+      return;
+    }
+
+    const behavior = this.processBehaviorHandler(
+      sheet.onEscapeKeyDown,
+      {
+        nativePreventDefault: true,
+        dismiss: true,
+        stopOverlayPropagation: true,
+      },
+      event
+    );
+
+    if (behavior.nativePreventDefault !== false) {
+      event.preventDefault();
+    }
+
+    if (behavior.dismiss !== false && sheet.role !== "alertdialog") {
+      sheet.close();
+    }
+
+    if (behavior.stopOverlayPropagation === false && layerIndex > 0) {
+      this.processEscapeOnLayer(layerIndex - 1, event);
+    }
+  }
+
+  /**
+   * Handles click-outside events.
+   *
+   * @param {Event} event
+   */
+  handleClickOutside(event) {
+    const target = event.target;
+
+    if (!target || !target.isConnected) {
+      this.pointerDownTarget = null;
+      return;
+    }
+
+    if (target === document.body && this.pointerDownTarget !== document.body) {
+      this.pointerDownTarget = null;
+      return;
+    }
+
+    const layerCount = this.sheetsInOrder.length;
+    if (layerCount > 0) {
+      this.processClickOnLayer(layerCount - 1, event);
+    }
+
+    this.pointerDownTarget = null;
+  }
+
+  /**
+   * Processes click on a specific layer.
+   *
+   * @param {number} layerIndex
+   * @param {Event} event
+   */
+  processClickOnLayer(layerIndex, event) {
+    const sheet = this.sheetsInOrder[layerIndex];
+    if (!sheet) {
+      return;
+    }
+
+    if (!sheet.state.openness.isOpen) {
+      return;
+    }
+
+    const target = event.target;
+    const content = sheet.content;
+    const view = sheet.view;
+
+    // Click is "outside" if:
+    // 1. Target is outside the view entirely, OR
+    // 2. Target is inside the view but NOT inside the content
+    const isClickOutside =
+      (view && !view.contains(target)) ||
+      (view && content && !content.contains(target));
+
+    if (isClickOutside) {
+      const behavior = this.processBehaviorHandler(
+        sheet.onClickOutside,
+        { dismiss: true, stopOverlayPropagation: true },
+        event
+      );
+
+      if (behavior.dismiss && sheet.role !== "alertdialog") {
+        sheet.close();
+      }
+
+      if (!behavior.stopOverlayPropagation && layerIndex > 0) {
+        this.processClickOnLayer(layerIndex - 1, event);
+      }
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/services/sheet-stack-registry.js b/frontend/discourse/float-kit/services/sheet-stack-registry.js
new file mode 100644
index 0000000000000..774c5db0c3a34
--- /dev/null
+++ b/frontend/discourse/float-kit/services/sheet-stack-registry.js
@@ -0,0 +1,473 @@
+import { guidFor } from "@ember/object/internals";
+import Service from "@ember/service";
+import { TrackedMap } from "@ember-compat/tracked-built-ins";
+
+/**
+ * Service for managing sheet stacks.
+ * Tracks which sheets belong to which stacks and maintains the stacking order.
+ * Enables stacking-driven animations where sheets that are covered by other
+ * sheets can animate based on stacking progress.
+ */
+export default class SheetStackRegistry extends Service {
+  /** @type {TrackedMap<string, Object>} */
+  stacks = new TrackedMap();
+
+  /** @type {TrackedMap<string, Object[]>} */
+  stackSheets = new TrackedMap();
+
+  /** @type {TrackedMap<string, number>} */
+  stackingCounts = new TrackedMap();
+
+  /** @type {TrackedMap<string, Map<string, string>>} */
+  stackStagingData = new TrackedMap();
+
+  /**
+   * Register a new stack.
+   *
+   * @param {Object} stack - Stack instance with id property
+   * @returns {string} The stack ID
+   */
+  registerStack(stack) {
+    const id = stack.id || guidFor(stack);
+
+    const stackObject = {
+      ...stack,
+      id,
+      stackingAnimations: [],
+      aggregatedStackingCallback(progress, tween) {
+        for (let i = 0; i < this.stackingAnimations.length; i++) {
+          this.stackingAnimations[i].callback(progress, tween);
+        }
+      },
+      travelProgress: 0,
+      selfAndAboveTravelProgressSum: [],
+    };
+
+    this.stacks.set(id, stackObject);
+    this.stackSheets.set(id, []);
+    this.stackStagingData.set(id, new Map());
+    return id;
+  }
+
+  /**
+   * Unregister a stack.
+   *
+   * @param {string} stackId
+   */
+  unregisterStack(stackId) {
+    this.stacks.delete(stackId);
+    this.stackSheets.delete(stackId);
+    this.stackingCounts.delete(stackId);
+    this.stackStagingData.delete(stackId);
+  }
+
+  /**
+   * Register a sheet with a stack.
+   *
+   * @param {string} stackId
+   * @param {Object} controller
+   */
+  registerSheetWithStack(stackId, controller) {
+    const sheets = this.stackSheets.get(stackId);
+    if (!sheets) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        `[SheetStackRegistry] Stack ${stackId} not found when registering sheet`
+      );
+      return;
+    }
+
+    sheets.push(controller);
+    controller.stackId = stackId;
+    controller.stackingIndex = sheets.length - 1;
+
+    this.updateBelowSheetsInStack(stackId);
+  }
+
+  /**
+   * Unregister a sheet from its stack.
+   *
+   * @param {Object} controller
+   */
+  unregisterSheetFromStack(controller) {
+    const stackId = controller.stackId;
+    if (!stackId) {
+      return;
+    }
+
+    const sheets = this.stackSheets.get(stackId);
+    if (!sheets) {
+      return;
+    }
+
+    const index = sheets.indexOf(controller);
+    const parentSheet = index > 0 ? sheets[index - 1] : null;
+
+    if (index !== -1) {
+      sheets.splice(index, 1);
+    }
+
+    controller.stackId = null;
+    controller.stackingIndex = -1;
+    controller.belowSheetsInStack = [];
+
+    this.updateBelowSheetsInStack(stackId);
+
+    if (parentSheet) {
+      const positionState = parentSheet.state?.position;
+
+      if (
+        positionState?.matches("covered.status:going-down") ||
+        positionState?.matches("covered.status:going-up")
+      ) {
+        parentSheet.sendToPositionMachine("NEXT");
+        parentSheet.sendToPositionMachine("GOTO_front");
+      } else if (
+        positionState?.matches("covered.status:idle") ||
+        positionState?.matches("covered.status:indeterminate")
+      ) {
+        parentSheet.sendToPositionMachine("GOTO_front");
+      }
+    }
+  }
+
+  /**
+   * Update belowSheetsInStack for all sheets in a stack.
+   *
+   * @param {string} stackId
+   */
+  updateBelowSheetsInStack(stackId) {
+    const sheets = this.stackSheets.get(stackId);
+    if (!sheets) {
+      return;
+    }
+
+    const stack = this.stacks.get(stackId);
+    const sheetsCount = sheets.length;
+
+    sheets.forEach((sheet, index) => {
+      sheet.stackingIndex = sheetsCount - 1 - index;
+
+      const sheetsBelow = sheets.filter(
+        (s) => s.stackingIndex > sheet.stackingIndex
+      );
+
+      if (stack) {
+        sheetsBelow.unshift(stack);
+        stack.stackingIndex = sheetsCount - 1;
+      }
+
+      sheet.belowSheetsInStack = sheetsBelow;
+    });
+
+    this.updateSelfAndAboveTravelProgressSumInStack(stackId);
+  }
+
+  /**
+   * Update selfAndAboveTravelProgressSum for all sheets in a stack.
+   *
+   * @param {string} stackId
+   */
+  updateSelfAndAboveTravelProgressSumInStack(stackId) {
+    const sheets = this.stackSheets.get(stackId);
+    if (!sheets) {
+      return;
+    }
+
+    const sortedSheets = [...sheets].sort(
+      (a, b) => b.stackingIndex - a.stackingIndex
+    );
+
+    const stack = this.stacks.get(stackId);
+    if (stack) {
+      sortedSheets.unshift(stack);
+    }
+
+    const totalCount = sortedSheets.length;
+
+    for (let r = 0; r < totalCount; r++) {
+      const sheet = sortedSheets[r];
+      sheet.selfAndAboveTravelProgressSum = [];
+
+      for (let o = 0; o < totalCount; o++) {
+        if (o <= r) {
+          sheet.selfAndAboveTravelProgressSum[o] = 0;
+        } else {
+          sheet.selfAndAboveTravelProgressSum[o] = sortedSheets
+            .slice(r + 1, o + 1)
+            .reduce((sum, s) => sum + (s.travelProgress || 0), 0);
+        }
+      }
+    }
+  }
+
+  /**
+   * Update a sheet's travel progress and recalculate selfAndAboveTravelProgressSum.
+   *
+   * @param {Object} controller
+   * @param {number} progress - Current travel progress (0-1)
+   */
+  updateSheetTravelProgress(controller, progress) {
+    if (!controller || !controller.stackId) {
+      return;
+    }
+
+    controller.travelProgress = progress;
+    this.updateSelfAndAboveTravelProgressSumInStack(controller.stackId);
+  }
+
+  /**
+   * Get all sheets in a stack.
+   *
+   * @param {string} stackId
+   * @returns {Object[]}
+   */
+  getSheetsInStack(stackId) {
+    return this.stackSheets.get(stackId) || [];
+  }
+
+  /**
+   * Get the previous (parent) sheet in stack relative to a given sheet.
+   *
+   * @param {string} stackId
+   * @param {Object} controller
+   * @returns {Object|null}
+   */
+  getPreviousSheetInStack(stackId, controller) {
+    const sheets = this.stackSheets.get(stackId);
+    if (!sheets || sheets.length < 2) {
+      return null;
+    }
+
+    const index = sheets.indexOf(controller);
+    if (index <= 0) {
+      return null;
+    }
+
+    return sheets[index - 1];
+  }
+
+  /**
+   * Get the topmost (front) sheet in stack.
+   *
+   * @param {string} stackId
+   * @returns {Object|null}
+   */
+  getTopmostSheetInStack(stackId) {
+    const sheets = this.stackSheets.get(stackId);
+    if (!sheets || sheets.length === 0) {
+      return null;
+    }
+    return sheets[sheets.length - 1];
+  }
+
+  /**
+   * Check if any sheet in the stack is currently animating (not in idle position).
+   *
+   * @param {string} stackId
+   * @returns {boolean}
+   */
+  isStackAnimating(stackId) {
+    const sheets = this.stackSheets.get(stackId);
+    if (!sheets) {
+      return false;
+    }
+
+    return sheets.some((sheet) => {
+      const positionState = sheet.state?.position?.current;
+      return (
+        positionState &&
+        positionState !== "out" &&
+        !positionState.endsWith(".idle")
+      );
+    });
+  }
+
+  /**
+   * Notify parent sheet that a new sheet is opening above it.
+   *
+   * @param {string} stackId
+   * @param {Object} newSheetController
+   * @param {Object} options
+   */
+  notifyParentSheetOfChildOpening(stackId, newSheetController, options = {}) {
+    const parentSheet = this.getPreviousSheetInStack(
+      stackId,
+      newSheetController
+    );
+    if (!parentSheet) {
+      return;
+    }
+
+    parentSheet.sendToPositionMachine({
+      type: "READY_TO_GO_DOWN",
+      skipOpening: options.skipOpening || false,
+    });
+  }
+
+  /**
+   * Notify parent sheet that a child sheet is closing.
+   *
+   * @param {string} stackId
+   * @param {Object} closingSheetController
+   */
+  notifyParentSheetOfChildClosing(stackId, closingSheetController) {
+    const parentSheet = this.getPreviousSheetInStack(
+      stackId,
+      closingSheetController
+    );
+    if (!parentSheet) {
+      return;
+    }
+
+    parentSheet.sendToPositionMachine("READY_TO_GO_UP");
+  }
+
+  /**
+   * Notify parent sheet that a child sheet closed immediately (SWIPE_OUT).
+   *
+   * @param {string} stackId
+   * @param {Object} closingSheetController
+   */
+  notifyParentSheetOfChildClosingImmediate(stackId, closingSheetController) {
+    const parentSheet = this.getPreviousSheetInStack(
+      stackId,
+      closingSheetController
+    );
+    if (!parentSheet) {
+      return;
+    }
+
+    const positionState = parentSheet.state?.position;
+
+    if (
+      positionState?.matches("covered.status:going-down") ||
+      positionState?.matches("covered.status:going-up")
+    ) {
+      parentSheet.sendToPositionMachine("NEXT");
+      parentSheet.sendToPositionMachine("GOTO_front");
+    } else if (positionState?.matches("covered.status:idle")) {
+      parentSheet.sendToPositionMachine("GO_UP");
+    } else if (positionState?.matches("covered.status:indeterminate")) {
+      parentSheet.sendToPositionMachine("GOTO_front");
+    }
+  }
+
+  /**
+   * Get the stack instance.
+   *
+   * @param {string} stackId
+   * @returns {Object|null}
+   */
+  getStack(stackId) {
+    return this.stacks.get(stackId) || null;
+  }
+
+  /**
+   * Get the current stacking count.
+   *
+   * @param {string} stackId
+   * @returns {number}
+   */
+  getStackingCount(stackId) {
+    return this.stackingCounts.get(stackId) || 0;
+  }
+
+  /**
+   * Increment the stacking count. Called when a sheet enters idleInside state.
+   *
+   * @param {string} stackId
+   * @returns {number}
+   */
+  incrementStackingCount(stackId) {
+    const currentCount = this.stackingCounts.get(stackId) || 0;
+    const newCount = currentCount + 1;
+    this.stackingCounts.set(stackId, newCount);
+    return newCount;
+  }
+
+  /**
+   * Decrement the stacking count. Called when a sheet enters idleOutside state.
+   *
+   * @param {string} stackId
+   * @returns {number}
+   */
+  decrementStackingCount(stackId) {
+    const currentCount = this.stackingCounts.get(stackId) || 0;
+    const newCount = Math.max(0, currentCount - 1);
+    this.stackingCounts.set(stackId, newCount);
+    return newCount;
+  }
+
+  /**
+   * Update a sheet's staging state in the stack.
+   *
+   * @param {string} stackId
+   * @param {string} sheetId
+   * @param {string} staging - The staging state ("none", "opening", "closing", etc.)
+   */
+  updateSheetStagingInStack(stackId, sheetId, staging) {
+    const stagingData = this.stackStagingData.get(stackId);
+    if (!stagingData) {
+      return;
+    }
+
+    stagingData.set(sheetId, staging);
+    this.stackStagingData.set(stackId, new Map(stagingData));
+  }
+
+  /**
+   * Remove a sheet's staging data from the stack.
+   *
+   * @param {string} stackId
+   * @param {string} sheetId
+   */
+  removeSheetStagingFromStack(stackId, sheetId) {
+    const stagingData = this.stackStagingData.get(stackId);
+    if (!stagingData) {
+      return;
+    }
+
+    stagingData.delete(sheetId);
+    this.stackStagingData.set(stackId, new Map(stagingData));
+  }
+
+  /**
+   * Get the merged staging state for a stack.
+   * Returns "not-none" if any sheet in the stack has staging !== "none",
+   * otherwise returns "none".
+   *
+   * @param {string} stackId
+   * @returns {string} "none" or "not-none"
+   */
+  getMergedStagingForStack(stackId) {
+    const stagingData = this.stackStagingData.get(stackId);
+    if (!stagingData || stagingData.size === 0) {
+      return "none";
+    }
+
+    for (const staging of stagingData.values()) {
+      if (staging !== "none") {
+        return "not-none";
+      }
+    }
+
+    return "none";
+  }
+
+  /**
+   * Update a sheet's stacking index with position value.
+   * This enables position-aware stacking calculations.
+   *
+   * @param {Object} controller - The sheet controller
+   * @param {string} positionValue - The position machine's silent value
+   */
+  updateSheetStackingIndex(controller, positionValue) {
+    if (!controller || !controller.stackId) {
+      return;
+    }
+
+    controller.positionValueForStacking = positionValue;
+    this.updateSelfAndAboveTravelProgressSumInStack(controller.stackId);
+  }
+}
diff --git a/frontend/discourse/float-kit/services/theme-color-manager.js b/frontend/discourse/float-kit/services/theme-color-manager.js
new file mode 100644
index 0000000000000..e7d676134d747
--- /dev/null
+++ b/frontend/discourse/float-kit/services/theme-color-manager.js
@@ -0,0 +1,416 @@
+import Service from "@ember/service";
+
+/**
+ * Service to manage the theme-color meta tag.
+ * Handles stacking and dimming across multiple sheets.
+ * Strictly follows the internal implementation for color logic.
+ */
+export default class ThemeColorManager extends Service {
+  /**
+   * Stack of theme color ownership entries.
+   * Each entry: { controller, previousContent }
+   * @type {Array<{controller: Object, previousContent: string}>}
+   */
+  ownershipStack = [];
+
+  /**
+   * Global list of theme color dimming overlays.
+   * @type {Array<{controller: Object, color: number[], alpha: number}>}
+   */
+  dimmingOverlays = [];
+
+  /**
+   * Parses an RGB/RGBA string into an array of [r, g, b].
+   *
+   * @param {string} colorStr
+   * @returns {number[]|null}
+   */
+  #parseRGB(colorStr) {
+    if (!colorStr) {
+      return null;
+    }
+
+    return (colorStr.startsWith("rgb(") || colorStr.startsWith("rgba(")) &&
+      colorStr.endsWith(")")
+      ? colorStr
+          .substring(colorStr.indexOf("(") + 1, colorStr.indexOf(")"))
+          .split(",")
+          .map((c) => c.trim())
+          .slice(0, 3)
+          .map((c) => parseFloat(c))
+      : null;
+  }
+
+  /**
+   * Parses a color string (RGB, RGBA, or Hex) into an array of [r, g, b].
+   * Strictly follows the internal color parsing implementation.
+   *
+   * @param {string} colorStr
+   * @returns {number[]|null}
+   */
+  #parseColor(colorStr) {
+    if (!colorStr) {
+      return null;
+    }
+
+    let result = null;
+    if (colorStr.startsWith("rgb(") || colorStr.startsWith("rgba(")) {
+      result = this.#parseRGB(colorStr);
+    } else if (colorStr.startsWith("#")) {
+      let hex = colorStr.replace(/^#/, "");
+      let normalizedHex =
+        hex.length === 3
+          ? hex
+              .split("")
+              .map((h) => h + h)
+              .join("")
+          : hex;
+
+      result = /^[0-9A-Fa-f]{6}$/.test(normalizedHex)
+        ? [
+            parseInt(normalizedHex.slice(0, 2), 16),
+            parseInt(normalizedHex.slice(2, 4), 16),
+            parseInt(normalizedHex.slice(4, 6), 16),
+          ]
+        : null;
+    }
+    return result;
+  }
+
+  /**
+   * Mixes a base color with multiple overlays.
+   *
+   * @param {number[]} baseColor - [r, g, b]
+   * @param {Array<{color: number[], alpha: number}>} overlays
+   * @returns {string} rgb() string
+   */
+  #mixColors(baseColor, overlays) {
+    let result = [...baseColor];
+    for (let i = 0; i < overlays.length; i++) {
+      const overlay = overlays[i];
+      const alpha = overlay.alpha;
+      for (let j = 0; j < 3; j++) {
+        result[j] = (1 - alpha) * result[j] + alpha * overlay.color[j];
+      }
+    }
+    return `rgb(${result.join(",")})`;
+  }
+
+  /**
+   * Check if a color string is usable for theme color.
+   *
+   * @param {string} colorStr - Color string to check
+   * @returns {boolean}
+   */
+  isUsableThemeColor(colorStr) {
+    return Boolean(this.#parseColor(colorStr));
+  }
+
+  // ============================================================================
+  // Meta Tag Management
+  // ============================================================================
+
+  /**
+   * Find the currently active theme-color meta tag.
+   * Prioritizes tags with matching media queries.
+   *
+   * @returns {HTMLMetaElement | null}
+   */
+  findActiveThemeColorMetaTag() {
+    if (typeof document === "undefined") {
+      return null;
+    }
+
+    const metaTags = document.querySelectorAll('meta[name="theme-color"]');
+
+    if (!metaTags.length) {
+      return null;
+    }
+
+    let fallback = null;
+
+    for (const meta of metaTags) {
+      if (!meta.media) {
+        fallback = fallback || meta;
+        continue;
+      }
+
+      try {
+        if (
+          typeof window === "undefined" ||
+          window.matchMedia(meta.media).matches
+        ) {
+          return meta;
+        }
+      } catch {
+        // Ignore invalid media queries
+      }
+    }
+
+    return fallback || metaTags[0];
+  }
+
+  /**
+   * Ensure a theme-color meta tag exists.
+   * Creates one if none exists.
+   *
+   * @param {Object} controller - The controller requesting the meta tag
+   * @returns {HTMLMetaElement | null}
+   */
+  ensureThemeColorMetaTag(controller) {
+    if (typeof document === "undefined") {
+      return null;
+    }
+
+    if (
+      controller.themeColorMetaTag &&
+      document.contains(controller.themeColorMetaTag)
+    ) {
+      return controller.themeColorMetaTag;
+    }
+
+    controller.themeColorMetaTag = this.findActiveThemeColorMetaTag();
+
+    if (!controller.themeColorMetaTag) {
+      const meta = document.createElement("meta");
+      meta.name = "theme-color";
+      const fallback =
+        typeof window !== "undefined"
+          ? window.getComputedStyle(document.body)?.backgroundColor
+          : "#000000";
+      meta.setAttribute("content", fallback || "#000000");
+      document.head.appendChild(meta);
+      controller.themeColorMetaTag = meta;
+    }
+
+    return controller.themeColorMetaTag;
+  }
+
+  /**
+   * Check if a controller currently controls the theme color.
+   *
+   * @param {Object} controller - The controller to check
+   * @returns {boolean}
+   */
+  controlsThemeColor(controller) {
+    if (!controller.themeColorStackEntry) {
+      return false;
+    }
+
+    const topEntry = this.ownershipStack[this.ownershipStack.length - 1];
+    return topEntry?.controller === controller;
+  }
+
+  /**
+   * Acquire theme color ownership for a controller.
+   * Moves existing entry to top if already in stack.
+   *
+   * @param {Object} controller - The controller acquiring ownership
+   */
+  acquireThemeColorOwnership(controller) {
+    if (controller.themeColorStackEntry) {
+      if (this.controlsThemeColor(controller)) {
+        return;
+      }
+
+      const idx = this.ownershipStack.findIndex(
+        (entry) => entry === controller.themeColorStackEntry
+      );
+      if (idx !== -1) {
+        this.ownershipStack.splice(idx, 1);
+      }
+      controller.themeColorStackEntry = null;
+    }
+
+    const metaTag = this.ensureThemeColorMetaTag(controller);
+    if (!metaTag) {
+      return;
+    }
+
+    const entry = {
+      controller,
+      previousContent: metaTag.getAttribute("content"),
+    };
+
+    this.ownershipStack.push(entry);
+    controller.themeColorStackEntry = entry;
+  }
+
+  /**
+   * Release theme color ownership for a controller.
+   * Restores previous color if this was the top entry.
+   *
+   * @param {Object} controller - The controller releasing ownership
+   */
+  releaseThemeColorOwnership(controller) {
+    if (!controller.themeColorStackEntry) {
+      return;
+    }
+
+    const idx = this.ownershipStack.findIndex(
+      (entry) => entry === controller.themeColorStackEntry
+    );
+
+    if (idx === -1) {
+      controller.themeColorStackEntry = null;
+      return;
+    }
+
+    const wasTop = idx === this.ownershipStack.length - 1;
+    const [entry] = this.ownershipStack.splice(idx, 1);
+    controller.themeColorStackEntry = null;
+
+    const controllerOverlays = this.dimmingOverlays.filter(
+      (o) => o.controller === controller
+    );
+    for (const overlay of controllerOverlays) {
+      this.#removeOverlayDelayed(overlay, controller);
+    }
+
+    if (wasTop) {
+      const nextEntry = this.ownershipStack[this.ownershipStack.length - 1];
+
+      if (nextEntry) {
+        this.setActualThemeColor(nextEntry.controller);
+      } else if (entry.previousContent && controller.themeColorMetaTag) {
+        controller.themeColorMetaTag.setAttribute(
+          "content",
+          entry.previousContent
+        );
+      }
+    }
+  }
+
+  /**
+   * Update the theme color for a controller.
+   *
+   * @param {Object} controller - The controller updating the color
+   * @param {string} color - The new color
+   */
+  updateThemeColor(controller, color) {
+    if (!color) {
+      return;
+    }
+
+    this.acquireThemeColorOwnership(controller);
+    controller.underlyingThemeColor = color;
+    this.setActualThemeColor(controller);
+  }
+
+  /**
+   * Set the actual theme color meta tag content.
+   * Applies dimming overlays if present.
+   *
+   * @param {Object} controller - The controller setting the color
+   */
+  setActualThemeColor(controller) {
+    const metaTag = this.ensureThemeColorMetaTag(controller);
+    if (!metaTag || !this.controlsThemeColor(controller)) {
+      return;
+    }
+
+    // Capture existing color from DOM if we haven't stored one yet
+    if (!controller.underlyingThemeColor) {
+      controller.underlyingThemeColor = metaTag.getAttribute("content");
+    }
+
+    const baseColor = this.#parseColor(controller.underlyingThemeColor);
+    if (!baseColor) {
+      return;
+    }
+
+    const targetColorStr = this.#mixColors(baseColor, this.dimmingOverlays);
+    metaTag.setAttribute("content", targetColorStr);
+  }
+
+  /**
+   * Register a theme color dimming overlay for a controller.
+   *
+   * @param {Object} controller - The controller registering the overlay
+   * @param {Object} overlay - The overlay { color, alpha }
+   * @returns {{ updateAlpha: Function, remove: Function }}
+   */
+  registerThemeColorDimmingOverlay(controller, overlay) {
+    const existing = this.dimmingOverlays.find(
+      (o) => o.controller === controller
+    );
+
+    if (existing) {
+      existing.abortRemoval = true;
+      existing.color = this.#parseColor(overlay.color) || [0, 0, 0];
+      existing.alpha = overlay.alpha;
+      this.setActualThemeColor(controller);
+      return this.#createOverlayHandle(existing, controller);
+    }
+
+    const overlayEntry = {
+      ...overlay,
+      color: this.#parseColor(overlay.color) || [0, 0, 0],
+      controller,
+      abortRemoval: true,
+    };
+
+    this.dimmingOverlays.push(overlayEntry);
+    this.setActualThemeColor(controller);
+
+    return this.#createOverlayHandle(overlayEntry, controller);
+  }
+
+  #createOverlayHandle(overlayEntry, controller) {
+    return {
+      updateAlpha: (alpha) => {
+        overlayEntry.alpha = alpha;
+        this.setActualThemeColor(controller);
+      },
+      remove: () => {
+        this.#removeOverlayDelayed(overlayEntry, controller);
+      },
+    };
+  }
+
+  #removeOverlayDelayed(overlayEntry, controller) {
+    overlayEntry.abortRemoval = false;
+
+    setTimeout(() => {
+      if (overlayEntry.abortRemoval) {
+        return;
+      }
+
+      this.dimmingOverlays = this.dimmingOverlays.filter(
+        (o) => o !== overlayEntry
+      );
+      this.setActualThemeColor(controller);
+
+      if (this.dimmingOverlays.length === 0) {
+        controller.underlyingThemeColor = null;
+        controller.themeColorMetaTag = null;
+      }
+    }, 20);
+  }
+
+  /**
+   * Capture the theme color from content element's background.
+   *
+   * @param {Object} controller - The controller to capture for
+   */
+  captureContentThemeColor(controller) {
+    if (!controller.content || typeof window === "undefined") {
+      return;
+    }
+
+    const computedColor = window
+      .getComputedStyle(controller.content)
+      ?.getPropertyValue("background-color");
+
+    if (this.isUsableThemeColor(computedColor)) {
+      this.updateThemeColor(controller, computedColor);
+      return;
+    }
+
+    const fallback =
+      this.ensureThemeColorMetaTag(controller)?.getAttribute("content");
+    if (fallback) {
+      this.updateThemeColor(controller, fallback);
+    }
+  }
+}
diff --git a/frontend/discourse/float-kit/services/toasts.js b/frontend/discourse/float-kit/services/toasts.js
index 0852979799d72..ef215028e7551 100644
--- a/frontend/discourse/float-kit/services/toasts.js
+++ b/frontend/discourse/float-kit/services/toasts.js
@@ -2,12 +2,32 @@ import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import { getOwner } from "@ember/owner";
 import Service from "@ember/service";
-import { TrackedArray } from "@ember-compat/tracked-built-ins";
+import { TrackedArray, TrackedMap } from "@ember-compat/tracked-built-ins";
 import DDefaultToast from "discourse/float-kit/components/d-default-toast";
 import DToastInstance from "discourse/float-kit/lib/d-toast-instance";
 
 export default class Toasts extends Service {
   @tracked activeToasts = new TrackedArray();
+  heights = new TrackedMap();
+  #stackOrderCounter = 0;
+
+  /**
+   * Returns the toast that is currently at the front of the stack.
+   *
+   * @returns {DToastInstance|undefined}
+   */
+  get frontToast() {
+    return this.activeToasts.filter((t) => !t.dismissed).slice(-1)[0];
+  }
+
+  /**
+   * The height of the front-most toast.
+   *
+   * @returns {number}
+   */
+  get frontToastHeight() {
+    return this.heights.get(this.frontToast?.id) || 0;
+  }
 
   /**
    * Render a toast
@@ -29,6 +49,7 @@ export default class Toasts extends Service {
     });
 
     if (instance.isValidForView) {
+      instance.stackOrder = this.#stackOrderCounter++;
       this.activeToasts.push(instance);
     }
 
@@ -44,6 +65,7 @@ export default class Toasts extends Service {
    */
   @action
   default(options = {}) {
+    options.data ??= {};
     options.data.theme = "default";
 
     return this.show(options);
@@ -58,6 +80,7 @@ export default class Toasts extends Service {
    */
   @action
   success(options = {}) {
+    options.data ??= {};
     options.data.theme = "success";
     options.data.icon ??= "check";
 
@@ -73,6 +96,7 @@ export default class Toasts extends Service {
    */
   @action
   error(options = {}) {
+    options.data ??= {};
     options.data.theme = "error";
     options.data.icon ??= "triangle-exclamation";
 
@@ -88,6 +112,7 @@ export default class Toasts extends Service {
    */
   @action
   warning(options = {}) {
+    options.data ??= {};
     options.data.theme = "warning";
     options.data.icon ??= "circle-exclamation";
 
@@ -103,6 +128,7 @@ export default class Toasts extends Service {
    */
   @action
   info(options = {}) {
+    options.data ??= {};
     options.data.theme = "info";
     options.data.icon ??= "circle-info";
 
@@ -111,11 +137,14 @@ export default class Toasts extends Service {
 
   /**
    * Close a toast. Any object containing a valid `id` property can be used as a toast parameter.
+   *
+   * @param {Object} toast - The toast instance or an object with an `id` property
    */
   @action
   close(toast) {
-    this.activeToasts = new TrackedArray(
-      this.activeToasts.filter((activeToast) => activeToast.id !== toast.id)
-    );
+    const index = this.activeToasts.findIndex((t) => t.id === toast.id);
+    if (index !== -1) {
+      this.activeToasts.splice(index, 1);
+    }
   }
 }
diff --git a/frontend/discourse/tests/integration/components/float-kit/d-bottom-sheet-test.gjs b/frontend/discourse/tests/integration/components/float-kit/d-bottom-sheet-test.gjs
new file mode 100644
index 0000000000000..1b17f42364f07
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/float-kit/d-bottom-sheet-test.gjs
@@ -0,0 +1,178 @@
+import { tracked } from "@glimmer/tracking";
+import { click, find, render, waitFor, waitUntil } from "@ember/test-helpers";
+import { module, test } from "qunit";
+import DBottomSheet from "discourse/float-kit/components/d-bottom-sheet";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+module("Integration | Component | FloatKit | d-bottom-sheet", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("opens when trigger is clicked", async function (assert) {
+    await render(
+      <template>
+        <DBottomSheet as |bs|>
+          <bs.Trigger>Open</bs.Trigger>
+          <bs.Content as |content|>
+            <p>Content</p>
+            <content.Trigger @action="dismiss">Close</content.Trigger>
+          </bs.Content>
+        </DBottomSheet>
+      </template>
+    );
+
+    assert.dom("[data-d-sheet~='view']").doesNotExist();
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']");
+
+    assert.dom("[data-d-sheet~='view']").exists();
+  });
+
+  test("opens by default with @defaultPresented", async function (assert) {
+    await render(
+      <template>
+        <DBottomSheet @defaultPresented={{true}} as |bs|>
+          <bs.Content as |content|>
+            <p>Content</p>
+            <content.Trigger @action="dismiss">Close</content.Trigger>
+          </bs.Content>
+        </DBottomSheet>
+      </template>
+    );
+
+    await waitFor("[data-d-sheet~='view']");
+
+    assert.dom("[data-d-sheet~='view']").exists();
+  });
+
+  test("closes when dismiss trigger is clicked", async function (assert) {
+    await render(
+      <template>
+        <DBottomSheet as |bs|>
+          <bs.Trigger>Open</bs.Trigger>
+          <bs.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </bs.Content>
+        </DBottomSheet>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+    await click(".dismiss-btn");
+    await waitUntil(() => !find("[data-d-sheet~='view']"));
+
+    assert.dom("[data-d-sheet~='view']").doesNotExist();
+  });
+
+  test("renders backdrop when open", async function (assert) {
+    await render(
+      <template>
+        <DBottomSheet as |bs|>
+          <bs.Trigger>Open</bs.Trigger>
+          <bs.Content>
+            <p>Content</p>
+          </bs.Content>
+        </DBottomSheet>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']");
+
+    assert.dom("[data-d-sheet~='view']").exists();
+    assert.dom("[data-d-sheet~='backdrop']").exists();
+  });
+
+  test("controlled mode with @presented and @onPresentedChange", async function (assert) {
+    const state = new (class {
+      @tracked presented = false;
+    })();
+
+    const onPresentedChange = (value) => (state.presented = value);
+
+    await render(
+      <template>
+        <DBottomSheet
+          @presented={{state.presented}}
+          @onPresentedChange={{onPresentedChange}}
+          as |bs|
+        >
+          <bs.Trigger>Open</bs.Trigger>
+          <bs.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </bs.Content>
+        </DBottomSheet>
+      </template>
+    );
+
+    assert.dom("[data-d-sheet~='view']").doesNotExist();
+    assert.false(state.presented);
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+
+    assert.true(state.presented);
+    assert.dom("[data-d-sheet~='view']").exists();
+
+    await click(".dismiss-btn");
+    await waitUntil(() => !find("[data-d-sheet~='view']"));
+
+    assert.false(state.presented);
+    assert.dom("[data-d-sheet~='view']").doesNotExist();
+  });
+
+  test("@expandable shows expandable sheet", async function (assert) {
+    await render(
+      <template>
+        <DBottomSheet @expandable={{true}} as |bs|>
+          <bs.Trigger>Open</bs.Trigger>
+          <bs.Content>
+            <p>Content</p>
+          </bs.Content>
+        </DBottomSheet>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']");
+
+    assert.dom("[data-d-sheet~='view']").exists();
+    assert.dom(".bottom-sheet__content.--expandable").exists();
+  });
+
+  test("@onClosed is called when sheet closes", async function (assert) {
+    let closedCalled = false;
+    const onClosed = () => (closedCalled = true);
+
+    await render(
+      <template>
+        <DBottomSheet @onClosed={{onClosed}} as |bs|>
+          <bs.Trigger>Open</bs.Trigger>
+          <bs.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </bs.Content>
+        </DBottomSheet>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+    await click(".dismiss-btn");
+    await waitUntil(() => !find("[data-d-sheet~='view']"));
+
+    assert.true(closedCalled);
+  });
+});
diff --git a/frontend/discourse/tests/integration/components/float-kit/d-card-test.gjs b/frontend/discourse/tests/integration/components/float-kit/d-card-test.gjs
new file mode 100644
index 0000000000000..be695c7b876a6
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/float-kit/d-card-test.gjs
@@ -0,0 +1,207 @@
+import { tracked } from "@glimmer/tracking";
+import {
+  click,
+  find,
+  render,
+  triggerKeyEvent,
+  waitFor,
+  waitUntil,
+} from "@ember/test-helpers";
+import { module, test } from "qunit";
+import DCard from "discourse/float-kit/components/d-card";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+module("Integration | Component | FloatKit | d-card", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("opens when trigger is clicked", async function (assert) {
+    await render(
+      <template>
+        <DCard as |card|>
+          <card.Trigger>Open</card.Trigger>
+          <card.Content as |content|>
+            <p>Content</p>
+            <content.Trigger @action="dismiss">Close</content.Trigger>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    assert.dom(".d-card").doesNotExist();
+
+    await click(".btn");
+    await waitFor(".d-card");
+
+    assert.dom(".d-card").exists();
+  });
+
+  test("opens by default with @defaultPresented", async function (assert) {
+    await render(
+      <template>
+        <DCard @defaultPresented={{true}} as |card|>
+          <card.Content as |content|>
+            <p>Content</p>
+            <content.Trigger @action="dismiss">Close</content.Trigger>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    await waitFor(".d-card");
+
+    assert.dom(".d-card").exists();
+  });
+
+  test("closes when dismiss trigger is clicked", async function (assert) {
+    await render(
+      <template>
+        <DCard as |card|>
+          <card.Trigger>Open</card.Trigger>
+          <card.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+    await click(".dismiss-btn");
+    await waitUntil(() => !find(".d-card"));
+
+    assert.dom(".d-card").doesNotExist();
+  });
+
+  test("renders backdrop when open", async function (assert) {
+    await render(
+      <template>
+        <DCard as |card|>
+          <card.Trigger>Open</card.Trigger>
+          <card.Content>
+            <p>Content</p>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor(".d-card");
+
+    assert.dom(".d-card").exists();
+    assert.dom("[data-d-sheet~='backdrop']").exists();
+  });
+
+  test("controlled mode with @presented and @onPresentedChange", async function (assert) {
+    const state = new (class {
+      @tracked presented = false;
+    })();
+
+    const onPresentedChange = (value) => (state.presented = value);
+
+    await render(
+      <template>
+        <DCard
+          @presented={{state.presented}}
+          @onPresentedChange={{onPresentedChange}}
+          as |card|
+        >
+          <card.Trigger>Open</card.Trigger>
+          <card.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    assert.dom(".d-card").doesNotExist();
+    assert.false(state.presented);
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+
+    assert.true(state.presented);
+    assert.dom(".d-card").exists();
+
+    await click(".dismiss-btn");
+    await waitUntil(() => !find(".d-card"));
+
+    assert.false(state.presented);
+    assert.dom(".d-card").doesNotExist();
+  });
+
+  test("closes on escape key", async function (assert) {
+    await render(
+      <template>
+        <DCard as |card|>
+          <card.Trigger>Open</card.Trigger>
+          <card.Content>
+            <p>Content</p>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+
+    assert.dom(".d-card").exists();
+
+    await triggerKeyEvent(document, "keydown", "Escape");
+    await waitUntil(() => !find(".d-card"));
+
+    assert.dom(".d-card").doesNotExist();
+  });
+
+  test("@onClosed is called when sheet closes", async function (assert) {
+    let closedCalled = false;
+    const onClosed = () => (closedCalled = true);
+
+    await render(
+      <template>
+        <DCard @onClosed={{onClosed}} as |card|>
+          <card.Trigger>Open</card.Trigger>
+          <card.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+    await click(".dismiss-btn");
+    await waitUntil(() => !find(".d-card"));
+
+    assert.true(closedCalled);
+  });
+
+  test("uses top track by default", async function (assert) {
+    await render(
+      <template>
+        <DCard as |card|>
+          <card.Trigger>Open</card.Trigger>
+          <card.Content>
+            <p>Content</p>
+          </card.Content>
+        </DCard>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor(".d-card");
+
+    assert.dom("[data-d-sheet~='view'][data-d-sheet~='top']").exists();
+  });
+});
diff --git a/frontend/discourse/tests/integration/components/float-kit/d-default-toast-test.gjs b/frontend/discourse/tests/integration/components/float-kit/d-default-toast-test.gjs
index 69e1ad2d53518..53ab39639db94 100644
--- a/frontend/discourse/tests/integration/components/float-kit/d-default-toast-test.gjs
+++ b/frontend/discourse/tests/integration/components/float-kit/d-default-toast-test.gjs
@@ -17,7 +17,7 @@ module(
         <template><DDefaultToast @data={{this.toast.options.data}} /></template>
       );
 
-      assert.dom(".fk-d-default-toast__icon-container .d-icon-check").exists();
+      assert.dom(".fk-d-default-toast__icon .d-icon-check").exists();
     });
 
     test("no icon", async function (assert) {
@@ -27,7 +27,7 @@ module(
         <template><DDefaultToast @data={{this.toast.options.data}} /></template>
       );
 
-      assert.dom(".fk-d-default-toast__icon-container").doesNotExist();
+      assert.dom(".fk-d-default-toast__icon").doesNotExist();
     });
 
     test("progress bar", async function (assert) {
@@ -38,7 +38,7 @@ module(
           <DDefaultToast
             @data={{this.toast.options.data}}
             @showProgressBar={{true}}
-            @onRegisterProgressBar={{(noop)}}
+            @registerProgressBar={{(noop)}}
           />
         </template>
       );
@@ -91,7 +91,7 @@ module(
       );
 
       assert
-        .dom(".fk-d-default-toast__message")
+        .dom(".fk-d-default-toast__description")
         .hasText(this.toast.options.data.message);
     });
 
@@ -102,7 +102,7 @@ module(
         <template><DDefaultToast @data={{this.toast.options.data}} /></template>
       );
 
-      assert.dom(".fk-d-default-toast__message").doesNotExist();
+      assert.dom(".fk-d-default-toast__description").doesNotExist();
     });
 
     test("actions", async function (assert) {
@@ -124,7 +124,7 @@ module(
       );
 
       assert
-        .dom(".fk-d-default-toast__actions .btn.btn-danger")
+        .dom(".fk-d-default-toast__actions-legacy .btn.btn-danger")
         .exists()
         .hasText("cancel");
     });
diff --git a/frontend/discourse/tests/integration/components/float-kit/d-stack-test.gjs b/frontend/discourse/tests/integration/components/float-kit/d-stack-test.gjs
new file mode 100644
index 0000000000000..ae70ecb43aef9
--- /dev/null
+++ b/frontend/discourse/tests/integration/components/float-kit/d-stack-test.gjs
@@ -0,0 +1,292 @@
+import { tracked } from "@glimmer/tracking";
+import {
+  click,
+  find,
+  findAll,
+  render,
+  triggerKeyEvent,
+  waitFor,
+  waitUntil,
+} from "@ember/test-helpers";
+import { module, test } from "qunit";
+import DStack from "discourse/float-kit/components/d-stack";
+import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+
+module("Integration | Component | FloatKit | d-stack", function (hooks) {
+  setupRenderingTest(hooks);
+
+  test("opens when trigger is clicked", async function (assert) {
+    await render(
+      <template>
+        <DStack as |stack|>
+          <stack.Trigger>Open</stack.Trigger>
+          <stack.Content as |content|>
+            <p>Content</p>
+            <content.Trigger @action="dismiss">Close</content.Trigger>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    assert.dom(".d-stack__view").doesNotExist();
+
+    await click(".btn");
+    await waitFor(".d-stack__view");
+
+    assert.dom(".d-stack__view").exists();
+  });
+
+  test("opens by default with @defaultPresented", async function (assert) {
+    await render(
+      <template>
+        <DStack @defaultPresented={{true}} as |stack|>
+          <stack.Content as |content|>
+            <p>Content</p>
+            <content.Trigger @action="dismiss">Close</content.Trigger>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await waitFor(".d-stack__view");
+
+    assert.dom(".d-stack__view").exists();
+  });
+
+  test("closes when dismiss trigger is clicked", async function (assert) {
+    await render(
+      <template>
+        <DStack as |stack|>
+          <stack.Trigger>Open</stack.Trigger>
+          <stack.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+    await click(".dismiss-btn");
+    await waitUntil(() => !find(".d-stack__view"));
+
+    assert.dom(".d-stack__view").doesNotExist();
+  });
+
+  test("renders backdrop when open", async function (assert) {
+    await render(
+      <template>
+        <DStack as |stack|>
+          <stack.Trigger>Open</stack.Trigger>
+          <stack.Content>
+            <p>Content</p>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor(".d-stack__view");
+
+    assert.dom(".d-stack__view").exists();
+    assert.dom("[data-d-sheet~='backdrop']").exists();
+  });
+
+  test("controlled mode with @presented and @onPresentedChange", async function (assert) {
+    const state = new (class {
+      @tracked presented = false;
+    })();
+
+    const onPresentedChange = (value) => (state.presented = value);
+
+    await render(
+      <template>
+        <DStack
+          @presented={{state.presented}}
+          @onPresentedChange={{onPresentedChange}}
+          as |stack|
+        >
+          <stack.Trigger>Open</stack.Trigger>
+          <stack.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    assert.dom(".d-stack__view").doesNotExist();
+    assert.false(state.presented);
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+
+    assert.true(state.presented);
+    assert.dom(".d-stack__view").exists();
+
+    await click(".dismiss-btn");
+    await waitUntil(() => !find(".d-stack__view"));
+
+    assert.false(state.presented);
+    assert.dom(".d-stack__view").doesNotExist();
+  });
+
+  test("closes on escape key", async function (assert) {
+    await render(
+      <template>
+        <DStack as |stack|>
+          <stack.Trigger>Open</stack.Trigger>
+          <stack.Content>
+            <p>Content</p>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+
+    assert.dom(".d-stack__view").exists();
+
+    await triggerKeyEvent(document, "keydown", "Escape");
+    await waitUntil(() => !find(".d-stack__view"));
+
+    assert.dom(".d-stack__view").doesNotExist();
+  });
+
+  test("@onClosed is called when sheet closes", async function (assert) {
+    let closedCalled = false;
+    const onClosed = () => (closedCalled = true);
+
+    await render(
+      <template>
+        <DStack @onClosed={{onClosed}} as |stack|>
+          <stack.Trigger>Open</stack.Trigger>
+          <stack.Content as |content|>
+            <p>Content</p>
+            <content.Trigger
+              @action="dismiss"
+              class="dismiss-btn"
+            >Close</content.Trigger>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+    await click(".dismiss-btn");
+    await waitUntil(() => !find(".d-stack__view"));
+
+    assert.true(closedCalled);
+  });
+
+  test("tracks based on viewport width", async function (assert) {
+    await render(
+      <template>
+        <DStack as |stack|>
+          <stack.Trigger>Open</stack.Trigger>
+          <stack.Content>
+            <p>Content</p>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await click(".btn");
+    await waitFor(".d-stack__view");
+
+    assert
+      .dom("[data-d-sheet~='view']")
+      .hasAttribute("data-d-sheet", /bottom|right/);
+  });
+
+  test("nested stack opens on top of parent", async function (assert) {
+    await render(
+      <template>
+        <DStack as |stack|>
+          <stack.Trigger class="open-parent">Open</stack.Trigger>
+          <stack.Content as |content|>
+            <p>Parent content</p>
+            <content.Stack as |nested|>
+              <nested.Trigger class="open-nested">Open Nested</nested.Trigger>
+              <nested.Content as |nestedContent|>
+                <p>Nested content</p>
+                <nestedContent.Trigger
+                  @action="dismiss"
+                  class="close-nested"
+                >Close Nested</nestedContent.Trigger>
+              </nested.Content>
+            </content.Stack>
+            <content.Trigger
+              @action="dismiss"
+              class="close-parent"
+            >Close</content.Trigger>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await click(".open-parent");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+
+    assert.dom(".d-stack__view").exists({ count: 1 });
+
+    await click(".open-nested");
+    await waitFor(".close-nested");
+
+    assert.dom(".d-stack__view").exists({ count: 2 });
+  });
+
+  test("closing nested stack returns to parent", async function (assert) {
+    await render(
+      <template>
+        <DStack as |stack|>
+          <stack.Trigger class="open-parent">Open</stack.Trigger>
+          <stack.Content as |content|>
+            <p>Parent content</p>
+            <content.Stack as |nested|>
+              <nested.Trigger class="open-nested">Open Nested</nested.Trigger>
+              <nested.Content as |nestedContent|>
+                <p>Nested content</p>
+                <nestedContent.Trigger
+                  @action="dismiss"
+                  class="close-nested"
+                >Close Nested</nestedContent.Trigger>
+              </nested.Content>
+            </content.Stack>
+            <content.Trigger
+              @action="dismiss"
+              class="close-parent"
+            >Close</content.Trigger>
+          </stack.Content>
+        </DStack>
+      </template>
+    );
+
+    await click(".open-parent");
+    await waitFor("[data-d-sheet~='view']:not([data-d-sheet~='closed'])");
+
+    await click(".open-nested");
+    await waitFor(".close-nested");
+    await waitUntil(
+      () =>
+        findAll("[data-d-sheet~='view']:not([data-d-sheet~='closed'])")
+          .length === 2
+    );
+
+    assert.dom(".d-stack__view").exists({ count: 2 });
+
+    await click(".close-nested");
+    await waitUntil(() => !find(".close-nested"));
+
+    assert.dom(".d-stack__view").exists({ count: 1 });
+  });
+});
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignee-row.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignee-row.gjs
new file mode 100644
index 0000000000000..a99a66371325b
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignee-row.gjs
@@ -0,0 +1,48 @@
+import Component from "@glimmer/component";
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
+import concatClass from "discourse/helpers/concat-class";
+import DButton from "discourse/components/d-button";
+import avatar from "discourse/helpers/avatar";
+import icon from "discourse/helpers/d-icon";
+import formatUsername from "discourse/helpers/format-username";
+
+export default class AssigneeRow extends Component {
+  <template>
+    <DButton
+      class={{concatClass
+        "btn-default assign-sheet__assignee-row"
+        (if @selected "--selected")
+      }}
+      {{on "click" (fn @onPress @assignee)}}
+    >
+      <span class="assign-sheet__assignee-avatar">
+        {{#if @assignee.username}}
+          {{avatar @assignee imageSize="medium"}}
+        {{else if @assignee.name}}
+          {{icon "users"}}
+        {{else}}
+          <span class="assign-sheet__no-assignee">
+            {{icon "user"}}
+          </span>
+        {{/if}}
+      </span>
+
+      <span class="assign-sheet__assignee-details">
+        <span class="assign-sheet__assignee-name">
+          {{#if @assignee.username}}
+            {{formatUsername @assignee.username}}
+          {{else if @assignee.name}}
+            {{@assignee.name}}
+          {{else}}
+            {{yield}}
+          {{/if}}
+        </span>
+      </span>
+
+      {{#if @disclosureIndicatorIcon}}
+        {{icon @disclosureIndicatorIcon class="disclosure-indicator-icon"}}
+      {{/if}}
+    </DButton>
+  </template>
+}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignees-list.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignees-list.gjs
new file mode 100644
index 0000000000000..739e5e7bbc5a3
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignees-list.gjs
@@ -0,0 +1,103 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { fn, hash } from "@ember/helper";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import AsyncContent from "discourse/components/async-content";
+import FilterInput from "discourse/components/filter-input";
+import DSheet from "discourse/float-kit/components/d-sheet";
+import userSearch from "discourse/lib/user-search";
+import { i18n } from "discourse-i18n";
+import AssigneeRow from "./assignee-row";
+
+export default class AssigneesList extends Component {
+  @service taskActions;
+
+  @tracked filter;
+
+  @action
+  setFilter(event) {
+    this.filter = event.target.value;
+  }
+
+  @action
+  async loadAssignees() {
+    if (!this.filter && this.taskActions.suggestions) {
+      return Promise.resolve(
+        this.taskActions.suggestions.filter((suggestion) => {
+          return suggestion.username !== this.args.data.assignee?.username;
+        })
+      );
+    }
+
+    const results = await userSearch({
+      term: this.filter,
+      includeGroups: true,
+      customSearchOptions: {
+        assignableGroups: true,
+      },
+    });
+
+    if (typeof results === "string") {
+      // do nothing promise probably got cancelled
+    } else {
+      return results;
+    }
+  }
+
+  @action
+  onSelectAssignee(assignee) {
+    if (assignee.isGroup) {
+      this.args.form.set("assignee", {
+        is_group: true,
+        name: assignee.name,
+        full_name: assignee.full_name,
+      });
+    } else {
+      this.args.form.set("assignee", {
+        is_user: true,
+        name: assignee.name,
+        username: assignee.username,
+        avatar_template: assignee.avatar_template,
+      });
+    }
+
+    this.args.sheet.close();
+  }
+
+  <template>
+    <DSheet.Scroll.Root as |controller|>
+      <DSheet.Scroll.View
+        @scrollGestureTrap={{hash yEnd=true}}
+        @safeArea="layout-viewport"
+        @onScrollStart={{hash dismissKeyboard=true}}
+        @controller={{controller}}
+      >
+        <DSheet.Scroll.Content
+          class="SheetWithDetent-scrollContent"
+          @controller={{controller}}
+        >
+          <div class="assign-sheet__assignees-list">
+            <FilterInput
+              @filterAction={{this.setFilter}}
+              @icons={{hash left="magnifying-glass"}}
+              placeholder={{i18n "discourse_assign.assign_to"}}
+            />
+
+            <AsyncContent @asyncData={{this.loadAssignees}}>
+              <:content as |assignees|>
+                {{#each assignees as |assignee|}}
+                  <AssigneeRow
+                    @onPress={{fn this.onSelectAssignee assignee}}
+                    @assignee={{assignee}}
+                    @disclosureIndicatorIcon="check"
+                  />
+                {{/each}}
+              </:content>
+            </AsyncContent>
+          </div>
+        </DSheet.Scroll.Content>
+      </DSheet.Scroll.View>
+    </DSheet.Scroll.Root>
+  </template>
+}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-card.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-card.gjs
new file mode 100644
index 0000000000000..b1aaa3a908988
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-card.gjs
@@ -0,0 +1,86 @@
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
+import concatClass from "discourse/helpers/concat-class";
+import DButton from "discourse/components/d-button";
+import formatUsername from "discourse/helpers/format-username";
+import DiscourseURL from "discourse/lib/url";
+import { eq, or } from "discourse/truth-helpers";
+import { i18n } from "discourse-i18n";
+
+function navigateToAssignment(topic, assignment) {
+  let url = `/t/${topic.slug}/${topic.id}`;
+
+  if (assignment.targetType !== "Topic") {
+    url += `/${assignment.postNumber}`;
+  }
+
+  DiscourseURL.routeTo(url);
+}
+
+const AssignmentCard = <template>
+  <div
+    class={{concatClass
+      "assignment-card"
+      (if
+        (or @assignment.username @assignment.groupName)
+        ""
+        "--unassigned"
+      )
+    }}
+  >
+    <div class="assignment-card__header">
+      <button
+        type="button"
+        class="assignment-card__content"
+        {{on "click" (fn navigateToAssignment @topic @assignment)}}
+      >
+        {{#if (eq @assignment.targetType "Topic")}}
+          <span class="assignment-card__title">{{@topic.title}}</span>
+          {{#if @assignment.username}}
+            <span class="assignment-card__username">
+              @{{formatUsername @assignment.username}}
+            </span>
+          {{else if @assignment.groupName}}
+            <span class="assignment-card__username">{{@assignment.groupName}}</span>
+          {{else}}
+            <span class="assignment-card__unassigned">
+              {{i18n "discourse_assign.unassigned"}}
+            </span>
+          {{/if}}
+        {{else}}
+          <span class="assignment-card__title">
+            {{i18n "discourse_assign.post_number" number=@assignment.postNumber}}
+          </span>
+          {{#if @assignment.username}}
+            <span class="assignment-card__username">
+              @{{formatUsername @assignment.username}}
+            </span>
+          {{else if @assignment.groupName}}
+            <span class="assignment-card__username">{{@assignment.groupName}}</span>
+          {{/if}}
+        {{/if}}
+      </button>
+
+      <div class="assignment-card__actions">
+        <DButton
+          class="btn-flat btn-small assignment-card__action-btn"
+          @icon="pencil"
+          @action={{fn @onEditAssignment @assignment}}
+        />
+        {{#if (or @assignment.username @assignment.groupName)}}
+          <DButton
+            class="btn-flat btn-small assignment-card__action-btn"
+            @icon="user-xmark"
+            @action={{fn @onRemoveAssignment @assignment}}
+          />
+        {{/if}}
+      </div>
+    </div>
+
+    {{#if @assignment.note}}
+      <div class="assignment-card__note">{{@assignment.note}}</div>
+    {{/if}}
+  </div>
+</template>;
+
+export default AssignmentCard;
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-form.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-form.gjs
new file mode 100644
index 0000000000000..c381ffe5eb59b
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignment-form.gjs
@@ -0,0 +1,41 @@
+import Component from "@glimmer/component";
+import { hash } from "@ember/helper";
+import DSheet from "discourse/float-kit/components/d-sheet";
+import AssigneeRow from "./assignee-row";
+
+export default class AssignmentForm extends Component {
+  <template>
+    <DSheet.Scroll.Root as |controller|>
+      <DSheet.Scroll.View
+        @scrollGestureTrap={{hash yEnd=true}}
+        @safeArea="layout-viewport"
+        @onScrollStart={{hash dismissKeyboard=true}}
+        @controller={{controller}}
+      >
+        <DSheet.Scroll.Content
+          class="assign-sheet__nested-form"
+          @controller={{controller}}
+        >
+          <AssigneeRow
+            @assignee={{@data.assignee}}
+            @onPress={{@onShowAssigneesList}}
+            @disclosureIndicatorIcon="chevron-right"
+          >
+            Choose assignee...
+          </AssigneeRow>
+
+          <@form.Field
+            @name="note"
+            @title="note"
+            @showTitle={{false}}
+            class="assign-sheet__note-field"
+            @format="full"
+            as |field|
+          >
+            <field.Textarea placeholder="Optional note" />
+          </@form.Field>
+        </DSheet.Scroll.Content>
+      </DSheet.Scroll.View>
+    </DSheet.Scroll.Root>
+  </template>
+}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignments-list.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignments-list.gjs
new file mode 100644
index 0000000000000..4f4904e7c8cd6
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/assignments-list.gjs
@@ -0,0 +1,30 @@
+import { hash } from "@ember/helper";
+import DSheet from "discourse/float-kit/components/d-sheet";
+import AssignmentCard from "./assignment-card";
+
+const AssignmentsList = <template>
+  <DSheet.Scroll.Root as |controller|>
+    <DSheet.Scroll.View
+      @scrollGestureTrap={{hash yEnd=true}}
+      @safeArea="layout-viewport"
+      @onScrollStart={{hash dismissKeyboard=true}}
+      @controller={{controller}}
+    >
+      <DSheet.Scroll.Content
+        class="assignments-list"
+        @controller={{controller}}
+      >
+        {{#each @assignments as |assignment|}}
+          <AssignmentCard
+            @assignment={{assignment}}
+            @topic={{@topic}}
+            @onEditAssignment={{@onEditAssignment}}
+            @onRemoveAssignment={{@onRemoveAssignment}}
+          />
+        {{/each}}
+      </DSheet.Scroll.Content>
+    </DSheet.Scroll.View>
+  </DSheet.Scroll.Root>
+</template>;
+
+export default AssignmentsList;
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/index.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/index.gjs
new file mode 100644
index 0000000000000..2ba72bb8e58e8
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-topic-sheet/index.gjs
@@ -0,0 +1,165 @@
+import Component from "@glimmer/component";
+import { cached, tracked } from "@glimmer/tracking";
+import { fn } from "@ember/helper";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import Form from "discourse/components/form";
+import DSheet from "discourse/float-kit/components/d-sheet";
+import DStack from "discourse/float-kit/components/d-stack";
+import AssigneesList from "./assignees-list";
+import AssignmentForm from "./assignment-form";
+import AssignmentsList from "./assignments-list";
+
+export default class AssignTopicSheet extends Component {
+  @service taskActions;
+
+  @tracked assignment = this.assignments[0];
+
+  @cached
+  get formData() {
+    const data = {};
+
+    data.targetId = this.assignment?.targetId;
+    data.targetType = this.assignment?.targetType;
+    data.assignee = undefined;
+    data.note = this.assignment?.note;
+
+    if (this.assignment?.username) {
+      data.assignee = {
+        username: this.assignment.username,
+        avatar_template: this.assignment.avatar_template,
+        is_user: true,
+      };
+    } else if (this.assignment?.groupName) {
+      data.assignee = {
+        name: this.assignment.groupName,
+        is_group: true,
+      };
+    }
+
+    return data;
+  }
+
+  get assignments() {
+    return this.args.topic.assignments();
+  }
+
+  @action
+  async unassign(assignment) {
+    await this.taskActions.unassign(assignment.targetId, assignment.targetType);
+  }
+
+  @action
+  async handleSubmit(data) {
+    if (!data.assignee) {
+      return;
+    }
+
+    const payload = {
+      targetId: data.targetId,
+      targetType: data.targetType,
+      note: data.note,
+    };
+
+    if (data.assignee.is_user) {
+      payload.username = data.assignee.username;
+    }
+
+    if (data.assignee.is_group) {
+      payload.group_name = data.assignee.name;
+    }
+
+    await this.taskActions.putAssignment(payload);
+  }
+
+  @action
+  async saveAndDismiss(form, dismiss) {
+    await form.submit();
+    dismiss?.();
+  }
+
+  @action
+  onEditAssignment(presentEditSheet, assignment) {
+    this.assignment = assignment;
+    presentEditSheet?.();
+  }
+
+  <template>
+    <DStack as |stack|>
+      <stack.Trigger class="btn-default" @icon="user-plus">
+        Assign
+      </stack.Trigger>
+
+      <stack.Content as |content|>
+        <Form
+          @data={{this.formData}}
+          @onSubmit={{this.handleSubmit}}
+          @noLayout={{true}}
+          as |form data|
+        >
+          <DSheet.Header @sheet={{content.sheet}}>
+            <:left as |Button|>
+              <Button.Close />
+            </:left>
+            <:title>
+              Assignments
+            </:title>
+          </DSheet.Header>
+
+          <content.Stack as |editStack|>
+            <AssignmentsList
+              @assignments={{this.assignments}}
+              @topic={{@topic}}
+              @onEditAssignment={{fn this.onEditAssignment editStack.present}}
+              @onRemoveAssignment={{this.unassign}}
+            />
+
+            <editStack.Content as |editContent|>
+              <DSheet.Header @sheet={{editContent.sheet}}>
+                <:left as |Button|>
+                  <Button.Cancel />
+                </:left>
+                <:title>
+                  Edit Assignment
+                </:title>
+                <:right as |Button|>
+                  <Button @action={{fn this.saveAndDismiss form editContent.dismiss}}>
+                    Save
+                  </Button>
+                </:right>
+              </DSheet.Header>
+
+              <editContent.Stack as |assigneesStack|>
+                <AssignmentForm
+                  @assignment={{this.assignment}}
+                  @sheet={{editContent.sheet}}
+                  @form={{form}}
+                  @data={{data}}
+                  @onShowAssigneesList={{assigneesStack.present}}
+                />
+
+                <assigneesStack.Content as |assigneesContent|>
+                  <DSheet.Header @sheet={{assigneesContent.sheet}}>
+                    <:left as |Button|>
+                      <Button.Cancel />
+                    </:left>
+                    <:title>
+                      Select Assignee
+                    </:title>
+                  </DSheet.Header>
+
+                  <AssigneesList
+                    @assignment={{this.assignment}}
+                    @sheet={{assigneesContent.sheet}}
+                    @form={{form}}
+                    @data={{data}}
+                  />
+                </assigneesStack.Content>
+              </editContent.Stack>
+            </editStack.Content>
+          </content.Stack>
+        </Form>
+      </stack.Content>
+    </DStack>
+  </template>
+}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs
index 934b16d7310a6..37420d55c25ef 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs
@@ -46,6 +46,7 @@ export default class AssignUser extends Component {
   <template>
     <DModal class="assign" @title={{this.title}} @closeModal={{@closeModal}}>
       <:body>
+        ASSIGN USER
         <AssignUserForm
           @model={{this.model}}
           @onSubmit={{this.onSubmit}}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs
index 086500953213e..aeaaaa33ef440 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs
+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs
@@ -46,6 +46,7 @@ export default class EditTopicAssignments extends Component {
   <template>
     <DModal class="assign" @title={{this.title}} @closeModal={{@closeModal}}>
       <:body>
+        EDIT TOPIC ASSIGNMENT
         <TopicAssignments
           @assignments={{this.assignments}}
           @onSubmit={{this.submit}}
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-topic-sheet.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-topic-sheet.gjs
new file mode 100644
index 0000000000000..7ed331a876243
--- /dev/null
+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/topic-footer-main-buttons-before-create/assign-topic-sheet.gjs
@@ -0,0 +1,7 @@
+import AssignTopicSheet from "../../components/assign-topic-sheet";
+
+const AssignTopicSheetConnector = <template>
+  <AssignTopicSheet @topic={{@outletArgs.topic}} />
+</template>;
+
+export default AssignTopicSheetConnector;
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js b/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js
index 175054b17a5d5..c5fa47389b34d 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js
@@ -43,59 +43,59 @@ function defaultTitle(topic) {
 function registerTopicFooterButtons(api) {
   registerTopicFooterDropdown(TopicLevelAssignMenu);
 
-  api.registerTopicFooterButton({
-    id: "assign",
-    icon() {
-      return this.topic.isAssigned()
-        ? this.site.mobileView
-          ? "user-xmark"
-          : null
-        : "user-plus";
-    },
-    priority: 250,
-    translatedTitle() {
-      return defaultTitle(this.topic);
-    },
-    translatedAriaLabel() {
-      return defaultTitle(this.topic);
-    },
-    translatedLabel() {
-      return i18n("discourse_assign.assign.title");
-    },
-    async action() {
-      if (!this.currentUser?.can_assign) {
-        return;
-      }
-
-      const taskActions = getOwner(this).lookup("service:task-actions");
-      const modal = getOwner(this).lookup("service:modal");
-
-      if (this.topic.isAssigned()) {
-        this.topic.assigned_to_user = null;
-        this.topic.assigned_to_group = null;
-
-        await taskActions.unassign(this.topic.id, "Topic");
-      } else {
-        await modal.show(EditTopicAssignments, {
-          model: {
-            topic: this.topic,
-          },
-        });
-      }
-    },
-    dropdown() {
-      return this.site.mobileView;
-    },
-    classNames: ["assign"],
-    dependentKeys: DEPENDENT_KEYS,
-    displayed() {
-      return (
-        this.currentUser?.can_assign &&
-        !this.topic.isAssigned() &&
-        !this.topic.hasAssignedPosts()
-      );
-    },
-  });
+  // api.registerTopicFooterButton({
+  //   id: "assign",
+  //   icon() {
+  //     return this.topic.isAssigned()
+  //       ? this.site.mobileView
+  //         ? "user-xmark"
+  //         : null
+  //       : "user-plus";
+  //   },
+  //   priority: 250,
+  //   translatedTitle() {
+  //     return defaultTitle(this.topic);
+  //   },
+  //   translatedAriaLabel() {
+  //     return defaultTitle(this.topic);
+  //   },
+  //   translatedLabel() {
+  //     return i18n("discourse_assign.assign.title");
+  //   },
+  //   async action() {
+  //     if (!this.currentUser?.can_assign) {
+  //       return;
+  //     }
+
+  //     const taskActions = getOwner(this).lookup("service:task-actions");
+  //     const modal = getOwner(this).lookup("service:modal");
+
+  //     if (this.topic.isAssigned()) {
+  //       this.topic.assigned_to_user = null;
+  //       this.topic.assigned_to_group = null;
+
+  //       await taskActions.unassign(this.topic.id, "Topic");
+  //     } else {
+  //       await modal.show(EditTopicAssignments, {
+  //         model: {
+  //           topic: this.topic,
+  //         },
+  //       });
+  //     }
+  //   },
+  //   dropdown() {
+  //     return this.site.mobileView;
+  //   },
+  //   classNames: ["assign"],
+  //   dependentKeys: DEPENDENT_KEYS,
+  //   displayed() {
+  //     return (
+  //       this.currentUser?.can_assign &&
+  //       !this.topic.isAssigned() &&
+  //       !this.topic.hasAssignedPosts()
+  //     );
+  //   },
+  // });
 
   api.registerTopicFooterButton({
     id: "unassign-mobile-header",
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/models/assignment.js b/plugins/discourse-assign/assets/javascripts/discourse/models/assignment.js
index 488e6df7c1175..e3ca9b0f06a8d 100644
--- a/plugins/discourse-assign/assets/javascripts/discourse/models/assignment.js
+++ b/plugins/discourse-assign/assets/javascripts/discourse/models/assignment.js
@@ -6,6 +6,7 @@ export class Assignment extends EmberObject {
     const assignment = new Assignment();
     assignment.id = 0;
     assignment.username = topic.assigned_to_user?.username;
+    assignment.avatar_template = topic.assigned_to_user?.avatar_template;
     assignment.groupName = topic.assigned_to_group?.name;
     assignment.status = topic.assignment_status;
     assignment.note = topic.assignment_note;
@@ -17,6 +18,7 @@ export class Assignment extends EmberObject {
   static fromPost(post) {
     const assignment = new Assignment();
     assignment.username = post.assigned_to.username;
+    assignment.avatar_template = post.assigned_to.avatar_template;
     assignment.name = post.assigned_to.name;
     assignment.groupName = post.assigned_to.name;
     assignment.status = post.assignment_status;
@@ -36,6 +38,7 @@ export class Assignment extends EmberObject {
   @tracked note;
   @tracked status;
   @tracked username;
+  @tracked avatar_template;
   targetId;
   targetType;
   postNumber;
diff --git a/plugins/discourse-assign/assets/stylesheets/assign-sheet.scss b/plugins/discourse-assign/assets/stylesheets/assign-sheet.scss
new file mode 100644
index 0000000000000..b12afacb66250
--- /dev/null
+++ b/plugins/discourse-assign/assets/stylesheets/assign-sheet.scss
@@ -0,0 +1,128 @@
+.assign-sheet__nested-form {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-2);
+  height: 100%;
+  padding: var(--space-2);
+
+  .filter-input,
+  .assign-sheet__assignees-list {
+    width: 100%;
+  }
+
+  .assign-sheet__assignees-list {
+    padding: 0;
+  }
+
+  .assign-sheet__full-width-btn {
+    width: 100%;
+    justify-content: center;
+    margin: 0;
+  }
+}
+
+.assign-sheet__note-field {
+  width: 100%;
+}
+
+.assign-sheet__assignees {
+  overflow-y: auto;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.assign-sheet__assignee-row {
+  display: flex;
+  text-align: left;
+  gap: var(--space-2);
+
+  &:hover {
+    .assign-sheet__assignee-avatar {
+      .assign-sheet__no-assignee {
+        border: 1px dotted var(--d-button-default-icon-color--hover);
+      }
+    }
+  }
+
+  .assign-sheet__assignee-avatar {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 20px;
+    height: 20px;
+
+    .assign-sheet__no-assignee {
+      display: flex;
+      width: 20px;
+      height: 20px;
+      border-radius: 50%;
+      border: 1px dotted var(--primary-medium);
+      align-items: center;
+      justify-content: center;
+
+      .d-icon {
+        padding: 5px;
+      }
+    }
+
+    img.avatar {
+      width: 20px;
+      height: 20px;
+      border-radius: 50%;
+    }
+
+    .d-icon {
+      width: 20px;
+      height: 20px;
+      color: var(--primary-medium);
+    }
+  }
+
+  .assign-sheet__assignee-details {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    min-width: 0;
+    flex: 1;
+
+    .assign-sheet__assignee-name {
+      font-size: var(--font-down-1);
+
+      @include ellipsis;
+    }
+
+    .assign-sheet__assignee-full-name {
+      font-size: var(--font-down-1);
+      color: var(--primary-medium);
+      font-weight: normal;
+
+      @include ellipsis;
+    }
+  }
+}
+
+.assign-sheet__assignees-list {
+  display: flex;
+  width: 100%;
+  gap: var(--space-2);
+  flex-direction: column;
+  padding: var(--space-2);
+
+  .btn {
+    width: 100%;
+  }
+
+  .assign-sheet__assignee-row {
+    .disclosure-indicator-icon {
+      visibility: hidden;
+    }
+
+    &:hover,
+    &.--selected {
+      .disclosure-indicator-icon {
+        visibility: visible;
+      }
+    }
+  }
+}
diff --git a/plugins/discourse-assign/assets/stylesheets/assignment-card.scss b/plugins/discourse-assign/assets/stylesheets/assignment-card.scss
new file mode 100644
index 0000000000000..07991aebf8ec5
--- /dev/null
+++ b/plugins/discourse-assign/assets/stylesheets/assignment-card.scss
@@ -0,0 +1,92 @@
+.assignment-card {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  gap: var(--space-2);
+  padding: var(--space-3);
+
+  &:not(:first-child) {
+    border-top: 1px solid var(--primary-low);
+  }
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+    gap: var(--space-3);
+  }
+
+  &__content {
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    background: none;
+    border: none;
+    padding: 0;
+    cursor: pointer;
+    text-align: left;
+  }
+
+  &__title {
+    font-weight: 700;
+    font-size: var(--font-down-1);
+    color: var(--primary);
+    max-width: 100%;
+
+    @include ellipsis;
+  }
+
+  &__username {
+    font-size: var(--font-down-2);
+    color: var(--primary-medium);
+    max-width: 100%;
+
+    @include ellipsis;
+  }
+
+  &__unassigned {
+    font-size: var(--font-down-2);
+    color: var(--primary-low-mid);
+    font-style: italic;
+  }
+
+  &.--unassigned {
+    opacity: 0.7;
+  }
+
+  &__note {
+    margin-top: var(--space-2);
+    padding: var(--space-2) var(--space-3);
+    border: 1px dashed var(--primary-low-mid);
+    font-size: var(--font-down-1);
+    color: var(--primary-medium);
+    font-style: italic;
+    white-space: pre-wrap;
+  }
+
+  &__actions {
+    display: flex;
+    gap: var(--space-1);
+    align-items: center;
+    flex-shrink: 0;
+  }
+
+  &__action-btn.btn-flat {
+    background-color: var(--primary-very-low);
+    border-radius: var(--d-border-radius);
+
+    .d-icon {
+      color: var(--primary-medium);
+    }
+
+    &:hover {
+      background-color: var(--primary-low);
+
+      .d-icon {
+        color: var(--primary);
+      }
+    }
+  }
+}
diff --git a/plugins/discourse-assign/assets/stylesheets/assignments-list.scss b/plugins/discourse-assign/assets/stylesheets/assignments-list.scss
new file mode 100644
index 0000000000000..336f19574d196
--- /dev/null
+++ b/plugins/discourse-assign/assets/stylesheets/assignments-list.scss
@@ -0,0 +1,7 @@
+.assignments-list {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
diff --git a/plugins/discourse-assign/assets/stylesheets/assigns.scss b/plugins/discourse-assign/assets/stylesheets/assigns.scss
index 73ccc16bfc93e..625f028faac76 100644
--- a/plugins/discourse-assign/assets/stylesheets/assigns.scss
+++ b/plugins/discourse-assign/assets/stylesheets/assigns.scss
@@ -1,3 +1,7 @@
+@import "assign-sheet";
+@import "assignment-card";
+@import "assignments-list";
+
 .user-content {
   .assign-controls {
     display: flex;
diff --git a/plugins/discourse-assign/config/locales/client.en.yml b/plugins/discourse-assign/config/locales/client.en.yml
index 88da3e6a02db1..13dab1d114209 100644
--- a/plugins/discourse-assign/config/locales/client.en.yml
+++ b/plugins/discourse-assign/config/locales/client.en.yml
@@ -24,6 +24,9 @@ en:
       note_change: "Changed assignment note for %{who} %{when}"
       status_change: "Changed assignment status for %{who} %{when}"
     discourse_assign:
+      post_number: "Post#%{number}"
+      unassigned: "Unassigned"
+      assign_to: Assign to...
       add_unassigned_filter: "Add 'unassigned' filter to category"
       cant_act: "You cannot act on flags that have been assigned to other users"
       cant_act_unclaimed: "You must claim this topic before acting on flags."
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs
new file mode 100644
index 0000000000000..b9747119bca78
--- /dev/null
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs
@@ -0,0 +1,786 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { fn } from "@ember/helper";
+import { on } from "@ember/modifier";
+import { action } from "@ember/object";
+import { service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import DButton from "discourse/components/d-button";
+import DBottomSheet from "discourse/float-kit/components/d-bottom-sheet";
+import DCard from "discourse/float-kit/components/d-card";
+import DStack from "discourse/float-kit/components/d-stack";
+import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";
+import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";
+
+export default class Sheets extends Component {
+  @service toasts;
+
+  // Form values for Cat Profile Builder
+  @tracked catName = "Luna";
+  @tracked catAge = "adult";
+  @tracked catBreed = "mixed";
+  @tracked catFurLength = "short";
+  @tracked catSize = "medium";
+  @tracked catColor1 = "#f5a623";
+  @tracked catColor2 = "#ffffff";
+  @tracked catColor3 = "#4a4a4a";
+  @tracked catPersonality = ["cuddly", "curious"];
+  @tracked catLifestyle = ["apartment", "indoor"];
+  @tracked
+  catDescription =
+    "A gentle, affectionate companion who loves sunny windowsills and quiet evenings curled up on the couch.";
+  @tracked controlledSheetPresented = false;
+
+  scrollItems = Array.from({ length: 100 }, (_, i) => i + 1);
+
+  @action
+  updateFormField(field, event) {
+    this[field] = event.target.value;
+  }
+
+  @action
+  exampleToastAction() {
+    alert("exampleToastAction");
+  }
+
+  @action
+  showToast() {
+    this.toasts.success({
+      showProgressBar: true,
+      data: {
+        cancel: true,
+        action: {
+          label: "Action",
+          onClick: this.exampleToastAction,
+        },
+        title: "Hello",
+        message: "This is a toast",
+      },
+    });
+  }
+
+  @action
+  setControlledSheetPresented(value) {
+    this.controlledSheetPresented = value;
+  }
+
+  @action
+  toggleCheckbox(field, value) {
+    const current = this[field];
+    if (current.includes(value)) {
+      this[field] = current.filter((v) => v !== value);
+    } else {
+      this[field] = [...current, value];
+    }
+  }
+
+  colorStyle(color) {
+    return htmlSafe(`--color: ${color}`);
+  }
+
+  <template>
+    <StyleguideExample @title="Sheets">
+      <StyleguideComponent @tag="bottom">
+        <:sample>
+          <DBottomSheet as |bs|>
+            <bs.Trigger>Open Bottom Sheet</bs.Trigger>
+            <bs.Content as |content|>
+              <p>Bottom sheet content here</p>
+              <content.Trigger @action="dismiss">Close</content.Trigger>
+            </bs.Content>
+          </DBottomSheet>
+        </:sample>
+      </StyleguideComponent>
+
+      <StyleguideComponent @tag="controlled">
+        <:sample>
+          <DButton
+            class="btn-default"
+            @action={{fn this.setControlledSheetPresented true}}
+          >Open Controlled Bottom Sheet</DButton>
+          <DBottomSheet
+            @presented={{this.controlledSheetPresented}}
+            @onPresentedChange={{this.setControlledSheetPresented}}
+            as |bs|
+          >
+            <bs.Content as |content|>
+              <p>Controlled bottom sheet content here</p>
+              <content.Trigger @action="dismiss">Close</content.Trigger>
+            </bs.Content>
+          </DBottomSheet>
+        </:sample>
+      </StyleguideComponent>
+
+      <StyleguideComponent @tag="expandable">
+        <:sample>
+          <DBottomSheet @expandable={{true}} as |bs|>
+            <bs.Trigger>Open Expandable Bottom Sheet</bs.Trigger>
+            <bs.Content as |content|>
+              <input
+                class="bottom-sheet__input"
+                placeholder="Focus to expand..."
+                {{on "focus" content.expand}}
+              />
+              <content.ScrollArea>
+                <ul>
+                  {{#each this.scrollItems as |item|}}
+                    <li>Item {{item}}</li>
+                  {{/each}}
+                </ul>
+              </content.ScrollArea>
+            </bs.Content>
+          </DBottomSheet>
+        </:sample>
+      </StyleguideComponent>
+
+      <StyleguideComponent @tag="card">
+        <:sample>
+          <DCard as |card|>
+            <card.Trigger>Open Card</card.Trigger>
+            <card.Content as |content|>
+              <p>Card content here</p>
+              <content.Trigger @action="dismiss">Close</content.Trigger>
+            </card.Content>
+          </DCard>
+        </:sample>
+      </StyleguideComponent>
+
+      <StyleguideComponent @tag="toast">
+        <:sample>
+          <DButton @action={{this.showToast}} class="btn-default">Show toast</DButton>
+        </:sample>
+      </StyleguideComponent>
+
+      <StyleguideComponent @tag="stacks">
+        <:sample>
+          <DStack as |stack|>
+            <stack.Trigger>Open Stack</stack.Trigger>
+            <stack.Content as |content|>
+              <p>First level content</p>
+              <content.Stack as |nested|>
+                <nested.Trigger>Open Nested</nested.Trigger>
+                <nested.Content as |nestedContent|>
+                  <p>Second level content</p>
+                  <nestedContent.Stack as |deepNested|>
+                    <deepNested.Trigger>Open Deep Nested</deepNested.Trigger>
+                    <deepNested.Content as |deepNestedContent|>
+                      <p>Third level content</p>
+                      <deepNestedContent.Trigger @action="dismiss">Close Deep
+                        Nested</deepNestedContent.Trigger>
+                    </deepNested.Content>
+                  </nestedContent.Stack>
+                  <nestedContent.Trigger @action="dismiss">Close Nested</nestedContent.Trigger>
+                </nested.Content>
+              </content.Stack>
+              <content.Trigger @action="dismiss">Close</content.Trigger>
+            </stack.Content>
+          </DStack>
+        </:sample>
+      </StyleguideComponent>
+
+      {{!-- <StyleguideComponent @tag="with-keyboard">
+        <:sample>
+          <DSheetWithKeyboard.Root as |root|>
+            <root.Trigger class="ExampleSheetWithKeyboard-presentTrigger">
+              Build Your Ideal Cat
+            </root.Trigger>
+            <root.Portal>
+              <root.View as |view|>
+                <view.Backdrop />
+                <view.Content class="ExampleSheetWithKeyboard-content">
+                  <div class="ExampleSheetWithKeyboard-header">
+                    <root.Trigger
+                      class="ExampleSheetWithKeyboard-cancelButton"
+                      @action="dismiss"
+                    >
+                      Cancel
+                    </root.Trigger>
+                    <h2 class="ExampleSheetWithKeyboard-title">
+                      Build Your Ideal Cat
+                    </h2>
+                    <root.Trigger
+                      class="ExampleSheetWithKeyboard-saveButton"
+                      @action="dismiss"
+                    >
+                      Save
+                    </root.Trigger>
+                  </div>
+                  <root.ScrollView>
+                    <div class="ExampleSheetWithKeyboard-info">
+                      <h3 class="ExampleSheetWithKeyboard-details">
+                        Cat Profile
+                      </h3>
+                      <div class="ExampleSheetWithKeyboard-form">
+                        {{! Cat Name }}
+                        <div class="ExampleSheetWithKeyboard-field">
+                          <label
+                            for="cat-name"
+                            class="ExampleSheetWithKeyboard-label"
+                          >
+                            Cat Name
+                          </label>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            What would you name your ideal cat?
+                          </p>
+                          <input
+                            class="ExampleSheetWithKeyboard-input"
+                            id="cat-name"
+                            name="catName"
+                            type="text"
+                            placeholder="Whiskers, Luna, Oliver..."
+                            value={{this.catName}}
+                            {{on "input" (fn this.updateFormField "catName")}}
+                          />
+                        </div>
+
+                        {{! Age Preference }}
+                        <div class="ExampleSheetWithKeyboard-field">
+                          <div class="ExampleSheetWithKeyboard-label">
+                            Age Preference
+                          </div>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            What life stage are you looking for?
+                          </p>
+                          <div class="ExampleSheetWithKeyboard-radioGroup">
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catAge"
+                                value="kitten"
+                                checked={{eq this.catAge "kitten"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catAge")
+                                }}
+                              />
+                              <span>Kitten (0-1 year)</span>
+                            </label>
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catAge"
+                                value="adult"
+                                checked={{eq this.catAge "adult"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catAge")
+                                }}
+                              />
+                              <span>Adult (1-7 years)</span>
+                            </label>
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catAge"
+                                value="senior"
+                                checked={{eq this.catAge "senior"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catAge")
+                                }}
+                              />
+                              <span>Senior (7+ years)</span>
+                            </label>
+                          </div>
+                        </div>
+
+                        {{! Breed }}
+                        <div class="ExampleSheetWithKeyboard-field">
+                          <label
+                            for="cat-breed"
+                            class="ExampleSheetWithKeyboard-label"
+                          >
+                            Breed
+                          </label>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            Select your preferred breed.
+                          </p>
+                          <select
+                            class="ExampleSheetWithKeyboard-select"
+                            id="cat-breed"
+                            name="catBreed"
+                            value={{this.catBreed}}
+                            {{on "change" (fn this.updateFormField "catBreed")}}
+                          >
+                            <option value="mixed">Mixed / Rescue</option>
+                            <option value="persian">Persian</option>
+                            <option value="siamese">Siamese</option>
+                            <option value="maine-coon">Maine Coon</option>
+                            <option value="british-shorthair">British Shorthair</option>
+                            <option value="ragdoll">Ragdoll</option>
+                            <option value="bengal">Bengal</option>
+                            <option value="abyssinian">Abyssinian</option>
+                            <option value="scottish-fold">Scottish Fold</option>
+                            <option value="sphynx">Sphynx</option>
+                          </select>
+                        </div>
+
+                        {{! Personality Traits }}
+                        <div class="ExampleSheetWithKeyboard-field">
+                          <div class="ExampleSheetWithKeyboard-label">
+                            Personality Traits
+                          </div>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            Select the traits that matter most to you.
+                          </p>
+                          <div class="ExampleSheetWithKeyboard-checkboxGroup">
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes
+                                  this.catPersonality
+                                  "playful"
+                                }}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox
+                                    "catPersonality"
+                                    "playful"
+                                  )
+                                }}
+                              />
+                              <span>Playful</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes this.catPersonality "calm"}}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox "catPersonality" "calm"
+                                  )
+                                }}
+                              />
+                              <span>Calm</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes
+                                  this.catPersonality
+                                  "independent"
+                                }}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox
+                                    "catPersonality"
+                                    "independent"
+                                  )
+                                }}
+                              />
+                              <span>Independent</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes
+                                  this.catPersonality
+                                  "cuddly"
+                                }}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox
+                                    "catPersonality"
+                                    "cuddly"
+                                  )
+                                }}
+                              />
+                              <span>Cuddly</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes
+                                  this.catPersonality
+                                  "curious"
+                                }}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox
+                                    "catPersonality"
+                                    "curious"
+                                  )
+                                }}
+                              />
+                              <span>Curious</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes this.catPersonality "vocal"}}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox "catPersonality" "vocal"
+                                  )
+                                }}
+                              />
+                              <span>Vocal</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes this.catPersonality "shy"}}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox "catPersonality" "shy"
+                                  )
+                                }}
+                              />
+                              <span>Shy</span>
+                            </label>
+                          </div>
+                        </div>
+
+                        {{! Fur Length }}
+                        <div class="ExampleSheetWithKeyboard-field">
+                          <div class="ExampleSheetWithKeyboard-label">
+                            Fur Length
+                          </div>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            What coat length do you prefer?
+                          </p>
+                          <div class="ExampleSheetWithKeyboard-radioGroup">
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catFurLength"
+                                value="hairless"
+                                checked={{eq this.catFurLength "hairless"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catFurLength")
+                                }}
+                              />
+                              <span>Hairless</span>
+                            </label>
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catFurLength"
+                                value="short"
+                                checked={{eq this.catFurLength "short"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catFurLength")
+                                }}
+                              />
+                              <span>Short</span>
+                            </label>
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catFurLength"
+                                value="medium"
+                                checked={{eq this.catFurLength "medium"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catFurLength")
+                                }}
+                              />
+                              <span>Medium</span>
+                            </label>
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catFurLength"
+                                value="long"
+                                checked={{eq this.catFurLength "long"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catFurLength")
+                                }}
+                              />
+                              <span>Long</span>
+                            </label>
+                          </div>
+                        </div>
+
+                        {{! Size }}
+                        <div class="ExampleSheetWithKeyboard-field">
+                          <div class="ExampleSheetWithKeyboard-label">
+                            Size
+                          </div>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            What size cat do you prefer?
+                          </p>
+                          <div class="ExampleSheetWithKeyboard-radioGroup">
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catSize"
+                                value="small"
+                                checked={{eq this.catSize "small"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catSize")
+                                }}
+                              />
+                              <span>Small (5-8 lbs)</span>
+                            </label>
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catSize"
+                                value="medium"
+                                checked={{eq this.catSize "medium"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catSize")
+                                }}
+                              />
+                              <span>Medium (8-12 lbs)</span>
+                            </label>
+                            <label class="ExampleSheetWithKeyboard-radioLabel">
+                              <input
+                                type="radio"
+                                name="catSize"
+                                value="large"
+                                checked={{eq this.catSize "large"}}
+                                {{on
+                                  "change"
+                                  (fn this.updateFormField "catSize")
+                                }}
+                              />
+                              <span>Large (12+ lbs)</span>
+                            </label>
+                          </div>
+                        </div>
+
+                        {{! Coat Colors }}
+                        <div
+                          class="ExampleSheetWithKeyboard-field fieldType-color"
+                        >
+                          <div class="ExampleSheetWithKeyboard-label">
+                            Coat Colors
+                          </div>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            Pick your preferred coat colors.
+                          </p>
+                          <div class="ExampleSheetWithKeyboard-colorInputs">
+                            <div
+                              class="ExampleSheetWithKeyboard-colorInputWrapper"
+                            >
+                              <input
+                                class="ExampleSheetWithKeyboard-colorInput"
+                                id="cat-color1"
+                                name="color1"
+                                type="color"
+                                value={{this.catColor1}}
+                                {{on
+                                  "input"
+                                  (fn this.updateFormField "catColor1")
+                                }}
+                              />
+                              <div
+                                class="ExampleSheetWithKeyboard-colorInputReplacement"
+                                style={{this.colorStyle this.catColor1}}
+                              ></div>
+                            </div>
+                            <div
+                              class="ExampleSheetWithKeyboard-colorInputWrapper"
+                            >
+                              <input
+                                class="ExampleSheetWithKeyboard-colorInput"
+                                id="cat-color2"
+                                name="color2"
+                                type="color"
+                                value={{this.catColor2}}
+                                {{on
+                                  "input"
+                                  (fn this.updateFormField "catColor2")
+                                }}
+                              />
+                              <div
+                                class="ExampleSheetWithKeyboard-colorInputReplacement"
+                                style={{this.colorStyle this.catColor2}}
+                              ></div>
+                            </div>
+                            <div
+                              class="ExampleSheetWithKeyboard-colorInputWrapper"
+                            >
+                              <input
+                                class="ExampleSheetWithKeyboard-colorInput"
+                                id="cat-color3"
+                                name="color3"
+                                type="color"
+                                value={{this.catColor3}}
+                                {{on
+                                  "input"
+                                  (fn this.updateFormField "catColor3")
+                                }}
+                              />
+                              <div
+                                class="ExampleSheetWithKeyboard-colorInputReplacement"
+                                style={{this.colorStyle this.catColor3}}
+                              ></div>
+                            </div>
+                          </div>
+                        </div>
+
+                        {{! Lifestyle Compatibility }}
+                        <div class="ExampleSheetWithKeyboard-field">
+                          <div class="ExampleSheetWithKeyboard-label">
+                            Lifestyle Compatibility
+                          </div>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            Select what applies to your living situation.
+                          </p>
+                          <div class="ExampleSheetWithKeyboard-checkboxGroup">
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes
+                                  this.catLifestyle
+                                  "apartment"
+                                }}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox
+                                    "catLifestyle"
+                                    "apartment"
+                                  )
+                                }}
+                              />
+                              <span>Apartment-friendly</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes
+                                  this.catLifestyle
+                                  "children"
+                                }}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox
+                                    "catLifestyle"
+                                    "children"
+                                  )
+                                }}
+                              />
+                              <span>Good with children</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes this.catLifestyle "dogs"}}
+                                {{on
+                                  "change"
+                                  (fn this.toggleCheckbox "catLifestyle" "dogs")
+                                }}
+                              />
+                              <span>Good with dogs</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes this.catLifestyle "cats"}}
+                                {{on
+                                  "change"
+                                  (fn this.toggleCheckbox "catLifestyle" "cats")
+                                }}
+                              />
+                              <span>Good with other cats</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes this.catLifestyle "indoor"}}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox "catLifestyle" "indoor"
+                                  )
+                                }}
+                              />
+                              <span>Indoor only</span>
+                            </label>
+                            <label
+                              class="ExampleSheetWithKeyboard-checkboxLabel"
+                            >
+                              <input
+                                type="checkbox"
+                                checked={{includes this.catLifestyle "outdoor"}}
+                                {{on
+                                  "change"
+                                  (fn
+                                    this.toggleCheckbox "catLifestyle" "outdoor"
+                                  )
+                                }}
+                              />
+                              <span>Outdoor access</span>
+                            </label>
+                          </div>
+                        </div>
+
+                        {{! Description }}
+                        <div
+                          class="ExampleSheetWithKeyboard-field fieldType-description"
+                        >
+                          <label
+                            for="cat-description"
+                            class="ExampleSheetWithKeyboard-label"
+                          >
+                            Describe Your Ideal Cat
+                          </label>
+                          <p class="ExampleSheetWithKeyboard-labelDescription">
+                            In your own words, describe what makes your perfect
+                            feline companion.
+                          </p>
+                          <textarea
+                            class="ExampleSheetWithKeyboard-textarea"
+                            id="cat-description"
+                            name="catDescription"
+                            rows="6"
+                            placeholder="Tell us about your dream cat's personality, quirks, and what kind of bond you hope to share..."
+                            {{on
+                              "input"
+                              (fn this.updateFormField "catDescription")
+                            }}
+                          >{{this.catDescription}}</textarea>
+                        </div>
+                      </div>
+                    </div>
+                  </root.ScrollView>
+                </view.Content>
+              </root.View>
+            </root.Portal>
+          </DSheetWithKeyboard.Root>
+        </:sample>
+      </StyleguideComponent> --}}
+    </StyleguideExample>
+  </template>
+}
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs
index 8d2a51973cba3..930ce4dd4bf87 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs
@@ -9,22 +9,37 @@ import DToggleSwitch from "discourse/components/d-toggle-switch";
 import { TOAST } from "discourse/float-kit/lib/constants";
 import withEventValue from "discourse/helpers/with-event-value";
 import IconPicker from "discourse/select-kit/components/icon-picker";
-import DummyComponent from "discourse/plugins/styleguide/discourse/components/dummy-component";
 import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";
 import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";
 import Row from "discourse/plugins/styleguide/discourse/components/styleguide/controls/row";
 import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";
 
+const ToastCustomComponent = <template>
+  <style>
+    .my-custom-component {
+      background-color: var(--secondary);
+      padding: var(--space-4);
+      border-radius: var(--d-border-radius-large);
+      box-shadow: var(--shadow-card);
+    }
+  </style>
+  <div class="my-custom-component" ...attributes>
+    My custom component with foo: My custom component with foo:
+    {{@toast.options.data.foo}}
+  </div>
+</template>;
+
 export default class Toasts extends Component {
   @service toasts;
 
   @tracked title = "Title";
   @tracked message = "Message";
-  @tracked duration = TOAST.options.duration;
+  @tracked duration = 3000;
   @tracked autoClose = TOAST.options.autoClose;
   @tracked showProgressBar = TOAST.options.showProgressBar;
   @tracked class;
   @tracked action = true;
+  @tracked cancel = false;
   @tracked icon;
 
   @action
@@ -33,7 +48,7 @@ export default class Toasts extends Component {
       duration: this.duration,
       autoClose: this.autoClose,
       class: this.class,
-      component: DummyComponent,
+      component: ToastCustomComponent,
       data: {
         foo: 1,
       },
@@ -51,11 +66,20 @@ export default class Toasts extends Component {
         action: (args) => {
           // eslint-disable-next-line no-alert
           alert("Closing toast:" + args.data.title);
-          args.close();
         },
       });
     }
 
+    let cancel;
+    if (this.cancel) {
+      cancel = {
+        label: "Cancel",
+        onClick: () => {
+          alert("Cancelled toast");
+        },
+      };
+    }
+
     this.toasts[theme]({
       duration: this.duration,
       autoClose: this.autoClose,
@@ -66,6 +90,7 @@ export default class Toasts extends Component {
         message: this.message,
         icon: this.icon,
         actions,
+        cancel,
       },
     });
   }
@@ -75,6 +100,11 @@ export default class Toasts extends Component {
     this.action = !this.action;
   }
 
+  @action
+  toggleCancel() {
+    this.cancel = !this.cancel;
+  }
+
   @action
   toggleAutoClose() {
     this.autoClose = !this.autoClose;
@@ -85,6 +115,11 @@ export default class Toasts extends Component {
     this.showProgressBar = !this.showProgressBar;
   }
 
+  @action
+  updateDuration(value) {
+    this.duration = parseInt(value, 10);
+  }
+
   <template>
     {{! template-lint-disable no-potential-path-strings }}
     <StyleguideExample @title="Toasts service">
@@ -158,7 +193,7 @@ export default class Toasts extends Component {
         {{#if this.autoClose}}
           <Row @name="[@options.duration] ms">
             <input
-              {{on "input" (withEventValue (fn (mut this.duration)))}}
+              {{on "input" (withEventValue this.updateDuration)}}
               type="number"
               value={{this.duration}}
             />
@@ -202,6 +237,12 @@ export default class Toasts extends Component {
             {{on "click" this.toggleAction}}
           />
         </Row>
+        <Row @name="With a cancel">
+          <DToggleSwitch
+            @state={{this.cancel}}
+            {{on "click" this.toggleCancel}}
+          />
+        </Row>
       </Controls>
     </StyleguideExample>
   </template>
diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js b/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js
index 03dfd374cbc8d..a3f9a5e1d381a 100644
--- a/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js
+++ b/plugins/styleguide/assets/javascripts/discourse/lib/styleguide.js
@@ -19,6 +19,7 @@ import multiselect from "../components/sections/molecules/multi-select";
 import navigationBar from "../components/sections/molecules/navigation-bar";
 import navigationStacked from "../components/sections/molecules/navigation-stacked";
 import postMenu from "../components/sections/molecules/post-menu";
+import sheets from "../components/sections/molecules/sheets";
 import signupCta from "../components/sections/molecules/signup-cta";
 import toasts from "../components/sections/molecules/toasts";
 import tooltips from "../components/sections/molecules/tooltips";
@@ -74,6 +75,7 @@ const SECTIONS = [
   },
   { component: postMenu, category: "molecules", id: "post-menu" },
   { component: tooltips, category: "molecules", id: "tooltips" },
+  { component: sheets, category: "molecules", id: "sheets" },
   { component: menus, category: "molecules", id: "menus" },
   { component: multiselect, category: "molecules", id: "multi-select" },
   { component: toasts, category: "molecules", id: "toasts" },
diff --git a/spec/system/admin_color_palettes_config_area_spec.rb b/spec/system/admin_color_palettes_config_area_spec.rb
index 8bf75b5fc42ba..fc414450b1ff3 100644
--- a/spec/system/admin_color_palettes_config_area_spec.rb
+++ b/spec/system/admin_color_palettes_config_area_spec.rb
@@ -244,7 +244,7 @@
         ),
       )
 
-      expect(page).to have_no_css(".fk-d-default-toast.-success")
+      expect(page).to have_no_css(".fk-d-default-toast--success")
     end
 
     it "shows toast when admin cannot see live preview" do
diff --git a/spec/system/page_objects/components/toasts.rb b/spec/system/page_objects/components/toasts.rb
index 40bb9dc7e3c46..1e160caf99e03 100644
--- a/spec/system/page_objects/components/toasts.rb
+++ b/spec/system/page_objects/components/toasts.rb
@@ -8,27 +8,27 @@ def has_default?(message)
       end
 
       def has_success?(message)
-        has_css?(".fk-d-default-toast.-success", text: message)
+        has_css?(".fk-d-default-toast--success", text: message)
       end
 
       def close_button
-        find(".fk-d-default-toast__close-container .btn")
+        find(".fk-d-default-toast__close-btn")
       end
 
       def has_warning?(message)
-        has_css?(".fk-d-default-toast.-warning", text: message)
+        has_css?(".fk-d-default-toast--warning", text: message)
       end
 
       def has_info?(message)
-        has_css?(".fk-d-default-toast.-info", text: message)
+        has_css?(".fk-d-default-toast--info", text: message)
       end
 
       def has_error?(message)
-        has_css?(".fk-d-default-toast.-error", text: message)
+        has_css?(".fk-d-default-toast--error", text: message)
       end
 
       def has_no_message?
-        has_no_css?(".fk-d-default-toast__message")
+        has_no_css?(".fk-d-default-toast__description")
       end
     end
   end

From 6c61dd6602d5f805d3e48ebeb4e8e9965d9c3de4 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 6 Feb 2026 15:35:35 +0100
Subject: [PATCH 143/168] tweaks

---
 frontend/discourse/float-kit/components/d-stack.gjs             | 2 +-
 .../discourse/components/sections/molecules/sheets.gjs          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/discourse/float-kit/components/d-stack.gjs b/frontend/discourse/float-kit/components/d-stack.gjs
index baeebe3b3a199..85c9bcf20f436 100644
--- a/frontend/discourse/float-kit/components/d-stack.gjs
+++ b/frontend/discourse/float-kit/components/d-stack.gjs
@@ -48,7 +48,7 @@ const DStackSharedContent = <template>
       <DSheet.Backdrop
         class="d-stack__backdrop"
         @sheet={{@sheet}}
-        @travelAnimation={{hash opacity=(array 0 0.2)}}
+        @travelAnimation={{hash opacity=(array 0 0.4)}}
       />
       <DSheet.Content
         class="d-stack__content"
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs
index b9747119bca78..544333d5ab50f 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/sheets.gjs
@@ -121,6 +121,7 @@ export default class Sheets extends Component {
                 placeholder="Focus to expand..."
                 {{on "focus" content.expand}}
               />
+
               <content.ScrollArea>
                 <ul>
                   {{#each this.scrollItems as |item|}}

From 39b75aa6282021b8f7e90efd510b010c7ac12ba5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Feb 2026 13:52:46 +0100
Subject: [PATCH 144/168] fixes

---
 .../components/d-sheet/animation-travel.js    |   4 +
 .../components/d-sheet/controller.js          |  19 +-
 .../components/d-sheet/focus-management.js    |  66 +-
 .../float-kit/components/d-sheet/root.gjs     |  18 +-
 .../components/d-sheet/sheet-action-base.js   |  11 +-
 .../float-kit/components/d-sheet/trigger.gjs  |   6 +
 .../float-kit/lib/behavior-handler.js         |   8 +-
 .../float-kit/services/sheet-layer-store.js   | 746 ++++++++++++++++++
 .../float-kit/services/sheet-registry.js      | 539 +------------
 .../services/sheet-stack-registry.js          |  15 +-
 10 files changed, 848 insertions(+), 584 deletions(-)
 create mode 100644 frontend/discourse/float-kit/services/sheet-layer-store.js

diff --git a/frontend/discourse/float-kit/components/d-sheet/animation-travel.js b/frontend/discourse/float-kit/components/d-sheet/animation-travel.js
index 8ef038ed7dbd9..c1b953785fcef 100644
--- a/frontend/discourse/float-kit/components/d-sheet/animation-travel.js
+++ b/frontend/discourse/float-kit/components/d-sheet/animation-travel.js
@@ -218,6 +218,10 @@ export default class AnimationTravel {
         c.state.openness.completeAnimation();
         c.state.staging.advance();
       }
+      if (c.state.position.isFrontOpening || c.state.position.isFrontClosing) {
+        c.state.position.advance();
+        c.stackingAdapter?.notifyParentPositionMachineNext();
+      }
       return;
     }
 
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index a7c37d985fbd8..021951f4e0f02 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -351,6 +351,12 @@ export default class Controller {
    */
   sheetRegistry = null;
 
+  /**
+   * Reference to the sheet layer store.
+   * @type {Object|null}
+   */
+  sheetLayerStore = null;
+
   /**
    * Reference to the theme color manager.
    * @type {Object|null}
@@ -833,6 +839,7 @@ export default class Controller {
       "onSafeToUnmountChange",
       "sheetStackRegistry",
       "sheetRegistry",
+      "sheetLayerStore",
       "themeColorManager",
     ];
 
@@ -1361,6 +1368,7 @@ export default class Controller {
    * @private
    */
   handleClosing() {
+    this.focusManagement.captureFocusWasInsideOnClose();
     this.state.position.readyToGoOut();
     this.updateTravelStatus("travellingOut");
     this.stackingAdapter.notifyParentOfClosing();
@@ -1412,6 +1420,7 @@ export default class Controller {
       return;
     }
 
+    this.focusManagement.captureFocusWasInsideOnClose();
     this.state.beginImmediateClose(true);
     this.updateTravelStatus("travellingOut");
     this.state.skip.disableClosing();
@@ -1463,9 +1472,6 @@ export default class Controller {
       this.state.elements.reset();
     }
 
-    this.executeAutoFocusOnDismiss();
-    this.cleanup();
-
     // Reset travel state
     this.activeDetent = 0;
     this.currentSegment = [0, 0];
@@ -1617,7 +1623,7 @@ export default class Controller {
     this.resetViewStyles();
     this.calculateDimensionsIfReady();
     this.setupResizeObserver();
-    this.sheetRegistry?.recalculateInertOutside();
+    this.sheetLayerStore?.recalculateInertOutside();
     this.#notifyElementsRegisteredIfReady();
   }
 
@@ -1692,6 +1698,10 @@ export default class Controller {
     this.focusManagement.executeAutoFocusOnDismiss();
   }
 
+  setPreviouslyFocusedElement(element) {
+    this.focusManagement.setPreviouslyFocusedElement(element);
+  }
+
   /**
    * Apply inert attribute to elements outside the sheet.
    */
@@ -2142,6 +2152,7 @@ export default class Controller {
    */
   @action
   open() {
+    this.focusManagement.capturePreviouslyFocusedElement();
     this.state.broadcastOpen();
   }
 
diff --git a/frontend/discourse/float-kit/components/d-sheet/focus-management.js b/frontend/discourse/float-kit/components/d-sheet/focus-management.js
index 405c668f20acb..6f1a98cc568fd 100644
--- a/frontend/discourse/float-kit/components/d-sheet/focus-management.js
+++ b/frontend/discourse/float-kit/components/d-sheet/focus-management.js
@@ -130,13 +130,6 @@ export default class FocusManagement {
    */
   controller;
 
-  /**
-   * The element that was focused before the sheet opened.
-   *
-   * @type {HTMLElement|null}
-   */
-  #previouslyFocusedElement = null;
-
   /**
    * Creates a new FocusManagement instance.
    *
@@ -155,13 +148,31 @@ export default class FocusManagement {
     return this.controller.view;
   }
 
+  get #layerStore() {
+    return this.controller.sheetRegistry?.sheetLayerStore;
+  }
+
+  setPreviouslyFocusedElement(element) {
+    this.#layerStore?.setLayerFocusedLastBeforeShowing(
+      this.controller.id,
+      element
+    );
+  }
+
+  captureFocusWasInsideOnClose() {
+    this.#layerStore?.captureLayerFocusWasInsideOnClose(
+      this.controller.id,
+      this.#view
+    );
+  }
+
   /**
    * Capture the currently focused element before the sheet opens.
    */
   capturePreviouslyFocusedElement() {
-    if (typeof document !== "undefined") {
-      this.#previouslyFocusedElement = document.activeElement;
-    }
+    this.#layerStore?.captureLayerFocusedLastBeforeShowingFromActive(
+      this.controller.id
+    );
   }
 
   /**
@@ -210,42 +221,17 @@ export default class FocusManagement {
    * Respects the onDismissAutoFocus behavior handler.
    */
   executeAutoFocusOnDismiss() {
-    const activeElement = document.activeElement;
-
-    if (
-      this.#view &&
-      !this.#view.contains(activeElement) &&
-      document.contains(activeElement)
-    ) {
-      this.#previouslyFocusedElement = null;
-      return;
-    }
-
-    const behavior = processBehavior({
-      nativeEvent: null,
-      defaultBehavior: { focus: true },
-      handler: this.controller.onDismissAutoFocus,
+    this.#layerStore?.executeLayerDismissAutoFocus({
+      sheetId: this.controller.id,
+      viewElement: this.#view,
+      onDismissAutoFocus: this.controller.onDismissAutoFocus,
     });
-
-    if (behavior.focus === false) {
-      this.#previouslyFocusedElement = null;
-      return;
-    }
-
-    const target =
-      this.#previouslyFocusedElement &&
-      document.contains(this.#previouslyFocusedElement)
-        ? this.#previouslyFocusedElement
-        : document.body;
-
-    target.focus({ preventScroll: true });
-    this.#previouslyFocusedElement = null;
   }
 
   /**
    * Clean up all resources and reset state.
    */
   cleanup() {
-    this.#previouslyFocusedElement = null;
+    this.#layerStore?.clearLayerFocusState(this.controller.id);
   }
 }
diff --git a/frontend/discourse/float-kit/components/d-sheet/root.gjs b/frontend/discourse/float-kit/components/d-sheet/root.gjs
index 9f8c189ca9241..7ba06db407ee9 100644
--- a/frontend/discourse/float-kit/components/d-sheet/root.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/root.gjs
@@ -35,6 +35,9 @@ export default class Root extends Component {
   /** @type {import("discourse/float-kit/services/sheet-registry").default} */
   @service sheetRegistry;
 
+  /** @type {import("discourse/float-kit/services/sheet-layer-store").default} */
+  @service sheetLayerStore;
+
   /** @type {import("discourse/float-kit/services/sheet-stack-registry").default} */
   @service sheetStackRegistry;
 
@@ -98,13 +101,13 @@ export default class Root extends Component {
     }
 
     if (this.args.componentId) {
-      this.sheetRegistry.registerRoot(this.args.componentId, this);
+      this.sheetLayerStore.registerRoot(this.args.componentId, this);
     }
 
     registerDestructor(this, () => {
       this.#cleanupPendingOpen();
       if (this.args.componentId) {
-        this.sheetRegistry.unregisterRoot(this.args.componentId);
+        this.sheetLayerStore.unregisterRoot(this.args.componentId);
       }
       this.#cleanupCurrentSheet();
     });
@@ -202,11 +205,17 @@ export default class Root extends Component {
    *
    * @private
    */
-  #cleanupCurrentSheet() {
+  #cleanupCurrentSheet(focusOnDismiss = false) {
     if (this.sheet.stackId) {
       this.sheetStackRegistry.unregisterSheetFromStack(this.sheet);
     }
     this.sheetRegistry.unregister(this.sheet);
+
+    if (focusOnDismiss) {
+      this.sheetLayerStore.flushInertOutside();
+      this.sheet.executeAutoFocusOnDismiss();
+    }
+
     this.sheet.cleanup();
   }
 
@@ -259,6 +268,7 @@ export default class Root extends Component {
       themeColorManager: this.themeColorManager,
       sheetStackRegistry: this.sheetStackRegistry,
       sheetRegistry: this.sheetRegistry,
+      sheetLayerStore: this.sheetLayerStore,
     });
   }
 
@@ -364,7 +374,7 @@ export default class Root extends Component {
     const shouldReopen = this.#reopenAfterClose;
     this.#reopenAfterClose = false;
 
-    this.#cleanupCurrentSheet();
+    this.#cleanupCurrentSheet(true);
     this.createController();
     this.sheet.rootComponent = this;
 
diff --git a/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js b/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
index 6a11e98238f79..d31d5ef0522d7 100644
--- a/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
+++ b/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
@@ -15,8 +15,8 @@ import { processBehavior } from "discourse/float-kit/lib/behavior-handler";
  * @extends Component
  */
 export default class SheetActionBase extends Component {
-  /** @type {import("discourse/float-kit/services/sheet-registry").default} */
-  @service sheetRegistry;
+  /** @type {import("discourse/float-kit/services/sheet-layer-store").default} */
+  @service sheetLayerStore;
 
   /**
    * Handles click events with configurable behavior via the onPress arg.
@@ -39,6 +39,7 @@ export default class SheetActionBase extends Component {
       return;
     }
 
+    this.beforeExecuteAction(event);
     this.executeAction();
   };
 
@@ -53,13 +54,13 @@ export default class SheetActionBase extends Component {
   }
 
   /**
-   * Resolves the Root component via the forComponent arg using the sheet registry.
+   * Resolves the Root component via the forComponent arg using the layer store.
    *
    * @type {Object|undefined}
    */
   get targetRoot() {
     if (this.args.forComponent) {
-      return this.sheetRegistry.getRootByComponentId(this.args.forComponent);
+      return this.sheetLayerStore.getRootByComponentId(this.args.forComponent);
     }
     return undefined;
   }
@@ -127,6 +128,8 @@ export default class SheetActionBase extends Component {
     // Implemented by subclasses
   }
 
+  beforeExecuteAction() {}
+
   /**
    * Executes a step action on the sheet. Steps to a specific detent if
    * configured, otherwise steps down or up based on the step direction.
diff --git a/frontend/discourse/float-kit/components/d-sheet/trigger.gjs b/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
index 84645555e76b2..162b32ac50b5d 100644
--- a/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
@@ -54,6 +54,12 @@ export default class Trigger extends SheetActionBase {
     return this.targetRoot ?? this.sheet?.rootComponent;
   }
 
+  beforeExecuteAction(event) {
+    if (this.actionType === "present") {
+      this.sheet?.setPreviouslyFocusedElement(event.currentTarget);
+    }
+  }
+
   /**
    * Execute the configured action on the sheet.
    * Uses Root's present()/dismiss() methods for controlled/uncontrolled handling.
diff --git a/frontend/discourse/float-kit/lib/behavior-handler.js b/frontend/discourse/float-kit/lib/behavior-handler.js
index ee4d76b0e4793..7d3892fddbee8 100644
--- a/frontend/discourse/float-kit/lib/behavior-handler.js
+++ b/frontend/discourse/float-kit/lib/behavior-handler.js
@@ -29,18 +29,19 @@
  * });
  */
 export function processBehavior({ nativeEvent, defaultBehavior, handler }) {
-  let result = { ...defaultBehavior };
+  let result = defaultBehavior;
 
   if (handler) {
     if (typeof handler === "function") {
       const customEvent = {
-        ...result,
+        ...defaultBehavior,
         nativeEvent,
         changeDefault(changes) {
-          result = { ...result, ...changes };
+          result = { ...defaultBehavior, ...changes };
           Object.assign(this, changes);
         },
       };
+      customEvent.changeDefault = customEvent.changeDefault.bind(customEvent);
       handler(customEvent);
     } else {
       result = { ...defaultBehavior, ...handler };
@@ -49,4 +50,3 @@ export function processBehavior({ nativeEvent, defaultBehavior, handler }) {
 
   return result;
 }
-
diff --git a/frontend/discourse/float-kit/services/sheet-layer-store.js b/frontend/discourse/float-kit/services/sheet-layer-store.js
new file mode 100644
index 0000000000000..5e7e2847b4511
--- /dev/null
+++ b/frontend/discourse/float-kit/services/sheet-layer-store.js
@@ -0,0 +1,746 @@
+import { cancel, schedule } from "@ember/runloop";
+import Service from "@ember/service";
+import { processBehavior } from "discourse/float-kit/lib/behavior-handler";
+
+const inertRefCounts = new WeakMap();
+
+export default class SheetLayerStore extends Service {
+  controllers = new Map();
+  sheetOrder = [];
+  rootsByComponentId = new Map();
+  stacks = new Map();
+  stackSheetIds = new Map();
+  stackStaging = new Map();
+  layers = new Map();
+  layerFocusState = new Map();
+  inertRootElements = [];
+  inertElements = new Set();
+  rootElements = new Set();
+  mutationObserver = null;
+  recalculateInertTimeout = null;
+  clickOutsideCleanup = null;
+  escapeKeyCleanup = null;
+  pointerDownTarget = null;
+
+  willDestroy() {
+    super.willDestroy();
+    cancel(this.recalculateInertTimeout);
+    this.cleanupInert();
+    this.#cleanupClickOutsideListener();
+    this.#cleanupEscapeKeyListener();
+  }
+
+  registerSheet(controller) {
+    if (!controller?.id) {
+      return;
+    }
+
+    this.controllers.set(controller.id, controller);
+
+    if (!this.sheetOrder.includes(controller.id)) {
+      this.sheetOrder.push(controller.id);
+    }
+
+    this.#syncGlobalListeners();
+  }
+
+  unregisterSheet(controllerOrId) {
+    const id =
+      typeof controllerOrId === "string" ? controllerOrId : controllerOrId?.id;
+
+    if (!id) {
+      return;
+    }
+
+    this.controllers.delete(id);
+    this.removeLayer(id);
+    this.sheetOrder = this.sheetOrder.filter((sheetId) => sheetId !== id);
+
+    for (const [stackId, sheetIds] of this.stackSheetIds.entries()) {
+      this.stackSheetIds.set(
+        stackId,
+        sheetIds.filter((sheetId) => sheetId !== id)
+      );
+    }
+
+    for (const stagingBySheetId of this.stackStaging.values()) {
+      stagingBySheetId.delete(id);
+    }
+
+    this.#syncGlobalListeners();
+  }
+
+  updateSheet(controller) {
+    if (!controller?.id) {
+      return;
+    }
+
+    this.controllers.set(controller.id, controller);
+  }
+
+  registerRoot(componentId, rootComponent) {
+    if (!componentId) {
+      return;
+    }
+
+    this.rootsByComponentId.set(componentId, rootComponent);
+  }
+
+  unregisterRoot(componentId) {
+    if (!componentId) {
+      return;
+    }
+
+    this.rootsByComponentId.delete(componentId);
+  }
+
+  getRootByComponentId(componentId) {
+    return this.rootsByComponentId.get(componentId);
+  }
+
+  registerStack(stack) {
+    const id = stack?.id;
+    if (!id) {
+      return;
+    }
+
+    this.stacks.set(id, {
+      id,
+      stackingIndex: stack.stackingIndex ?? -1,
+      travelProgress: stack.travelProgress ?? 0,
+    });
+    this.stackSheetIds.set(id, this.stackSheetIds.get(id) || []);
+    this.stackStaging.set(id, this.stackStaging.get(id) || new Map());
+  }
+
+  unregisterStack(stackId) {
+    if (!stackId) {
+      return;
+    }
+
+    this.stacks.delete(stackId);
+    this.stackSheetIds.delete(stackId);
+    this.stackStaging.delete(stackId);
+  }
+
+  registerSheetWithStack(stackId, controller) {
+    if (!stackId || !controller?.id) {
+      return;
+    }
+
+    const sheetIds = this.stackSheetIds.get(stackId) || [];
+    if (!sheetIds.includes(controller.id)) {
+      this.stackSheetIds.set(stackId, [...sheetIds, controller.id]);
+    }
+
+    this.updateSheet(controller);
+  }
+
+  unregisterSheetFromStack(stackId, controllerOrId) {
+    const id =
+      typeof controllerOrId === "string" ? controllerOrId : controllerOrId?.id;
+
+    if (!stackId || !id) {
+      return;
+    }
+
+    const sheetIds = this.stackSheetIds.get(stackId) || [];
+    this.stackSheetIds.set(
+      stackId,
+      sheetIds.filter((sheetId) => sheetId !== id)
+    );
+  }
+
+  syncStackSheets(stackId, controllers) {
+    if (!stackId) {
+      return;
+    }
+
+    const sheetIds = controllers.map((controller) => controller.id);
+    this.stackSheetIds.set(stackId, sheetIds);
+
+    for (const controller of controllers) {
+      this.updateSheet(controller);
+    }
+  }
+
+  updateSheetTravelProgress(controller, progress) {
+    if (!controller?.id) {
+      return;
+    }
+
+    controller.travelProgress = progress;
+    this.controllers.set(controller.id, controller);
+  }
+
+  updateSheetStagingInStack(stackId, sheetId, staging) {
+    if (!stackId || !sheetId) {
+      return;
+    }
+
+    const stagingBySheetId = this.stackStaging.get(stackId) || new Map();
+    stagingBySheetId.set(sheetId, staging);
+    this.stackStaging.set(stackId, stagingBySheetId);
+  }
+
+  removeSheetStagingFromStack(stackId, sheetId) {
+    if (!stackId || !sheetId) {
+      return;
+    }
+
+    const stagingBySheetId = this.stackStaging.get(stackId);
+    if (!stagingBySheetId) {
+      return;
+    }
+
+    stagingBySheetId.delete(sheetId);
+  }
+
+  syncLayerFromSheet(controller) {
+    if (!controller?.id) {
+      return;
+    }
+
+    const focusState = this.layerFocusState.get(controller.id);
+
+    this.layers.set(controller.id, {
+      sheetId: controller.id,
+      inertOutside: controller.inertOutside ?? true,
+      viewElement: controller.view ?? null,
+      backdropElement: controller.backdrop ?? null,
+      scrollContainerElement: controller.scrollContainer ?? null,
+      contentElement: controller.content ?? null,
+      elementFocusedLastBeforeShowing:
+        focusState?.elementFocusedLastBeforeShowing ?? null,
+      focusWasInsideOnClose: focusState?.focusWasInsideOnClose ?? false,
+    });
+  }
+
+  removeLayer(sheetId) {
+    if (!sheetId) {
+      return;
+    }
+
+    this.layers.delete(sheetId);
+  }
+
+  syncInertRoots(rootElements) {
+    this.inertRootElements = [...rootElements];
+  }
+
+  recalculateInertOutside() {
+    cancel(this.recalculateInertTimeout);
+
+    this.recalculateInertTimeout = schedule("afterRender", () => {
+      this.#runInertOutsideRecalculation();
+    });
+  }
+
+  flushInertOutside() {
+    cancel(this.recalculateInertTimeout);
+    this.#runInertOutsideRecalculation();
+  }
+
+  cleanupInert() {
+    if (this.mutationObserver) {
+      this.mutationObserver.disconnect();
+      this.mutationObserver = null;
+    }
+
+    for (const element of this.inertElements) {
+      const count = inertRefCounts.get(element);
+      if (count === 1) {
+        element.inert = false;
+        inertRefCounts.delete(element);
+      } else if (count !== undefined) {
+        inertRefCounts.set(element, count - 1);
+      }
+    }
+
+    this.inertElements = new Set();
+    this.rootElements = new Set();
+    this.syncInertRoots(new Set());
+  }
+
+  consumeEscapeKey(event) {
+    const sheetsInOrder = this.#orderedControllers();
+    const layerCount = sheetsInOrder.length;
+
+    if (layerCount > 0) {
+      this.#processEscapeOnLayer({
+        sheetsInOrder,
+        layerIndex: layerCount - 1,
+        event,
+      });
+    }
+
+    return true;
+  }
+
+  consumeClickOutside(event) {
+    const target = event.target;
+    const targetElement =
+      target instanceof Element ? target : target?.parentElement;
+
+    if (targetElement?.matches('[data-d-sheet~="pass-through"] *')) {
+      this.pointerDownTarget = null;
+      return true;
+    }
+
+    if (!target || !target.isConnected) {
+      this.pointerDownTarget = null;
+      return true;
+    }
+
+    if (target === document.body && this.pointerDownTarget !== document.body) {
+      this.pointerDownTarget = null;
+      return true;
+    }
+
+    const sheetsInOrder = this.#orderedControllers();
+    const layerCount = sheetsInOrder.length;
+    if (layerCount > 0) {
+      this.#processClickOnLayer({
+        sheetsInOrder,
+        layerIndex: layerCount - 1,
+        event,
+      });
+    }
+
+    this.pointerDownTarget = null;
+    return true;
+  }
+
+  setLayerFocusedLastBeforeShowing(sheetId, element) {
+    if (!sheetId) {
+      return;
+    }
+
+    const focusState = this.layerFocusState.get(sheetId) || {};
+    focusState.elementFocusedLastBeforeShowing = element ?? null;
+    this.layerFocusState.set(sheetId, focusState);
+    this.#syncLayerFocusStateToLayer(sheetId);
+  }
+
+  captureLayerFocusedLastBeforeShowingFromActive(sheetId) {
+    if (!sheetId) {
+      return;
+    }
+
+    const focusState = this.layerFocusState.get(sheetId) || {};
+    if (focusState.elementFocusedLastBeforeShowing) {
+      return;
+    }
+
+    focusState.elementFocusedLastBeforeShowing = document.activeElement;
+    this.layerFocusState.set(sheetId, focusState);
+    this.#syncLayerFocusStateToLayer(sheetId);
+  }
+
+  captureLayerFocusWasInsideOnClose(sheetId, viewElement) {
+    if (!sheetId) {
+      return;
+    }
+
+    const focusState = this.layerFocusState.get(sheetId) || {};
+    const activeElement = document.activeElement;
+
+    focusState.focusWasInsideOnClose =
+      !!viewElement &&
+      !!activeElement &&
+      viewElement.contains(activeElement);
+
+    this.layerFocusState.set(sheetId, focusState);
+    this.#syncLayerFocusStateToLayer(sheetId);
+  }
+
+  executeLayerDismissAutoFocus({ sheetId, viewElement, onDismissAutoFocus }) {
+    if (!sheetId) {
+      return;
+    }
+
+    const focusState = this.layerFocusState.get(sheetId) || {};
+    const activeElement = document.activeElement;
+    const focusWasInside =
+      focusState.focusWasInsideOnClose ||
+      (!!viewElement &&
+        !!activeElement &&
+        viewElement.contains(activeElement));
+
+    focusState.focusWasInsideOnClose = false;
+    this.layerFocusState.set(sheetId, focusState);
+    this.#syncLayerFocusStateToLayer(sheetId);
+
+    if (!focusWasInside && document.contains(activeElement)) {
+      focusState.elementFocusedLastBeforeShowing = null;
+      this.layerFocusState.set(sheetId, focusState);
+      this.#syncLayerFocusStateToLayer(sheetId);
+      return;
+    }
+
+    const behavior = processBehavior({
+      nativeEvent: null,
+      defaultBehavior: { focus: true },
+      handler: onDismissAutoFocus,
+    });
+
+    if (behavior.focus === false) {
+      focusState.elementFocusedLastBeforeShowing = null;
+      this.layerFocusState.set(sheetId, focusState);
+      this.#syncLayerFocusStateToLayer(sheetId);
+      return;
+    }
+
+    const target =
+      focusState.elementFocusedLastBeforeShowing &&
+      document.contains(focusState.elementFocusedLastBeforeShowing)
+        ? focusState.elementFocusedLastBeforeShowing
+        : document.body;
+
+    target.focus({ preventScroll: true });
+    focusState.elementFocusedLastBeforeShowing = null;
+    this.layerFocusState.set(sheetId, focusState);
+    this.#syncLayerFocusStateToLayer(sheetId);
+  }
+
+  clearLayerFocusState(sheetId) {
+    if (!sheetId) {
+      return;
+    }
+
+    this.layerFocusState.delete(sheetId);
+    this.#syncLayerFocusStateToLayer(sheetId);
+  }
+
+  #processEscapeOnLayer({ sheetsInOrder, layerIndex, event }) {
+    const sheet = sheetsInOrder[layerIndex];
+    if (!sheet) {
+      return;
+    }
+
+    if (!sheet.state.openness.isOpen) {
+      return;
+    }
+
+    const behavior = processBehavior({
+      handler: sheet.onEscapeKeyDown,
+      defaultBehavior: {
+        nativePreventDefault: true,
+        dismiss: true,
+        stopOverlayPropagation: true,
+      },
+      nativeEvent: event,
+    });
+
+    if (behavior.nativePreventDefault !== false) {
+      event.preventDefault();
+    }
+
+    if (behavior.dismiss !== false && sheet.role !== "alertdialog") {
+      sheet.close();
+    }
+
+    if (behavior.stopOverlayPropagation === false && layerIndex > 0) {
+      this.#processEscapeOnLayer({
+        sheetsInOrder,
+        layerIndex: layerIndex - 1,
+        event,
+      });
+    }
+  }
+
+  #processClickOnLayer({ sheetsInOrder, layerIndex, event }) {
+    const sheet = sheetsInOrder[layerIndex];
+    if (!sheet) {
+      return;
+    }
+
+    if (!sheet.state.openness.isOpen) {
+      return;
+    }
+
+    const target = event.target;
+    const content = sheet.content;
+    const view = sheet.view;
+    const isClickOutside =
+      (view && !view.contains(target)) ||
+      (view && content && !content.contains(target));
+
+    if (!isClickOutside) {
+      return;
+    }
+
+    const behavior = processBehavior({
+      handler: sheet.onClickOutside,
+      defaultBehavior: { dismiss: true, stopOverlayPropagation: true },
+      nativeEvent: event,
+    });
+
+    if (behavior.dismiss && sheet.role !== "alertdialog") {
+      sheet.close();
+    }
+
+    if (!behavior.stopOverlayPropagation && layerIndex > 0) {
+      this.#processClickOnLayer({
+        sheetsInOrder,
+        layerIndex: layerIndex - 1,
+        event,
+      });
+    }
+  }
+
+  #orderedControllers() {
+    const orderedControllers = [];
+
+    for (const sheetId of this.sheetOrder) {
+      const controller = this.controllers.get(sheetId);
+      if (controller) {
+        orderedControllers.push(controller);
+      }
+    }
+
+    return orderedControllers;
+  }
+
+  #runInertOutsideRecalculation() {
+    this.cleanupInert();
+
+    const sheetsInOrder = this.#orderedControllers();
+    for (const sheet of sheetsInOrder) {
+      this.updateSheet(sheet);
+      this.syncLayerFromSheet(sheet);
+    }
+
+    const hasInertOutside = sheetsInOrder.some((sheet) => sheet.inertOutside);
+
+    if (!hasInertOutside || sheetsInOrder.length === 0) {
+      this.syncInertRoots(new Set());
+      return;
+    }
+
+    const rootElements = new Set();
+
+    for (let i = sheetsInOrder.length - 1; i >= 0; i--) {
+      const sheet = sheetsInOrder[i];
+
+      if (sheet.view) {
+        rootElements.add(sheet.view);
+      }
+
+      if (sheet.inertOutside) {
+        break;
+      }
+    }
+
+    document.querySelectorAll("[aria-live]").forEach((el) => {
+      rootElements.add(el);
+    });
+
+    this.rootElements = rootElements;
+    this.#moveFocusIfNecessary(rootElements, sheetsInOrder);
+    this.#applyInert(rootElements);
+    this.syncInertRoots(rootElements);
+  }
+
+  #moveFocusIfNecessary(rootElements, sheetsInOrder) {
+    const activeElement = document.activeElement;
+    if (!activeElement || activeElement === document.body) {
+      return;
+    }
+
+    const focusInRoot = [...rootElements].some((root) =>
+      root.contains(activeElement)
+    );
+
+    if (focusInRoot) {
+      return;
+    }
+
+    const topmostSheet = sheetsInOrder[sheetsInOrder.length - 1];
+    if (topmostSheet?.view) {
+      topmostSheet.view.focus({ preventScroll: true });
+    }
+  }
+
+  #applyInert(rootElements) {
+    const inertElements = new Set();
+
+    const treeWalker = document.createTreeWalker(
+      document,
+      NodeFilter.SHOW_ELEMENT,
+      {
+        acceptNode: (node) => {
+          if (
+            node instanceof HTMLElement &&
+            node.dataset.liveAnnouncer === "true"
+          ) {
+            rootElements.add(node);
+          }
+
+          if (
+            node.tagName === "HEAD" ||
+            node.tagName === "SCRIPT" ||
+            rootElements.has(node) ||
+            (node.parentElement && inertElements.has(node.parentElement))
+          ) {
+            return NodeFilter.FILTER_REJECT;
+          }
+
+          if (
+            (node instanceof HTMLElement &&
+              node.getAttribute("role") === "row") ||
+            [...rootElements].some((root) => node.contains(root))
+          ) {
+            return NodeFilter.FILTER_SKIP;
+          }
+
+          return NodeFilter.FILTER_ACCEPT;
+        },
+      }
+    );
+
+    let node = treeWalker.nextNode();
+    while (node) {
+      this.#makeElementInert(node, inertElements);
+      node = treeWalker.nextNode();
+    }
+
+    this.inertElements = inertElements;
+    this.#setupMutationObserver(rootElements);
+  }
+
+  #makeElementInert(element, inertElements) {
+    const count = inertRefCounts.get(element) ?? 0;
+
+    if (!element.hasAttribute("inert") || count > 0) {
+      if (count === 0) {
+        element.inert = true;
+      }
+      inertElements.add(element);
+      inertRefCounts.set(element, count + 1);
+    }
+  }
+
+  #setupMutationObserver(rootElements) {
+    this.mutationObserver = new MutationObserver((mutations) => {
+      for (const mutation of mutations) {
+        if (mutation.type !== "childList" || mutation.addedNodes.length === 0) {
+          continue;
+        }
+
+        const allProtected = [...rootElements, ...this.inertElements];
+        if (allProtected.some((el) => el.contains(mutation.target))) {
+          continue;
+        }
+
+        for (const addedNode of mutation.addedNodes) {
+          if (!(addedNode instanceof HTMLElement)) {
+            continue;
+          }
+
+          if (addedNode.dataset.liveAnnouncer === "true") {
+            rootElements.add(addedNode);
+          } else {
+            this.#makeElementInert(addedNode, this.inertElements);
+          }
+        }
+      }
+    });
+
+    this.mutationObserver.observe(document, {
+      childList: true,
+      subtree: true,
+    });
+  }
+
+  #setupClickOutsideListener() {
+    if (this.clickOutsideCleanup) {
+      return;
+    }
+
+    const handlePointerDown = (event) => {
+      this.pointerDownTarget = event.target;
+    };
+
+    const handleClick = (event) => {
+      this.consumeClickOutside(event);
+    };
+
+    document.addEventListener("pointerdown", handlePointerDown, {
+      capture: true,
+    });
+
+    document.addEventListener("click", handleClick, {
+      capture: true,
+    });
+
+    this.clickOutsideCleanup = () => {
+      document.removeEventListener("pointerdown", handlePointerDown, {
+        capture: true,
+      });
+      document.removeEventListener("click", handleClick, {
+        capture: true,
+      });
+      this.clickOutsideCleanup = null;
+    };
+  }
+
+  #cleanupClickOutsideListener() {
+    if (this.clickOutsideCleanup) {
+      this.clickOutsideCleanup();
+    }
+    this.pointerDownTarget = null;
+  }
+
+  #setupEscapeKeyListener() {
+    if (this.escapeKeyCleanup) {
+      return;
+    }
+
+    const handleKeyDown = (event) => {
+      if (event.key === "Escape") {
+        this.consumeEscapeKey(event);
+      }
+    };
+
+    document.addEventListener("keydown", handleKeyDown);
+
+    this.escapeKeyCleanup = () => {
+      document.removeEventListener("keydown", handleKeyDown);
+      this.escapeKeyCleanup = null;
+    };
+  }
+
+  #cleanupEscapeKeyListener() {
+    if (this.escapeKeyCleanup) {
+      this.escapeKeyCleanup();
+    }
+  }
+
+  #syncGlobalListeners() {
+    if (this.sheetOrder.length > 0) {
+      this.#setupClickOutsideListener();
+      this.#setupEscapeKeyListener();
+      return;
+    }
+
+    this.#cleanupClickOutsideListener();
+    this.#cleanupEscapeKeyListener();
+  }
+
+  #syncLayerFocusStateToLayer(sheetId) {
+    const layer = this.layers.get(sheetId);
+    if (!layer) {
+      return;
+    }
+
+    const focusState = this.layerFocusState.get(sheetId) || {};
+    this.layers.set(sheetId, {
+      ...layer,
+      elementFocusedLastBeforeShowing:
+        focusState.elementFocusedLastBeforeShowing ?? null,
+      focusWasInsideOnClose: focusState.focusWasInsideOnClose ?? false,
+    });
+  }
+
+}
diff --git a/frontend/discourse/float-kit/services/sheet-registry.js b/frontend/discourse/float-kit/services/sheet-registry.js
index b1f6a5db77203..5365977a37ee7 100644
--- a/frontend/discourse/float-kit/services/sheet-registry.js
+++ b/frontend/discourse/float-kit/services/sheet-registry.js
@@ -1,27 +1,10 @@
-import { cancel, schedule } from "@ember/runloop";
-import Service from "@ember/service";
-
-const inertRefCounts = new WeakMap();
+import Service, { service } from "@ember/service";
 
 /**
- * Service for managing sheet instances, click-outside handling,
- * scroll lock, and centralized inert management.
+ * Service for managing sheet instances and scroll lock.
  */
 export default class SheetRegistry extends Service {
-  /** @type {Map<string, Object>} */
-  sheets = new Map();
-
-  /** @type {Object[]} */
-  sheetsInOrder = [];
-
-  /** @type {Function|null} */
-  clickOutsideCleanup = null;
-
-  /** @type {Function|null} */
-  escapeKeyCleanup = null;
-
-  /** @type {EventTarget|null} */
-  pointerDownTarget = null;
+  @service sheetLayerStore;
 
   /** @type {number} */
   scrollLockCount = 0;
@@ -41,34 +24,13 @@ export default class SheetRegistry extends Service {
   /** @type {Set<string>} */
   controllersWithScrollLock = new Set();
 
-  /** @type {Function|null} */
-  inertCleanup = null;
-
-  /** @type {Set<Element>} */
-  inertElements = new Set();
-
-  /** @type {Set<Element>} */
-  rootElements = new Set();
-
-  /** @type {MutationObserver|null} */
-  mutationObserver = null;
-
-  /** @type {Object|null} */
-  recalculateInertTimeout = null;
-
-  /** @type {Map<string, Object>} Root components registered by componentId */
-  #rootsByComponentId = new Map();
-
   /**
    * Cleans up all listeners and state when the service is destroyed.
    */
   willDestroy() {
     super.willDestroy();
 
-    cancel(this.recalculateInertTimeout);
-    this.cleanupClickOutsideListener();
-    this.cleanupEscapeKeyListener();
-    this.cleanupInert();
+    this.sheetLayerStore.cleanupInert();
     if (this.scrollLockCleanup) {
       this.scrollLockCleanup();
       this.scrollLockCleanup = null;
@@ -82,20 +44,15 @@ export default class SheetRegistry extends Service {
    * @param {Object} controller
    */
   register(controller) {
-    this.sheets.set(controller.id, controller);
-    this.sheetsInOrder.push(controller);
-
-    if (this.sheetsInOrder.length === 1) {
-      this.setupClickOutsideListener();
-      this.setupEscapeKeyListener();
-    }
+    this.sheetLayerStore.registerSheet(controller);
+    this.sheetLayerStore.syncLayerFromSheet(controller);
 
     if (controller.inertOutside) {
       this.applyScrollLock();
       this.controllersWithScrollLock.add(controller.id);
     }
 
-    this.recalculateInertOutside();
+    this.sheetLayerStore.recalculateInertOutside();
   }
 
   /**
@@ -109,18 +66,8 @@ export default class SheetRegistry extends Service {
       this.controllersWithScrollLock.delete(controller.id);
     }
 
-    this.sheets.delete(controller.id);
-    const index = this.sheetsInOrder.indexOf(controller);
-    if (index !== -1) {
-      this.sheetsInOrder.splice(index, 1);
-    }
-
-    if (this.sheetsInOrder.length === 0) {
-      this.cleanupClickOutsideListener();
-      this.cleanupEscapeKeyListener();
-    }
-
-    this.recalculateInertOutside();
+    this.sheetLayerStore.unregisterSheet(controller.id);
+    this.sheetLayerStore.recalculateInertOutside();
   }
 
   /**
@@ -158,251 +105,9 @@ export default class SheetRegistry extends Service {
       }
     }
 
-    this.recalculateInertOutside();
-  }
-
-  /**
-   * Recalculates which elements should be inert.
-   * Collects all sheet views from topmost down to first inertOutside sheet.
-   */
-  recalculateInertOutside() {
-    cancel(this.recalculateInertTimeout);
-
-    this.recalculateInertTimeout = schedule("afterRender", () => {
-      this.cleanupInert();
-
-      const hasInertOutside = this.sheetsInOrder.some(
-        (sheet) => sheet.inertOutside
-      );
-
-      if (!hasInertOutside || this.sheetsInOrder.length === 0) {
-        return;
-      }
-
-      const rootElements = new Set();
-
-      for (let i = this.sheetsInOrder.length - 1; i >= 0; i--) {
-        const sheet = this.sheetsInOrder[i];
-
-        if (sheet.view) {
-          rootElements.add(sheet.view);
-        }
-
-        if (sheet.inertOutside) {
-          break;
-        }
-      }
-
-      document.querySelectorAll("[aria-live]").forEach((el) => {
-        rootElements.add(el);
-      });
-
-      this.rootElements = rootElements;
-      this.moveFocusIfNecessary(rootElements);
-      this.applyInert(rootElements);
-    });
-  }
-
-  /**
-   * Moves focus to topmost sheet if currently outside protected elements.
-   *
-   * @param {Set<Element>} rootElements
-   */
-  moveFocusIfNecessary(rootElements) {
-    const activeElement = document.activeElement;
-    if (!activeElement || activeElement === document.body) {
-      return;
-    }
-
-    const focusInRoot = [...rootElements].some((root) =>
-      root.contains(activeElement)
-    );
-
-    if (!focusInRoot) {
-      const topmostSheet = this.sheetsInOrder[this.sheetsInOrder.length - 1];
-      if (topmostSheet?.view) {
-        topmostSheet.view.focus({ preventScroll: true });
-      }
-    }
-  }
-
-  /**
-   * Applies inert attribute to elements outside the root elements.
-   *
-   * @param {Set<Element>} rootElements
-   */
-  applyInert(rootElements) {
-    const inertElements = new Set();
-
-    const treeWalker = document.createTreeWalker(
-      document,
-      NodeFilter.SHOW_ELEMENT,
-      {
-        acceptNode: (node) => {
-          if (
-            node instanceof HTMLElement &&
-            node.dataset.liveAnnouncer === "true"
-          ) {
-            rootElements.add(node);
-          }
-
-          if (
-            node.tagName === "HEAD" ||
-            node.tagName === "SCRIPT" ||
-            rootElements.has(node) ||
-            (node.parentElement && inertElements.has(node.parentElement))
-          ) {
-            return NodeFilter.FILTER_REJECT;
-          }
-
-          if (
-            (node instanceof HTMLElement &&
-              node.getAttribute("role") === "row") ||
-            [...rootElements].some((root) => node.contains(root))
-          ) {
-            return NodeFilter.FILTER_SKIP;
-          }
-
-          return NodeFilter.FILTER_ACCEPT;
-        },
-      }
-    );
-
-    let node = treeWalker.nextNode();
-    while (node) {
-      this.makeElementInert(node, inertElements);
-      node = treeWalker.nextNode();
-    }
-
-    this.inertElements = inertElements;
-    this.setupMutationObserver(rootElements);
-  }
-
-  /**
-   * Makes an element inert using reference counting.
-   *
-   * @param {Element} element
-   * @param {Set<Element>} inertElements
-   */
-  makeElementInert(element, inertElements) {
-    const count = inertRefCounts.get(element) ?? 0;
-
-    if (!element.hasAttribute("inert") || count > 0) {
-      if (count === 0) {
-        element.inert = true;
-      }
-      inertElements.add(element);
-      inertRefCounts.set(element, count + 1);
-    }
-  }
-
-  /**
-   * Sets up MutationObserver to apply inert to dynamically added content.
-   *
-   * @param {Set<Element>} rootElements
-   */
-  setupMutationObserver(rootElements) {
-    this.mutationObserver = new MutationObserver((mutations) => {
-      for (const mutation of mutations) {
-        if (mutation.type !== "childList" || mutation.addedNodes.length === 0) {
-          continue;
-        }
-
-        const allProtected = [...rootElements, ...this.inertElements];
-        if (allProtected.some((el) => el.contains(mutation.target))) {
-          continue;
-        }
-
-        for (const addedNode of mutation.addedNodes) {
-          if (!(addedNode instanceof HTMLElement)) {
-            continue;
-          }
-
-          if (addedNode.dataset.liveAnnouncer === "true") {
-            rootElements.add(addedNode);
-          } else {
-            this.makeElementInert(addedNode, this.inertElements);
-          }
-        }
-      }
-    });
-
-    this.mutationObserver.observe(document, {
-      childList: true,
-      subtree: true,
-    });
-  }
-
-  /**
-   * Cleans up inert state - removes inert from elements.
-   */
-  cleanupInert() {
-    if (this.mutationObserver) {
-      this.mutationObserver.disconnect();
-      this.mutationObserver = null;
-    }
-
-    for (const element of this.inertElements) {
-      const count = inertRefCounts.get(element);
-      if (count === 1) {
-        element.inert = false;
-        inertRefCounts.delete(element);
-      } else if (count !== undefined) {
-        inertRefCounts.set(element, count - 1);
-      }
-    }
-
-    this.inertElements = new Set();
-    this.rootElements = new Set();
-  }
-
-  /**
-   * @param {string} id
-   * @returns {Object|undefined}
-   */
-  find(id) {
-    return this.sheets.get(id);
-  }
-
-  /**
-   * Registers a Root component by its componentId.
-   *
-   * @param {string} componentId
-   * @param {Object} rootComponent
-   */
-  registerRoot(componentId, rootComponent) {
-    this.#rootsByComponentId.set(componentId, rootComponent);
-  }
-
-  /**
-   * Unregisters a Root component by its componentId.
-   *
-   * @param {string} componentId
-   */
-  unregisterRoot(componentId) {
-    this.#rootsByComponentId.delete(componentId);
-  }
-
-  /**
-   * Gets a Root component by its componentId.
-   *
-   * @param {string} componentId
-   * @returns {Object|undefined}
-   */
-  getRootByComponentId(componentId) {
-    return this.#rootsByComponentId.get(componentId);
-  }
-
-  /**
-   * Gets the topmost sheet (last in order).
-   *
-   * @returns {Object|null}
-   */
-  getTopmostSheet() {
-    if (this.sheetsInOrder.length === 0) {
-      return null;
-    }
-    return this.sheetsInOrder[this.sheetsInOrder.length - 1];
+    this.sheetLayerStore.updateSheet(controller);
+    this.sheetLayerStore.syncLayerFromSheet(controller);
+    this.sheetLayerStore.recalculateInertOutside();
   }
 
   /**
@@ -457,224 +162,4 @@ export default class SheetRegistry extends Service {
       }
     }
   }
-
-  /**
-   * Sets up global click listener for click-outside handling.
-   */
-  setupClickOutsideListener() {
-    const handlePointerDown = (event) => {
-      this.pointerDownTarget = event.target;
-    };
-
-    const handleClick = (event) => {
-      this.handleClickOutside(event);
-    };
-
-    document.addEventListener("pointerdown", handlePointerDown, {
-      capture: true,
-    });
-    document.addEventListener("click", handleClick, {
-      capture: true,
-    });
-
-    this.clickOutsideCleanup = () => {
-      document.removeEventListener("pointerdown", handlePointerDown, {
-        capture: true,
-      });
-      document.removeEventListener("click", handleClick, {
-        capture: true,
-      });
-    };
-  }
-
-  /**
-   * Cleans up global click listener.
-   */
-  cleanupClickOutsideListener() {
-    if (this.clickOutsideCleanup) {
-      this.clickOutsideCleanup();
-      this.clickOutsideCleanup = null;
-    }
-    this.pointerDownTarget = null;
-  }
-
-  /**
-   * Sets up a single global keydown listener for Escape key handling.
-   * Only the topmost sheet handles Escape.
-   */
-  setupEscapeKeyListener() {
-    const handleKeyDown = (event) => {
-      if (event.key === "Escape") {
-        this.handleEscapeKey(event);
-      }
-    };
-
-    document.addEventListener("keydown", handleKeyDown);
-
-    this.escapeKeyCleanup = () => {
-      document.removeEventListener("keydown", handleKeyDown);
-    };
-  }
-
-  /**
-   * Cleans up global escape key listener.
-   */
-  cleanupEscapeKeyListener() {
-    if (this.escapeKeyCleanup) {
-      this.escapeKeyCleanup();
-      this.escapeKeyCleanup = null;
-    }
-  }
-
-  /**
-   * Processes a behavior handler that can be either an object or a function.
-   *
-   * @param {Object|Function} handler - The handler (object or function with changeDefault)
-   * @param {Object} defaultBehavior - The default behavior object
-   * @param {Event} nativeEvent - The native DOM event
-   * @returns {Object} The resolved behavior object
-   */
-  processBehaviorHandler(handler, defaultBehavior, nativeEvent) {
-    let result = { ...defaultBehavior };
-    if (handler) {
-      if (typeof handler === "function") {
-        const customEvent = {
-          ...defaultBehavior,
-          nativeEvent,
-          changeDefault(changedBehavior) {
-            result = { ...defaultBehavior, ...changedBehavior };
-            Object.assign(this, changedBehavior);
-          },
-        };
-        customEvent.changeDefault = customEvent.changeDefault.bind(customEvent);
-        handler(customEvent);
-      } else {
-        result = { ...defaultBehavior, ...handler };
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Handles Escape key for stacked sheets.
-   * Processes from topmost sheet down, respecting stopOverlayPropagation.
-   *
-   * @param {KeyboardEvent} event
-   */
-  handleEscapeKey(event) {
-    const layerCount = this.sheetsInOrder.length;
-    if (layerCount > 0) {
-      this.processEscapeOnLayer(layerCount - 1, event);
-    }
-  }
-
-  /**
-   * Processes Escape key on a specific layer.
-   * Recursively processes lower layers if stopOverlayPropagation is false.
-   *
-   * @param {number} layerIndex - Index of the layer to process
-   * @param {KeyboardEvent} event - The keyboard event
-   */
-  processEscapeOnLayer(layerIndex, event) {
-    const sheet = this.sheetsInOrder[layerIndex];
-    if (!sheet) {
-      return;
-    }
-
-    if (!sheet.state.openness.isOpen) {
-      return;
-    }
-
-    const behavior = this.processBehaviorHandler(
-      sheet.onEscapeKeyDown,
-      {
-        nativePreventDefault: true,
-        dismiss: true,
-        stopOverlayPropagation: true,
-      },
-      event
-    );
-
-    if (behavior.nativePreventDefault !== false) {
-      event.preventDefault();
-    }
-
-    if (behavior.dismiss !== false && sheet.role !== "alertdialog") {
-      sheet.close();
-    }
-
-    if (behavior.stopOverlayPropagation === false && layerIndex > 0) {
-      this.processEscapeOnLayer(layerIndex - 1, event);
-    }
-  }
-
-  /**
-   * Handles click-outside events.
-   *
-   * @param {Event} event
-   */
-  handleClickOutside(event) {
-    const target = event.target;
-
-    if (!target || !target.isConnected) {
-      this.pointerDownTarget = null;
-      return;
-    }
-
-    if (target === document.body && this.pointerDownTarget !== document.body) {
-      this.pointerDownTarget = null;
-      return;
-    }
-
-    const layerCount = this.sheetsInOrder.length;
-    if (layerCount > 0) {
-      this.processClickOnLayer(layerCount - 1, event);
-    }
-
-    this.pointerDownTarget = null;
-  }
-
-  /**
-   * Processes click on a specific layer.
-   *
-   * @param {number} layerIndex
-   * @param {Event} event
-   */
-  processClickOnLayer(layerIndex, event) {
-    const sheet = this.sheetsInOrder[layerIndex];
-    if (!sheet) {
-      return;
-    }
-
-    if (!sheet.state.openness.isOpen) {
-      return;
-    }
-
-    const target = event.target;
-    const content = sheet.content;
-    const view = sheet.view;
-
-    // Click is "outside" if:
-    // 1. Target is outside the view entirely, OR
-    // 2. Target is inside the view but NOT inside the content
-    const isClickOutside =
-      (view && !view.contains(target)) ||
-      (view && content && !content.contains(target));
-
-    if (isClickOutside) {
-      const behavior = this.processBehaviorHandler(
-        sheet.onClickOutside,
-        { dismiss: true, stopOverlayPropagation: true },
-        event
-      );
-
-      if (behavior.dismiss && sheet.role !== "alertdialog") {
-        sheet.close();
-      }
-
-      if (!behavior.stopOverlayPropagation && layerIndex > 0) {
-        this.processClickOnLayer(layerIndex - 1, event);
-      }
-    }
-  }
 }
diff --git a/frontend/discourse/float-kit/services/sheet-stack-registry.js b/frontend/discourse/float-kit/services/sheet-stack-registry.js
index 774c5db0c3a34..f4263f7de6c11 100644
--- a/frontend/discourse/float-kit/services/sheet-stack-registry.js
+++ b/frontend/discourse/float-kit/services/sheet-stack-registry.js
@@ -1,5 +1,5 @@
 import { guidFor } from "@ember/object/internals";
-import Service from "@ember/service";
+import Service, { service } from "@ember/service";
 import { TrackedMap } from "@ember-compat/tracked-built-ins";
 
 /**
@@ -9,6 +9,8 @@ import { TrackedMap } from "@ember-compat/tracked-built-ins";
  * sheets can animate based on stacking progress.
  */
 export default class SheetStackRegistry extends Service {
+  @service sheetLayerStore;
+
   /** @type {TrackedMap<string, Object>} */
   stacks = new TrackedMap();
 
@@ -46,6 +48,7 @@ export default class SheetStackRegistry extends Service {
     this.stacks.set(id, stackObject);
     this.stackSheets.set(id, []);
     this.stackStagingData.set(id, new Map());
+    this.sheetLayerStore.registerStack(stackObject);
     return id;
   }
 
@@ -59,6 +62,7 @@ export default class SheetStackRegistry extends Service {
     this.stackSheets.delete(stackId);
     this.stackingCounts.delete(stackId);
     this.stackStagingData.delete(stackId);
+    this.sheetLayerStore.unregisterStack(stackId);
   }
 
   /**
@@ -80,6 +84,7 @@ export default class SheetStackRegistry extends Service {
     sheets.push(controller);
     controller.stackId = stackId;
     controller.stackingIndex = sheets.length - 1;
+    this.sheetLayerStore.registerSheetWithStack(stackId, controller);
 
     this.updateBelowSheetsInStack(stackId);
   }
@@ -95,6 +100,8 @@ export default class SheetStackRegistry extends Service {
       return;
     }
 
+    this.removeSheetStagingFromStack(stackId, controller.id);
+
     const sheets = this.stackSheets.get(stackId);
     if (!sheets) {
       return;
@@ -107,6 +114,8 @@ export default class SheetStackRegistry extends Service {
       sheets.splice(index, 1);
     }
 
+    this.sheetLayerStore.unregisterSheetFromStack(stackId, controller.id);
+
     controller.stackId = null;
     controller.stackingIndex = -1;
     controller.belowSheetsInStack = [];
@@ -161,6 +170,7 @@ export default class SheetStackRegistry extends Service {
     });
 
     this.updateSelfAndAboveTravelProgressSumInStack(stackId);
+    this.sheetLayerStore.syncStackSheets(stackId, sheets);
   }
 
   /**
@@ -213,6 +223,7 @@ export default class SheetStackRegistry extends Service {
     }
 
     controller.travelProgress = progress;
+    this.sheetLayerStore.updateSheetTravelProgress(controller, progress);
     this.updateSelfAndAboveTravelProgressSumInStack(controller.stackId);
   }
 
@@ -414,6 +425,7 @@ export default class SheetStackRegistry extends Service {
 
     stagingData.set(sheetId, staging);
     this.stackStagingData.set(stackId, new Map(stagingData));
+    this.sheetLayerStore.updateSheetStagingInStack(stackId, sheetId, staging);
   }
 
   /**
@@ -430,6 +442,7 @@ export default class SheetStackRegistry extends Service {
 
     stagingData.delete(sheetId);
     this.stackStagingData.set(stackId, new Map(stagingData));
+    this.sheetLayerStore.removeSheetStagingFromStack(stackId, sheetId);
   }
 
   /**

From 3d1292f48b34339232eb455b868a5ba6972649e8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Feb 2026 16:46:50 +0100
Subject: [PATCH 145/168] remove dead code

---
 .../float-kit/services/sheet-layer-store.js   | 121 ------------------
 .../services/sheet-stack-registry.js          |  13 +-
 2 files changed, 1 insertion(+), 133 deletions(-)

diff --git a/frontend/discourse/float-kit/services/sheet-layer-store.js b/frontend/discourse/float-kit/services/sheet-layer-store.js
index 5e7e2847b4511..7da85abb3ec9e 100644
--- a/frontend/discourse/float-kit/services/sheet-layer-store.js
+++ b/frontend/discourse/float-kit/services/sheet-layer-store.js
@@ -8,12 +8,8 @@ export default class SheetLayerStore extends Service {
   controllers = new Map();
   sheetOrder = [];
   rootsByComponentId = new Map();
-  stacks = new Map();
-  stackSheetIds = new Map();
-  stackStaging = new Map();
   layers = new Map();
   layerFocusState = new Map();
-  inertRootElements = [];
   inertElements = new Set();
   rootElements = new Set();
   mutationObserver = null;
@@ -56,17 +52,6 @@ export default class SheetLayerStore extends Service {
     this.removeLayer(id);
     this.sheetOrder = this.sheetOrder.filter((sheetId) => sheetId !== id);
 
-    for (const [stackId, sheetIds] of this.stackSheetIds.entries()) {
-      this.stackSheetIds.set(
-        stackId,
-        sheetIds.filter((sheetId) => sheetId !== id)
-      );
-    }
-
-    for (const stagingBySheetId of this.stackStaging.values()) {
-      stagingBySheetId.delete(id);
-    }
-
     this.#syncGlobalListeners();
   }
 
@@ -98,104 +83,6 @@ export default class SheetLayerStore extends Service {
     return this.rootsByComponentId.get(componentId);
   }
 
-  registerStack(stack) {
-    const id = stack?.id;
-    if (!id) {
-      return;
-    }
-
-    this.stacks.set(id, {
-      id,
-      stackingIndex: stack.stackingIndex ?? -1,
-      travelProgress: stack.travelProgress ?? 0,
-    });
-    this.stackSheetIds.set(id, this.stackSheetIds.get(id) || []);
-    this.stackStaging.set(id, this.stackStaging.get(id) || new Map());
-  }
-
-  unregisterStack(stackId) {
-    if (!stackId) {
-      return;
-    }
-
-    this.stacks.delete(stackId);
-    this.stackSheetIds.delete(stackId);
-    this.stackStaging.delete(stackId);
-  }
-
-  registerSheetWithStack(stackId, controller) {
-    if (!stackId || !controller?.id) {
-      return;
-    }
-
-    const sheetIds = this.stackSheetIds.get(stackId) || [];
-    if (!sheetIds.includes(controller.id)) {
-      this.stackSheetIds.set(stackId, [...sheetIds, controller.id]);
-    }
-
-    this.updateSheet(controller);
-  }
-
-  unregisterSheetFromStack(stackId, controllerOrId) {
-    const id =
-      typeof controllerOrId === "string" ? controllerOrId : controllerOrId?.id;
-
-    if (!stackId || !id) {
-      return;
-    }
-
-    const sheetIds = this.stackSheetIds.get(stackId) || [];
-    this.stackSheetIds.set(
-      stackId,
-      sheetIds.filter((sheetId) => sheetId !== id)
-    );
-  }
-
-  syncStackSheets(stackId, controllers) {
-    if (!stackId) {
-      return;
-    }
-
-    const sheetIds = controllers.map((controller) => controller.id);
-    this.stackSheetIds.set(stackId, sheetIds);
-
-    for (const controller of controllers) {
-      this.updateSheet(controller);
-    }
-  }
-
-  updateSheetTravelProgress(controller, progress) {
-    if (!controller?.id) {
-      return;
-    }
-
-    controller.travelProgress = progress;
-    this.controllers.set(controller.id, controller);
-  }
-
-  updateSheetStagingInStack(stackId, sheetId, staging) {
-    if (!stackId || !sheetId) {
-      return;
-    }
-
-    const stagingBySheetId = this.stackStaging.get(stackId) || new Map();
-    stagingBySheetId.set(sheetId, staging);
-    this.stackStaging.set(stackId, stagingBySheetId);
-  }
-
-  removeSheetStagingFromStack(stackId, sheetId) {
-    if (!stackId || !sheetId) {
-      return;
-    }
-
-    const stagingBySheetId = this.stackStaging.get(stackId);
-    if (!stagingBySheetId) {
-      return;
-    }
-
-    stagingBySheetId.delete(sheetId);
-  }
-
   syncLayerFromSheet(controller) {
     if (!controller?.id) {
       return;
@@ -224,10 +111,6 @@ export default class SheetLayerStore extends Service {
     this.layers.delete(sheetId);
   }
 
-  syncInertRoots(rootElements) {
-    this.inertRootElements = [...rootElements];
-  }
-
   recalculateInertOutside() {
     cancel(this.recalculateInertTimeout);
 
@@ -259,7 +142,6 @@ export default class SheetLayerStore extends Service {
 
     this.inertElements = new Set();
     this.rootElements = new Set();
-    this.syncInertRoots(new Set());
   }
 
   consumeEscapeKey(event) {
@@ -507,14 +389,12 @@ export default class SheetLayerStore extends Service {
 
     const sheetsInOrder = this.#orderedControllers();
     for (const sheet of sheetsInOrder) {
-      this.updateSheet(sheet);
       this.syncLayerFromSheet(sheet);
     }
 
     const hasInertOutside = sheetsInOrder.some((sheet) => sheet.inertOutside);
 
     if (!hasInertOutside || sheetsInOrder.length === 0) {
-      this.syncInertRoots(new Set());
       return;
     }
 
@@ -539,7 +419,6 @@ export default class SheetLayerStore extends Service {
     this.rootElements = rootElements;
     this.#moveFocusIfNecessary(rootElements, sheetsInOrder);
     this.#applyInert(rootElements);
-    this.syncInertRoots(rootElements);
   }
 
   #moveFocusIfNecessary(rootElements, sheetsInOrder) {
diff --git a/frontend/discourse/float-kit/services/sheet-stack-registry.js b/frontend/discourse/float-kit/services/sheet-stack-registry.js
index f4263f7de6c11..c14fc3df385b3 100644
--- a/frontend/discourse/float-kit/services/sheet-stack-registry.js
+++ b/frontend/discourse/float-kit/services/sheet-stack-registry.js
@@ -1,5 +1,5 @@
 import { guidFor } from "@ember/object/internals";
-import Service, { service } from "@ember/service";
+import Service from "@ember/service";
 import { TrackedMap } from "@ember-compat/tracked-built-ins";
 
 /**
@@ -9,8 +9,6 @@ import { TrackedMap } from "@ember-compat/tracked-built-ins";
  * sheets can animate based on stacking progress.
  */
 export default class SheetStackRegistry extends Service {
-  @service sheetLayerStore;
-
   /** @type {TrackedMap<string, Object>} */
   stacks = new TrackedMap();
 
@@ -48,7 +46,6 @@ export default class SheetStackRegistry extends Service {
     this.stacks.set(id, stackObject);
     this.stackSheets.set(id, []);
     this.stackStagingData.set(id, new Map());
-    this.sheetLayerStore.registerStack(stackObject);
     return id;
   }
 
@@ -62,7 +59,6 @@ export default class SheetStackRegistry extends Service {
     this.stackSheets.delete(stackId);
     this.stackingCounts.delete(stackId);
     this.stackStagingData.delete(stackId);
-    this.sheetLayerStore.unregisterStack(stackId);
   }
 
   /**
@@ -84,7 +80,6 @@ export default class SheetStackRegistry extends Service {
     sheets.push(controller);
     controller.stackId = stackId;
     controller.stackingIndex = sheets.length - 1;
-    this.sheetLayerStore.registerSheetWithStack(stackId, controller);
 
     this.updateBelowSheetsInStack(stackId);
   }
@@ -114,8 +109,6 @@ export default class SheetStackRegistry extends Service {
       sheets.splice(index, 1);
     }
 
-    this.sheetLayerStore.unregisterSheetFromStack(stackId, controller.id);
-
     controller.stackId = null;
     controller.stackingIndex = -1;
     controller.belowSheetsInStack = [];
@@ -170,7 +163,6 @@ export default class SheetStackRegistry extends Service {
     });
 
     this.updateSelfAndAboveTravelProgressSumInStack(stackId);
-    this.sheetLayerStore.syncStackSheets(stackId, sheets);
   }
 
   /**
@@ -223,7 +215,6 @@ export default class SheetStackRegistry extends Service {
     }
 
     controller.travelProgress = progress;
-    this.sheetLayerStore.updateSheetTravelProgress(controller, progress);
     this.updateSelfAndAboveTravelProgressSumInStack(controller.stackId);
   }
 
@@ -425,7 +416,6 @@ export default class SheetStackRegistry extends Service {
 
     stagingData.set(sheetId, staging);
     this.stackStagingData.set(stackId, new Map(stagingData));
-    this.sheetLayerStore.updateSheetStagingInStack(stackId, sheetId, staging);
   }
 
   /**
@@ -442,7 +432,6 @@ export default class SheetStackRegistry extends Service {
 
     stagingData.delete(sheetId);
     this.stackStagingData.set(stackId, new Map(stagingData));
-    this.sheetLayerStore.removeSheetStagingFromStack(stackId, sheetId);
   }
 
   /**

From 2693e6319b209430602f614387ed20a950b9268d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Feb 2026 17:21:45 +0100
Subject: [PATCH 146/168] cleaning

---
 .../float-kit/services/sheet-layer-store.js   | 64 -------------------
 .../float-kit/services/sheet-registry.js      |  3 -
 .../services/sheet-stack-registry.js          | 42 ------------
 3 files changed, 109 deletions(-)

diff --git a/frontend/discourse/float-kit/services/sheet-layer-store.js b/frontend/discourse/float-kit/services/sheet-layer-store.js
index 7da85abb3ec9e..3816493ccc831 100644
--- a/frontend/discourse/float-kit/services/sheet-layer-store.js
+++ b/frontend/discourse/float-kit/services/sheet-layer-store.js
@@ -8,7 +8,6 @@ export default class SheetLayerStore extends Service {
   controllers = new Map();
   sheetOrder = [];
   rootsByComponentId = new Map();
-  layers = new Map();
   layerFocusState = new Map();
   inertElements = new Set();
   rootElements = new Set();
@@ -49,20 +48,11 @@ export default class SheetLayerStore extends Service {
     }
 
     this.controllers.delete(id);
-    this.removeLayer(id);
     this.sheetOrder = this.sheetOrder.filter((sheetId) => sheetId !== id);
 
     this.#syncGlobalListeners();
   }
 
-  updateSheet(controller) {
-    if (!controller?.id) {
-      return;
-    }
-
-    this.controllers.set(controller.id, controller);
-  }
-
   registerRoot(componentId, rootComponent) {
     if (!componentId) {
       return;
@@ -83,34 +73,6 @@ export default class SheetLayerStore extends Service {
     return this.rootsByComponentId.get(componentId);
   }
 
-  syncLayerFromSheet(controller) {
-    if (!controller?.id) {
-      return;
-    }
-
-    const focusState = this.layerFocusState.get(controller.id);
-
-    this.layers.set(controller.id, {
-      sheetId: controller.id,
-      inertOutside: controller.inertOutside ?? true,
-      viewElement: controller.view ?? null,
-      backdropElement: controller.backdrop ?? null,
-      scrollContainerElement: controller.scrollContainer ?? null,
-      contentElement: controller.content ?? null,
-      elementFocusedLastBeforeShowing:
-        focusState?.elementFocusedLastBeforeShowing ?? null,
-      focusWasInsideOnClose: focusState?.focusWasInsideOnClose ?? false,
-    });
-  }
-
-  removeLayer(sheetId) {
-    if (!sheetId) {
-      return;
-    }
-
-    this.layers.delete(sheetId);
-  }
-
   recalculateInertOutside() {
     cancel(this.recalculateInertTimeout);
 
@@ -201,7 +163,6 @@ export default class SheetLayerStore extends Service {
     const focusState = this.layerFocusState.get(sheetId) || {};
     focusState.elementFocusedLastBeforeShowing = element ?? null;
     this.layerFocusState.set(sheetId, focusState);
-    this.#syncLayerFocusStateToLayer(sheetId);
   }
 
   captureLayerFocusedLastBeforeShowingFromActive(sheetId) {
@@ -216,7 +177,6 @@ export default class SheetLayerStore extends Service {
 
     focusState.elementFocusedLastBeforeShowing = document.activeElement;
     this.layerFocusState.set(sheetId, focusState);
-    this.#syncLayerFocusStateToLayer(sheetId);
   }
 
   captureLayerFocusWasInsideOnClose(sheetId, viewElement) {
@@ -233,7 +193,6 @@ export default class SheetLayerStore extends Service {
       viewElement.contains(activeElement);
 
     this.layerFocusState.set(sheetId, focusState);
-    this.#syncLayerFocusStateToLayer(sheetId);
   }
 
   executeLayerDismissAutoFocus({ sheetId, viewElement, onDismissAutoFocus }) {
@@ -251,12 +210,10 @@ export default class SheetLayerStore extends Service {
 
     focusState.focusWasInsideOnClose = false;
     this.layerFocusState.set(sheetId, focusState);
-    this.#syncLayerFocusStateToLayer(sheetId);
 
     if (!focusWasInside && document.contains(activeElement)) {
       focusState.elementFocusedLastBeforeShowing = null;
       this.layerFocusState.set(sheetId, focusState);
-      this.#syncLayerFocusStateToLayer(sheetId);
       return;
     }
 
@@ -269,7 +226,6 @@ export default class SheetLayerStore extends Service {
     if (behavior.focus === false) {
       focusState.elementFocusedLastBeforeShowing = null;
       this.layerFocusState.set(sheetId, focusState);
-      this.#syncLayerFocusStateToLayer(sheetId);
       return;
     }
 
@@ -282,7 +238,6 @@ export default class SheetLayerStore extends Service {
     target.focus({ preventScroll: true });
     focusState.elementFocusedLastBeforeShowing = null;
     this.layerFocusState.set(sheetId, focusState);
-    this.#syncLayerFocusStateToLayer(sheetId);
   }
 
   clearLayerFocusState(sheetId) {
@@ -291,7 +246,6 @@ export default class SheetLayerStore extends Service {
     }
 
     this.layerFocusState.delete(sheetId);
-    this.#syncLayerFocusStateToLayer(sheetId);
   }
 
   #processEscapeOnLayer({ sheetsInOrder, layerIndex, event }) {
@@ -388,9 +342,6 @@ export default class SheetLayerStore extends Service {
     this.cleanupInert();
 
     const sheetsInOrder = this.#orderedControllers();
-    for (const sheet of sheetsInOrder) {
-      this.syncLayerFromSheet(sheet);
-    }
 
     const hasInertOutside = sheetsInOrder.some((sheet) => sheet.inertOutside);
 
@@ -607,19 +558,4 @@ export default class SheetLayerStore extends Service {
     this.#cleanupEscapeKeyListener();
   }
 
-  #syncLayerFocusStateToLayer(sheetId) {
-    const layer = this.layers.get(sheetId);
-    if (!layer) {
-      return;
-    }
-
-    const focusState = this.layerFocusState.get(sheetId) || {};
-    this.layers.set(sheetId, {
-      ...layer,
-      elementFocusedLastBeforeShowing:
-        focusState.elementFocusedLastBeforeShowing ?? null,
-      focusWasInsideOnClose: focusState.focusWasInsideOnClose ?? false,
-    });
-  }
-
 }
diff --git a/frontend/discourse/float-kit/services/sheet-registry.js b/frontend/discourse/float-kit/services/sheet-registry.js
index 5365977a37ee7..95953e2fc7c7a 100644
--- a/frontend/discourse/float-kit/services/sheet-registry.js
+++ b/frontend/discourse/float-kit/services/sheet-registry.js
@@ -45,7 +45,6 @@ export default class SheetRegistry extends Service {
    */
   register(controller) {
     this.sheetLayerStore.registerSheet(controller);
-    this.sheetLayerStore.syncLayerFromSheet(controller);
 
     if (controller.inertOutside) {
       this.applyScrollLock();
@@ -105,8 +104,6 @@ export default class SheetRegistry extends Service {
       }
     }
 
-    this.sheetLayerStore.updateSheet(controller);
-    this.sheetLayerStore.syncLayerFromSheet(controller);
     this.sheetLayerStore.recalculateInertOutside();
   }
 
diff --git a/frontend/discourse/float-kit/services/sheet-stack-registry.js b/frontend/discourse/float-kit/services/sheet-stack-registry.js
index c14fc3df385b3..f9a7b7e0cee6c 100644
--- a/frontend/discourse/float-kit/services/sheet-stack-registry.js
+++ b/frontend/discourse/float-kit/services/sheet-stack-registry.js
@@ -218,16 +218,6 @@ export default class SheetStackRegistry extends Service {
     this.updateSelfAndAboveTravelProgressSumInStack(controller.stackId);
   }
 
-  /**
-   * Get all sheets in a stack.
-   *
-   * @param {string} stackId
-   * @returns {Object[]}
-   */
-  getSheetsInStack(stackId) {
-    return this.stackSheets.get(stackId) || [];
-  }
-
   /**
    * Get the previous (parent) sheet in stack relative to a given sheet.
    *
@@ -263,28 +253,6 @@ export default class SheetStackRegistry extends Service {
     return sheets[sheets.length - 1];
   }
 
-  /**
-   * Check if any sheet in the stack is currently animating (not in idle position).
-   *
-   * @param {string} stackId
-   * @returns {boolean}
-   */
-  isStackAnimating(stackId) {
-    const sheets = this.stackSheets.get(stackId);
-    if (!sheets) {
-      return false;
-    }
-
-    return sheets.some((sheet) => {
-      const positionState = sheet.state?.position?.current;
-      return (
-        positionState &&
-        positionState !== "out" &&
-        !positionState.endsWith(".idle")
-      );
-    });
-  }
-
   /**
    * Notify parent sheet that a new sheet is opening above it.
    *
@@ -355,16 +323,6 @@ export default class SheetStackRegistry extends Service {
     }
   }
 
-  /**
-   * Get the stack instance.
-   *
-   * @param {string} stackId
-   * @returns {Object|null}
-   */
-  getStack(stackId) {
-    return this.stacks.get(stackId) || null;
-  }
-
   /**
    * Get the current stacking count.
    *

From b5a51db70ffbc5b19a69ad73ba2f3df2f8e3f36b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Feb 2026 18:21:25 +0100
Subject: [PATCH 147/168] fixes

---
 .../discourse/float-kit/components/d-sheet-stack.gjs |  2 +-
 .../float-kit/components/d-sheet/controller.js       |  9 +--------
 .../float-kit/components/d-sheet/focus-management.js | 10 +++-------
 .../discourse/float-kit/components/d-sheet/root.gjs  |  1 -
 .../float-kit/services/sheet-layer-store.js          | 12 +++---------
 5 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet-stack.gjs b/frontend/discourse/float-kit/components/d-sheet-stack.gjs
index 412c61ea6ea15..5b60e07dbadb8 100644
--- a/frontend/discourse/float-kit/components/d-sheet-stack.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet-stack.gjs
@@ -33,7 +33,7 @@ export default class Root extends Component {
     super(owner, args);
 
     // Register stack early so children can register
-    this.sheetStackRegistry.registerStack({ id: this.id }, null);
+    this.sheetStackRegistry.registerStack({ id: this.id });
 
     registerDestructor(this, () => {
       this.sheetStackRegistry.unregisterStack(this.id);
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index 021951f4e0f02..86d73b9337b67 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -351,12 +351,6 @@ export default class Controller {
    */
   sheetRegistry = null;
 
-  /**
-   * Reference to the sheet layer store.
-   * @type {Object|null}
-   */
-  sheetLayerStore = null;
-
   /**
    * Reference to the theme color manager.
    * @type {Object|null}
@@ -839,7 +833,6 @@ export default class Controller {
       "onSafeToUnmountChange",
       "sheetStackRegistry",
       "sheetRegistry",
-      "sheetLayerStore",
       "themeColorManager",
     ];
 
@@ -1623,7 +1616,7 @@ export default class Controller {
     this.resetViewStyles();
     this.calculateDimensionsIfReady();
     this.setupResizeObserver();
-    this.sheetLayerStore?.recalculateInertOutside();
+    this.sheetRegistry?.sheetLayerStore?.recalculateInertOutside();
     this.#notifyElementsRegisteredIfReady();
   }
 
diff --git a/frontend/discourse/float-kit/components/d-sheet/focus-management.js b/frontend/discourse/float-kit/components/d-sheet/focus-management.js
index 6f1a98cc568fd..8ec080365c755 100644
--- a/frontend/discourse/float-kit/components/d-sheet/focus-management.js
+++ b/frontend/discourse/float-kit/components/d-sheet/focus-management.js
@@ -78,11 +78,11 @@ function getFirstSafeElement(elements) {
  *
  * @param {HTMLElement} container - The container element to search within
  * @param {string[]} [additionalSkipSelectors] - Additional selectors for elements to skip
- * @returns {{ safelyFocusableElements: HTMLElement[], safelyTabbableElements: HTMLElement[] }} Object containing arrays of focusable and tabbable elements
+ * @returns {{ safelyTabbableElements: HTMLElement[] }} Object containing tabbable elements
  */
 function getFocusableElements(container, additionalSkipSelectors = []) {
   if (!container) {
-    return { safelyFocusableElements: [], safelyTabbableElements: [] };
+    return { safelyTabbableElements: [] };
   }
 
   const skipSelector = [
@@ -107,15 +107,11 @@ function getFocusableElements(container, additionalSkipSelectors = []) {
       ),
   }));
 
-  const safelyFocusableElements = elementsWithData
-    .filter((data) => !data.skippable)
-    .map((data) => data.element);
-
   const safelyTabbableElements = elementsWithData
     .filter((data) => data.tabbable && !data.skippable)
     .map((data) => data.element);
 
-  return { safelyFocusableElements, safelyTabbableElements };
+  return { safelyTabbableElements };
 }
 
 /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/root.gjs b/frontend/discourse/float-kit/components/d-sheet/root.gjs
index 7ba06db407ee9..25e4dbf875c7f 100644
--- a/frontend/discourse/float-kit/components/d-sheet/root.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/root.gjs
@@ -268,7 +268,6 @@ export default class Root extends Component {
       themeColorManager: this.themeColorManager,
       sheetStackRegistry: this.sheetStackRegistry,
       sheetRegistry: this.sheetRegistry,
-      sheetLayerStore: this.sheetLayerStore,
     });
   }
 
diff --git a/frontend/discourse/float-kit/services/sheet-layer-store.js b/frontend/discourse/float-kit/services/sheet-layer-store.js
index 3816493ccc831..475d280885679 100644
--- a/frontend/discourse/float-kit/services/sheet-layer-store.js
+++ b/frontend/discourse/float-kit/services/sheet-layer-store.js
@@ -10,7 +10,6 @@ export default class SheetLayerStore extends Service {
   rootsByComponentId = new Map();
   layerFocusState = new Map();
   inertElements = new Set();
-  rootElements = new Set();
   mutationObserver = null;
   recalculateInertTimeout = null;
   clickOutsideCleanup = null;
@@ -103,7 +102,6 @@ export default class SheetLayerStore extends Service {
     }
 
     this.inertElements = new Set();
-    this.rootElements = new Set();
   }
 
   consumeEscapeKey(event) {
@@ -117,8 +115,6 @@ export default class SheetLayerStore extends Service {
         event,
       });
     }
-
-    return true;
   }
 
   consumeClickOutside(event) {
@@ -128,17 +124,17 @@ export default class SheetLayerStore extends Service {
 
     if (targetElement?.matches('[data-d-sheet~="pass-through"] *')) {
       this.pointerDownTarget = null;
-      return true;
+      return;
     }
 
     if (!target || !target.isConnected) {
       this.pointerDownTarget = null;
-      return true;
+      return;
     }
 
     if (target === document.body && this.pointerDownTarget !== document.body) {
       this.pointerDownTarget = null;
-      return true;
+      return;
     }
 
     const sheetsInOrder = this.#orderedControllers();
@@ -152,7 +148,6 @@ export default class SheetLayerStore extends Service {
     }
 
     this.pointerDownTarget = null;
-    return true;
   }
 
   setLayerFocusedLastBeforeShowing(sheetId, element) {
@@ -367,7 +362,6 @@ export default class SheetLayerStore extends Service {
       rootElements.add(el);
     });
 
-    this.rootElements = rootElements;
     this.#moveFocusIfNecessary(rootElements, sheetsInOrder);
     this.#applyInert(rootElements);
   }

From ed76d5aea3732e37a3d1447d0f94140c741623cd Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Feb 2026 23:23:32 +0100
Subject: [PATCH 148/168] move theme color to backdrop

---
 .../float-kit/components/d-sheet/backdrop.gjs | 125 +++++++++++++++++-
 .../components/d-sheet/controller.js          |  73 +---------
 2 files changed, 123 insertions(+), 75 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
index f29823293ae03..06ff5272c1e50 100644
--- a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
@@ -4,6 +4,7 @@ import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import effect from "discourse/float-kit/helpers/effect";
 import concatClass from "discourse/helpers/concat-class";
+import { capabilities } from "discourse/services/capabilities";
 import Outlet from "./outlet";
 
 /**
@@ -37,6 +38,16 @@ export default class Backdrop extends Component {
    */
   @tracked backdropElement = null;
 
+  /**
+   * Override for the travel animation when theme color dimming takes over opacity.
+   * @type {Object|null}
+   */
+  @tracked _travelAnimationOverride = null;
+
+  _themeColorDimmingAlpha = 0;
+  _themeColorDimmingOverlay = null;
+  _themeColorDimmingTravelCleanup = null;
+
   /**
    * Whether the backdrop responds to click/swipe interactions.
    * Defaults to true when the arg is not provided.
@@ -47,6 +58,22 @@ export default class Backdrop extends Component {
     return this.args.swipeable ?? true;
   }
 
+  /**
+   * Whether theme color dimming is effectively enabled.
+   * When set to "auto", checks WebKit capabilities.
+   *
+   * @type {boolean}
+   */
+  get effectiveThemeColorDimming() {
+    const dimming = this.args.themeColorDimming ?? false;
+    if (dimming === "auto") {
+      return (
+        capabilities.isWebKit && !capabilities.isStandaloneWithBlackTranslucent
+      );
+    }
+    return Boolean(dimming);
+  }
+
   /**
    * Effective travel animation config, merging default with provided config.
    * Converts array-style opacity values to interpolation functions.
@@ -70,6 +97,15 @@ export default class Backdrop extends Component {
     return merged;
   }
 
+  /**
+   * Returns the override animation when dimming is active, otherwise the effective animation.
+   *
+   * @type {Object|null}
+   */
+  get activeTravelAnimation() {
+    return this._travelAnimationOverride ?? this.effectiveTravelAnimation;
+  }
+
   /**
    * Stores the rendered backdrop element.
    *
@@ -87,22 +123,96 @@ export default class Backdrop extends Component {
    * @param {Object} sheet - The sheet controller instance
    * @param {HTMLElement} backdropElement - The backdrop DOM element
    * @param {boolean} swipeable - Whether the backdrop responds to interactions
-   * @param {Object|null} travelAnimation - The effective travel animation config
+   * @param {Object|null} travelAnimation - Tracked dependency for re-registration
    * @returns {Function|undefined} Cleanup function to unregister the backdrop
    */
   @action
   syncBackdrop(sheet, backdropElement, swipeable, travelAnimation) {
+    // travelAnimation is a tracked dependency that triggers re-registration
+    // when the animation override changes, but is not passed to the controller
+    void travelAnimation;
+
     if (!sheet || !backdropElement) {
       return;
     }
 
-    sheet.registerBackdrop(backdropElement, travelAnimation, swipeable);
+    sheet.registerBackdrop(backdropElement, swipeable);
 
     return () => {
       sheet.unregisterBackdrop(backdropElement);
     };
   }
 
+  /**
+   * Manages theme color dimming lifecycle, gated by long-running state.
+   * When active, registers an overlay and a travel animation that drives
+   * both backdrop opacity and the overlay alpha.
+   *
+   * @param {Object} sheet - The sheet controller instance
+   * @param {HTMLElement} backdropElement - The backdrop DOM element
+   * @param {boolean} effectiveThemeColorDimming - Whether dimming is enabled
+   * @param {boolean} longRunningActive - Whether long-running state is active
+   * @returns {Function|undefined} Cleanup function
+   */
+  @action
+  syncThemeColorDimming(
+    sheet,
+    backdropElement,
+    effectiveThemeColorDimming,
+    longRunningActive
+  ) {
+    if (
+      !sheet ||
+      !backdropElement ||
+      !effectiveThemeColorDimming ||
+      !longRunningActive
+    ) {
+      return;
+    }
+
+    const animation = this.effectiveTravelAnimation;
+    const opacityFn =
+      typeof animation?.opacity === "function"
+        ? animation.opacity
+        : ({ progress }) => Math.min(progress * 0.33, 0.33);
+
+    this._travelAnimationOverride = animation
+      ? { ...animation, opacity: "ignore" }
+      : { opacity: "ignore" };
+
+    const computedStyle = window.getComputedStyle(backdropElement);
+    const backgroundColor = computedStyle.backgroundColor || "rgb(0, 0, 0)";
+
+    this._themeColorDimmingOverlay =
+      sheet.themeColorAdapter.registerThemeColorDimmingOverlay({
+        color: backgroundColor,
+        alpha: this._themeColorDimmingAlpha,
+      });
+
+    this._themeColorDimmingTravelCleanup = sheet.registerTravelAnimation({
+      callback: (progress) => {
+        const opacity = opacityFn({ progress });
+        this._themeColorDimmingAlpha = opacity;
+        backdropElement.style.setProperty("opacity", opacity);
+
+        if (this._themeColorDimmingOverlay) {
+          this._themeColorDimmingOverlay.updateAlpha(opacity);
+        }
+      },
+    });
+
+    return () => {
+      this._themeColorDimmingTravelCleanup?.();
+      this._themeColorDimmingTravelCleanup = null;
+
+      this._themeColorDimmingOverlay?.remove?.();
+      this._themeColorDimmingOverlay = null;
+
+      this._themeColorDimmingAlpha = 0;
+      this._travelAnimationOverride = null;
+    };
+  }
+
   <template>
     {{#if @sheet}}
       {{effect
@@ -110,11 +220,18 @@ export default class Backdrop extends Component {
         @sheet
         this.backdropElement
         this.swipeable
-        this.effectiveTravelAnimation
+        this.activeTravelAnimation
+      }}
+      {{effect
+        this.syncThemeColorDimming
+        @sheet
+        this.backdropElement
+        this.effectiveThemeColorDimming
+        @sheet.state.longRunning.isActive
       }}
       <Outlet
         @sheet={{@sheet}}
-        @travelAnimation={{this.effectiveTravelAnimation}}
+        @travelAnimation={{this.activeTravelAnimation}}
         @stackingAnimation={{@stackingAnimation}}
         data-d-sheet={{concatClass
           "backdrop"
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index 86d73b9337b67..be7b94911101c 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -369,24 +369,6 @@ export default class Controller {
    */
   stackingAnimations = [];
 
-  /**
-   * Theme color dimming overlay for backdrop.
-   * @type {{updateAlpha: Function, remove: Function}|null}
-   */
-  backdropThemeColorDimmingOverlay = null;
-
-  /**
-   * Cleanup function for backdrop theme color dimming travel animation.
-   * @type {Function|null}
-   */
-  backdropThemeColorDimmingTravelAnimationCleanup = null;
-
-  /**
-   * Current alpha value for backdrop theme color dimming.
-   * @type {number}
-   */
-  backdropThemeColorDimmingAlpha = 0;
-
   /**
    * Callback invoked when travel status changes.
    * @type {Function|null}
@@ -2020,67 +2002,17 @@ export default class Controller {
   }
 
   /**
-   * Register backdrop element with optional custom travel animation.
+   * Register backdrop element.
    *
    * @param {HTMLElement} backdrop - The backdrop element
-   * @param {Object|Function|null} travelAnimation - Travel animation config (used for theme color dimming)
    * @param {boolean} swipeable - Whether backdrop responds to swipe/click
    */
   @action
-  registerBackdrop(backdrop, travelAnimation = null, swipeable = true) {
+  registerBackdrop(backdrop, swipeable = true) {
     this.backdrop = backdrop;
     this.backdropSwipeable = swipeable;
     backdrop.style.opacity = 0;
     backdrop.style.willChange = "opacity";
-    this.#cleanupBackdropThemeColorDimming();
-
-    const isDisabled =
-      travelAnimation &&
-      typeof travelAnimation === "object" &&
-      travelAnimation.opacity === null;
-
-    if (!isDisabled && this.themeColorAdapter.effectiveThemeColorDimming) {
-      const opacityFn =
-        typeof travelAnimation === "function"
-          ? travelAnimation
-          : typeof travelAnimation?.opacity === "function"
-            ? travelAnimation.opacity
-            : ({ progress }) => Math.min(progress * 0.33, 0.33);
-
-      const computedStyle = window.getComputedStyle(backdrop);
-      const backgroundColor = computedStyle.backgroundColor || "rgb(0, 0, 0)";
-
-      this.backdropThemeColorDimmingOverlay =
-        this.themeColorAdapter.registerThemeColorDimmingOverlay({
-          color: backgroundColor,
-          alpha: this.backdropThemeColorDimmingAlpha,
-        });
-
-      this.backdropThemeColorDimmingTravelAnimationCleanup =
-        this.registerTravelAnimation({
-          callback: (progress) => {
-            const opacity = opacityFn({ progress });
-            this.backdropThemeColorDimmingAlpha = opacity;
-            backdrop.style.setProperty("opacity", opacity);
-
-            if (this.backdropThemeColorDimmingOverlay) {
-              this.backdropThemeColorDimmingOverlay.updateAlpha(opacity);
-            }
-          },
-        });
-    }
-  }
-
-  /**
-   * Clean up backdrop theme color dimming overlay and travel animation.
-   * @private
-   */
-  #cleanupBackdropThemeColorDimming() {
-    this.backdropThemeColorDimmingTravelAnimationCleanup?.();
-    this.backdropThemeColorDimmingTravelAnimationCleanup = null;
-
-    this.backdropThemeColorDimmingOverlay?.remove?.();
-    this.backdropThemeColorDimmingOverlay = null;
   }
 
   /**
@@ -2094,7 +2026,6 @@ export default class Controller {
       return;
     }
 
-    this.#cleanupBackdropThemeColorDimming();
     this.backdrop = null;
     this.backdropSwipeable = false;
   }

From f613176ec766278f6554ca85134d6fda8a9da415 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 7 Feb 2026 23:52:47 +0100
Subject: [PATCH 149/168] fixes backdrop in safari

---
 .../float-kit/components/d-sheet/backdrop.gjs | 94 +++++++------------
 1 file changed, 33 insertions(+), 61 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
index 06ff5272c1e50..364446b1003c7 100644
--- a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
@@ -30,6 +30,7 @@ const DEFAULT_BACKDROP_TRAVEL_ANIMATION = {
  *   Default: { opacity: ({ progress }) => Math.min(progress * 0.33, 0.33) }
  *   Set to { opacity: null } to disable default opacity animation.
  * @param {Object} [stackingAnimation] - Stacking animation config (same format as travelAnimation)
+ * @param {boolean|string} [themeColorDimming] - Theme color dimming mode ("auto", true, or false)
  */
 export default class Backdrop extends Component {
   /**
@@ -38,15 +39,7 @@ export default class Backdrop extends Component {
    */
   @tracked backdropElement = null;
 
-  /**
-   * Override for the travel animation when theme color dimming takes over opacity.
-   * @type {Object|null}
-   */
-  @tracked _travelAnimationOverride = null;
-
   _themeColorDimmingAlpha = 0;
-  _themeColorDimmingOverlay = null;
-  _themeColorDimmingTravelCleanup = null;
 
   /**
    * Whether the backdrop responds to click/swipe interactions.
@@ -98,12 +91,17 @@ export default class Backdrop extends Component {
   }
 
   /**
-   * Returns the override animation when dimming is active, otherwise the effective animation.
+   * Whether backdrop theme color dimming should take over opacity updates.
+   * Mirrors Silk behavior by only enabling this in long-running state.
    *
-   * @type {Object|null}
+   * @type {boolean}
    */
-  get activeTravelAnimation() {
-    return this._travelAnimationOverride ?? this.effectiveTravelAnimation;
+  get shouldUseThemeColorDimmingOverlay() {
+    return (
+      this.effectiveThemeColorDimming &&
+      this.args.sheet?.state.longRunning.isActive &&
+      typeof this.effectiveTravelAnimation?.opacity === "function"
+    );
   }
 
   /**
@@ -123,15 +121,10 @@ export default class Backdrop extends Component {
    * @param {Object} sheet - The sheet controller instance
    * @param {HTMLElement} backdropElement - The backdrop DOM element
    * @param {boolean} swipeable - Whether the backdrop responds to interactions
-   * @param {Object|null} travelAnimation - Tracked dependency for re-registration
    * @returns {Function|undefined} Cleanup function to unregister the backdrop
    */
   @action
-  syncBackdrop(sheet, backdropElement, swipeable, travelAnimation) {
-    // travelAnimation is a tracked dependency that triggers re-registration
-    // when the animation override changes, but is not passed to the controller
-    void travelAnimation;
-
+  syncBackdrop(sheet, backdropElement, swipeable) {
     if (!sheet || !backdropElement) {
       return;
     }
@@ -150,88 +143,67 @@ export default class Backdrop extends Component {
    *
    * @param {Object} sheet - The sheet controller instance
    * @param {HTMLElement} backdropElement - The backdrop DOM element
-   * @param {boolean} effectiveThemeColorDimming - Whether dimming is enabled
-   * @param {boolean} longRunningActive - Whether long-running state is active
+   * @param {boolean} shouldUseThemeColorDimmingOverlay - Whether overlay dimming should drive opacity
+   * @param {Object|null} travelAnimation - Effective travel animation
    * @returns {Function|undefined} Cleanup function
    */
   @action
   syncThemeColorDimming(
     sheet,
     backdropElement,
-    effectiveThemeColorDimming,
-    longRunningActive
+    shouldUseThemeColorDimmingOverlay,
+    travelAnimation
   ) {
-    if (
-      !sheet ||
-      !backdropElement ||
-      !effectiveThemeColorDimming ||
-      !longRunningActive
-    ) {
+    if (!sheet || !backdropElement || !shouldUseThemeColorDimmingOverlay) {
       return;
     }
 
-    const animation = this.effectiveTravelAnimation;
-    const opacityFn =
-      typeof animation?.opacity === "function"
-        ? animation.opacity
-        : ({ progress }) => Math.min(progress * 0.33, 0.33);
-
-    this._travelAnimationOverride = animation
-      ? { ...animation, opacity: "ignore" }
-      : { opacity: "ignore" };
+    const opacityFn = travelAnimation?.opacity;
+    if (typeof opacityFn !== "function") {
+      return;
+    }
 
     const computedStyle = window.getComputedStyle(backdropElement);
     const backgroundColor = computedStyle.backgroundColor || "rgb(0, 0, 0)";
 
-    this._themeColorDimmingOverlay =
-      sheet.themeColorAdapter.registerThemeColorDimmingOverlay({
-        color: backgroundColor,
-        alpha: this._themeColorDimmingAlpha,
-      });
+    const overlay = sheet.themeColorAdapter.registerThemeColorDimmingOverlay({
+      color: backgroundColor,
+      alpha: this._themeColorDimmingAlpha,
+    });
 
-    this._themeColorDimmingTravelCleanup = sheet.registerTravelAnimation({
+    const unregisterTravelAnimation = sheet.registerTravelAnimation({
       callback: (progress) => {
         const opacity = opacityFn({ progress });
         this._themeColorDimmingAlpha = opacity;
         backdropElement.style.setProperty("opacity", opacity);
 
-        if (this._themeColorDimmingOverlay) {
-          this._themeColorDimmingOverlay.updateAlpha(opacity);
+        if (overlay) {
+          overlay.updateAlpha(opacity);
         }
       },
     });
 
     return () => {
-      this._themeColorDimmingTravelCleanup?.();
-      this._themeColorDimmingTravelCleanup = null;
-
-      this._themeColorDimmingOverlay?.remove?.();
-      this._themeColorDimmingOverlay = null;
+      unregisterTravelAnimation?.();
+      overlay?.remove?.();
 
       this._themeColorDimmingAlpha = 0;
-      this._travelAnimationOverride = null;
     };
   }
 
   <template>
     {{#if @sheet}}
-      {{effect
-        this.syncBackdrop
-        @sheet
-        this.backdropElement
-        this.swipeable
-        this.activeTravelAnimation
-      }}
+      {{effect this.syncBackdrop @sheet this.backdropElement this.swipeable}}
       {{effect
         this.syncThemeColorDimming
         @sheet
         this.backdropElement
-        this.effectiveThemeColorDimming
-        @sheet.state.longRunning.isActive
+        this.shouldUseThemeColorDimmingOverlay
+        this.effectiveTravelAnimation
       }}
       <Outlet
         @sheet={{@sheet}}
-        @travelAnimation={{this.activeTravelAnimation}}
+        @travelAnimation={{this.effectiveTravelAnimation}}
         @stackingAnimation={{@stackingAnimation}}
         data-d-sheet={{concatClass
           "backdrop"

From 221a6c4e371d4c632902ce5fd2fd1549c57ba1f5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 8 Feb 2026 00:03:10 +0100
Subject: [PATCH 150/168] overflow on body

---
 frontend/discourse/float-kit/services/sheet-registry.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/discourse/float-kit/services/sheet-registry.js b/frontend/discourse/float-kit/services/sheet-registry.js
index 95953e2fc7c7a..44d1f1c3537a7 100644
--- a/frontend/discourse/float-kit/services/sheet-registry.js
+++ b/frontend/discourse/float-kit/services/sheet-registry.js
@@ -113,7 +113,7 @@ export default class SheetRegistry extends Service {
   applyScrollLock() {
     if (this.scrollLockCount === 0) {
       this.savedScrollPosition = [window.scrollX, window.scrollY];
-      document.documentElement.style.setProperty("overflow", "hidden");
+      document.body.style.setProperty("overflow", "hidden");
 
       const handleResize = () => {
         clearTimeout(this.resizeTimeout);
@@ -151,7 +151,7 @@ export default class SheetRegistry extends Service {
     if (this.scrollLockCount > 0) {
       this.scrollLockCount--;
       if (this.scrollLockCount === 0) {
-        document.documentElement.style.removeProperty("overflow");
+        document.body.style.removeProperty("overflow");
         if (this.scrollLockCleanup) {
           this.scrollLockCleanup();
           this.scrollLockCleanup = null;

From bf8af7499a652c855305935d0c5b02070bd07198 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 8 Feb 2026 17:40:50 +0100
Subject: [PATCH 151/168] disable swipe

---
 .../stylesheets/common/float-kit/d-sheet.scss |  4 +++
 .../float-kit/components/d-sheet/content.gjs  |  1 +
 .../components/d-sheet/controller.js          | 34 +++++++++++++++++--
 .../components/d-sheet/observer-manager.js    |  5 ++-
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common/float-kit/d-sheet.scss b/app/assets/stylesheets/common/float-kit/d-sheet.scss
index 0474c74fefef0..7370c3c8d6935 100644
--- a/app/assets/stylesheets/common/float-kit/d-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/d-sheet.scss
@@ -401,6 +401,10 @@
   user-select: none;
 }
 
+[data-d-sheet~="scroll-container"][data-d-sheet~="swipe-disabled"][data-d-sheet] {
+  overflow: hidden;
+}
+
 [data-d-sheet~="scroll-container"][data-d-sheet~="overscroll-contain"] {
   overscroll-behavior-y: contain;
 }
diff --git a/frontend/discourse/float-kit/components/d-sheet/content.gjs b/frontend/discourse/float-kit/components/d-sheet/content.gjs
index 09cd13232a8b0..a934bbdaadcf1 100644
--- a/frontend/discourse/float-kit/components/d-sheet/content.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/content.gjs
@@ -51,6 +51,7 @@ export default class Content extends Component {
         (concat "staging-" @sheet.state.staging.current)
         @sheet.effectiveSwipeTrapClass
         "scroll-trap-optimised"
+        (if @sheet.swipeDisabled "swipe-disabled")
         (if @sheet.swipeOutDisabledWithDetent "swipe-out-disabled")
         (unless @sheet.swipeOvershoot "overshoot-inactive")
         (if @sheet.scrollContainerShouldBePassThrough "no-pointer-events")
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index be7b94911101c..6b9e962f22cf5 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -975,6 +975,30 @@ export default class Controller {
     }
   }
 
+  /**
+   * Whether swipe interaction is fully disabled.
+   * True when swipe is off, browser doesn't support required features,
+   * or dismissal is disabled without detents.
+   *
+   * @type {boolean}
+   */
+  get swipeDisabled() {
+    if (this.swipe === false || !Controller.browserSupportsRequiredFeatures) {
+      return true;
+    }
+
+    const dismissalDisabled =
+      this.role === "alertdialog" || !this.swipeDismissal;
+    if (
+      dismissalDisabled &&
+      (this.detentsConfig === null || this.detentsConfig === undefined)
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
   /**
    * Whether swipe-to-dismiss is disabled.
    * True when sheet has detents, dismissal is disabled, and sheet is open.
@@ -1307,12 +1331,16 @@ export default class Controller {
    * @private
    */
   #setupIntersectionObserver() {
-    if (this.swipeOutDisabledWithDetent) {
+    if (this.swipeDisabled || this.swipeOutDisabledWithDetent) {
       return;
     }
 
     requestAnimationFrame(() => {
-      if (this.state.openness.isOpen && !this.swipeOutDisabledWithDetent) {
+      if (
+        this.state.openness.isOpen &&
+        !this.swipeDisabled &&
+        !this.swipeOutDisabledWithDetent
+      ) {
         this.setupIntersectionObserver();
       }
     });
@@ -1625,7 +1653,7 @@ export default class Controller {
     this.dimensions = this.#calculateDimensions();
 
     if (this.state.openness.isOpen) {
-      if (!this.swipeOutDisabledWithDetent) {
+      if (!this.swipeDisabled && !this.swipeOutDisabledWithDetent) {
         this.setupIntersectionObserver();
       } else {
         this.cleanupIntersectionObserver();
diff --git a/frontend/discourse/float-kit/components/d-sheet/observer-manager.js b/frontend/discourse/float-kit/components/d-sheet/observer-manager.js
index 1480c6214f4a8..572ccdd4f1de6 100644
--- a/frontend/discourse/float-kit/components/d-sheet/observer-manager.js
+++ b/frontend/discourse/float-kit/components/d-sheet/observer-manager.js
@@ -63,7 +63,10 @@ export default class ObserverManager {
       return;
     }
 
-    if (this.#controller.swipeOutDisabledWithDetent) {
+    if (
+      this.#controller.swipeDisabled ||
+      this.#controller.swipeOutDisabledWithDetent
+    ) {
       this.cleanupIntersectionObserver();
       return;
     }

From d6d1bd9167b6f406af673b182c47ce08633d4e19 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 8 Feb 2026 21:13:22 +0100
Subject: [PATCH 152/168] theme color refactor

---
 .../float-kit/components/d-sheet/backdrop.gjs | 101 +----
 .../components/d-sheet/controller.js          |  11 +-
 .../float-kit/components/d-sheet/root.gjs     |   4 -
 .../components/d-sheet/theme-color-adapter.js | 107 +----
 .../float-kit/services/theme-color-manager.js | 414 ++++--------------
 5 files changed, 107 insertions(+), 530 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
index 364446b1003c7..4796f2d1e6d4f 100644
--- a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
@@ -2,61 +2,27 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import { service } from "@ember/service";
 import effect from "discourse/float-kit/helpers/effect";
 import concatClass from "discourse/helpers/concat-class";
 import { capabilities } from "discourse/services/capabilities";
 import Outlet from "./outlet";
 
-/**
- * Default opacity travel animation for backdrop.
- * @type {{ opacity: (params: { progress: number }) => number }}
- */
 const DEFAULT_BACKDROP_TRAVEL_ANIMATION = {
   opacity: ({ progress }) => Math.min(progress * 0.33, 0.33),
 };
 
-/**
- * Backdrop component for d-sheet. Renders a semi-transparent overlay behind the sheet
- * content that can optionally respond to click/swipe interactions.
- *
- * @component Backdrop
- * @param {Object} sheet - The sheet controller instance
- * @param {boolean} [swipeable=true] - Whether backdrop responds to click/swipe
- * @param {Object|null} [travelAnimation] - Custom travel animation config. Properties can be:
- *   - [start, end] array for keyframe tweening
- *   - ({ progress, tween }) => value function
- *   - string for static values
- *   - null to disable
- *   Default: { opacity: ({ progress }) => Math.min(progress * 0.33, 0.33) }
- *   Set to { opacity: null } to disable default opacity animation.
- * @param {Object} [stackingAnimation] - Stacking animation config (same format as travelAnimation)
- * @param {boolean|string} [themeColorDimming] - Theme color dimming mode ("auto", true, or false)
- */
 export default class Backdrop extends Component {
-  /**
-   * The rendered backdrop DOM element.
-   * @type {HTMLElement|null}
-   */
+  @service themeColorManager;
+
   @tracked backdropElement = null;
 
   _themeColorDimmingAlpha = 0;
 
-  /**
-   * Whether the backdrop responds to click/swipe interactions.
-   * Defaults to true when the arg is not provided.
-   *
-   * @type {boolean}
-   */
   get swipeable() {
     return this.args.swipeable ?? true;
   }
 
-  /**
-   * Whether theme color dimming is effectively enabled.
-   * When set to "auto", checks WebKit capabilities.
-   *
-   * @type {boolean}
-   */
   get effectiveThemeColorDimming() {
     const dimming = this.args.themeColorDimming ?? false;
     if (dimming === "auto") {
@@ -67,12 +33,6 @@ export default class Backdrop extends Component {
     return Boolean(dimming);
   }
 
-  /**
-   * Effective travel animation config, merging default with provided config.
-   * Converts array-style opacity values to interpolation functions.
-   *
-   * @type {Object|null}
-   */
   get effectiveTravelAnimation() {
     const userAnimation = this.args.travelAnimation;
 
@@ -90,12 +50,6 @@ export default class Backdrop extends Component {
     return merged;
   }
 
-  /**
-   * Whether backdrop theme color dimming should take over opacity updates.
-   * Mirrors Silk behavior by only enabling this in long-running state.
-   *
-   * @type {boolean}
-   */
   get shouldUseThemeColorDimmingOverlay() {
     return (
       this.effectiveThemeColorDimming &&
@@ -104,25 +58,11 @@ export default class Backdrop extends Component {
     );
   }
 
-  /**
-   * Stores the rendered backdrop element.
-   *
-   * @param {HTMLElement} element
-   */
   @action
   setBackdropElement(element) {
     this.backdropElement = element;
   }
 
-  /**
-   * Registers the backdrop with the sheet controller and returns a cleanup function.
-   * Called via the effect helper when dependencies change.
-   *
-   * @param {Object} sheet - The sheet controller instance
-   * @param {HTMLElement} backdropElement - The backdrop DOM element
-   * @param {boolean} swipeable - Whether the backdrop responds to interactions
-   * @returns {Function|undefined} Cleanup function to unregister the backdrop
-   */
   @action
   syncBackdrop(sheet, backdropElement, swipeable) {
     if (!sheet || !backdropElement) {
@@ -136,17 +76,6 @@ export default class Backdrop extends Component {
     };
   }
 
-  /**
-   * Manages theme color dimming lifecycle, gated by long-running state.
-   * When active, registers an overlay and a travel animation that drives
-   * both backdrop opacity and the overlay alpha.
-   *
-   * @param {Object} sheet - The sheet controller instance
-   * @param {HTMLElement} backdropElement - The backdrop DOM element
-   * @param {boolean} shouldUseThemeColorDimmingOverlay - Whether overlay dimming should drive opacity
-   * @param {Object|null} travelAnimation - Effective travel animation
-   * @returns {Function|undefined} Cleanup function
-   */
   @action
   syncThemeColorDimming(
     sheet,
@@ -163,10 +92,17 @@ export default class Backdrop extends Component {
       return;
     }
 
-    const computedStyle = window.getComputedStyle(backdropElement);
-    const backgroundColor = computedStyle.backgroundColor || "rgb(0, 0, 0)";
+    if (!this.themeColorManager.getAndStoreUnderlyingThemeColorAsRGBArray()) {
+      return;
+    }
+
+    const dimmingOverlayId = sheet.themeColorAdapter.dimmingOverlayId;
+    const backgroundColor =
+      window.getComputedStyle(backdropElement).backgroundColor || "rgb(0,0,0)";
 
-    const overlay = sheet.themeColorAdapter.registerThemeColorDimmingOverlay({
+    const overlay = this.themeColorManager.updateThemeColorDimmingOverlay({
+      abortRemoval: true,
+      dimmingOverlayId,
       color: backgroundColor,
       alpha: this._themeColorDimmingAlpha,
     });
@@ -176,17 +112,16 @@ export default class Backdrop extends Component {
         const opacity = opacityFn({ progress });
         this._themeColorDimmingAlpha = opacity;
         backdropElement.style.setProperty("opacity", opacity);
-
-        if (overlay) {
-          overlay.updateAlpha(opacity);
-        }
+        this.themeColorManager.updateThemeColorDimmingOverlayAlphaValue(
+          overlay,
+          opacity
+        );
       },
     });
 
     return () => {
       unregisterTravelAnimation?.();
-      overlay?.remove?.();
-
+      this.themeColorManager.removeThemeColorDimmingOverlay(dimmingOverlayId);
       this._themeColorDimmingAlpha = 0;
     };
   }
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index 6b9e962f22cf5..d2f08517c21c7 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -351,12 +351,6 @@ export default class Controller {
    */
   sheetRegistry = null;
 
-  /**
-   * Reference to the theme color manager.
-   * @type {Object|null}
-   */
-  themeColorManager = null;
-
   /**
    * Array of registered travel animations.
    * @type {Array<Object>}
@@ -760,7 +754,7 @@ export default class Controller {
     /** @type {AnimationTravel} */
     this.animationTravel = new AnimationTravel(this);
     /** @type {ThemeColorAdapter} */
-    this.themeColorAdapter = new ThemeColorAdapter(this);
+    this.themeColorAdapter = new ThemeColorAdapter();
     this.setupSubscriptions();
   }
 
@@ -815,7 +809,6 @@ export default class Controller {
       "onSafeToUnmountChange",
       "sheetStackRegistry",
       "sheetRegistry",
-      "themeColorManager",
     ];
 
     for (const key of propsToAssign) {
@@ -1680,7 +1673,6 @@ export default class Controller {
     this.touchHandler.detach();
     this.observerManager.cleanup();
     this.unregisterBackdrop(this.backdrop);
-    this.themeColorAdapter.cleanup();
     this.domAttributes.cleanup();
     this.focusManagement.cleanup();
     this.state.cleanup();
@@ -1720,7 +1712,6 @@ export default class Controller {
   @action
   registerContent(content) {
     this.content = content;
-    this.themeColorAdapter.captureContentThemeColor();
     this.calculateDimensionsIfReady();
   }
 
diff --git a/frontend/discourse/float-kit/components/d-sheet/root.gjs b/frontend/discourse/float-kit/components/d-sheet/root.gjs
index 25e4dbf875c7f..01d90dc6d6544 100644
--- a/frontend/discourse/float-kit/components/d-sheet/root.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/root.gjs
@@ -41,9 +41,6 @@ export default class Root extends Component {
   /** @type {import("discourse/float-kit/services/sheet-stack-registry").default} */
   @service sheetStackRegistry;
 
-  /** @type {import("discourse/float-kit/services/theme-color-manager").default} */
-  @service themeColorManager;
-
   /**
    * The sheet controller instance. Created immediately and replaced after each close cycle.
    *
@@ -265,7 +262,6 @@ export default class Root extends Component {
       onSafeToUnmountChange: this.args.onSafeToUnmountChange,
       role: this.args.role,
       inertOutside: this.args.inertOutside,
-      themeColorManager: this.themeColorManager,
       sheetStackRegistry: this.sheetStackRegistry,
       sheetRegistry: this.sheetRegistry,
     });
diff --git a/frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js b/frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js
index 78df5a5658324..c84a17aa4c28c 100644
--- a/frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js
+++ b/frontend/discourse/float-kit/components/d-sheet/theme-color-adapter.js
@@ -1,67 +1,15 @@
-/**
- * Adapter for managing mobile browser theme-color meta tag behavior in d-sheet modals.
- * Coordinates with ThemeColorManager to handle dimming overlays during sheet presentation,
- * captures theme colors from sheet content backgrounds, and maintains a stack-based ownership
- * model for nested sheets. Supports auto-detection of WebKit capabilities and configurable
- * dimming alpha values for visual sheet hierarchy.
- */
-
+import { guidFor } from "@ember/object/internals";
 import { capabilities } from "discourse/services/capabilities";
 
-/**
- * Manages theme color behavior for sheets including dimming overlays,
- * meta tag ownership, and color capture from content elements.
- */
 export default class ThemeColorAdapter {
-  /** @type {import("./controller").default} */
-  controller;
-
-  /** @type {boolean | string} */
+  dimmingOverlayId;
   themeColorDimming = false;
-
-  /** @type {number | null} */
   themeColorDimmingAlpha = null;
 
-  /** @type {HTMLMetaElement | null} */
-  themeColorMetaTag = null;
-
-  /** @type {{controller: ThemeColorAdapter, previousContent: string} | null} */
-  themeColorStackEntry = null;
-
-  /** @type {string | null} */
-  underlyingThemeColor = null;
-
-  /**
-   * @param {import("./controller").default} controller
-   */
-  constructor(controller) {
-    this.controller = controller;
-  }
-
-  /**
-   * Proxies the theme color manager service from the controller.
-   *
-   * @type {import("../../services/theme-color-manager").default | null}
-   */
-  get themeColorManager() {
-    return this.controller.themeColorManager;
-  }
-
-  /**
-   * Proxies the sheet's content element from the controller.
-   *
-   * @type {HTMLElement | null}
-   */
-  get content() {
-    return this.controller.content;
+  constructor() {
+    this.dimmingOverlayId = guidFor(this);
   }
 
-  /**
-   * Whether theme color dimming is effectively enabled.
-   * When set to "auto", checks WebKit capabilities.
-   *
-   * @type {boolean}
-   */
   get effectiveThemeColorDimming() {
     if (this.themeColorDimming === "auto") {
       return (
@@ -71,13 +19,6 @@ export default class ThemeColorAdapter {
     return Boolean(this.themeColorDimming);
   }
 
-  /**
-   * Applies theme color settings from the provided options.
-   *
-   * @param {Object} options
-   * @param {boolean | string} [options.themeColorDimming]
-   * @param {number} [options.themeColorDimmingAlpha]
-   */
   configure(options) {
     if (options.themeColorDimming !== undefined) {
       this.themeColorDimming = options.themeColorDimming;
@@ -86,44 +27,4 @@ export default class ThemeColorAdapter {
       this.themeColorDimmingAlpha = options.themeColorDimmingAlpha;
     }
   }
-
-  /**
-   * Registers a theme color dimming overlay via the manager.
-   *
-   * @param {{color: string, alpha: number}} overlay
-   * @returns {{updateAlpha: (alpha: number) => void, remove: () => void} | undefined}
-   */
-  registerThemeColorDimmingOverlay(overlay) {
-    return this.themeColorManager?.registerThemeColorDimmingOverlay(
-      this,
-      overlay
-    );
-  }
-
-  /**
-   * Releases ownership of the theme color via the manager.
-   *
-   * @returns {void}
-   */
-  releaseThemeColorOwnership() {
-    this.themeColorManager?.releaseThemeColorOwnership(this);
-  }
-
-  /**
-   * Captures the theme color from the content element's background.
-   *
-   * @returns {void}
-   */
-  captureContentThemeColor() {
-    this.themeColorManager?.captureContentThemeColor(this);
-  }
-
-  /**
-   * Cleans up theme color resources by releasing ownership.
-   *
-   * @returns {void}
-   */
-  cleanup() {
-    this.releaseThemeColorOwnership();
-  }
 }
diff --git a/frontend/discourse/float-kit/services/theme-color-manager.js b/frontend/discourse/float-kit/services/theme-color-manager.js
index e7d676134d747..a57fe0b66a28d 100644
--- a/frontend/discourse/float-kit/services/theme-color-manager.js
+++ b/frontend/discourse/float-kit/services/theme-color-manager.js
@@ -1,35 +1,11 @@
 import Service from "@ember/service";
 
-/**
- * Service to manage the theme-color meta tag.
- * Handles stacking and dimming across multiple sheets.
- * Strictly follows the internal implementation for color logic.
- */
 export default class ThemeColorManager extends Service {
-  /**
-   * Stack of theme color ownership entries.
-   * Each entry: { controller, previousContent }
-   * @type {Array<{controller: Object, previousContent: string}>}
-   */
-  ownershipStack = [];
+  themeColorMetaTag = null;
+  underlyingThemeColor = null;
+  themeColorDimmingOverlays = [];
 
-  /**
-   * Global list of theme color dimming overlays.
-   * @type {Array<{controller: Object, color: number[], alpha: number}>}
-   */
-  dimmingOverlays = [];
-
-  /**
-   * Parses an RGB/RGBA string into an array of [r, g, b].
-   *
-   * @param {string} colorStr
-   * @returns {number[]|null}
-   */
   #parseRGB(colorStr) {
-    if (!colorStr) {
-      return null;
-    }
-
     return (colorStr.startsWith("rgb(") || colorStr.startsWith("rgba(")) &&
       colorStr.endsWith(")")
       ? colorStr
@@ -41,24 +17,18 @@ export default class ThemeColorManager extends Service {
       : null;
   }
 
-  /**
-   * Parses a color string (RGB, RGBA, or Hex) into an array of [r, g, b].
-   * Strictly follows the internal color parsing implementation.
-   *
-   * @param {string} colorStr
-   * @returns {number[]|null}
-   */
   #parseColor(colorStr) {
     if (!colorStr) {
       return null;
     }
 
-    let result = null;
     if (colorStr.startsWith("rgb(") || colorStr.startsWith("rgba(")) {
-      result = this.#parseRGB(colorStr);
-    } else if (colorStr.startsWith("#")) {
-      let hex = colorStr.replace(/^#/, "");
-      let normalizedHex =
+      return this.#parseRGB(colorStr);
+    }
+
+    if (colorStr.startsWith("#")) {
+      const hex = colorStr.replace(/^#/, "");
+      const normalized =
         hex.length === 3
           ? hex
               .split("")
@@ -66,351 +36,135 @@ export default class ThemeColorManager extends Service {
               .join("")
           : hex;
 
-      result = /^[0-9A-Fa-f]{6}$/.test(normalizedHex)
+      return /^[0-9A-Fa-f]{6}$/.test(normalized)
         ? [
-            parseInt(normalizedHex.slice(0, 2), 16),
-            parseInt(normalizedHex.slice(2, 4), 16),
-            parseInt(normalizedHex.slice(4, 6), 16),
+            parseInt(normalized.slice(0, 2), 16),
+            parseInt(normalized.slice(2, 4), 16),
+            parseInt(normalized.slice(4, 6), 16),
           ]
         : null;
     }
-    return result;
+
+    return null;
   }
 
-  /**
-   * Mixes a base color with multiple overlays.
-   *
-   * @param {number[]} baseColor - [r, g, b]
-   * @param {Array<{color: number[], alpha: number}>} overlays
-   * @returns {string} rgb() string
-   */
   #mixColors(baseColor, overlays) {
-    let result = [...baseColor];
+    const result = [...baseColor];
     for (let i = 0; i < overlays.length; i++) {
-      const overlay = overlays[i];
-      const alpha = overlay.alpha;
+      const alpha = overlays[i].alpha;
       for (let j = 0; j < 3; j++) {
-        result[j] = (1 - alpha) * result[j] + alpha * overlay.color[j];
+        result[j] = (1 - alpha) * result[j] + alpha * overlays[i].color[j];
       }
     }
     return `rgb(${result.join(",")})`;
   }
 
-  /**
-   * Check if a color string is usable for theme color.
-   *
-   * @param {string} colorStr - Color string to check
-   * @returns {boolean}
-   */
-  isUsableThemeColor(colorStr) {
-    return Boolean(this.#parseColor(colorStr));
-  }
-
-  // ============================================================================
-  // Meta Tag Management
-  // ============================================================================
-
-  /**
-   * Find the currently active theme-color meta tag.
-   * Prioritizes tags with matching media queries.
-   *
-   * @returns {HTMLMetaElement | null}
-   */
-  findActiveThemeColorMetaTag() {
-    if (typeof document === "undefined") {
-      return null;
-    }
-
-    const metaTags = document.querySelectorAll('meta[name="theme-color"]');
-
-    if (!metaTags.length) {
-      return null;
-    }
-
-    let fallback = null;
-
-    for (const meta of metaTags) {
-      if (!meta.media) {
-        fallback = fallback || meta;
-        continue;
-      }
-
-      try {
-        if (
-          typeof window === "undefined" ||
-          window.matchMedia(meta.media).matches
-        ) {
-          return meta;
-        }
-      } catch {
-        // Ignore invalid media queries
-      }
-    }
-
-    return fallback || metaTags[0];
-  }
-
-  /**
-   * Ensure a theme-color meta tag exists.
-   * Creates one if none exists.
-   *
-   * @param {Object} controller - The controller requesting the meta tag
-   * @returns {HTMLMetaElement | null}
-   */
-  ensureThemeColorMetaTag(controller) {
-    if (typeof document === "undefined") {
-      return null;
-    }
-
-    if (
-      controller.themeColorMetaTag &&
-      document.contains(controller.themeColorMetaTag)
-    ) {
-      return controller.themeColorMetaTag;
-    }
-
-    controller.themeColorMetaTag = this.findActiveThemeColorMetaTag();
+  storeThemeColorMetaTag() {
+    this.themeColorMetaTag =
+      typeof document !== "undefined"
+        ? document.querySelector('meta[name="theme-color"]')
+        : null;
 
-    if (!controller.themeColorMetaTag) {
+    if (!this.themeColorMetaTag) {
       const meta = document.createElement("meta");
       meta.name = "theme-color";
-      const fallback =
-        typeof window !== "undefined"
-          ? window.getComputedStyle(document.body)?.backgroundColor
-          : "#000000";
-      meta.setAttribute("content", fallback || "#000000");
+      meta.content = window.getComputedStyle(document.body).backgroundColor;
       document.head.appendChild(meta);
-      controller.themeColorMetaTag = meta;
+      this.themeColorMetaTag = meta;
     }
-
-    return controller.themeColorMetaTag;
   }
 
-  /**
-   * Check if a controller currently controls the theme color.
-   *
-   * @param {Object} controller - The controller to check
-   * @returns {boolean}
-   */
-  controlsThemeColor(controller) {
-    if (!controller.themeColorStackEntry) {
-      return false;
+  getAndStoreUnderlyingThemeColorAsRGBArray() {
+    if (this.themeColorDimmingOverlays.length > 0) {
+      return this.underlyingThemeColor;
     }
 
-    const topEntry = this.ownershipStack[this.ownershipStack.length - 1];
-    return topEntry?.controller === controller;
-  }
-
-  /**
-   * Acquire theme color ownership for a controller.
-   * Moves existing entry to top if already in stack.
-   *
-   * @param {Object} controller - The controller acquiring ownership
-   */
-  acquireThemeColorOwnership(controller) {
-    if (controller.themeColorStackEntry) {
-      if (this.controlsThemeColor(controller)) {
-        return;
-      }
+    this.themeColorMetaTag || this.storeThemeColorMetaTag();
 
-      const idx = this.ownershipStack.findIndex(
-        (entry) => entry === controller.themeColorStackEntry
+    const parsed = this.#parseColor(this.themeColorMetaTag?.content);
+    if (!parsed) {
+      // eslint-disable-next-line no-console
+      console.warn(
+        "`themeColorDimming` prop ignored: Only `theme-color` meta tag with a value in `rgb()`, `rgba()`, or hexadecimal format is supported."
       );
-      if (idx !== -1) {
-        this.ownershipStack.splice(idx, 1);
-      }
-      controller.themeColorStackEntry = null;
     }
 
-    const metaTag = this.ensureThemeColorMetaTag(controller);
-    if (!metaTag) {
-      return;
-    }
-
-    const entry = {
-      controller,
-      previousContent: metaTag.getAttribute("content"),
-    };
-
-    this.ownershipStack.push(entry);
-    controller.themeColorStackEntry = entry;
+    this.underlyingThemeColor = parsed;
+    return parsed;
   }
 
-  /**
-   * Release theme color ownership for a controller.
-   * Restores previous color if this was the top entry.
-   *
-   * @param {Object} controller - The controller releasing ownership
-   */
-  releaseThemeColorOwnership(controller) {
-    if (!controller.themeColorStackEntry) {
-      return;
-    }
-
-    const idx = this.ownershipStack.findIndex(
-      (entry) => entry === controller.themeColorStackEntry
-    );
-
-    if (idx === -1) {
-      controller.themeColorStackEntry = null;
-      return;
+  updateUnderlyingThemeColor(color) {
+    const parsed = this.#parseColor(color);
+    if (!parsed) {
+      throw new Error(
+        "The color provided to `updateThemeColor` doesn't match `rgb()`, `rgba()`, or hexadecimal format."
+      );
     }
 
-    const wasTop = idx === this.ownershipStack.length - 1;
-    const [entry] = this.ownershipStack.splice(idx, 1);
-    controller.themeColorStackEntry = null;
+    this.underlyingThemeColor = parsed;
+    this.setActualThemeColor();
+  }
 
-    const controllerOverlays = this.dimmingOverlays.filter(
-      (o) => o.controller === controller
+  setActualThemeColor() {
+    this.themeColorMetaTag || this.storeThemeColorMetaTag();
+    this.themeColorMetaTag?.setAttribute(
+      "content",
+      this.#mixColors(this.underlyingThemeColor, this.themeColorDimmingOverlays)
     );
-    for (const overlay of controllerOverlays) {
-      this.#removeOverlayDelayed(overlay, controller);
-    }
-
-    if (wasTop) {
-      const nextEntry = this.ownershipStack[this.ownershipStack.length - 1];
-
-      if (nextEntry) {
-        this.setActualThemeColor(nextEntry.controller);
-      } else if (entry.previousContent && controller.themeColorMetaTag) {
-        controller.themeColorMetaTag.setAttribute(
-          "content",
-          entry.previousContent
-        );
-      }
-    }
   }
 
-  /**
-   * Update the theme color for a controller.
-   *
-   * @param {Object} controller - The controller updating the color
-   * @param {string} color - The new color
-   */
-  updateThemeColor(controller, color) {
-    if (!color) {
-      return;
-    }
-
-    this.acquireThemeColorOwnership(controller);
-    controller.underlyingThemeColor = color;
-    this.setActualThemeColor(controller);
-  }
+  updateThemeColorDimmingOverlay(overlayData) {
+    const entry = overlayData.color
+      ? { ...overlayData, color: this.#parseRGB(overlayData.color) }
+      : overlayData;
 
-  /**
-   * Set the actual theme color meta tag content.
-   * Applies dimming overlays if present.
-   *
-   * @param {Object} controller - The controller setting the color
-   */
-  setActualThemeColor(controller) {
-    const metaTag = this.ensureThemeColorMetaTag(controller);
-    if (!metaTag || !this.controlsThemeColor(controller)) {
-      return;
-    }
+    const existing = this.themeColorDimmingOverlays.find(
+      (o) => o.dimmingOverlayId === entry.dimmingOverlayId
+    );
 
-    // Capture existing color from DOM if we haven't stored one yet
-    if (!controller.underlyingThemeColor) {
-      controller.underlyingThemeColor = metaTag.getAttribute("content");
+    let result;
+    if (existing) {
+      Object.assign(existing, entry);
+      result = existing;
+    } else {
+      result = entry;
+      this.themeColorDimmingOverlays.push(entry);
     }
 
-    const baseColor = this.#parseColor(controller.underlyingThemeColor);
-    if (!baseColor) {
-      return;
-    }
+    this.setActualThemeColor();
+    return result;
+  }
 
-    const targetColorStr = this.#mixColors(baseColor, this.dimmingOverlays);
-    metaTag.setAttribute("content", targetColorStr);
+  updateThemeColorDimmingOverlayAlphaValue(overlay, alpha) {
+    overlay.alpha = alpha;
+    this.setActualThemeColor();
   }
 
-  /**
-   * Register a theme color dimming overlay for a controller.
-   *
-   * @param {Object} controller - The controller registering the overlay
-   * @param {Object} overlay - The overlay { color, alpha }
-   * @returns {{ updateAlpha: Function, remove: Function }}
-   */
-  registerThemeColorDimmingOverlay(controller, overlay) {
-    const existing = this.dimmingOverlays.find(
-      (o) => o.controller === controller
+  removeThemeColorDimmingOverlay(dimmingOverlayId) {
+    const overlay = this.themeColorDimmingOverlays.find(
+      (o) => o.dimmingOverlayId === dimmingOverlayId
     );
 
-    if (existing) {
-      existing.abortRemoval = true;
-      existing.color = this.#parseColor(overlay.color) || [0, 0, 0];
-      existing.alpha = overlay.alpha;
-      this.setActualThemeColor(controller);
-      return this.#createOverlayHandle(existing, controller);
+    if (!overlay) {
+      return;
     }
 
-    const overlayEntry = {
-      ...overlay,
-      color: this.#parseColor(overlay.color) || [0, 0, 0],
-      controller,
-      abortRemoval: true,
-    };
-
-    this.dimmingOverlays.push(overlayEntry);
-    this.setActualThemeColor(controller);
-
-    return this.#createOverlayHandle(overlayEntry, controller);
-  }
-
-  #createOverlayHandle(overlayEntry, controller) {
-    return {
-      updateAlpha: (alpha) => {
-        overlayEntry.alpha = alpha;
-        this.setActualThemeColor(controller);
-      },
-      remove: () => {
-        this.#removeOverlayDelayed(overlayEntry, controller);
-      },
-    };
-  }
-
-  #removeOverlayDelayed(overlayEntry, controller) {
-    overlayEntry.abortRemoval = false;
+    overlay.abortRemoval = false;
 
     setTimeout(() => {
-      if (overlayEntry.abortRemoval) {
+      if (overlay.abortRemoval) {
         return;
       }
 
-      this.dimmingOverlays = this.dimmingOverlays.filter(
-        (o) => o !== overlayEntry
+      this.themeColorDimmingOverlays = this.themeColorDimmingOverlays.filter(
+        (o) => o.dimmingOverlayId !== dimmingOverlayId
       );
-      this.setActualThemeColor(controller);
+      this.setActualThemeColor();
 
-      if (this.dimmingOverlays.length === 0) {
-        controller.underlyingThemeColor = null;
-        controller.themeColorMetaTag = null;
+      if (this.themeColorDimmingOverlays.length === 0) {
+        this.underlyingThemeColor = null;
+        this.themeColorMetaTag = null;
       }
     }, 20);
   }
-
-  /**
-   * Capture the theme color from content element's background.
-   *
-   * @param {Object} controller - The controller to capture for
-   */
-  captureContentThemeColor(controller) {
-    if (!controller.content || typeof window === "undefined") {
-      return;
-    }
-
-    const computedColor = window
-      .getComputedStyle(controller.content)
-      ?.getPropertyValue("background-color");
-
-    if (this.isUsableThemeColor(computedColor)) {
-      this.updateThemeColor(controller, computedColor);
-      return;
-    }
-
-    const fallback =
-      this.ensureThemeColorMetaTag(controller)?.getAttribute("content");
-    if (fallback) {
-      this.updateThemeColor(controller, fallback);
-    }
-  }
 }

From 7247b8cc74c87169660061be42574d50016eb2d2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 8 Feb 2026 21:30:00 +0100
Subject: [PATCH 153/168] animateDimmingOverlayOpacity

---
 .../float-kit/components/d-sheet/animation.js |  4 +-
 .../float-kit/services/theme-color-manager.js | 53 +++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/animation.js b/frontend/discourse/float-kit/components/d-sheet/animation.js
index 87a0d69a41cac..eac91d4d325c4 100644
--- a/frontend/discourse/float-kit/components/d-sheet/animation.js
+++ b/frontend/discourse/float-kit/components/d-sheet/animation.js
@@ -83,7 +83,7 @@ const STANDARD_EASINGS = {
  * @param {string} easing - Easing string (e.g., "cubic-bezier(0.1, 0.7, 1.0, 0.1)")
  * @returns {number[]|null} Array of 4 points or null if invalid
  */
-function parseCubicBezier(easing) {
+export function parseCubicBezier(easing) {
   const prefix = "cubic-bezier(";
   if (!easing.startsWith(prefix)) {
     return null;
@@ -218,7 +218,7 @@ function getTForX(x, x1, x2, sampleValues) {
  * @param {number} y2 - Second control point y
  * @returns {Function} Easing function that takes time (0-1) and returns progress (0-1)
  */
-function createCubicBezierEasing(x1, y1, x2, y2) {
+export function createCubicBezierEasing(x1, y1, x2, y2) {
   if (!(0 <= x1 && x1 <= 1 && 0 <= x2 && x2 <= 1)) {
     throw new Error("bezier x values must be in [0, 1] range");
   }
diff --git a/frontend/discourse/float-kit/services/theme-color-manager.js b/frontend/discourse/float-kit/services/theme-color-manager.js
index a57fe0b66a28d..ad6c5ad48029d 100644
--- a/frontend/discourse/float-kit/services/theme-color-manager.js
+++ b/frontend/discourse/float-kit/services/theme-color-manager.js
@@ -1,4 +1,11 @@
 import Service from "@ember/service";
+import {
+  createCubicBezierEasing,
+  parseCubicBezier,
+} from "discourse/float-kit/components/d-sheet/animation";
+
+const DEFAULT_ANIMATION_EASING = "cubic-bezier(0.25, 0.1, 0.25, 1)";
+const DEFAULT_ANIMATION_DURATION = 500;
 
 export default class ThemeColorManager extends Service {
   themeColorMetaTag = null;
@@ -140,6 +147,52 @@ export default class ThemeColorManager extends Service {
     this.setActualThemeColor();
   }
 
+  #runAnimation(callback, { duration, cubicBezier }) {
+    const easingFn = createCubicBezierEasing(...cubicBezier);
+    let startTime = null;
+
+    const step = (time) => {
+      if (startTime === null) {
+        startTime = time;
+      }
+
+      const elapsed = time - startTime;
+      if (elapsed < duration) {
+        callback(easingFn(elapsed / duration));
+        requestAnimationFrame(step);
+      } else {
+        callback(1);
+      }
+    };
+
+    requestAnimationFrame(step);
+  }
+
+  animateDimmingOverlayOpacity(overlay, element, options) {
+    const { keyframes, duration, easing } = options;
+    const [start, end] = keyframes;
+    const interpolate = (progress) => start + (end - start) * progress;
+
+    const cubicBezier = parseCubicBezier(easing || DEFAULT_ANIMATION_EASING);
+    if (!cubicBezier) {
+      return;
+    }
+
+    this.#runAnimation(
+      (progress) => {
+        const value = interpolate(progress);
+        if (overlay) {
+          this.updateThemeColorDimmingOverlayAlphaValue(overlay, value);
+        }
+        element?.style.setProperty("opacity", value);
+      },
+      {
+        duration: duration ?? DEFAULT_ANIMATION_DURATION,
+        cubicBezier,
+      }
+    );
+  }
+
   removeThemeColorDimmingOverlay(dimmingOverlayId) {
     const overlay = this.themeColorDimmingOverlays.find(
       (o) => o.dimmingOverlayId === dimmingOverlayId

From 168919e3a687718407d2b6d8429594b6a2e1c7b2 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 8 Feb 2026 23:58:43 +0100
Subject: [PATCH 154/168] not needed

---
 frontend/discourse/float-kit/components/d-sheet/backdrop.gjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
index 4796f2d1e6d4f..1b18d5529e3dd 100644
--- a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
@@ -53,7 +53,6 @@ export default class Backdrop extends Component {
   get shouldUseThemeColorDimmingOverlay() {
     return (
       this.effectiveThemeColorDimming &&
-      this.args.sheet?.state.longRunning.isActive &&
       typeof this.effectiveTravelAnimation?.opacity === "function"
     );
   }

From dafa543c53daab74f602d4ae4079aa5488398420 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 00:10:34 +0100
Subject: [PATCH 155/168] fixes

---
 frontend/discourse/float-kit/components/d-sheet/travel.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/discourse/float-kit/components/d-sheet/travel.js b/frontend/discourse/float-kit/components/d-sheet/travel.js
index 12565e90922a2..ad18d33dea58a 100644
--- a/frontend/discourse/float-kit/components/d-sheet/travel.js
+++ b/frontend/discourse/float-kit/components/d-sheet/travel.js
@@ -595,6 +595,13 @@ export function executeSheetTravel(config) {
             }
           }
 
+          for (let i = 0; i < travelAnimations.length; i++) {
+            const anim = travelAnimations[i];
+            if (anim.callback && !anim.config) {
+              anim.callback(progress);
+            }
+          }
+
           if (onTravel) {
             onTravel({
               progress,

From 1f8f2f9e39cf282133814fa897289a7135459a07 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 00:22:12 +0100
Subject: [PATCH 156/168] we don't support sheet with depth for now

---
 .../float-kit/components/d-sheet/backdrop.gjs | 10 +++-
 .../float-kit/services/theme-color-manager.js | 53 -------------------
 2 files changed, 9 insertions(+), 54 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
index 1b18d5529e3dd..451f6a6847b6d 100644
--- a/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/backdrop.gjs
@@ -53,10 +53,18 @@ export default class Backdrop extends Component {
   get shouldUseThemeColorDimmingOverlay() {
     return (
       this.effectiveThemeColorDimming &&
+      this.args.sheet?.state.longRunning.isActive &&
       typeof this.effectiveTravelAnimation?.opacity === "function"
     );
   }
 
+  get outletTravelAnimation() {
+    if (this.shouldUseThemeColorDimmingOverlay) {
+      return { ...this.effectiveTravelAnimation, opacity: "ignore" };
+    }
+    return this.effectiveTravelAnimation;
+  }
+
   @action
   setBackdropElement(element) {
     this.backdropElement = element;
@@ -137,7 +145,7 @@ export default class Backdrop extends Component {
       }}
       <Outlet
         @sheet={{@sheet}}
-        @travelAnimation={{this.effectiveTravelAnimation}}
+        @travelAnimation={{this.outletTravelAnimation}}
         @stackingAnimation={{@stackingAnimation}}
         data-d-sheet={{concatClass
           "backdrop"
diff --git a/frontend/discourse/float-kit/services/theme-color-manager.js b/frontend/discourse/float-kit/services/theme-color-manager.js
index ad6c5ad48029d..a57fe0b66a28d 100644
--- a/frontend/discourse/float-kit/services/theme-color-manager.js
+++ b/frontend/discourse/float-kit/services/theme-color-manager.js
@@ -1,11 +1,4 @@
 import Service from "@ember/service";
-import {
-  createCubicBezierEasing,
-  parseCubicBezier,
-} from "discourse/float-kit/components/d-sheet/animation";
-
-const DEFAULT_ANIMATION_EASING = "cubic-bezier(0.25, 0.1, 0.25, 1)";
-const DEFAULT_ANIMATION_DURATION = 500;
 
 export default class ThemeColorManager extends Service {
   themeColorMetaTag = null;
@@ -147,52 +140,6 @@ export default class ThemeColorManager extends Service {
     this.setActualThemeColor();
   }
 
-  #runAnimation(callback, { duration, cubicBezier }) {
-    const easingFn = createCubicBezierEasing(...cubicBezier);
-    let startTime = null;
-
-    const step = (time) => {
-      if (startTime === null) {
-        startTime = time;
-      }
-
-      const elapsed = time - startTime;
-      if (elapsed < duration) {
-        callback(easingFn(elapsed / duration));
-        requestAnimationFrame(step);
-      } else {
-        callback(1);
-      }
-    };
-
-    requestAnimationFrame(step);
-  }
-
-  animateDimmingOverlayOpacity(overlay, element, options) {
-    const { keyframes, duration, easing } = options;
-    const [start, end] = keyframes;
-    const interpolate = (progress) => start + (end - start) * progress;
-
-    const cubicBezier = parseCubicBezier(easing || DEFAULT_ANIMATION_EASING);
-    if (!cubicBezier) {
-      return;
-    }
-
-    this.#runAnimation(
-      (progress) => {
-        const value = interpolate(progress);
-        if (overlay) {
-          this.updateThemeColorDimmingOverlayAlphaValue(overlay, value);
-        }
-        element?.style.setProperty("opacity", value);
-      },
-      {
-        duration: duration ?? DEFAULT_ANIMATION_DURATION,
-        cubicBezier,
-      }
-    );
-  }
-
   removeThemeColorDimmingOverlay(dimmingOverlayId) {
     const overlay = this.themeColorDimmingOverlays.find(
       (o) => o.dimmingOverlayId === dimmingOverlayId

From a3d271bc147b485eba33d35768d31ac4a1139337 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 11:13:25 +0100
Subject: [PATCH 157/168] remove useless code

---
 .../common/float-kit/bottom-sheet.scss        | 10 +++++++
 .../stylesheets/common/float-kit/d-sheet.scss | 30 +++++++++++++++++++
 .../float-kit/components/d-sheet/view.gjs     | 11 +++++++
 .../float-kit/services/theme-color-manager.js |  3 +-
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/float-kit/bottom-sheet.scss b/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
index f684403fd37bd..433cfa9610338 100644
--- a/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
@@ -54,3 +54,13 @@
   height: 35px;
   padding-inline: var(--space-4);
 }
+
+.bottom-sheet__view {
+  [data-d-sheet~="bottom-color-fade"] {
+    background-color: var(--secondary);
+  }
+
+  [data-d-sheet~="bottom-color-border"] {
+    border-top-color: var(--primary-low);
+  }
+}
diff --git a/app/assets/stylesheets/common/float-kit/d-sheet.scss b/app/assets/stylesheets/common/float-kit/d-sheet.scss
index 7370c3c8d6935..847b49257d8ab 100644
--- a/app/assets/stylesheets/common/float-kit/d-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/d-sheet.scss
@@ -893,3 +893,33 @@
     opacity: 0.5;
   }
 }
+
+:where([data-d-sheet~="bottom-color-fade"]) {
+  --d-sheet-defaults: initial;
+  background-color: var(--d-sheet-defaults, #fff);
+}
+
+[data-d-sheet~="bottom-color-fade"] {
+  position: fixed;
+  z-index: 10;
+  bottom: 0;
+  width: 100%;
+  height: 5px;
+  mask-image: linear-gradient(rgb(0, 0, 0, 0.01), transparent);
+  pointer-events: none;
+}
+
+:where([data-d-sheet~="bottom-color-border"]) {
+  --d-sheet-defaults: initial;
+  border-top-color: var(--d-sheet-defaults, rgb(0, 0, 0, 0.066));
+}
+
+[data-d-sheet~="bottom-color-border"] {
+  position: fixed;
+  z-index: 10;
+  bottom: 0;
+  width: 100%;
+  height: 0;
+  border-top: 1px solid;
+  pointer-events: none;
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/view.gjs b/frontend/discourse/float-kit/components/d-sheet/view.gjs
index cdeeb3b6cd097..9f666642485a0 100644
--- a/frontend/discourse/float-kit/components/d-sheet/view.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/view.gjs
@@ -5,6 +5,7 @@ import { action } from "@ember/object";
 import { modifier as modifierFn } from "ember-modifier";
 import effect from "discourse/float-kit/helpers/effect";
 import concatClass from "discourse/helpers/concat-class";
+import { capabilities } from "discourse/services/capabilities";
 import { or } from "discourse/truth-helpers";
 import Backdrop from "./backdrop";
 import Content from "./content";
@@ -54,6 +55,12 @@ export default class View extends Component {
     sheet.registerView(element);
   });
 
+  get showBottomColorHint() {
+    return (
+      this.args.sheet?.contentPlacement === "bottom" && capabilities.isWebKit
+    );
+  }
+
   /**
    * Configure the Controller with behavioral options.
    * Called via effect helper when sheet or any configuration args change.
@@ -165,6 +172,10 @@ export default class View extends Component {
         }}
         {{scrollTrapModifier true}}
       ></div>
+      {{!-- {{#if this.showBottomColorHint}} --}}
+      <div data-d-sheet="bottom-color-fade"></div>
+      <div data-d-sheet="bottom-color-border"></div>
+      {{!-- {{/if}} --}}
     </div>
   </template>
 }
diff --git a/frontend/discourse/float-kit/services/theme-color-manager.js b/frontend/discourse/float-kit/services/theme-color-manager.js
index a57fe0b66a28d..ec8dccef81d7f 100644
--- a/frontend/discourse/float-kit/services/theme-color-manager.js
+++ b/frontend/discourse/float-kit/services/theme-color-manager.js
@@ -56,7 +56,7 @@ export default class ThemeColorManager extends Service {
         result[j] = (1 - alpha) * result[j] + alpha * overlays[i].color[j];
       }
     }
-    return `rgb(${result.join(",")})`;
+    return `rgb(${Math.round(result[0])},${Math.round(result[1])},${Math.round(result[2])})`;
   }
 
   storeThemeColorMetaTag() {
@@ -82,6 +82,7 @@ export default class ThemeColorManager extends Service {
     this.themeColorMetaTag || this.storeThemeColorMetaTag();
 
     const parsed = this.#parseColor(this.themeColorMetaTag?.content);
+
     if (!parsed) {
       // eslint-disable-next-line no-console
       console.warn(

From fbe68c8d3fd88c79076ca300a3b189e68f9a374b Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 13:32:23 +0100
Subject: [PATCH 158/168] prevents white border

---
 .../stylesheets/common/float-kit/bottom-sheet.scss  | 10 ----------
 .../stylesheets/common/float-kit/d-sheet.scss       | 13 ++-----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/common/float-kit/bottom-sheet.scss b/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
index 433cfa9610338..f684403fd37bd 100644
--- a/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/bottom-sheet.scss
@@ -54,13 +54,3 @@
   height: 35px;
   padding-inline: var(--space-4);
 }
-
-.bottom-sheet__view {
-  [data-d-sheet~="bottom-color-fade"] {
-    background-color: var(--secondary);
-  }
-
-  [data-d-sheet~="bottom-color-border"] {
-    border-top-color: var(--primary-low);
-  }
-}
diff --git a/app/assets/stylesheets/common/float-kit/d-sheet.scss b/app/assets/stylesheets/common/float-kit/d-sheet.scss
index 847b49257d8ab..7e46f52cb7962 100644
--- a/app/assets/stylesheets/common/float-kit/d-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/d-sheet.scss
@@ -894,32 +894,23 @@
   }
 }
 
-:where([data-d-sheet~="bottom-color-fade"]) {
-  --d-sheet-defaults: initial;
-  background-color: var(--d-sheet-defaults, #fff);
-}
-
 [data-d-sheet~="bottom-color-fade"] {
   position: fixed;
   z-index: 10;
   bottom: 0;
   width: 100%;
   height: 5px;
+  background-color: var(--secondary);
   mask-image: linear-gradient(rgb(0, 0, 0, 0.01), transparent);
   pointer-events: none;
 }
 
-:where([data-d-sheet~="bottom-color-border"]) {
-  --d-sheet-defaults: initial;
-  border-top-color: var(--d-sheet-defaults, rgb(0, 0, 0, 0.066));
-}
-
 [data-d-sheet~="bottom-color-border"] {
   position: fixed;
   z-index: 10;
   bottom: 0;
   width: 100%;
   height: 0;
-  border-top: 1px solid;
+  border-top: 1px solid var(--primary-low);
   pointer-events: none;
 }

From 328e63eb1aa55a474d789e663d9d2ebb1f214a4d Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 14:36:12 +0100
Subject: [PATCH 159/168] trap root

---
 .../stylesheets/common/float-kit/d-sheet.scss | 14 ++++
 .../float-kit/components/d-scroll/view.gjs    | 14 +++-
 .../components/d-sheet/controller.js          | 77 ++++++++++++++++---
 .../float-kit/components/d-sheet/view.gjs     |  2 +-
 4 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/common/float-kit/d-sheet.scss b/app/assets/stylesheets/common/float-kit/d-sheet.scss
index 7e46f52cb7962..65274f64bfc89 100644
--- a/app/assets/stylesheets/common/float-kit/d-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/d-sheet.scss
@@ -12,6 +12,14 @@
   overscroll-behavior: contain !important;
 }
 
+[data-d-sheet~="swipe-trap-horizontal"] {
+  overscroll-behavior-x: contain !important;
+}
+
+[data-d-sheet~="swipe-trap-vertical"] {
+  overscroll-behavior-y: contain !important;
+}
+
 :where([data-d-sheet~="scroll-trap-root"]:not([data-d-sheet~="fixed"])) {
   --d-sheet-defaults: initial;
   position: var(--d-sheet-defaults, relative);
@@ -70,6 +78,12 @@
   overflow: hidden;
 }
 
+[data-d-sheet~="view"]:not([data-d-sheet~="staging-none"])
+  [data-d-scroll~="scroll-container"] {
+  overflow-anchor: none;
+  overflow: hidden !important;
+}
+
 [data-d-sheet~="view"][data-d-sheet~="animating"]
   [data-d-sheet~="secondary-scroll-trap"][data-d-sheet~="no-pointer-events"] {
   z-index: 1;
diff --git a/frontend/discourse/float-kit/components/d-scroll/view.gjs b/frontend/discourse/float-kit/components/d-scroll/view.gjs
index de0b5970a4b14..6f682c35bbcb9 100644
--- a/frontend/discourse/float-kit/components/d-scroll/view.gjs
+++ b/frontend/discourse/float-kit/components/d-scroll/view.gjs
@@ -4,6 +4,7 @@ import { registerDestructor } from "@ember/destroyable";
 import { action } from "@ember/object";
 import { htmlSafe } from "@ember/template";
 import { modifier } from "ember-modifier";
+import { isKeyboardVisible } from "discourse/lib/utilities";
 import { capabilities } from "discourse/services/capabilities";
 import GestureTrapHandler from "./gesture-trap-handler";
 import isTextInput from "./is-text-input";
@@ -293,13 +294,13 @@ export default class DScrollView extends Component {
         Object.assign(defaultBehavior, this.args.onScrollStart);
       }
 
-      // Don't dismiss keyboard if scroll was triggered by focus event
       if (
         defaultBehavior.dismissKeyboard &&
         !this.keyboardHandler?.scrollTriggeredByFocus &&
-        document.activeElement
+        isKeyboardVisible() &&
+        this.viewElement
       ) {
-        document.activeElement.blur();
+        this.viewElement.focus({ preventScroll: true });
       }
     }
   }
@@ -516,10 +517,15 @@ export default class DScrollView extends Component {
    * @returns {string|undefined}
    */
   get computedTabIndex() {
+    const hasOverflow =
+      this.controller?.overflowX || this.controller?.overflowY;
+    if (hasOverflow) {
+      return "0";
+    }
     if (this.shouldPreventNativeFocus) {
       return "-1";
     }
-    return "0";
+    return undefined;
   }
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index d2f08517c21c7..dcc66a62e4316 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -886,8 +886,7 @@ export default class Controller {
    * @type {boolean}
    */
   get isScrollTrapActive() {
-    const trapValue = this.inertOutside ? true : this.swipeTrap;
-    return trapValue !== false && trapValue !== null && trapValue !== "none";
+    return this.resolvedSwipeTrap !== "none";
   }
 
   /**
@@ -896,21 +895,81 @@ export default class Controller {
    * @type {string|null}
    */
   get effectiveSwipeTrapClass() {
+    const resolved = this.resolvedSwipeTrap;
+    switch (resolved) {
+      case "both":
+        return "swipe-trap-both";
+      case "horizontal":
+        return "swipe-trap-horizontal";
+      case "vertical":
+        return "swipe-trap-vertical";
+      default:
+        return null;
+    }
+  }
+
+  /**
+   * @type {string}
+   */
+  get resolvedSwipeTrap() {
     const trapValue = this.inertOutside ? true : this.swipeTrap;
 
-    if (!trapValue) {
-      return null;
+    let n;
+    if (typeof trapValue === "boolean") {
+      n = { x: trapValue, y: trapValue };
+    } else if (trapValue && typeof trapValue === "object") {
+      n = { x: trapValue.x, y: trapValue.y };
+    } else {
+      n = { x: false, y: false };
     }
 
-    if (trapValue === true) {
-      return "swipe-trap-both";
+    let a, r;
+    const travelAxis = this.isHorizontalTrack ? "horizontal" : "vertical";
+
+    if (travelAxis === "vertical") {
+      a = n.x;
+      r = n.y !== false && n.y !== null && n.y !== undefined ? n.y : true;
+    } else if (travelAxis === "horizontal") {
+      r = n.y;
+      a = n.x !== false && n.x !== null && n.x !== undefined ? n.x : true;
     }
 
-    if (typeof trapValue === "object" && trapValue.x && trapValue.y) {
-      return "swipe-trap-both";
+    if (a && !r) {
+      return "horizontal";
+    } else if (!a && r) {
+      return "vertical";
+    } else if (a && r) {
+      return "both";
     }
+    return "none";
+  }
 
-    return null;
+  /**
+   * Whether the ancestor primary swipe trap is active on the Y axis.
+   * Used by nested DScroll to determine keyboard-related trap behavior.
+   *
+   * @type {boolean}
+   */
+  get ancestorPrimarySwipeTrapActiveOnYAxis() {
+    const resolved = this.resolvedSwipeTrap;
+    return resolved === "vertical" || resolved === "both";
+  }
+
+  /**
+   * @type {string}
+   */
+  get primaryScrollTrapAxisClass() {
+    const resolved = this.resolvedSwipeTrap;
+    switch (resolved) {
+      case "horizontal":
+        return "scroll-horizontal";
+      case "vertical":
+        return "scroll-vertical";
+      case "both":
+        return "scroll-both";
+      default:
+        return "scroll-vertical";
+    }
   }
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/view.gjs b/frontend/discourse/float-kit/components/d-sheet/view.gjs
index 9f666642485a0..c361b672006aa 100644
--- a/frontend/discourse/float-kit/components/d-sheet/view.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/view.gjs
@@ -134,7 +134,7 @@ export default class View extends Component {
         data-d-sheet={{concatClass
           "primary-scroll-trap"
           "scroll-trap-root"
-          (if @sheet.isHorizontalTrack "scroll-horizontal" "scroll-vertical")
+          @sheet.primaryScrollTrapAxisClass
           @sheet.tracks
           (unless @sheet.inertOutside "no-pointer-events")
           (if @sheet.scrollContainerShouldBePassThrough "pass-through")

From 87f2f90f5a2b493c8baea332dc1e1603b2e9d1b0 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 17:54:39 +0100
Subject: [PATCH 160/168] better color hint

---
 frontend/discourse/float-kit/components/d-card.gjs   |  1 +
 .../discourse/float-kit/components/d-sheet/view.gjs  | 12 +++++-------
 frontend/discourse/float-kit/components/d-toast.gjs  |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-card.gjs b/frontend/discourse/float-kit/components/d-card.gjs
index 55bb87052f70a..8a0b91a7b66a7 100644
--- a/frontend/discourse/float-kit/components/d-card.gjs
+++ b/frontend/discourse/float-kit/components/d-card.gjs
@@ -29,6 +29,7 @@ class DCardContent extends Component {
         @sheet={{@sheet}}
         @contentPlacement="center"
         @tracks="top"
+        @bottomColorHint={{false}}
         @enteringAnimationSettings={{hash
           easing="spring"
           stiffness=260
diff --git a/frontend/discourse/float-kit/components/d-sheet/view.gjs b/frontend/discourse/float-kit/components/d-sheet/view.gjs
index c361b672006aa..25a4d1a03efdd 100644
--- a/frontend/discourse/float-kit/components/d-sheet/view.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/view.gjs
@@ -56,9 +56,7 @@ export default class View extends Component {
   });
 
   get showBottomColorHint() {
-    return (
-      this.args.sheet?.contentPlacement === "bottom" && capabilities.isWebKit
-    );
+    return (this.args.bottomColorHint ?? true) && capabilities.isWebKit;
   }
 
   /**
@@ -172,10 +170,10 @@ export default class View extends Component {
         }}
         {{scrollTrapModifier true}}
       ></div>
-      {{!-- {{#if this.showBottomColorHint}} --}}
-      <div data-d-sheet="bottom-color-fade"></div>
-      <div data-d-sheet="bottom-color-border"></div>
-      {{!-- {{/if}} --}}
+      {{#if this.showBottomColorHint}}
+        <div data-d-sheet="bottom-color-fade"></div>
+        <div data-d-sheet="bottom-color-border"></div>
+      {{/if}}
     </div>
   </template>
 }
diff --git a/frontend/discourse/float-kit/components/d-toast.gjs b/frontend/discourse/float-kit/components/d-toast.gjs
index 3ea34c2501117..07dcfb8fddc5a 100644
--- a/frontend/discourse/float-kit/components/d-toast.gjs
+++ b/frontend/discourse/float-kit/components/d-toast.gjs
@@ -283,6 +283,7 @@ export default class DToast extends Component {
           @sheet={{sheet}}
           @contentPlacement={{this.contentPlacement}}
           @tracks={{this.tracks}}
+          @bottomColorHint={{false}}
           @inertOutside={{false}}
           @onClickOutside={{hash dismiss=false stopOverlayPropagation=false}}
           @onEscapeKeyDown={{this.handleEscapeKey}}

From 547d65138e756587b64f015ba996a5aa81048d36 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 17:56:08 +0100
Subject: [PATCH 161/168] fixes

---
 .../stylesheets/common/float-kit/d-sheet.scss     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/float-kit/d-sheet.scss b/app/assets/stylesheets/common/float-kit/d-sheet.scss
index 65274f64bfc89..bb9b89fc2daea 100644
--- a/app/assets/stylesheets/common/float-kit/d-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/d-sheet.scss
@@ -218,7 +218,6 @@
 [data-d-sheet~="backdrop"] {
   z-index: -1 !important;
   position: absolute !important;
-  user-select: none;
 }
 
 [data-d-sheet~="backdrop"][data-d-sheet~="no-pointer-events"] {
@@ -237,6 +236,10 @@
   background-color: initial;
 }
 
+[data-d-sheet~="no-bleeding-background"] {
+  background-color: initial;
+}
+
 :where([data-d-sheet~="bleeding-background"]) {
   --d-sheet-defaults: initial;
   border-radius: var(--d-sheet-defaults, inherit);
@@ -255,6 +258,11 @@
   height: 100% !important;
 }
 
+[data-d-sheet~="bleeding-background"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="right"],
+[data-d-sheet~="bleeding-background"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="left"] {
+  width: 100% !important;
+}
+
 [data-d-sheet~="bleeding-background"][data-d-sheet~="right"] {
   top: 0 !important;
   right: 0 !important;
@@ -272,6 +280,11 @@
   width: 100% !important;
 }
 
+[data-d-sheet~="bleeding-background"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="start"],
+[data-d-sheet~="bleeding-background"][data-d-sheet~="overshoot-inactive"][data-d-sheet~="end"] {
+  height: 100% !important;
+}
+
 [data-d-sheet~="bleeding-background"][data-d-sheet~="start"] {
   bottom: 0 !important;
   left: 0 !important;

From 008092ed3d5639f24ac5181c1dc521de33df19ca Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 17:58:11 +0100
Subject: [PATCH 162/168] remove touch target expander

---
 .../stylesheets/common/float-kit/d-sheet.scss | 48 -------------------
 .../float-kit/components/d-sheet/content.gjs  |  3 --
 2 files changed, 51 deletions(-)

diff --git a/app/assets/stylesheets/common/float-kit/d-sheet.scss b/app/assets/stylesheets/common/float-kit/d-sheet.scss
index bb9b89fc2daea..16ab382c35f2f 100644
--- a/app/assets/stylesheets/common/float-kit/d-sheet.scss
+++ b/app/assets/stylesheets/common/float-kit/d-sheet.scss
@@ -643,54 +643,6 @@
   top: var(--d-sheet-content-wrapper-overshoot-offset);
 }
 
-[data-d-sheet~="touch-target-expander"] {
-  position: absolute;
-  pointer-events: auto;
-  user-select: none;
-}
-
-[data-d-sheet~="touch-target-expander"][data-d-sheet~="bottom"] {
-  top: -20px;
-  left: 0;
-  right: 0;
-  height: 40px;
-}
-
-[data-d-sheet~="touch-target-expander"][data-d-sheet~="top"] {
-  bottom: -20px;
-  left: 0;
-  right: 0;
-  height: 40px;
-}
-
-[data-d-sheet~="touch-target-expander"][data-d-sheet~="left"] {
-  right: -20px;
-  top: 0;
-  bottom: 0;
-  width: 40px;
-}
-
-[data-d-sheet~="touch-target-expander"][data-d-sheet~="right"] {
-  left: -20px;
-  top: 0;
-  bottom: 0;
-  width: 40px;
-}
-
-[data-d-sheet~="touch-target-expander"][data-d-sheet~="horizontal"] {
-  left: -20px;
-  right: -20px;
-  top: 0;
-  bottom: 0;
-}
-
-[data-d-sheet~="touch-target-expander"][data-d-sheet~="vertical"] {
-  top: -20px;
-  bottom: -20px;
-  left: 0;
-  right: 0;
-}
-
 [data-d-sheet~="content"][data-d-sheet~="start"],
 [data-d-sheet~="content"][data-d-sheet~="end"],
 [data-d-sheet~="content"][data-d-sheet~="center"][data-d-sheet~="top"],
diff --git a/frontend/discourse/float-kit/components/d-sheet/content.gjs b/frontend/discourse/float-kit/components/d-sheet/content.gjs
index a934bbdaadcf1..fd503bfa9ed96 100644
--- a/frontend/discourse/float-kit/components/d-sheet/content.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/content.gjs
@@ -118,9 +118,6 @@ export default class Content extends Component {
             {{yield}}
           </div>
         {{/if}}
-        <div
-          data-d-sheet={{concatClass "touch-target-expander" @sheet.tracks}}
-        ></div>
       </div>
 
       <div data-d-sheet={{concatClass "back-spacer" @sheet.tracks}}>

From 8c5bb56f34a5d8e58664b2494e1f3e06019999f8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 9 Feb 2026 22:24:50 +0100
Subject: [PATCH 163/168] remove aschild

---
 .../float-kit/components/d-bottom-sheet.gjs   | 35 +++++------
 .../discourse/float-kit/components/d-card.gjs | 16 ++---
 .../d-sheet/bleeding-background.gjs           |  2 +-
 .../components/d-sheet/config-normalizer.js   |  6 +-
 .../components/d-sheet/content-tag.gjs        | 21 +++++++
 .../float-kit/components/d-sheet/content.gjs  | 59 ++++++-------------
 .../components/d-sheet/controller.js          |  8 +--
 .../d-sheet/special-wrapper/root.gjs          | 39 +-----------
 .../float-kit/components/d-stack.gjs          | 26 ++++----
 .../float-kit/components/d-toast.gjs          |  4 +-
 .../modifiers/merge-sheet-attributes.js       | 14 +++++
 11 files changed, 108 insertions(+), 122 deletions(-)
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/content-tag.gjs
 create mode 100644 frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js

diff --git a/frontend/discourse/float-kit/components/d-bottom-sheet.gjs b/frontend/discourse/float-kit/components/d-bottom-sheet.gjs
index ee67e1566dfc7..688b430cec3c2 100644
--- a/frontend/discourse/float-kit/components/d-bottom-sheet.gjs
+++ b/frontend/discourse/float-kit/components/d-bottom-sheet.gjs
@@ -122,23 +122,24 @@ class ExpandableView extends Component {
  */
 const BottomSheetInnerContent = <template>
   <DSheet.Backdrop @sheet={{@sheet}} />
-  <DSheet.Content
-    class={{concatClass
-      "bottom-sheet__content"
-      (if @expandable "--expandable")
-    }}
-    @sheet={{@sheet}}
-  >
-    <DSheet.BleedingBackground
-      @sheet={{@sheet}}
-      class="bottom-sheet__bleeding-background"
-    />
-    <DSheet.Handle
-      class="bottom-sheet__handle"
-      @sheet={{@sheet}}
-      @action={{@handleAction}}
-    />
-    {{yield}}
+  <DSheet.Content @sheet={{@sheet}} as |ContentTag|>
+    <ContentTag
+      class={{concatClass
+        "bottom-sheet__content"
+        (if @expandable "--expandable")
+      }}
+    >
+      <DSheet.BleedingBackground
+        @sheet={{@sheet}}
+        class="bottom-sheet__bleeding-background"
+      />
+      <DSheet.Handle
+        class="bottom-sheet__handle"
+        @sheet={{@sheet}}
+        @action={{@handleAction}}
+      />
+      {{yield}}
+    </ContentTag>
   </DSheet.Content>
 </template>;
 
diff --git a/frontend/discourse/float-kit/components/d-card.gjs b/frontend/discourse/float-kit/components/d-card.gjs
index 8a0b91a7b66a7..a6284740878a3 100644
--- a/frontend/discourse/float-kit/components/d-card.gjs
+++ b/frontend/discourse/float-kit/components/d-card.gjs
@@ -44,15 +44,17 @@ class DCardContent extends Component {
         />
         <DSheet.Content
           @travelAnimation={{hash scale=(array 0.8 1)}}
-          class="d-card-content"
           @sheet={{@sheet}}
+          as |ContentTag|
         >
-          {{yield
-            (hash
-              Trigger=(component DSheet.Trigger sheet=@sheet)
-              dismiss=@sheet.close
-            )
-          }}
+          <ContentTag class="d-card-content">
+            {{yield
+              (hash
+                Trigger=(component DSheet.Trigger sheet=@sheet)
+                dismiss=@sheet.close
+              )
+            }}
+          </ContentTag>
         </DSheet.Content>
       </DSheet.View>
     </DSheet.Portal>
diff --git a/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs b/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
index 8d4f21646e1e0..0dcff62d4cd1b 100644
--- a/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
@@ -10,7 +10,7 @@ const BleedingBackground = <template>
   <div
     data-d-sheet={{concatClass
       "bleeding-background"
-      @sheet.contentPlacementCssClass
+      @sheet.contentPlacementAttribute
       @sheet.tracks
       @sheet.stagingAttribute
     }}
diff --git a/frontend/discourse/float-kit/components/d-sheet/config-normalizer.js b/frontend/discourse/float-kit/components/d-sheet/config-normalizer.js
index 04be50e46b38a..44155845f7467 100644
--- a/frontend/discourse/float-kit/components/d-sheet/config-normalizer.js
+++ b/frontend/discourse/float-kit/components/d-sheet/config-normalizer.js
@@ -40,13 +40,13 @@ function normalizeTrack(track) {
 }
 
 /**
- * Convert API placement value to CSS class.
+ * Convert API placement value to data-d-sheet attribute token.
  * Uses "start"/"end" for vertical, "left"/"right" for horizontal, "center" for centered.
  *
  * @param {"top" | "bottom" | "left" | "right" | "center"} placement - Placement value
- * @returns {"start" | "end" | "left" | "right" | "center"} CSS class value
+ * @returns {"start" | "end" | "left" | "right" | "center"} Attribute token
  */
-export function placementToCssClass(placement) {
+export function placementToAttribute(placement) {
   switch (placement) {
     case "top":
       return "start";
diff --git a/frontend/discourse/float-kit/components/d-sheet/content-tag.gjs b/frontend/discourse/float-kit/components/d-sheet/content-tag.gjs
new file mode 100644
index 0000000000000..d52e30b0daefe
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/content-tag.gjs
@@ -0,0 +1,21 @@
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import mergeSheetAttributes from "../../modifiers/merge-sheet-attributes";
+import outletAnimationModifier from "./outlet-animation-modifier";
+
+const ContentTag = <template>
+  <div
+    ...attributes
+    {{mergeSheetAttributes
+      "content"
+      @sheet.contentPlacementAttribute
+      @sheet.tracks
+      (if @sheet.scrollContainerShouldBePassThrough "no-pointer-events")
+    }}
+    {{didInsert @sheet.registerContent}}
+    {{outletAnimationModifier @sheet @travelAnimation @stackingAnimation}}
+  >
+    {{yield}}
+  </div>
+</template>;
+
+export default ContentTag;
diff --git a/frontend/discourse/float-kit/components/d-sheet/content.gjs b/frontend/discourse/float-kit/components/d-sheet/content.gjs
index fd503bfa9ed96..f86cc64554882 100644
--- a/frontend/discourse/float-kit/components/d-sheet/content.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/content.gjs
@@ -1,10 +1,12 @@
 import Component from "@glimmer/component";
-import { concat, hash } from "@ember/helper";
+import { concat } from "@ember/helper";
 import { on } from "@ember/modifier";
+import { getOwner } from "@ember/owner";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import { htmlSafe } from "@ember/template";
+import curryComponent from "ember-curry-component";
 import concatClass from "discourse/helpers/concat-class";
-import outletAnimationModifier from "./outlet-animation-modifier";
+import ContentTag from "./content-tag";
 import scrollListenerModifier from "./scroll-listener-modifier";
 
 /**
@@ -20,7 +22,6 @@ import scrollListenerModifier from "./scroll-listener-modifier";
  *   Supports: opacity, visibility, transforms (translate, scale, rotate, skew variants),
  *   and any CSS property
  * @param {Record<string, [number, number] | ((params: { progress: number, tween: Function }) => string) | string | null>} [stackingAnimation] - Custom stacking animation config (same format as travelAnimation)
- * @param {boolean} [asChild] - When true, skips rendering the content div and yields attributes for child to apply
  */
 export default class Content extends Component {
   /**
@@ -39,6 +40,18 @@ export default class Content extends Component {
     );
   }
 
+  get contentTag() {
+    return curryComponent(
+      ContentTag,
+      {
+        sheet: this.args.sheet,
+        travelAnimation: this.args.travelAnimation,
+        stackingAnimation: this.args.stackingAnimation,
+      },
+      getOwner(this)
+    );
+  }
+
   <template>
     <div
       data-d-sheet={{concatClass
@@ -47,7 +60,7 @@ export default class Content extends Component {
         "scroll-trap-marker"
         "scroll-behavior-smooth"
         @sheet.tracks
-        @sheet.contentPlacementCssClass
+        @sheet.contentPlacementAttribute
         (concat "staging-" @sheet.state.staging.current)
         @sheet.effectiveSwipeTrapClass
         "scroll-trap-optimised"
@@ -70,7 +83,7 @@ export default class Content extends Component {
       <div
         data-d-sheet={{concatClass
           "content-wrapper"
-          @sheet.contentPlacementCssClass
+          @sheet.contentPlacementAttribute
           (concat "staging-" @sheet.state.staging.current)
           (if @sheet.swipeOvershoot "overshoot-active" "overshoot-inactive")
           (if @sheet.swipeOutDisabledWithDetent "swipe-out-disabled")
@@ -83,41 +96,7 @@ export default class Content extends Component {
         }}
         {{didInsert @sheet.registerContentWrapper}}
       >
-        {{#if @asChild}}
-          {{yield
-            (hash
-              dataDSheet=(concatClass
-                "content"
-                @sheet.contentPlacementCssClass
-                @sheet.tracks
-                (if
-                  @sheet.scrollContainerShouldBePassThrough "no-pointer-events"
-                )
-              )
-              registerContent=@sheet.registerContent
-              travelAnimation=@travelAnimation
-              stackingAnimation=@stackingAnimation
-            )
-          }}
-        {{else}}
-          <div
-            data-d-sheet={{concatClass
-              "content"
-              @sheet.contentPlacementCssClass
-              @sheet.tracks
-              (if @sheet.scrollContainerShouldBePassThrough "no-pointer-events")
-            }}
-            {{didInsert @sheet.registerContent}}
-            {{outletAnimationModifier
-              @sheet
-              @travelAnimation
-              @stackingAnimation
-            }}
-            ...attributes
-          >
-            {{yield}}
-          </div>
-        {{/if}}
+        {{yield this.contentTag}}
       </div>
 
       <div data-d-sheet={{concatClass "back-spacer" @sheet.tracks}}>
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index dcc66a62e4316..afab2473c0654 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -6,7 +6,7 @@ import { TrackedArray } from "@ember-compat/tracked-built-ins";
 import { capabilities } from "discourse/services/capabilities";
 import AnimationTravel from "./animation-travel";
 import {
-  placementToCssClass,
+  placementToAttribute,
   resolveTracksAndPlacement,
 } from "./config-normalizer";
 import DetentManager from "./detent-manager";
@@ -1140,12 +1140,12 @@ export default class Controller {
   }
 
   /**
-   * Get the CSS class for content placement.
+   * Get the data-d-sheet attribute token for content placement.
    *
    * @type {string}
    */
-  get contentPlacementCssClass() {
-    return placementToCssClass(this.contentPlacement);
+  get contentPlacementAttribute() {
+    return placementToAttribute(this.contentPlacement);
   }
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs b/frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs
index b47c5c107c664..be24db2aafd9e 100644
--- a/frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/special-wrapper/root.gjs
@@ -1,40 +1,12 @@
 import Component from "@glimmer/component";
 import { concat } from "@ember/helper";
-import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import concatClass from "discourse/helpers/concat-class";
 import { capabilities } from "discourse/services/capabilities";
-import outletAnimationModifier from "../outlet-animation-modifier";
 import { scrollTrapModifier } from "../scroll-trap-modifier";
 
-/**
- * Scroll-trap root for special layouts like Toast.
- * When used with Content's asChild pattern, this component merges
- * the content attributes with scroll-trap functionality.
- *
- * @component DSheetSpecialWrapperRoot
- * @param {import("../controller").default} sheet - The sheet controller instance
- * @param {Object} contentAttrs - Merged content attributes from Content's asChild pattern
- * @param {string} [contentAttrs.dataDSheet] - Content data-d-sheet attributes to merge
- * @param {Function} [contentAttrs.registerContent] - Content registration callback
- * @param {Object} [contentAttrs.travelAnimation] - Travel animation configuration
- * @param {Object} [contentAttrs.stackingAnimation] - Stacking animation configuration
- */
 export default class DSheetSpecialWrapperRoot extends Component {
-  /**
-   * Whether the scroll trap is active, based on WebKit browser detection.
-   * Only WebKit browsers require the scroll trap optimization.
-   *
-   * @type {boolean}
-   */
   active = capabilities.isWebKit;
 
-  /**
-   * Calculates the perpendicular axis based on the sheet's travel axis.
-   * Top/bottom tracks have vertical travel, so perpendicular is horizontal.
-   * Left/right/horizontal tracks have horizontal travel, so perpendicular is vertical.
-   *
-   * @returns {"vertical"|"horizontal"} The perpendicular axis direction
-   */
   get perpendicularAxis() {
     const tracks = this.args.sheet?.tracks;
     return tracks === "left" || tracks === "right" || tracks === "horizontal"
@@ -43,9 +15,8 @@ export default class DSheetSpecialWrapperRoot extends Component {
   }
 
   <template>
-    <div
+    <@tag
       data-d-sheet={{concatClass
-        @contentAttrs.dataDSheet
         "scroll-trap-root"
         "special-wrapper-root"
         (if this.perpendicularAxis (concat "scroll-" this.perpendicularAxis))
@@ -53,15 +24,9 @@ export default class DSheetSpecialWrapperRoot extends Component {
         "scroll-trap-optimised"
       }}
       {{scrollTrapModifier this.active}}
-      {{didInsert @contentAttrs.registerContent}}
-      {{outletAnimationModifier
-        @sheet
-        @contentAttrs.travelAnimation
-        @contentAttrs.stackingAnimation
-      }}
       ...attributes
     >
       {{yield}}
-    </div>
+    </@tag>
   </template>
 }
diff --git a/frontend/discourse/float-kit/components/d-stack.gjs b/frontend/discourse/float-kit/components/d-stack.gjs
index 85c9bcf20f436..545c8c05beb0d 100644
--- a/frontend/discourse/float-kit/components/d-stack.gjs
+++ b/frontend/discourse/float-kit/components/d-stack.gjs
@@ -51,20 +51,24 @@ const DStackSharedContent = <template>
         @travelAnimation={{hash opacity=(array 0 0.4)}}
       />
       <DSheet.Content
-        class="d-stack__content"
         @sheet={{@sheet}}
         @stackingAnimation={{@stackingAnimation}}
+        as |ContentTag|
       >
-        <div class="d-stack__inner-content">
-          {{yield
-            (hash
-              sheet=@sheet
-              Trigger=(component DSheet.Trigger sheet=@sheet)
-              Stack=(component DStackNested stackRoot=@stackRoot tracks=@tracks)
-              dismiss=@sheet.close
-            )
-          }}
-        </div>
+        <ContentTag class="d-stack__content">
+          <div class="d-stack__inner-content">
+            {{yield
+              (hash
+                sheet=@sheet
+                Trigger=(component DSheet.Trigger sheet=@sheet)
+                Stack=(component
+                  DStackNested stackRoot=@stackRoot tracks=@tracks
+                )
+                dismiss=@sheet.close
+              )
+            }}
+          </div>
+        </ContentTag>
       </DSheet.Content>
     </DSheet.View>
   </DSheet.Portal>
diff --git a/frontend/discourse/float-kit/components/d-toast.gjs b/frontend/discourse/float-kit/components/d-toast.gjs
index 07dcfb8fddc5a..e75219ded436a 100644
--- a/frontend/discourse/float-kit/components/d-toast.gjs
+++ b/frontend/discourse/float-kit/components/d-toast.gjs
@@ -300,10 +300,10 @@ export default class DToast extends Component {
           }}
           style={{this.toastStyles}}
         >
-          <DSheet.Content @sheet={{sheet}} @asChild={{true}} as |contentAttrs|>
+          <DSheet.Content @sheet={{sheet}} as |ContentTag|>
             <DSheet.SpecialWrapper.Root
               @sheet={{sheet}}
-              @contentAttrs={{contentAttrs}}
+              @tag={{ContentTag}}
               class="d-toast__content"
             >
               <DSheet.SpecialWrapper.Content
diff --git a/frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js b/frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js
new file mode 100644
index 0000000000000..1a5936c77c990
--- /dev/null
+++ b/frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js
@@ -0,0 +1,14 @@
+import { modifier } from "ember-modifier";
+
+export default modifier((element, positional) => {
+  const extra = positional.flat().filter(Boolean).join(" ");
+  if (!extra) {
+    return;
+  }
+
+  const current = element.getAttribute("data-d-sheet") || "";
+  element.setAttribute(
+    "data-d-sheet",
+    [current, extra].filter(Boolean).join(" ")
+  );
+});

From a432c577d0ba6b7cbe9dc1d28a28442e24eb8829 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Tue, 10 Feb 2026 08:47:25 +0100
Subject: [PATCH 164/168] pause toast on swipe

---
 .../float-kit/components/d-sheet/controller.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index afab2473c0654..7cd81a91a3653 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -656,16 +656,6 @@ export default class Controller {
         this.progressSmoother = this.createProgressSmoother(currentProgress);
       },
     },
-    {
-      machine: "openness",
-      state: "open.swipe:ended",
-      guard: () => typeof this.onTravelStatusChange === "function",
-      callback: () => {
-        if (this.state.openness.isOpen) {
-          this.onTravelStatusChange("idleInside");
-        }
-      },
-    },
     {
       machine: "staging",
       state: "none",
@@ -1831,6 +1821,7 @@ export default class Controller {
     if (!this.state.stuck.isFront && !this.state.stuck.isBack) {
       if (!this.state.openness.isSwipeOngoing) {
         this.state.openness.swipeStart();
+        this.updateTravelStatus("stepping");
       }
       if (!this.state.openness.isMoveOngoing) {
         this.state.openness.moveStart();
@@ -1881,6 +1872,9 @@ export default class Controller {
         if (matches) {
           this.state.openness.scrollEnd();
           this.state.openness.swipeEnd();
+          if (this.state.openness.isOpen) {
+            this.updateTravelStatus("idleInside");
+          }
           break;
         }
       }
@@ -2012,6 +2006,7 @@ export default class Controller {
    */
   onTouchGestureStart() {
     this.state.openness.swipeStart();
+    this.updateTravelStatus("stepping");
   }
 
   /**
@@ -2021,6 +2016,9 @@ export default class Controller {
    */
   onTouchGestureEnd() {
     this.state.openness.swipeEnd();
+    if (this.state.openness.isOpen) {
+      this.updateTravelStatus("idleInside");
+    }
 
     if (
       this.edgeAlignedNoOvershoot &&

From cc6464432976d96b65ef9b3b6f8288eeca6a990a Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sat, 28 Feb 2026 22:31:39 +0100
Subject: [PATCH 165/168] fixes

---
 .../float-kit/components/d-scroll/view.gjs    |  1 +
 .../d-sheet/bleeding-background.gjs           |  5 ++++
 .../components/d-sheet/content-tag.gjs        |  1 +
 .../components/d-sheet/controller.js          |  7 +++++
 .../d-sheet/dimensions-calculator.js          | 13 ++++----
 .../d-sheet/scroll-progress-calculator.js     |  3 +-
 .../modifiers/merge-sheet-attributes.js       | 30 ++++++++++++++-----
 7 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-scroll/view.gjs b/frontend/discourse/float-kit/components/d-scroll/view.gjs
index 6f682c35bbcb9..6c14610a120d5 100644
--- a/frontend/discourse/float-kit/components/d-scroll/view.gjs
+++ b/frontend/discourse/float-kit/components/d-scroll/view.gjs
@@ -189,6 +189,7 @@ export default class DScrollView extends Component {
 
   configureController() {
     this.controller.axis = this.args.axis ?? "y";
+    this.controller.pageScroll = this.args.pageScroll ?? false;
     this.controller.safeArea = this.args.safeArea ?? "visual-viewport";
     this.controller.scrollAnimationSettings = this.args
       .scrollAnimationSettings ?? { skip: "auto" };
diff --git a/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs b/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
index 0dcff62d4cd1b..f1fd7093a9c23 100644
--- a/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/bleeding-background.gjs
@@ -1,3 +1,6 @@
+import { fn } from "@ember/helper";
+import didInsert from "@ember/render-modifiers/modifiers/did-insert";
+import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
 import concatClass from "discourse/helpers/concat-class";
 
 /**
@@ -14,6 +17,8 @@ const BleedingBackground = <template>
       @sheet.tracks
       @sheet.stagingAttribute
     }}
+    {{didInsert (fn @sheet.setBleedingBackgroundPresent true)}}
+    {{willDestroy (fn @sheet.setBleedingBackgroundPresent false)}}
     ...attributes
   ></div>
 </template>;
diff --git a/frontend/discourse/float-kit/components/d-sheet/content-tag.gjs b/frontend/discourse/float-kit/components/d-sheet/content-tag.gjs
index d52e30b0daefe..3fa4cd8a9b038 100644
--- a/frontend/discourse/float-kit/components/d-sheet/content-tag.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/content-tag.gjs
@@ -10,6 +10,7 @@ const ContentTag = <template>
       @sheet.contentPlacementAttribute
       @sheet.tracks
       (if @sheet.scrollContainerShouldBePassThrough "no-pointer-events")
+      (unless @sheet.bleedingBackgroundPresent "no-bleeding-background")
     }}
     {{didInsert @sheet.registerContent}}
     {{outletAnimationModifier @sheet @travelAnimation @stackingAnimation}}
diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index 7cd81a91a3653..98e84723960de 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -102,6 +102,8 @@ export default class Controller {
    */
   @tracked backdrop = null;
 
+  @tracked bleedingBackgroundPresent = false;
+
   /**
    * Whether the sheet is currently presented.
    * @type {boolean}
@@ -1753,6 +1755,11 @@ export default class Controller {
     this.sheetRegistry?.updateInertOutside(this, this.inertOutside);
   }
 
+  @action
+  setBleedingBackgroundPresent(value) {
+    this.bleedingBackgroundPresent = value;
+  }
+
   /**
    * Register the content element.
    *
diff --git a/frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js b/frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js
index 28597849400fe..ac86efed49e2e 100644
--- a/frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js
+++ b/frontend/discourse/float-kit/components/d-sheet/dimensions-calculator.js
@@ -62,6 +62,7 @@ const WEBKIT_MOBILE_THRESHOLD = 716;
 /**
  * @typedef {Object} SheetDimensions
  * @property {AxisDimensions} view - Dimensions of the view element.
+ * @property {AxisDimensions} scroll - Dimensions of the scroll viewport.
  * @property {AxisDimensions} content - Dimensions of the content element.
  * @property {DetentMarkerDimension[]} detentMarkers - Computed dimensions for each detent marker.
  * @property {ProgressEntry[]} [progressValueAtDetents] - Progress entries at each detent.
@@ -234,13 +235,15 @@ export default class DimensionCalculator {
   #parseInitialDimensions(context) {
     const { view, content } = this.elements;
     const { travelProp, crossProp } = context;
+    const viewDimensions = parseDimensionsFromStyle(
+      window.getComputedStyle(view),
+      travelProp,
+      crossProp
+    );
 
     return {
-      view: parseDimensionsFromStyle(
-        window.getComputedStyle(view),
-        travelProp,
-        crossProp
-      ),
+      view: viewDimensions,
+      scroll: viewDimensions,
       content: parseDimensionsFromStyle(
         window.getComputedStyle(content),
         travelProp,
diff --git a/frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js b/frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js
index 2133aa3009fe9..ef26ac175a510 100644
--- a/frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js
+++ b/frontend/discourse/float-kit/components/d-sheet/scroll-progress-calculator.js
@@ -35,7 +35,8 @@ export default class ScrollProgressCalculator {
       return null;
     }
 
-    const isHorizontal = tracks === "left" || tracks === "right";
+    const isHorizontal =
+      tracks === "left" || tracks === "right" || tracks === "horizontal";
     const scrollPosition = isHorizontal
       ? scrollContainer.scrollLeft
       : scrollContainer.scrollTop;
diff --git a/frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js b/frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js
index 1a5936c77c990..cb38ec504ce53 100644
--- a/frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js
+++ b/frontend/discourse/float-kit/modifiers/merge-sheet-attributes.js
@@ -1,14 +1,28 @@
 import { modifier } from "ember-modifier";
 
+const PREVIOUS_EXTRA_TOKENS = new WeakMap();
+
+function tokenize(value) {
+  return value?.split(/\s+/).filter(Boolean) || [];
+}
+
 export default modifier((element, positional) => {
-  const extra = positional.flat().filter(Boolean).join(" ");
-  if (!extra) {
-    return;
-  }
+  const previousExtraTokens = PREVIOUS_EXTRA_TOKENS.get(element) || [];
+  const previousExtraTokenSet = new Set(previousExtraTokens);
 
-  const current = element.getAttribute("data-d-sheet") || "";
-  element.setAttribute(
-    "data-d-sheet",
-    [current, extra].filter(Boolean).join(" ")
+  const currentTokens = tokenize(element.getAttribute("data-d-sheet"));
+  const baseTokens = currentTokens.filter(
+    (token) => !previousExtraTokenSet.has(token)
   );
+
+  const extraTokens = tokenize(positional.flat().filter(Boolean).join(" "));
+  const mergedTokens = [...new Set([...baseTokens, ...extraTokens])];
+
+  if (mergedTokens.length) {
+    element.setAttribute("data-d-sheet", mergedTokens.join(" "));
+  } else {
+    element.removeAttribute("data-d-sheet");
+  }
+
+  PREVIOUS_EXTRA_TOKENS.set(element, extraTokens);
 });

From 4f5db8c397f68557332f5bf63d4919bbb773a616 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 1 Mar 2026 11:05:37 +0100
Subject: [PATCH 166/168] fixes

---
 .../components/d-sheet/controller.js          | 255 ++--------
 .../components/d-sheet/stacking-adapter.js    |   3 +-
 .../components/d-sheet/state-effects.js       | 238 ++++++++++
 .../components/d-sheet/state-helper.js        |  81 ++--
 .../d-sheet/state-machine-events.js           |  57 +++
 .../components/d-sheet/state-machine.js       |  51 +-
 .../components/d-sheet/state/elements.js      |   6 +-
 .../components/d-sheet/state/long-running.js  |   6 +-
 .../components/d-sheet/state/openness.js      |  27 +-
 .../components/d-sheet/state/position.js      |  14 +-
 .../components/d-sheet/state/skip.js          |  10 +-
 .../components/d-sheet/state/staging.js       |  14 +-
 .../components/d-sheet/state/stuck.js         |  10 +-
 .../components/d-sheet/state/touch.js         |   6 +-
 .../float-kit/components/d-sheet/states.js    | 446 +-----------------
 .../components/d-sheet/states/guards.js       |  37 ++
 .../d-sheet/states/position-machines.js       | 118 +++++
 .../d-sheet/states/sheet-machines.js          | 289 ++++++++++++
 .../float-kit/services/sheet-layer-store.js   |  13 +-
 .../services/sheet-stack-registry.js          |  19 +-
 20 files changed, 934 insertions(+), 766 deletions(-)
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state-effects.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/state-machine-events.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/states/guards.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/states/position-machines.js
 create mode 100644 frontend/discourse/float-kit/components/d-sheet/states/sheet-machines.js

diff --git a/frontend/discourse/float-kit/components/d-sheet/controller.js b/frontend/discourse/float-kit/components/d-sheet/controller.js
index 98e84723960de..d413dcc3881f9 100644
--- a/frontend/discourse/float-kit/components/d-sheet/controller.js
+++ b/frontend/discourse/float-kit/components/d-sheet/controller.js
@@ -16,7 +16,9 @@ import FocusManagement from "./focus-management";
 import ObserverManager from "./observer-manager";
 import ScrollProgressCalculator from "./scroll-progress-calculator";
 import StackingAdapter from "./stacking-adapter";
+import { buildStateEffects } from "./state-effects";
 import StateHelper from "./state-helper";
+import { EVENTS } from "./state-machine-events";
 import ThemeColorAdapter from "./theme-color-adapter";
 import TimeoutManager from "./timeout-manager";
 import { TouchHandler } from "./touch-handler";
@@ -506,219 +508,9 @@ export default class Controller {
   /**
    * Subscription definitions for state machines.
    *
-   * @type {Array<{machine: string, state: string, timing?: string, callback?: Function, handler?: string, guard?: Function, type?: string}>}
-   */
-  #subscriptionDefinitions = [
-    {
-      machine: "staging",
-      state: "opening",
-      timing: "after-paint",
-      callback: () => {
-        requestAnimationFrame(() => {
-          this.state.openness.readyToOpen(false);
-        });
-      },
-    },
-    {
-      machine: "staging",
-      state: "closing",
-      timing: "after-paint",
-      callback: () => {
-        this.handleStateTransition({ type: "READY_TO_CLOSE" });
-      },
-    },
-    {
-      machine: "openness",
-      state: "opening",
-      timing: "before-paint",
-      handler: "handleOpening",
-    },
-    {
-      machine: "elementsReady",
-      state: "true",
-      timing: "immediate",
-      guard: () => this.state.openness.current === "opening",
-      callback: () => this.#startOpeningAnimation(),
-    },
-    {
-      machine: "openness",
-      state: "open",
-      guard: () => {
-        const msg = this.state.openness.lastProcessedMessage;
-        return ["NEXT", "PREPARED", "STEP", "READY_TO_OPEN"].includes(
-          msg?.type
-        );
-      },
-      callback: (message) => this.handleOpen(message),
-    },
-    { machine: "openness", state: "closing", handler: "handleClosing" },
-    {
-      machine: "openness",
-      state: "closed.status:pending",
-      handler: "handleClosedPending",
-    },
-    {
-      machine: "openness",
-      state: "closed.status:safe-to-unmount",
-      handler: "handleClosedSafeToUnmount",
-    },
-    {
-      machine: "openness",
-      state: "closed.status:flushing-to-preparing-opening",
-      timing: "before-paint",
-      callback: () => {
-        this.timeoutManager.clear("pendingFlush");
-        this.state.flushClosedStatus();
-      },
-    },
-    {
-      machine: "openness",
-      state: "closed.status:flushing-to-preparing-open",
-      timing: "before-paint",
-      callback: () => {
-        this.timeoutManager.clear("pendingFlush");
-        this.state.flushClosedStatus();
-      },
-    },
-    {
-      machine: "openness",
-      state: "closed.status:preparing-opening",
-      timing: "after-paint",
-      callback: () => {
-        this.state.beginEnterAnimation(false);
-      },
-    },
-    {
-      machine: "openness",
-      state: "closed.status:preparing-open",
-      timing: "after-paint",
-      callback: () => {
-        this.state.beginEnterAnimation(true);
-      },
-    },
-    {
-      machine: "position",
-      state: "covered.status:going-down",
-      callback: () => {
-        this.coveredCount++;
-        this.stackingAdapter?.updateStackingIndexWithPositionValue();
-        this.state.staging.goDown();
-      },
-    },
-    {
-      machine: "position",
-      state: "covered.status:idle",
-      callback: () => {
-        if (
-          this.state.staging.matches("going-down") ||
-          this.state.staging.matches("go-down")
-        ) {
-          this.state.staging.advance();
-        }
-      },
-    },
-    {
-      machine: "position",
-      state: "covered.status:going-up",
-      callback: () => this.state.staging.goUp(),
-    },
-    {
-      machine: "position",
-      state: "covered.status:indeterminate",
-      callback: () => {
-        this.coveredCount--;
-        this.stackingAdapter?.updateStackingIndexWithPositionValue();
-
-        if (this.state.staging.matches("going-up")) {
-          this.state.staging.advance();
-        }
-
-        if (this.coveredCount === 0) {
-          this.state.position.goToFrontIdle();
-        } else {
-          this.state.position.goToCoveredIdle();
-        }
-      },
-    },
-    {
-      machine: "position",
-      state: "covered.status:come-back",
-      timing: "immediate",
-      callback: () => {
-        this.state.advancePositionAuto();
-      },
-    },
-    {
-      machine: "openness",
-      state: "open.scroll:ongoing",
-      callback: () => {
-        const currentProgress =
-          this.dimensions?.progressValueAtDetents?.[this.activeDetent]?.exact ??
-          0;
-        this.progressSmoother = this.createProgressSmoother(currentProgress);
-      },
-    },
-    {
-      machine: "staging",
-      state: "none",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("none"),
-    },
-    {
-      machine: "staging",
-      state: "opening",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("opening"),
-    },
-    {
-      machine: "staging",
-      state: "open",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("open"),
-    },
-    {
-      machine: "staging",
-      state: "stepping",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("stepping"),
-    },
-    {
-      machine: "staging",
-      state: "closing",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("closing"),
-    },
-    {
-      machine: "staging",
-      state: "go-down",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("go-down"),
-    },
-    {
-      machine: "staging",
-      state: "going-down",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("going-down"),
-    },
-    {
-      machine: "staging",
-      state: "going-up",
-      timing: "immediate",
-      callback: () => this.stackingAdapter?.updateStagingInStack("going-up"),
-    },
-    {
-      machine: "touch",
-      state: "ongoing",
-      timing: "immediate",
-      callback: () => this.touchHandler.handleScrollStart(),
-    },
-    {
-      machine: "touch",
-      state: "ended",
-      timing: "immediate",
-      callback: () => this.touchHandler.handleScrollEnd(),
-    },
-  ];
+   * @type {Array<{machine: string, state: string, timing?: string, callback?: Function, handler?: string, guard?: Function, type?: string, transition?: string | string[]}>}
+   */
+  #subscriptionDefinitions = [];
 
   /**
    * Initialize the controller with helpers.
@@ -747,6 +539,7 @@ export default class Controller {
     this.animationTravel = new AnimationTravel(this);
     /** @type {ThemeColorAdapter} */
     this.themeColorAdapter = new ThemeColorAdapter();
+    this.#subscriptionDefinitions = buildStateEffects(this);
     this.setupSubscriptions();
   }
 
@@ -840,6 +633,7 @@ export default class Controller {
       this.state.subscribe(def.machine, {
         timing: def.timing || "immediate",
         state: def.state,
+        transition: def.transition,
         guard: def.guard,
         callback: def.callback || ((msg) => this[def.handler](msg)),
         type: def.type,
@@ -1043,6 +837,16 @@ export default class Controller {
     return false;
   }
 
+  /**
+   * Whether the sheet can currently accept dismiss requests.
+   * Used by layer-level escape/click-outside handling.
+   *
+   * @type {boolean}
+   */
+  get canAcceptDismissRequest() {
+    return this.state.openness.isOpen || this.state.openness.isOpening;
+  }
+
   /**
    * Whether swipe-to-dismiss is disabled.
    * True when sheet has detents, dismissal is disabled, and sheet is open.
@@ -1315,6 +1119,10 @@ export default class Controller {
     this.animationTravel.animateToDetent(this.targetDetent);
   }
 
+  startOpeningAnimation() {
+    this.#startOpeningAnimation();
+  }
+
   /**
    * Send ELEMENTS_REGISTERED if all required elements are now present.
    * Used by register methods to signal readiness for deferred animations.
@@ -1354,7 +1162,7 @@ export default class Controller {
     this.updateTravelStatus("idleInside");
     this.applyInertOutside();
 
-    if (message?.type !== "STEP") {
+    if (message?.type !== EVENTS.STEP) {
       this.executeAutoFocusOnPresent();
     }
 
@@ -1364,7 +1172,7 @@ export default class Controller {
 
     this.#setupIntersectionObserver();
 
-    if (message?.type === "STEP") {
+    if (message?.type === EVENTS.STEP) {
       this.handleStepMessage(message);
     }
   }
@@ -1443,7 +1251,7 @@ export default class Controller {
     this.stackingAdapter.notifyBelowSheets(0);
 
     requestAnimationFrame(() => {
-      this.handleStateTransition({ type: "NEXT" });
+      this.handleStateTransition({ type: EVENTS.NEXT });
     });
   }
 
@@ -2168,16 +1976,15 @@ export default class Controller {
    */
   @action
   close() {
-    this.handleStateTransition({ type: "CLOSE" });
-    this.#evaluateCloseMessage();
+    this.handleStateTransition({ type: EVENTS.CLOSE });
   }
 
   /**
    * Evaluates whether a CLOSE request can proceed to actual closing.
    *
-   * @private
+   * Triggered by openness evaluateCloseMessage CLOSE transitions.
    */
-  #evaluateCloseMessage() {
+  evaluateCloseMessage() {
     if (!this.state.openness.isOpen) {
       return;
     }
@@ -2200,7 +2007,7 @@ export default class Controller {
     }
 
     this.state.staging.actuallyClose();
-    this.handleStateTransition({ type: "ACTUALLY_CLOSE" });
+    this.handleStateTransition({ type: EVENTS.ACTUALLY_CLOSE });
   }
 
   /**
@@ -2226,7 +2033,7 @@ export default class Controller {
 
     const nextDetent = this.detentManager.calculateStep("up");
     if (nextDetent !== null) {
-      this.handleStateTransition({ type: "STEP", detent: nextDetent });
+      this.handleStateTransition({ type: EVENTS.STEP, detent: nextDetent });
     }
   }
 
@@ -2242,7 +2049,7 @@ export default class Controller {
 
     const prevDetent = this.detentManager.calculateStep("down");
     if (prevDetent !== null) {
-      this.handleStateTransition({ type: "STEP", detent: prevDetent });
+      this.handleStateTransition({ type: EVENTS.STEP, detent: prevDetent });
     }
   }
 
@@ -2258,7 +2065,7 @@ export default class Controller {
     }
 
     if (this.detentManager.isValidDetent(detent)) {
-      this.handleStateTransition({ type: "STEP", detent });
+      this.handleStateTransition({ type: EVENTS.STEP, detent });
     }
   }
 
diff --git a/frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js b/frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js
index ec247fddc0c42..036f7c1563fd0 100644
--- a/frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js
+++ b/frontend/discourse/float-kit/components/d-sheet/stacking-adapter.js
@@ -8,6 +8,7 @@
  */
 
 import { createTweenFunction } from "./animation";
+import { EVENTS } from "./state-machine-events";
 
 /**
  * Adapter for managing sheet stacking within a registry.
@@ -198,7 +199,7 @@ export default class StackingAdapter {
   notifyParentPositionMachineNext() {
     const parentSheet = this.getParentSheet();
     if (parentSheet) {
-      parentSheet.sendToPositionMachine("NEXT");
+      parentSheet.sendToPositionMachine(EVENTS.NEXT);
     }
   }
 
diff --git a/frontend/discourse/float-kit/components/d-sheet/state-effects.js b/frontend/discourse/float-kit/components/d-sheet/state-effects.js
new file mode 100644
index 0000000000000..c2966ad4ab1a5
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state-effects.js
@@ -0,0 +1,238 @@
+import { EVENTS } from "./state-machine-events";
+
+export function buildStateEffects(controller) {
+  return [
+    {
+      machine: "staging",
+      state: "opening",
+      timing: "after-paint",
+      callback: () => {
+        requestAnimationFrame(() => {
+          controller.state.openness.readyToOpen(false);
+        });
+      },
+    },
+    {
+      machine: "staging",
+      state: "closing",
+      timing: "after-paint",
+      callback: () => {
+        controller.handleStateTransition({ type: EVENTS.READY_TO_CLOSE });
+      },
+    },
+    {
+      machine: "openness",
+      state: "opening",
+      timing: "before-paint",
+      handler: "handleOpening",
+    },
+    {
+      machine: "elementsReady",
+      state: "true",
+      timing: "immediate",
+      guard: () => controller.state.openness.current === "opening",
+      callback: () => controller.startOpeningAnimation(),
+    },
+    {
+      machine: "openness",
+      state: "open",
+      guard: () => {
+        const msg = controller.state.openness.lastProcessedMessage;
+        return [
+          EVENTS.NEXT,
+          EVENTS.PREPARED,
+          EVENTS.STEP,
+          EVENTS.READY_TO_OPEN,
+        ].includes(msg?.type);
+      },
+      callback: (message) => controller.handleOpen(message),
+    },
+    {
+      machine: "openness",
+      state: "open.evaluateCloseMessage:true",
+      transition: EVENTS.CLOSE,
+      callback: () => controller.evaluateCloseMessage(),
+    },
+    {
+      machine: "openness",
+      state: "open.evaluateCloseMessage:false",
+      transition: EVENTS.CLOSE,
+      callback: () => controller.evaluateCloseMessage(),
+    },
+    { machine: "openness", state: "closing", handler: "handleClosing" },
+    {
+      machine: "openness",
+      state: "closed.status:pending",
+      handler: "handleClosedPending",
+    },
+    {
+      machine: "openness",
+      state: "closed.status:safe-to-unmount",
+      handler: "handleClosedSafeToUnmount",
+    },
+    {
+      machine: "openness",
+      state: "closed.status:flushing-to-preparing-opening",
+      timing: "before-paint",
+      callback: () => {
+        controller.timeoutManager.clear("pendingFlush");
+        controller.state.flushClosedStatus();
+      },
+    },
+    {
+      machine: "openness",
+      state: "closed.status:flushing-to-preparing-open",
+      timing: "before-paint",
+      callback: () => {
+        controller.timeoutManager.clear("pendingFlush");
+        controller.state.flushClosedStatus();
+      },
+    },
+    {
+      machine: "openness",
+      state: "closed.status:preparing-opening",
+      timing: "after-paint",
+      callback: () => {
+        controller.state.beginEnterAnimation(false);
+      },
+    },
+    {
+      machine: "openness",
+      state: "closed.status:preparing-open",
+      timing: "after-paint",
+      callback: () => {
+        controller.state.beginEnterAnimation(true);
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:going-down",
+      callback: () => {
+        controller.coveredCount++;
+        controller.stackingAdapter?.updateStackingIndexWithPositionValue();
+        controller.state.staging.goDown();
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:idle",
+      callback: () => {
+        if (
+          controller.state.staging.matches("going-down") ||
+          controller.state.staging.matches("go-down")
+        ) {
+          controller.state.staging.advance();
+        }
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:going-up",
+      callback: () => controller.state.staging.goUp(),
+    },
+    {
+      machine: "position",
+      state: "covered.status:indeterminate",
+      callback: () => {
+        controller.coveredCount--;
+        controller.stackingAdapter?.updateStackingIndexWithPositionValue();
+
+        if (controller.state.staging.matches("going-up")) {
+          controller.state.staging.advance();
+        }
+
+        if (controller.coveredCount === 0) {
+          controller.state.position.goToFrontIdle();
+        } else {
+          controller.state.position.goToCoveredIdle();
+        }
+      },
+    },
+    {
+      machine: "position",
+      state: "covered.status:come-back",
+      timing: "immediate",
+      callback: () => {
+        controller.state.advancePositionAuto();
+      },
+    },
+    {
+      machine: "openness",
+      state: "open.scroll:ongoing",
+      callback: () => {
+        const currentProgress =
+          controller.dimensions?.progressValueAtDetents?.[
+            controller.activeDetent
+          ]?.exact ?? 0;
+        controller.progressSmoother =
+          controller.createProgressSmoother(currentProgress);
+      },
+    },
+    {
+      machine: "staging",
+      state: "none",
+      timing: "immediate",
+      callback: () => controller.stackingAdapter?.updateStagingInStack("none"),
+    },
+    {
+      machine: "staging",
+      state: "opening",
+      timing: "immediate",
+      callback: () =>
+        controller.stackingAdapter?.updateStagingInStack("opening"),
+    },
+    {
+      machine: "staging",
+      state: "open",
+      timing: "immediate",
+      callback: () => controller.stackingAdapter?.updateStagingInStack("open"),
+    },
+    {
+      machine: "staging",
+      state: "stepping",
+      timing: "immediate",
+      callback: () =>
+        controller.stackingAdapter?.updateStagingInStack("stepping"),
+    },
+    {
+      machine: "staging",
+      state: "closing",
+      timing: "immediate",
+      callback: () =>
+        controller.stackingAdapter?.updateStagingInStack("closing"),
+    },
+    {
+      machine: "staging",
+      state: "go-down",
+      timing: "immediate",
+      callback: () =>
+        controller.stackingAdapter?.updateStagingInStack("go-down"),
+    },
+    {
+      machine: "staging",
+      state: "going-down",
+      timing: "immediate",
+      callback: () =>
+        controller.stackingAdapter?.updateStagingInStack("going-down"),
+    },
+    {
+      machine: "staging",
+      state: "going-up",
+      timing: "immediate",
+      callback: () =>
+        controller.stackingAdapter?.updateStagingInStack("going-up"),
+    },
+    {
+      machine: "touch",
+      state: "ongoing",
+      timing: "immediate",
+      callback: () => controller.touchHandler.handleScrollStart(),
+    },
+    {
+      machine: "touch",
+      state: "ended",
+      timing: "immediate",
+      callback: () => controller.touchHandler.handleScrollEnd(),
+    },
+  ];
+}
diff --git a/frontend/discourse/float-kit/components/d-sheet/state-helper.js b/frontend/discourse/float-kit/components/d-sheet/state-helper.js
index c7ce46ff4c75a..08bae95e9849a 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state-helper.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state-helper.js
@@ -6,6 +6,7 @@ import SkipState from "./state/skip";
 import StagingState from "./state/staging";
 import StuckState from "./state/stuck";
 import TouchState from "./state/touch";
+import { EVENTS, MACHINE_NAMES } from "./state-machine-events";
 import StateMachineGroup from "./state-machine-group";
 import { GUARDS, POSITION_MACHINES, SHEET_MACHINES } from "./states";
 
@@ -37,7 +38,7 @@ export default class StateHelper {
      * @type {OpennessState}
      */
     this.openness = new OpennessState(
-      this.#sheetMachines.getMachine("openness")
+      this.#sheetMachines.getMachine(MACHINE_NAMES.OPENNESS)
     );
 
     /**
@@ -45,7 +46,7 @@ export default class StateHelper {
      * @type {StagingState}
      */
     this.staging = new StagingState(
-      this.#sheetMachines.getMachine("staging"),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.STAGING),
       this.openness
     );
 
@@ -54,7 +55,7 @@ export default class StateHelper {
      * @type {PositionState}
      */
     this.position = new PositionState(
-      this.#positionMachines.getMachine("position")
+      this.#positionMachines.getMachine(MACHINE_NAMES.POSITION)
     );
 
     /**
@@ -62,7 +63,7 @@ export default class StateHelper {
      * @type {TouchState}
      */
     this.touch = new TouchState(
-      this.#sheetMachines.getMachine("scrollContainerTouch")
+      this.#sheetMachines.getMachine(MACHINE_NAMES.SCROLL_CONTAINER_TOUCH)
     );
 
     /**
@@ -70,8 +71,8 @@ export default class StateHelper {
      * @type {StuckState}
      */
     this.stuck = new StuckState(
-      this.#sheetMachines.getMachine("frontStuck"),
-      this.#sheetMachines.getMachine("backStuck")
+      this.#sheetMachines.getMachine(MACHINE_NAMES.FRONT_STUCK),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.BACK_STUCK)
     );
 
     /**
@@ -79,7 +80,7 @@ export default class StateHelper {
      * @type {ElementsState}
      */
     this.elements = new ElementsState(
-      this.#sheetMachines.getMachine("elementsReady")
+      this.#sheetMachines.getMachine(MACHINE_NAMES.ELEMENTS_READY)
     );
 
     /**
@@ -87,8 +88,8 @@ export default class StateHelper {
      * @type {SkipState}
      */
     this.skip = new SkipState(
-      this.#sheetMachines.getMachine("skipOpening"),
-      this.#sheetMachines.getMachine("skipClosing")
+      this.#sheetMachines.getMachine(MACHINE_NAMES.SKIP_OPENING),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.SKIP_CLOSING)
     );
 
     /**
@@ -96,7 +97,7 @@ export default class StateHelper {
      * @type {LongRunningState}
      */
     this.longRunning = new LongRunningState(
-      this.#sheetMachines.getMachine("longRunning")
+      this.#sheetMachines.getMachine(MACHINE_NAMES.LONG_RUNNING)
     );
   }
 
@@ -160,16 +161,22 @@ export default class StateHelper {
    */
   #getMachine(name) {
     const mapping = {
-      openness: () => this.#sheetMachines.getMachine("openness"),
-      staging: () => this.#sheetMachines.getMachine("staging"),
-      position: () => this.#positionMachines.getMachine("position"),
-      touch: () => this.#sheetMachines.getMachine("scrollContainerTouch"),
-      longRunning: () => this.#sheetMachines.getMachine("longRunning"),
-      skipOpening: () => this.#sheetMachines.getMachine("skipOpening"),
-      skipClosing: () => this.#sheetMachines.getMachine("skipClosing"),
-      backStuck: () => this.#sheetMachines.getMachine("backStuck"),
-      frontStuck: () => this.#sheetMachines.getMachine("frontStuck"),
-      elementsReady: () => this.#sheetMachines.getMachine("elementsReady"),
+      openness: () => this.#sheetMachines.getMachine(MACHINE_NAMES.OPENNESS),
+      staging: () => this.#sheetMachines.getMachine(MACHINE_NAMES.STAGING),
+      position: () => this.#positionMachines.getMachine(MACHINE_NAMES.POSITION),
+      touch: () =>
+        this.#sheetMachines.getMachine(MACHINE_NAMES.SCROLL_CONTAINER_TOUCH),
+      longRunning: () =>
+        this.#sheetMachines.getMachine(MACHINE_NAMES.LONG_RUNNING),
+      skipOpening: () =>
+        this.#sheetMachines.getMachine(MACHINE_NAMES.SKIP_OPENING),
+      skipClosing: () =>
+        this.#sheetMachines.getMachine(MACHINE_NAMES.SKIP_CLOSING),
+      backStuck: () => this.#sheetMachines.getMachine(MACHINE_NAMES.BACK_STUCK),
+      frontStuck: () =>
+        this.#sheetMachines.getMachine(MACHINE_NAMES.FRONT_STUCK),
+      elementsReady: () =>
+        this.#sheetMachines.getMachine(MACHINE_NAMES.ELEMENTS_READY),
     };
     return mapping[name]?.();
   }
@@ -179,16 +186,20 @@ export default class StateHelper {
    * @returns {void}
    */
   cleanup() {
-    this.#sheetMachines.getMachine("openness").cleanup();
-    this.#sheetMachines.getMachine("staging").cleanup();
-    this.#positionMachines.getMachine("position").cleanup();
-    this.#sheetMachines.getMachine("scrollContainerTouch").cleanup();
-    this.#sheetMachines.getMachine("longRunning").cleanup();
-    this.#sheetMachines.getMachine("skipOpening").cleanup();
-    this.#sheetMachines.getMachine("skipClosing").cleanup();
-    this.#sheetMachines.getMachine("backStuck").cleanup();
-    this.#sheetMachines.getMachine("frontStuck").cleanup();
-    this.#sheetMachines.getMachine("elementsReady").cleanup();
+    for (const machine of [
+      this.#sheetMachines.getMachine(MACHINE_NAMES.OPENNESS),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.STAGING),
+      this.#positionMachines.getMachine(MACHINE_NAMES.POSITION),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.SCROLL_CONTAINER_TOUCH),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.LONG_RUNNING),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.SKIP_OPENING),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.SKIP_CLOSING),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.BACK_STUCK),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.FRONT_STUCK),
+      this.#sheetMachines.getMachine(MACHINE_NAMES.ELEMENTS_READY),
+    ]) {
+      machine.cleanup();
+    }
   }
 
   /**
@@ -199,7 +210,9 @@ export default class StateHelper {
    * @returns {boolean} Whether any transition occurred
    */
   sendToPosition(message, context = {}) {
-    return this.#positionMachines.getMachine("position").send(message, context);
+    return this.#positionMachines
+      .getMachine(MACHINE_NAMES.POSITION)
+      .send(message, context);
   }
 
   /**
@@ -207,7 +220,7 @@ export default class StateHelper {
    * @returns {void}
    */
   advancePositionAuto() {
-    this.#positionMachines.getMachine("position").send("");
+    this.#positionMachines.getMachine(MACHINE_NAMES.POSITION).send("");
   }
 
   /**
@@ -215,7 +228,7 @@ export default class StateHelper {
    * @returns {void}
    */
   flushClosedStatus() {
-    this.#sheetMachines.getMachine("openness").send({
+    this.#sheetMachines.getMachine(MACHINE_NAMES.OPENNESS).send({
       machine: "openness:closed.status",
       type: "",
     });
@@ -226,6 +239,6 @@ export default class StateHelper {
    * @returns {void}
    */
   broadcastOpen() {
-    this.#sheetMachines.send({ type: "OPEN" });
+    this.#sheetMachines.send({ type: EVENTS.OPEN });
   }
 }
diff --git a/frontend/discourse/float-kit/components/d-sheet/state-machine-events.js b/frontend/discourse/float-kit/components/d-sheet/state-machine-events.js
new file mode 100644
index 0000000000000..eea7599c5b7de
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/state-machine-events.js
@@ -0,0 +1,57 @@
+export const EVENTS = Object.freeze({
+  OPEN: "OPEN",
+  OPEN_PREPARED: "OPEN_PREPARED",
+  READY_TO_OPEN: "READY_TO_OPEN",
+  READY_TO_CLOSE: "READY_TO_CLOSE",
+  CLOSE: "CLOSE",
+  ACTUALLY_CLOSE: "ACTUALLY_CLOSE",
+  ACTUALLY_STEP: "ACTUALLY_STEP",
+  STEP: "STEP",
+  PREPARED: "PREPARED",
+  NEXT: "NEXT",
+  GO_DOWN: "GO_DOWN",
+  GO_UP: "GO_UP",
+  GO_OUT: "GO_OUT",
+  SWIPED_OUT: "SWIPED_OUT",
+  READY_TO_GO_FRONT: "READY_TO_GO_FRONT",
+  READY_TO_GO_OUT: "READY_TO_GO_OUT",
+  READY_TO_GO_UP: "READY_TO_GO_UP",
+  READY_TO_GO_DOWN: "READY_TO_GO_DOWN",
+  GOTO_FRONT: "GOTO_front",
+  GOTO_IDLE: "GOTO_idle",
+  SCROLL_START: "SCROLL_START",
+  SCROLL_END: "SCROLL_END",
+  SWIPE_START: "SWIPE_START",
+  SWIPE_END: "SWIPE_END",
+  SWIPE_RESET: "SWIPE_RESET",
+  MOVE_START: "MOVE_START",
+  MOVE_END: "MOVE_END",
+  TOUCH_START: "TOUCH_START",
+  TOUCH_END: "TOUCH_END",
+  STUCK_START: "STUCK_START",
+  STUCK_END: "STUCK_END",
+  ELEMENTS_REGISTERED: "ELEMENTS_REGISTERED",
+  RESET: "RESET",
+  TO_TRUE: "TO_TRUE",
+  TO_FALSE: "TO_FALSE",
+  OCCURRED: "OCCURRED",
+});
+
+export const MACHINE_NAMES = Object.freeze({
+  STAGING: "staging",
+  LONG_RUNNING: "longRunning",
+  SKIP_OPENING: "skipOpening",
+  SKIP_CLOSING: "skipClosing",
+  OPENNESS: "openness",
+  SCROLL_CONTAINER_TOUCH: "scrollContainerTouch",
+  BACK_STUCK: "backStuck",
+  FRONT_STUCK: "frontStuck",
+  ELEMENTS_READY: "elementsReady",
+  ACTIVE: "active",
+  POSITION: "position",
+});
+
+export const MACHINE_STATE = Object.freeze({
+  TRUE: "true",
+  FALSE: "false",
+});
diff --git a/frontend/discourse/float-kit/components/d-sheet/state-machine.js b/frontend/discourse/float-kit/components/d-sheet/state-machine.js
index fa595438f7e92..64811bd6c5824 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state-machine.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state-machine.js
@@ -7,6 +7,7 @@ import { TrackedObject } from "@ember-compat/tracked-built-ins";
  * @property {Symbol} id - Unique identifier for the subscription
  * @property {string} timing - When to invoke callback ("immediate", "before-paint", "after-paint")
  * @property {string|string[]} state - State pattern(s) to match
+ * @property {string|string[]} [transition] - Message type(s) that triggered the transition
  * @property {function(Object): void} callback - Function to call when state matches
  * @property {function(): boolean|boolean} guard - Guard condition
  */
@@ -317,6 +318,7 @@ class StateMachine {
    * @param {Object} options - Subscription options
    * @param {string} options.timing - "immediate", "before-paint", or "after-paint"
    * @param {string|string[]} options.state - State pattern(s) to match
+   * @param {string|string[]} [options.transition] - Message type(s) that triggered the transition
    * @param {Function} options.callback - Function to call when state matches
    * @param {Function|boolean} [options.guard] - Optional guard condition
    * @param {string} [options.type] - "enter" (default) or "exit"
@@ -332,9 +334,16 @@ class StateMachine {
    *
    * // Later: unsubscribe();
    */
-  subscribe({ timing, state, callback, guard = true, type = TYPE.ENTER }) {
+  subscribe({
+    timing,
+    state,
+    transition = null,
+    callback,
+    guard = true,
+    type = TYPE.ENTER,
+  }) {
     const id = Symbol();
-    const subscription = { id, timing, state, callback, guard };
+    const subscription = { id, timing, state, transition, callback, guard };
 
     if (type === TYPE.EXIT) {
       this.#exitActions.push(subscription);
@@ -1188,13 +1197,14 @@ class StateMachine {
   #dispatchExitActions(message, exitedStates) {
     for (const sub of this.#exitActions) {
       const wasExited = this.#didExitState(sub, exitedStates);
+      const transitionMatches = this.#matchesTransition(sub, message);
       const guardPasses =
         typeof sub.guard === "function" ? sub.guard() : sub.guard;
 
       DEBUG.log(
-        `notifySubscribers: exit action for state="${sub.state}", wasExited=${wasExited}, guardPasses=${guardPasses}`
+        `notifySubscribers: exit action for state="${sub.state}", wasExited=${wasExited}, transitionMatches=${transitionMatches}, guardPasses=${guardPasses}`
       );
-      if (wasExited && guardPasses) {
+      if (wasExited && transitionMatches && guardPasses) {
         DEBUG.log(`notifySubscribers: FIRING exit callback for "${sub.state}"`);
         sub.callback(message);
       }
@@ -1210,13 +1220,14 @@ class StateMachine {
   #dispatchEntryActions(message, enteredStates) {
     for (const sub of this.#entryActions) {
       const wasEntered = this.#didEnterState(sub, enteredStates);
+      const transitionMatches = this.#matchesTransition(sub, message);
       const guardPasses =
         typeof sub.guard === "function" ? sub.guard() : sub.guard;
 
       DEBUG.log(
-        `notifySubscribers: entry action for state="${sub.state}", wasEntered=${wasEntered}, guardPasses=${guardPasses}`
+        `notifySubscribers: entry action for state="${sub.state}", wasEntered=${wasEntered}, transitionMatches=${transitionMatches}, guardPasses=${guardPasses}`
       );
-      if (wasEntered && guardPasses) {
+      if (wasEntered && transitionMatches && guardPasses) {
         DEBUG.log(
           `notifySubscribers: FIRING entry callback for "${sub.state}"`
         );
@@ -1235,7 +1246,7 @@ class StateMachine {
     let afterPaintSubs = null;
 
     for (const sub of this.#subscriptions) {
-      if (!this.#evaluateSubscriptionConditions(sub)) {
+      if (!this.#evaluateSubscriptionConditions(sub, message)) {
         continue;
       }
 
@@ -1255,7 +1266,7 @@ class StateMachine {
     if (beforePaintSubs) {
       schedule("afterRender", () => {
         for (const sub of beforePaintSubs) {
-          if (this.#evaluateSubscriptionConditions(sub)) {
+          if (this.#evaluateSubscriptionConditions(sub, message)) {
             sub.callback(message);
           }
         }
@@ -1266,7 +1277,7 @@ class StateMachine {
       schedule("afterRender", () => {
         requestAnimationFrame(() => {
           for (const sub of afterPaintSubs) {
-            if (this.#evaluateSubscriptionConditions(sub)) {
+            if (this.#evaluateSubscriptionConditions(sub, message)) {
               sub.callback(message);
             }
           }
@@ -1281,16 +1292,34 @@ class StateMachine {
    * @param {Subscription} sub - Subscription to evaluate
    * @returns {boolean} Whether conditions are met
    */
-  #evaluateSubscriptionConditions(sub) {
+  #evaluateSubscriptionConditions(sub, message) {
     let stateMatches;
     if (Array.isArray(sub.state)) {
       stateMatches = sub.state.some((s) => this.matches(s));
     } else {
       stateMatches = this.matches(sub.state);
     }
+    const transitionMatches = this.#matchesTransition(sub, message);
     const guardPasses =
       typeof sub.guard === "function" ? sub.guard() : sub.guard;
-    return stateMatches && guardPasses;
+    return stateMatches && transitionMatches && guardPasses;
+  }
+
+  #matchesTransition(sub, message) {
+    if (!sub.transition) {
+      return true;
+    }
+
+    const messageType = message?.type;
+    if (!messageType) {
+      return false;
+    }
+
+    if (Array.isArray(sub.transition)) {
+      return sub.transition.includes(messageType);
+    }
+
+    return sub.transition === messageType;
   }
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/elements.js b/frontend/discourse/float-kit/components/d-sheet/state/elements.js
index 8e07c8e64dd55..7c53b61425355 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/elements.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/elements.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for elements ready state machine.
  * Tracks whether DOM elements have been registered.
@@ -38,7 +40,7 @@ export default class ElementsState {
    * @returns {void}
    */
   markRegistered() {
-    this.#machine.send("ELEMENTS_REGISTERED");
+    this.#machine.send(EVENTS.ELEMENTS_REGISTERED);
   }
 
   /**
@@ -46,6 +48,6 @@ export default class ElementsState {
    * @returns {void}
    */
   reset() {
-    this.#machine.send("RESET");
+    this.#machine.send(EVENTS.RESET);
   }
 }
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/long-running.js b/frontend/discourse/float-kit/components/d-sheet/state/long-running.js
index 7faa17ef44baf..27eadc35015e2 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/long-running.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/long-running.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for long-running operation state machine.
  * Tracks whether a long-running operation is in progress.
@@ -37,7 +39,7 @@ export default class LongRunningState {
    * @returns {void}
    */
   start() {
-    this.#machine.send("TO_TRUE");
+    this.#machine.send(EVENTS.TO_TRUE);
   }
 
   /**
@@ -45,6 +47,6 @@ export default class LongRunningState {
    * @returns {void}
    */
   end() {
-    this.#machine.send("TO_FALSE");
+    this.#machine.send(EVENTS.TO_FALSE);
   }
 }
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/openness.js b/frontend/discourse/float-kit/components/d-sheet/state/openness.js
index cd0d750d58816..a5b4882177f9a 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/openness.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/openness.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for openness state machine (main open/close lifecycle).
  * Includes nested scroll, move, and swipe states.
@@ -118,7 +120,7 @@ export default class OpennessState {
    */
   scrollStart() {
     if (!this.isScrollOngoing) {
-      this.#machine.send("SCROLL_START");
+      this.#machine.send(EVENTS.SCROLL_START);
     }
   }
 
@@ -129,7 +131,7 @@ export default class OpennessState {
    */
   scrollEnd() {
     if (this.isScrollOngoing) {
-      this.#machine.send("SCROLL_END");
+      this.#machine.send(EVENTS.SCROLL_END);
     }
   }
 
@@ -139,7 +141,7 @@ export default class OpennessState {
    * @returns {void}
    */
   swipeStart() {
-    this.#machine.send("SWIPE_START");
+    this.#machine.send(EVENTS.SWIPE_START);
   }
 
   /**
@@ -148,7 +150,7 @@ export default class OpennessState {
    * @returns {void}
    */
   swipeEnd() {
-    this.#machine.send("SWIPE_END");
+    this.#machine.send(EVENTS.SWIPE_END);
   }
 
   /**
@@ -157,7 +159,7 @@ export default class OpennessState {
    * @returns {void}
    */
   completeAnimation() {
-    this.#machine.send("NEXT");
+    this.#machine.send(EVENTS.NEXT);
   }
 
   /**
@@ -166,7 +168,7 @@ export default class OpennessState {
    * @returns {void}
    */
   moveStart() {
-    this.#machine.send("MOVE_START");
+    this.#machine.send(EVENTS.MOVE_START);
   }
 
   /**
@@ -175,7 +177,7 @@ export default class OpennessState {
    * @returns {void}
    */
   moveEnd() {
-    this.#machine.send("MOVE_END");
+    this.#machine.send(EVENTS.MOVE_END);
   }
 
   /**
@@ -185,7 +187,7 @@ export default class OpennessState {
    * @returns {void}
    */
   beginStep(detent) {
-    this.#machine.send({ type: "STEP", detent });
+    this.#machine.send({ type: EVENTS.STEP, detent });
   }
 
   /**
@@ -195,7 +197,14 @@ export default class OpennessState {
    * @returns {void}
    */
   readyToOpen(skipOpening) {
-    this.#machine.send({ type: "READY_TO_OPEN", skipOpening });
+    this.#machine.send({ type: EVENTS.READY_TO_OPEN, skipOpening });
+  }
+
+  flushComplete() {
+    this.#machine.send({
+      machine: "openness:closed.status",
+      type: "",
+    });
   }
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/position.js b/frontend/discourse/float-kit/components/d-sheet/state/position.js
index 89db8cbc17f8a..61524b1599a4f 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/position.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/position.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for position state machine.
  * Tracks sheet position in stack: out, front, covered.
@@ -99,7 +101,7 @@ export default class PositionState {
    * @returns {void}
    */
   goOut() {
-    this.#machine.send("GO_OUT");
+    this.#machine.send(EVENTS.GO_OUT);
   }
 
   /**
@@ -108,7 +110,7 @@ export default class PositionState {
    * @returns {void}
    */
   advance() {
-    this.#machine.send("NEXT");
+    this.#machine.send(EVENTS.NEXT);
   }
 
   /**
@@ -117,7 +119,7 @@ export default class PositionState {
    * @returns {void}
    */
   goToFrontIdle() {
-    this.#machine.send("GOTO_front");
+    this.#machine.send(EVENTS.GOTO_FRONT);
   }
 
   /**
@@ -126,7 +128,7 @@ export default class PositionState {
    * @returns {void}
    */
   goToCoveredIdle() {
-    this.#machine.send("GOTO_idle");
+    this.#machine.send(EVENTS.GOTO_IDLE);
   }
 
   /**
@@ -136,7 +138,7 @@ export default class PositionState {
    * @returns {void}
    */
   readyToGoFront(skipOpening) {
-    this.#machine.send("READY_TO_GO_FRONT", { skipOpening });
+    this.#machine.send(EVENTS.READY_TO_GO_FRONT, { skipOpening });
   }
 
   /**
@@ -145,7 +147,7 @@ export default class PositionState {
    * @returns {void}
    */
   readyToGoOut() {
-    this.#machine.send("READY_TO_GO_OUT");
+    this.#machine.send(EVENTS.READY_TO_GO_OUT);
   }
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/skip.js b/frontend/discourse/float-kit/components/d-sheet/state/skip.js
index 59dd458f2b56e..433bf9e3ebeae 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/skip.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/skip.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for skip animation state machines.
  * Tracks whether opening/closing animations should be skipped.
@@ -45,7 +47,7 @@ export default class SkipState {
    * @returns {void}
    */
   enableOpening() {
-    this.#openingMachine.send("TO_TRUE");
+    this.#openingMachine.send(EVENTS.TO_TRUE);
   }
 
   /**
@@ -53,7 +55,7 @@ export default class SkipState {
    * @returns {void}
    */
   disableOpening() {
-    this.#openingMachine.send("TO_FALSE");
+    this.#openingMachine.send(EVENTS.TO_FALSE);
   }
 
   /**
@@ -61,7 +63,7 @@ export default class SkipState {
    * @returns {void}
    */
   enableClosing() {
-    this.#closingMachine.send("TO_TRUE");
+    this.#closingMachine.send(EVENTS.TO_TRUE);
   }
 
   /**
@@ -69,6 +71,6 @@ export default class SkipState {
    * @returns {void}
    */
   disableClosing() {
-    this.#closingMachine.send("TO_FALSE");
+    this.#closingMachine.send(EVENTS.TO_FALSE);
   }
 }
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/staging.js b/frontend/discourse/float-kit/components/d-sheet/state/staging.js
index 1383057e3ac0a..5178d63edaad4 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/staging.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/staging.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for staging/animation state machine.
  * Tracks animation phases: none, opening, open, stepping, closing, going-down, going-up.
@@ -104,7 +106,7 @@ export default class StagingState {
    * Signal that opening preparation is complete, transitioning to the opening phase.
    */
   openPrepared() {
-    this.#machine.send("OPEN_PREPARED", {
+    this.#machine.send(EVENTS.OPEN_PREPARED, {
       opennessState: this.#openness.current,
     });
   }
@@ -115,7 +117,7 @@ export default class StagingState {
    * @param {boolean} [skipClosing=false] - Whether to skip the closing animation
    */
   actuallyClose(skipClosing = false) {
-    this.#machine.send("ACTUALLY_CLOSE", {
+    this.#machine.send(EVENTS.ACTUALLY_CLOSE, {
       opennessState: this.#openness.current,
       skipClosing,
     });
@@ -125,7 +127,7 @@ export default class StagingState {
    * Trigger the step animation between detents.
    */
   actuallyStep() {
-    this.#machine.send("ACTUALLY_STEP", {
+    this.#machine.send(EVENTS.ACTUALLY_STEP, {
       opennessState: this.#openness.current,
     });
   }
@@ -134,14 +136,14 @@ export default class StagingState {
    * Advance the staging machine to its next state via the NEXT message.
    */
   advance() {
-    this.#machine.send("NEXT");
+    this.#machine.send(EVENTS.NEXT);
   }
 
   /**
    * Trigger the going-down animation phase.
    */
   goDown() {
-    this.#machine.send("GO_DOWN", {
+    this.#machine.send(EVENTS.GO_DOWN, {
       opennessState: this.#openness.current,
     });
   }
@@ -150,7 +152,7 @@ export default class StagingState {
    * Trigger the going-up animation phase.
    */
   goUp() {
-    this.#machine.send("GO_UP", {
+    this.#machine.send(EVENTS.GO_UP, {
       opennessState: this.#openness.current,
     });
   }
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/stuck.js b/frontend/discourse/float-kit/components/d-sheet/state/stuck.js
index f6284f74d5d89..25cb165f588e9 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/stuck.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/stuck.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for stuck state machines (front and back).
  * Tracks whether sheet is stuck at detent boundaries.
@@ -53,7 +55,7 @@ export default class StuckState {
    * @returns {void}
    */
   startFront() {
-    this.#frontMachine.send("STUCK_START");
+    this.#frontMachine.send(EVENTS.STUCK_START);
   }
 
   /**
@@ -61,7 +63,7 @@ export default class StuckState {
    * @returns {void}
    */
   endFront() {
-    this.#frontMachine.send("STUCK_END");
+    this.#frontMachine.send(EVENTS.STUCK_END);
   }
 
   /**
@@ -69,7 +71,7 @@ export default class StuckState {
    * @returns {void}
    */
   startBack() {
-    this.#backMachine.send("STUCK_START");
+    this.#backMachine.send(EVENTS.STUCK_START);
   }
 
   /**
@@ -77,7 +79,7 @@ export default class StuckState {
    * @returns {void}
    */
   endBack() {
-    this.#backMachine.send("STUCK_END");
+    this.#backMachine.send(EVENTS.STUCK_END);
   }
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/state/touch.js b/frontend/discourse/float-kit/components/d-sheet/state/touch.js
index e7df29d4c94f7..68abb7de1cd12 100644
--- a/frontend/discourse/float-kit/components/d-sheet/state/touch.js
+++ b/frontend/discourse/float-kit/components/d-sheet/state/touch.js
@@ -1,3 +1,5 @@
+import { EVENTS } from "../state-machine-events";
+
 /**
  * Namespace for scroll container touch state machine.
  * Tracks whether touch is ongoing or ended.
@@ -37,7 +39,7 @@ export default class TouchState {
    * @returns {void}
    */
   start() {
-    this.#machine.send("TOUCH_START");
+    this.#machine.send(EVENTS.TOUCH_START);
   }
 
   /**
@@ -45,6 +47,6 @@ export default class TouchState {
    * @returns {void}
    */
   end() {
-    this.#machine.send("TOUCH_END");
+    this.#machine.send(EVENTS.TOUCH_END);
   }
 }
diff --git a/frontend/discourse/float-kit/components/d-sheet/states.js b/frontend/discourse/float-kit/components/d-sheet/states.js
index 1a0936587481a..3f5c0d2f198aa 100644
--- a/frontend/discourse/float-kit/components/d-sheet/states.js
+++ b/frontend/discourse/float-kit/components/d-sheet/states.js
@@ -1,443 +1,3 @@
-/**
- * @typedef {Object} TransitionTarget
- * @property {string} [guard] - Guard name that must pass for this transition
- * @property {string} target - Target state to transition to
- */
-
-/**
- * @typedef {string | TransitionTarget | TransitionTarget[]} TransitionDef
- */
-
-/**
- * @typedef {Object} StateConfig
- * @property {Object<string, TransitionDef>} [messages] - Map of message types to transitions
- * @property {MachineDefinition[]} [machines] - Nested child machines within this state
- */
-
-/**
- * @typedef {Object} MachineDefinition
- * @property {string} name - Unique name identifying the machine within the group
- * @property {string} initial - Initial state for the machine
- * @property {Object<string, StateConfig>} states - Map of state names to configurations
- * @property {boolean} [silentOnly] - If true, state changes do not trigger reactive updates
- */
-
-/**
- * @typedef {Object} GuardMessage
- * @property {string} type - The message type that triggered the transition
- * @property {boolean} [skipClosing] - Whether to skip closing animation
- * @property {boolean} [skipOpening] - Whether to skip opening animation
- */
-
-/**
- * Guard name constants for state machine transitions.
- * Use these instead of string literals to prevent typos.
- *
- * @type {Readonly<{
- *   NOT_SKIP_CLOSING: "notSkipClosing",
- *   NOT_SKIP_OPENING: "notSkipOpening",
- *   NOT_SKIP_CLOSING_MSG: "notSkipClosingMsg",
- *   NOT_SKIP_OPENING_MSG: "notSkipOpeningMsg",
- *   SKIP_OPENING: "skipOpening",
- *   SKIP_CLOSING: "skipClosing",
- *   SAFE_TO_UNMOUNT: "safeToUnmount",
- *   SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING: "safeToUnmountAndNotSkipOpening"
- * }>}
- */
-const GUARD_NAMES = {
-  NOT_SKIP_CLOSING: "notSkipClosing",
-  NOT_SKIP_OPENING: "notSkipOpening",
-  NOT_SKIP_CLOSING_MSG: "notSkipClosingMsg",
-  NOT_SKIP_OPENING_MSG: "notSkipOpeningMsg",
-  SKIP_OPENING: "skipOpening",
-  SKIP_CLOSING: "skipClosing",
-  SAFE_TO_UNMOUNT: "safeToUnmount",
-  SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING: "safeToUnmountAndNotSkipOpening",
-};
-
-/**
- * Guard functions for state machine transitions.
- * Each guard receives (previousStates, message) and returns a boolean.
- * - previousStates: Array of state strings before transition
- * - message: The message object with optional context properties
- *
- * @type {Object<string, (previousStates: string[], message: GuardMessage) => boolean>}
- */
-export const GUARDS = {
-  [GUARD_NAMES.NOT_SKIP_CLOSING]: (previousStates, message) =>
-    !previousStates.includes("skipClosing:true") && !message.skipClosing,
-  [GUARD_NAMES.NOT_SKIP_OPENING]: (previousStates, message) =>
-    !previousStates.includes("skipOpening:true") && !message.skipOpening,
-  [GUARD_NAMES.NOT_SKIP_CLOSING_MSG]: (previousStates, message) =>
-    !message.skipClosing,
-  [GUARD_NAMES.NOT_SKIP_OPENING_MSG]: (previousStates, message) =>
-    !message.skipOpening,
-  [GUARD_NAMES.SKIP_OPENING]: (previousStates, message) =>
-    previousStates.includes("skipOpening:true") || message.skipOpening,
-  [GUARD_NAMES.SKIP_CLOSING]: (previousStates, message) =>
-    previousStates.includes("skipClosing:true") || message.skipClosing,
-  [GUARD_NAMES.SAFE_TO_UNMOUNT]: (previousStates) =>
-    previousStates.includes("openness:closed.status:safe-to-unmount"),
-  [GUARD_NAMES.SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING]: (
-    previousStates,
-    message
-  ) =>
-    previousStates.includes("openness:closed.status:safe-to-unmount") &&
-    !previousStates.includes("skipOpening:true") &&
-    !message.skipOpening,
-};
-
-/**
- * Machine definitions for the sheet's primary state machine group.
- * Includes staging, longRunning, skipOpening, skipClosing, openness,
- * scrollContainerTouch, backStuck, frontStuck, and elementsReady machines.
- *
- * @type {MachineDefinition[]}
- */
-export const SHEET_MACHINES = [
-  {
-    name: "staging",
-    initial: "none",
-    states: {
-      none: {
-        messages: {
-          OPEN: [
-            {
-              guard: GUARD_NAMES.SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING,
-              target: "opening",
-            },
-            {
-              guard: GUARD_NAMES.SAFE_TO_UNMOUNT,
-              target: "open",
-            },
-          ],
-          OPEN_PREPARED: [
-            {
-              guard: GUARD_NAMES.NOT_SKIP_OPENING,
-              target: "opening",
-            },
-            {
-              target: "open",
-            },
-          ],
-          ACTUALLY_CLOSE: {
-            guard: GUARD_NAMES.NOT_SKIP_CLOSING,
-            target: "closing",
-          },
-          ACTUALLY_STEP: "stepping",
-          GO_DOWN: [
-            {
-              guard: GUARD_NAMES.NOT_SKIP_OPENING_MSG,
-              target: "going-down",
-            },
-            {
-              target: "go-down",
-            },
-          ],
-          GO_UP: "going-up",
-        },
-      },
-      open: { messages: { NEXT: "none" } },
-      opening: { messages: { NEXT: "none" } },
-      stepping: { messages: { NEXT: "none" } },
-      closing: { messages: { NEXT: "none" } },
-      "go-down": { messages: { NEXT: "none" } },
-      "going-down": { messages: { NEXT: "none" } },
-      "going-up": { messages: { NEXT: "none" } },
-    },
-  },
-  {
-    name: "longRunning",
-    initial: "false",
-    states: {
-      false: { messages: { TO_TRUE: "true" } },
-      true: { messages: { TO_FALSE: "false" } },
-    },
-  },
-  {
-    name: "skipOpening",
-    initial: "false",
-    states: {
-      true: { messages: { TO_FALSE: "false" } },
-      false: { messages: { TO_TRUE: "true" } },
-    },
-  },
-  {
-    name: "skipClosing",
-    initial: "false",
-    states: {
-      true: { messages: { TO_FALSE: "false" } },
-      false: { messages: { TO_TRUE: "true" } },
-    },
-  },
-  {
-    name: "openness",
-    initial: "closed",
-    states: {
-      closed: {
-        messages: {
-          READY_TO_OPEN: [
-            {
-              guard: GUARD_NAMES.NOT_SKIP_OPENING_MSG,
-              target: "opening",
-            },
-            {
-              target: "open",
-            },
-          ],
-        },
-        machines: [
-          {
-            name: "status",
-            initial: "safe-to-unmount",
-            states: {
-              "safe-to-unmount": {},
-              pending: {
-                messages: {
-                  OPEN: [
-                    {
-                      guard: GUARD_NAMES.SKIP_OPENING,
-                      target: "flushing-to-preparing-open",
-                    },
-                    { target: "flushing-to-preparing-opening" },
-                  ],
-                  "": "safe-to-unmount",
-                },
-              },
-              "flushing-to-preparing-open": {
-                messages: { "": "preparing-open" },
-              },
-              "flushing-to-preparing-opening": {
-                messages: { "": "preparing-opening" },
-              },
-              "preparing-open": {},
-              "preparing-opening": {},
-            },
-          },
-        ],
-      },
-      opening: {
-        messages: { NEXT: "open" },
-      },
-      open: {
-        messages: {
-          ACTUALLY_CLOSE: [
-            {
-              guard: GUARD_NAMES.SKIP_CLOSING,
-              target: "openness:closed.status:pending",
-            },
-          ],
-          SWIPED_OUT: "openness:closed.status:pending",
-          READY_TO_CLOSE: [
-            {
-              guard: GUARD_NAMES.NOT_SKIP_CLOSING_MSG,
-              target: "closing",
-            },
-          ],
-          STEP: "open",
-        },
-        machines: [
-          {
-            name: "scroll",
-            initial: "ended",
-            states: {
-              ended: { messages: { SCROLL_START: "ongoing" } },
-              ongoing: { messages: { SCROLL_END: "ended" } },
-            },
-          },
-          {
-            name: "move",
-            initial: "ended",
-            states: {
-              ended: { messages: { MOVE_START: "ongoing" } },
-              ongoing: { messages: { MOVE_END: "ended" } },
-            },
-          },
-          {
-            name: "swipe",
-            silentOnly: true,
-            initial: "unstarted",
-            states: {
-              unstarted: { messages: { SWIPE_START: "ongoing" } },
-              ongoing: { messages: { SWIPE_END: "ended" } },
-              ended: {
-                messages: { SWIPE_START: "ongoing" },
-              },
-            },
-          },
-          {
-            name: "evaluateCloseMessage",
-            silentOnly: true,
-            initial: "false",
-            states: {
-              false: { messages: { CLOSE: "true" } },
-              true: { messages: { CLOSE: "false" } },
-            },
-          },
-          {
-            name: "evaluateStepMessage",
-            silentOnly: true,
-            initial: "false",
-            states: {
-              false: { messages: { STEP: "true" } },
-              true: { messages: { STEP: "false" } },
-            },
-          },
-        ],
-      },
-      closing: { messages: { NEXT: "openness:closed.status:pending" } },
-    },
-  },
-  {
-    name: "scrollContainerTouch",
-    initial: "ended",
-    states: {
-      ended: { messages: { TOUCH_START: "ongoing" } },
-      ongoing: { messages: { TOUCH_END: "ended" } },
-    },
-  },
-  {
-    name: "backStuck",
-    silentOnly: true,
-    initial: "false",
-    states: {
-      false: { messages: { STUCK_START: "true" } },
-      true: { messages: { STUCK_END: "false" } },
-    },
-  },
-  {
-    name: "frontStuck",
-    silentOnly: true,
-    initial: "false",
-    states: {
-      false: { messages: { STUCK_START: "true" } },
-      true: { messages: { STUCK_END: "false" } },
-    },
-  },
-  {
-    name: "elementsReady",
-    initial: "false",
-    states: {
-      false: { messages: { ELEMENTS_REGISTERED: "true" } },
-      true: { messages: { RESET: "false" } },
-    },
-  },
-];
-
-/**
- * Machine definitions for the sheet's position state machine group.
- * Includes active and position machines that manage sheet stacking and transitions.
- *
- * @type {MachineDefinition[]}
- */
-export const POSITION_MACHINES = [
-  {
-    name: "active",
-    initial: "false",
-    states: {
-      false: { messages: { TO_TRUE: "true" } },
-      true: { messages: { TO_FALSE: "false" } },
-    },
-  },
-  {
-    name: "position",
-    initial: "out",
-    states: {
-      out: {
-        messages: {
-          READY_TO_GO_FRONT: [
-            {
-              guard: GUARD_NAMES.SKIP_OPENING,
-              target: "position:front.status:idle",
-            },
-            {
-              target: "position:front.status:opening",
-            },
-          ],
-        },
-      },
-      front: {
-        machines: [
-          {
-            name: "status",
-            initial: "opening",
-            states: {
-              opening: {
-                messages: {
-                  NEXT: "idle",
-                },
-              },
-              closing: {
-                messages: {
-                  NEXT: "position:out",
-                },
-              },
-              idle: {
-                messages: {
-                  READY_TO_GO_DOWN: [
-                    {
-                      guard: GUARD_NAMES.SKIP_OPENING,
-                      target: "position:covered.status:idle",
-                    },
-                    {
-                      target: "position:covered.status:going-down",
-                    },
-                  ],
-                  READY_TO_GO_OUT: "closing",
-                  GO_OUT: "position:out",
-                },
-              },
-            },
-          },
-        ],
-      },
-      covered: {
-        machines: [
-          {
-            name: "status",
-            initial: "going-down",
-            states: {
-              "going-down": {
-                messages: {
-                  NEXT: "idle",
-                },
-              },
-              "going-up": {
-                messages: {
-                  NEXT: "indeterminate",
-                },
-              },
-              indeterminate: {
-                messages: {
-                  GOTO_idle: "idle",
-                  GOTO_front: "position:front.status:idle",
-                },
-              },
-              idle: {
-                messages: {
-                  READY_TO_GO_DOWN: [
-                    {
-                      guard: GUARD_NAMES.SKIP_OPENING,
-                      target: "come-back",
-                    },
-                    {
-                      target: "going-down",
-                    },
-                  ],
-                  READY_TO_GO_UP: "going-up",
-                  GO_UP: "indeterminate",
-                  GOTO_front: "position:front.status:idle",
-                },
-              },
-              "come-back": {
-                messages: {
-                  "": "idle",
-                },
-              },
-            },
-          },
-        ],
-      },
-    },
-  },
-];
+export { GUARDS } from "./states/guards";
+export { POSITION_MACHINES } from "./states/position-machines";
+export { SHEET_MACHINES } from "./states/sheet-machines";
diff --git a/frontend/discourse/float-kit/components/d-sheet/states/guards.js b/frontend/discourse/float-kit/components/d-sheet/states/guards.js
new file mode 100644
index 0000000000000..a97c20232b834
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/states/guards.js
@@ -0,0 +1,37 @@
+export const GUARD_NAMES = Object.freeze({
+  NOT_SKIP_CLOSING: "notSkipClosing",
+  NOT_SKIP_OPENING: "notSkipOpening",
+  NOT_SKIP_CLOSING_MSG: "notSkipClosingMsg",
+  NOT_SKIP_OPENING_MSG: "notSkipOpeningMsg",
+  OPENING_CLOSE_REQUESTED: "openingCloseRequested",
+  SKIP_OPENING: "skipOpening",
+  SKIP_CLOSING: "skipClosing",
+  SAFE_TO_UNMOUNT: "safeToUnmount",
+  SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING: "safeToUnmountAndNotSkipOpening",
+});
+
+export const GUARDS = {
+  [GUARD_NAMES.NOT_SKIP_CLOSING]: (previousStates, message) =>
+    !previousStates.includes("skipClosing:true") && !message.skipClosing,
+  [GUARD_NAMES.NOT_SKIP_OPENING]: (previousStates, message) =>
+    !previousStates.includes("skipOpening:true") && !message.skipOpening,
+  [GUARD_NAMES.NOT_SKIP_CLOSING_MSG]: (_previousStates, message) =>
+    !message.skipClosing,
+  [GUARD_NAMES.NOT_SKIP_OPENING_MSG]: (_previousStates, message) =>
+    !message.skipOpening,
+  [GUARD_NAMES.OPENING_CLOSE_REQUESTED]: (previousStates) =>
+    previousStates.includes("openness:opening.evaluateCloseMessage:true"),
+  [GUARD_NAMES.SKIP_OPENING]: (previousStates, message) =>
+    previousStates.includes("skipOpening:true") || message.skipOpening,
+  [GUARD_NAMES.SKIP_CLOSING]: (previousStates, message) =>
+    previousStates.includes("skipClosing:true") || message.skipClosing,
+  [GUARD_NAMES.SAFE_TO_UNMOUNT]: (previousStates) =>
+    previousStates.includes("openness:closed.status:safe-to-unmount"),
+  [GUARD_NAMES.SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING]: (
+    previousStates,
+    message
+  ) =>
+    previousStates.includes("openness:closed.status:safe-to-unmount") &&
+    !previousStates.includes("skipOpening:true") &&
+    !message.skipOpening,
+};
diff --git a/frontend/discourse/float-kit/components/d-sheet/states/position-machines.js b/frontend/discourse/float-kit/components/d-sheet/states/position-machines.js
new file mode 100644
index 0000000000000..fc8dd8afeb92b
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/states/position-machines.js
@@ -0,0 +1,118 @@
+import { EVENTS, MACHINE_NAMES, MACHINE_STATE } from "../state-machine-events";
+import { GUARD_NAMES } from "./guards";
+
+export const POSITION_MACHINES = [
+  {
+    name: MACHINE_NAMES.ACTIVE,
+    initial: MACHINE_STATE.FALSE,
+    states: {
+      [MACHINE_STATE.FALSE]: {
+        messages: { [EVENTS.TO_TRUE]: MACHINE_STATE.TRUE },
+      },
+      [MACHINE_STATE.TRUE]: {
+        messages: { [EVENTS.TO_FALSE]: MACHINE_STATE.FALSE },
+      },
+    },
+  },
+  {
+    name: MACHINE_NAMES.POSITION,
+    initial: "out",
+    states: {
+      out: {
+        messages: {
+          [EVENTS.READY_TO_GO_FRONT]: [
+            {
+              guard: GUARD_NAMES.SKIP_OPENING,
+              target: "position:front.status:idle",
+            },
+            {
+              target: "position:front.status:opening",
+            },
+          ],
+        },
+      },
+      front: {
+        machines: [
+          {
+            name: "status",
+            initial: "opening",
+            states: {
+              opening: {
+                messages: {
+                  [EVENTS.NEXT]: "idle",
+                },
+              },
+              closing: {
+                messages: {
+                  [EVENTS.NEXT]: "position:out",
+                },
+              },
+              idle: {
+                messages: {
+                  [EVENTS.READY_TO_GO_DOWN]: [
+                    {
+                      guard: GUARD_NAMES.SKIP_OPENING,
+                      target: "position:covered.status:idle",
+                    },
+                    {
+                      target: "position:covered.status:going-down",
+                    },
+                  ],
+                  [EVENTS.READY_TO_GO_OUT]: "closing",
+                  [EVENTS.GO_OUT]: "position:out",
+                },
+              },
+            },
+          },
+        ],
+      },
+      covered: {
+        machines: [
+          {
+            name: "status",
+            initial: "going-down",
+            states: {
+              "going-down": {
+                messages: {
+                  [EVENTS.NEXT]: "idle",
+                },
+              },
+              "going-up": {
+                messages: {
+                  [EVENTS.NEXT]: "indeterminate",
+                },
+              },
+              indeterminate: {
+                messages: {
+                  [EVENTS.GOTO_IDLE]: "idle",
+                  [EVENTS.GOTO_FRONT]: "position:front.status:idle",
+                },
+              },
+              idle: {
+                messages: {
+                  [EVENTS.READY_TO_GO_DOWN]: [
+                    {
+                      guard: GUARD_NAMES.SKIP_OPENING,
+                      target: "come-back",
+                    },
+                    {
+                      target: "going-down",
+                    },
+                  ],
+                  [EVENTS.READY_TO_GO_UP]: "going-up",
+                  [EVENTS.GO_UP]: "indeterminate",
+                  [EVENTS.GOTO_FRONT]: "position:front.status:idle",
+                },
+              },
+              "come-back": {
+                messages: {
+                  "": "idle",
+                },
+              },
+            },
+          },
+        ],
+      },
+    },
+  },
+];
diff --git a/frontend/discourse/float-kit/components/d-sheet/states/sheet-machines.js b/frontend/discourse/float-kit/components/d-sheet/states/sheet-machines.js
new file mode 100644
index 0000000000000..851f55a894292
--- /dev/null
+++ b/frontend/discourse/float-kit/components/d-sheet/states/sheet-machines.js
@@ -0,0 +1,289 @@
+import { EVENTS, MACHINE_NAMES, MACHINE_STATE } from "../state-machine-events";
+import { GUARD_NAMES } from "./guards";
+
+export const SHEET_MACHINES = [
+  {
+    name: MACHINE_NAMES.STAGING,
+    initial: "none",
+    states: {
+      none: {
+        messages: {
+          [EVENTS.OPEN]: [
+            {
+              guard: GUARD_NAMES.SAFE_TO_UNMOUNT_AND_NOT_SKIP_OPENING,
+              target: "opening",
+            },
+            {
+              guard: GUARD_NAMES.SAFE_TO_UNMOUNT,
+              target: "open",
+            },
+          ],
+          [EVENTS.OPEN_PREPARED]: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_OPENING,
+              target: "opening",
+            },
+            {
+              target: "open",
+            },
+          ],
+          [EVENTS.ACTUALLY_CLOSE]: {
+            guard: GUARD_NAMES.NOT_SKIP_CLOSING,
+            target: "closing",
+          },
+          [EVENTS.ACTUALLY_STEP]: "stepping",
+          [EVENTS.GO_DOWN]: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_OPENING_MSG,
+              target: "going-down",
+            },
+            {
+              target: "go-down",
+            },
+          ],
+          [EVENTS.GO_UP]: "going-up",
+        },
+      },
+      open: { messages: { [EVENTS.NEXT]: "none" } },
+      opening: { messages: { [EVENTS.NEXT]: "none" } },
+      stepping: { messages: { [EVENTS.NEXT]: "none" } },
+      closing: { messages: { [EVENTS.NEXT]: "none" } },
+      "go-down": { messages: { [EVENTS.NEXT]: "none" } },
+      "going-down": { messages: { [EVENTS.NEXT]: "none" } },
+      "going-up": { messages: { [EVENTS.NEXT]: "none" } },
+    },
+  },
+  {
+    name: MACHINE_NAMES.LONG_RUNNING,
+    initial: MACHINE_STATE.FALSE,
+    states: {
+      [MACHINE_STATE.FALSE]: {
+        messages: { [EVENTS.TO_TRUE]: MACHINE_STATE.TRUE },
+      },
+      [MACHINE_STATE.TRUE]: {
+        messages: { [EVENTS.TO_FALSE]: MACHINE_STATE.FALSE },
+      },
+    },
+  },
+  {
+    name: MACHINE_NAMES.SKIP_OPENING,
+    initial: MACHINE_STATE.FALSE,
+    states: {
+      [MACHINE_STATE.TRUE]: {
+        messages: { [EVENTS.TO_FALSE]: MACHINE_STATE.FALSE },
+      },
+      [MACHINE_STATE.FALSE]: {
+        messages: { [EVENTS.TO_TRUE]: MACHINE_STATE.TRUE },
+      },
+    },
+  },
+  {
+    name: MACHINE_NAMES.SKIP_CLOSING,
+    initial: MACHINE_STATE.FALSE,
+    states: {
+      [MACHINE_STATE.TRUE]: {
+        messages: { [EVENTS.TO_FALSE]: MACHINE_STATE.FALSE },
+      },
+      [MACHINE_STATE.FALSE]: {
+        messages: { [EVENTS.TO_TRUE]: MACHINE_STATE.TRUE },
+      },
+    },
+  },
+  {
+    name: MACHINE_NAMES.OPENNESS,
+    initial: "closed",
+    states: {
+      closed: {
+        messages: {
+          [EVENTS.READY_TO_OPEN]: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_OPENING_MSG,
+              target: "opening",
+            },
+            {
+              target: "open",
+            },
+          ],
+        },
+        machines: [
+          {
+            name: "status",
+            initial: "safe-to-unmount",
+            states: {
+              "safe-to-unmount": {},
+              pending: {
+                messages: {
+                  [EVENTS.OPEN]: [
+                    {
+                      guard: GUARD_NAMES.SKIP_OPENING,
+                      target: "flushing-to-preparing-open",
+                    },
+                    { target: "flushing-to-preparing-opening" },
+                  ],
+                  "": "safe-to-unmount",
+                },
+              },
+              "flushing-to-preparing-open": {
+                messages: { "": "preparing-open" },
+              },
+              "flushing-to-preparing-opening": {
+                messages: { "": "preparing-opening" },
+              },
+              "preparing-open": {},
+              "preparing-opening": {},
+            },
+          },
+        ],
+      },
+      opening: {
+        messages: {
+          [EVENTS.NEXT]: [
+            {
+              guard: GUARD_NAMES.OPENING_CLOSE_REQUESTED,
+              target: "closing",
+            },
+            { target: "open" },
+          ],
+        },
+        machines: [
+          {
+            name: "evaluateCloseMessage",
+            silentOnly: true,
+            initial: MACHINE_STATE.FALSE,
+            states: {
+              [MACHINE_STATE.FALSE]: {
+                messages: { [EVENTS.CLOSE]: MACHINE_STATE.TRUE },
+              },
+              [MACHINE_STATE.TRUE]: {
+                messages: { [EVENTS.CLOSE]: MACHINE_STATE.TRUE },
+              },
+            },
+          },
+        ],
+      },
+      open: {
+        messages: {
+          [EVENTS.ACTUALLY_CLOSE]: [
+            {
+              guard: GUARD_NAMES.SKIP_CLOSING,
+              target: "openness:closed.status:pending",
+            },
+          ],
+          [EVENTS.SWIPED_OUT]: "openness:closed.status:pending",
+          [EVENTS.READY_TO_CLOSE]: [
+            {
+              guard: GUARD_NAMES.NOT_SKIP_CLOSING_MSG,
+              target: "closing",
+            },
+          ],
+          [EVENTS.STEP]: "open",
+        },
+        machines: [
+          {
+            name: "scroll",
+            initial: "ended",
+            states: {
+              ended: { messages: { [EVENTS.SCROLL_START]: "ongoing" } },
+              ongoing: { messages: { [EVENTS.SCROLL_END]: "ended" } },
+            },
+          },
+          {
+            name: "move",
+            initial: "ended",
+            states: {
+              ended: { messages: { [EVENTS.MOVE_START]: "ongoing" } },
+              ongoing: { messages: { [EVENTS.MOVE_END]: "ended" } },
+            },
+          },
+          {
+            name: "swipe",
+            silentOnly: true,
+            initial: "unstarted",
+            states: {
+              unstarted: { messages: { [EVENTS.SWIPE_START]: "ongoing" } },
+              ongoing: { messages: { [EVENTS.SWIPE_END]: "ended" } },
+              ended: {
+                messages: { [EVENTS.SWIPE_START]: "ongoing" },
+              },
+            },
+          },
+          {
+            name: "evaluateCloseMessage",
+            silentOnly: true,
+            initial: MACHINE_STATE.FALSE,
+            states: {
+              [MACHINE_STATE.FALSE]: {
+                messages: { [EVENTS.CLOSE]: MACHINE_STATE.TRUE },
+              },
+              [MACHINE_STATE.TRUE]: {
+                messages: { [EVENTS.CLOSE]: MACHINE_STATE.FALSE },
+              },
+            },
+          },
+          {
+            name: "evaluateStepMessage",
+            silentOnly: true,
+            initial: MACHINE_STATE.FALSE,
+            states: {
+              [MACHINE_STATE.FALSE]: {
+                messages: { [EVENTS.STEP]: MACHINE_STATE.TRUE },
+              },
+              [MACHINE_STATE.TRUE]: {
+                messages: { [EVENTS.STEP]: MACHINE_STATE.FALSE },
+              },
+            },
+          },
+        ],
+      },
+      closing: {
+        messages: { [EVENTS.NEXT]: "openness:closed.status:pending" },
+      },
+    },
+  },
+  {
+    name: MACHINE_NAMES.SCROLL_CONTAINER_TOUCH,
+    initial: "ended",
+    states: {
+      ended: { messages: { [EVENTS.TOUCH_START]: "ongoing" } },
+      ongoing: { messages: { [EVENTS.TOUCH_END]: "ended" } },
+    },
+  },
+  {
+    name: MACHINE_NAMES.BACK_STUCK,
+    silentOnly: true,
+    initial: MACHINE_STATE.FALSE,
+    states: {
+      [MACHINE_STATE.FALSE]: {
+        messages: { [EVENTS.STUCK_START]: MACHINE_STATE.TRUE },
+      },
+      [MACHINE_STATE.TRUE]: {
+        messages: { [EVENTS.STUCK_END]: MACHINE_STATE.FALSE },
+      },
+    },
+  },
+  {
+    name: MACHINE_NAMES.FRONT_STUCK,
+    silentOnly: true,
+    initial: MACHINE_STATE.FALSE,
+    states: {
+      [MACHINE_STATE.FALSE]: {
+        messages: { [EVENTS.STUCK_START]: MACHINE_STATE.TRUE },
+      },
+      [MACHINE_STATE.TRUE]: {
+        messages: { [EVENTS.STUCK_END]: MACHINE_STATE.FALSE },
+      },
+    },
+  },
+  {
+    name: MACHINE_NAMES.ELEMENTS_READY,
+    initial: MACHINE_STATE.FALSE,
+    states: {
+      [MACHINE_STATE.FALSE]: {
+        messages: { [EVENTS.ELEMENTS_REGISTERED]: MACHINE_STATE.TRUE },
+      },
+      [MACHINE_STATE.TRUE]: {
+        messages: { [EVENTS.RESET]: MACHINE_STATE.FALSE },
+      },
+    },
+  },
+];
diff --git a/frontend/discourse/float-kit/services/sheet-layer-store.js b/frontend/discourse/float-kit/services/sheet-layer-store.js
index 475d280885679..0be573ab74b37 100644
--- a/frontend/discourse/float-kit/services/sheet-layer-store.js
+++ b/frontend/discourse/float-kit/services/sheet-layer-store.js
@@ -183,9 +183,7 @@ export default class SheetLayerStore extends Service {
     const activeElement = document.activeElement;
 
     focusState.focusWasInsideOnClose =
-      !!viewElement &&
-      !!activeElement &&
-      viewElement.contains(activeElement);
+      !!viewElement && !!activeElement && viewElement.contains(activeElement);
 
     this.layerFocusState.set(sheetId, focusState);
   }
@@ -199,9 +197,7 @@ export default class SheetLayerStore extends Service {
     const activeElement = document.activeElement;
     const focusWasInside =
       focusState.focusWasInsideOnClose ||
-      (!!viewElement &&
-        !!activeElement &&
-        viewElement.contains(activeElement));
+      (!!viewElement && !!activeElement && viewElement.contains(activeElement));
 
     focusState.focusWasInsideOnClose = false;
     this.layerFocusState.set(sheetId, focusState);
@@ -249,7 +245,7 @@ export default class SheetLayerStore extends Service {
       return;
     }
 
-    if (!sheet.state.openness.isOpen) {
+    if (!sheet.canAcceptDismissRequest) {
       return;
     }
 
@@ -286,7 +282,7 @@ export default class SheetLayerStore extends Service {
       return;
     }
 
-    if (!sheet.state.openness.isOpen) {
+    if (!sheet.canAcceptDismissRequest) {
       return;
     }
 
@@ -551,5 +547,4 @@ export default class SheetLayerStore extends Service {
     this.#cleanupClickOutsideListener();
     this.#cleanupEscapeKeyListener();
   }
-
 }
diff --git a/frontend/discourse/float-kit/services/sheet-stack-registry.js b/frontend/discourse/float-kit/services/sheet-stack-registry.js
index f9a7b7e0cee6c..7c104057376c0 100644
--- a/frontend/discourse/float-kit/services/sheet-stack-registry.js
+++ b/frontend/discourse/float-kit/services/sheet-stack-registry.js
@@ -1,6 +1,7 @@
 import { guidFor } from "@ember/object/internals";
 import Service from "@ember/service";
 import { TrackedMap } from "@ember-compat/tracked-built-ins";
+import { EVENTS } from "discourse/float-kit/components/d-sheet/state-machine-events";
 
 /**
  * Service for managing sheet stacks.
@@ -122,13 +123,13 @@ export default class SheetStackRegistry extends Service {
         positionState?.matches("covered.status:going-down") ||
         positionState?.matches("covered.status:going-up")
       ) {
-        parentSheet.sendToPositionMachine("NEXT");
-        parentSheet.sendToPositionMachine("GOTO_front");
+        parentSheet.sendToPositionMachine(EVENTS.NEXT);
+        parentSheet.sendToPositionMachine(EVENTS.GOTO_FRONT);
       } else if (
         positionState?.matches("covered.status:idle") ||
         positionState?.matches("covered.status:indeterminate")
       ) {
-        parentSheet.sendToPositionMachine("GOTO_front");
+        parentSheet.sendToPositionMachine(EVENTS.GOTO_FRONT);
       }
     }
   }
@@ -270,7 +271,7 @@ export default class SheetStackRegistry extends Service {
     }
 
     parentSheet.sendToPositionMachine({
-      type: "READY_TO_GO_DOWN",
+      type: EVENTS.READY_TO_GO_DOWN,
       skipOpening: options.skipOpening || false,
     });
   }
@@ -290,7 +291,7 @@ export default class SheetStackRegistry extends Service {
       return;
     }
 
-    parentSheet.sendToPositionMachine("READY_TO_GO_UP");
+    parentSheet.sendToPositionMachine(EVENTS.READY_TO_GO_UP);
   }
 
   /**
@@ -314,12 +315,12 @@ export default class SheetStackRegistry extends Service {
       positionState?.matches("covered.status:going-down") ||
       positionState?.matches("covered.status:going-up")
     ) {
-      parentSheet.sendToPositionMachine("NEXT");
-      parentSheet.sendToPositionMachine("GOTO_front");
+      parentSheet.sendToPositionMachine(EVENTS.NEXT);
+      parentSheet.sendToPositionMachine(EVENTS.GOTO_FRONT);
     } else if (positionState?.matches("covered.status:idle")) {
-      parentSheet.sendToPositionMachine("GO_UP");
+      parentSheet.sendToPositionMachine(EVENTS.GO_UP);
     } else if (positionState?.matches("covered.status:indeterminate")) {
-      parentSheet.sendToPositionMachine("GOTO_front");
+      parentSheet.sendToPositionMachine(EVENTS.GOTO_FRONT);
     }
   }
 

From 53ddf29b3cf96f02eb492d0d6e91fd4f590af6bc Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Sun, 1 Mar 2026 23:46:00 +0100
Subject: [PATCH 167/168] let handle trigger dismiss

---
 frontend/discourse/float-kit/components/d-sheet/handle.gjs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/handle.gjs b/frontend/discourse/float-kit/components/d-sheet/handle.gjs
index 92766e38f3419..993424ed5fdd6 100644
--- a/frontend/discourse/float-kit/components/d-sheet/handle.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/handle.gjs
@@ -55,13 +55,17 @@ export default class Handle extends SheetActionBase {
     return this.sheet?.isPresented ?? false;
   }
 
+  get root() {
+    return this.targetRoot ?? this.sheet?.rootComponent;
+  }
+
   /**
    * Execute the configured action on the sheet.
    */
   executeAction() {
     switch (this.actionType) {
       case "dismiss":
-        this.sheet?.close();
+        this.root.dismiss();
         break;
       case "step":
         this.executeStepAction();

From e2262e867fcb4283941daabc8d083f1d64647447 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Mon, 2 Mar 2026 10:12:08 +0100
Subject: [PATCH 168/168] better onClick

---
 .../discourse/float-kit/components/d-sheet/handle.gjs    | 1 +
 .../float-kit/components/d-sheet/sheet-action-base.js    | 9 +++++----
 .../discourse/float-kit/components/d-sheet/trigger.gjs   | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/discourse/float-kit/components/d-sheet/handle.gjs b/frontend/discourse/float-kit/components/d-sheet/handle.gjs
index 993424ed5fdd6..b11628d8eaf40 100644
--- a/frontend/discourse/float-kit/components/d-sheet/handle.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/handle.gjs
@@ -15,6 +15,7 @@ import SheetActionBase from "./sheet-action-base";
  *   - { forceFocus?: boolean, runAction?: boolean }
  *   - Or function receiving event with changeDefault method
  *   Default: { forceFocus: true, runAction: true }
+ * @param {Function} onClick - Called after onPress behavior/action handling
  */
 export default class Handle extends SheetActionBase {
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js b/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
index d31d5ef0522d7..7d8315aee216a 100644
--- a/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
+++ b/frontend/discourse/float-kit/components/d-sheet/sheet-action-base.js
@@ -21,6 +21,7 @@ export default class SheetActionBase extends Component {
   /**
    * Handles click events with configurable behavior via the onPress arg.
    * Optionally forces focus and runs the configured action.
+   * Calls onClick afterward to match trigger API parity.
    *
    * @param {MouseEvent} event - The native click event
    */
@@ -35,12 +36,12 @@ export default class SheetActionBase extends Component {
       event.currentTarget?.focus({ preventScroll: true });
     }
 
-    if (!behavior.runAction) {
-      return;
+    if (behavior.runAction) {
+      this.beforeExecuteAction(event);
+      this.executeAction();
     }
 
-    this.beforeExecuteAction(event);
-    this.executeAction();
+    this.args.onClick?.(event);
   };
 
   /**
diff --git a/frontend/discourse/float-kit/components/d-sheet/trigger.gjs b/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
index 162b32ac50b5d..36e15e4ed5c3c 100644
--- a/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
+++ b/frontend/discourse/float-kit/components/d-sheet/trigger.gjs
@@ -17,6 +17,7 @@ import SheetActionBase from "./sheet-action-base";
  *   - { forceFocus?: boolean, runAction?: boolean }
  *   - Or function receiving event with changeDefault method
  *   Default: { forceFocus: true, runAction: true }
+ * @param {Function} onClick - Called after onPress behavior/action handling
  */
 export default class Trigger extends SheetActionBase {
   /**